Detect the presence of Puma a different way (#430)

* Detect the presence of Puma a different way * Update website gems
bridgetownrb · Oct 26, 2021 · 990b68a · 990b68a
1 parent 952061d
commit 990b68a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bridgetown-core/lib/bridgetown-core/commands/start.rb b/bridgetown-core/lib/bridgetown-core/commands/start.rb
@@ -30,8 +30,10 @@ def start # rubocop:todo Metrics/PerceivedComplexity
         Bridgetown::Commands::Build.print_startup_message
         sleep 0.25
 
-        unless Bundler.definition.specs.find { |s| s.name == "puma" }
-          raise "** No Rack-compatible server found **"
+        begin
+          require("puma/detect")
+        rescue LoadError
+          raise "** Puma server gem not found. Check your Gemfile and Bundler env? **"
         end
 
         options = Thor::CoreExt::HashWithIndifferentAccess.new(self.options)

diff --git a/bridgetown-website/Gemfile b/bridgetown-website/Gemfile
@@ -8,8 +8,8 @@ gem "bridgetown-core", path: "../bridgetown-core"
 gem "bridgetown-paginate", path: "../bridgetown-paginate"
 
 group :bridgetown_plugins do
-  gem "bridgetown-feed", "2.0.1", github: "bridgetownrb/bridgetown-feed"
-  gem "bridgetown-quick-search", "1.1.2", github: "bridgetownrb/bridgetown-quick-search"
+  gem "bridgetown-feed", "~> 2.1"
+  gem "bridgetown-quick-search", "~> 1.1"
   gem "bridgetown-seo-tag", "~> 5.0"
   gem "bridgetown-svg-inliner", "~> 1.0"
 end