Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect the presence of Puma a different way #430

Merged
merged 2 commits into from
Oct 26, 2021
Merged

Detect the presence of Puma a different way #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff7f529
Detect the presence of Puma a different way
jaredcwhite Oct 26, 2021
3ca5af5
Update website gems
jaredcwhite Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions bridgetown-core/lib/bridgetown-core/commands/start.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions bridgetown-website/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down