From ae48ea69cf378d03ffed0f694587a16696795387 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 16 Dec 2015 20:36:03 +0100
Subject: Use puma as the default development server, if available

---
 railties/lib/rails/commands/server.rb                     | 2 +-
 railties/lib/rails/generators/rails/app/templates/Gemfile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index d3ea441f8e..6a451861af 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -12,7 +12,7 @@ module Rails
         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
index 4384d9b6eb..abb4905294 100644
--- 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
 
-- 
cgit v1.2.3