Use puma as the default development server, if available

rails · Dec 16, 2015 · ae48ea6 · ae48ea6
1 parent bf16ec2
commit ae48ea6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
@@ -12,7 +12,7 @@ def parse!(args)
         option_parser(options).parse! args
 
         options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
-        options[:server]     = args.shift
+        options[:server]     = args.shift || defined?(Puma) ? 'puma' : nil
         options
       end
 

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -12,12 +12,12 @@ source 'https://rubygems.org'
 <% end -%>
 <% end -%>
 
+# Use Puma as the app server
+gem 'puma', github: 'puma/puma' # FIXME: Release Rack 2 compatible Puma
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
-# Use Unicorn as the app server
-# gem 'unicorn'
-
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development