puma 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b54fddb15d1859af7c94fe4dc95d34af40e876
-  data.tar.gz: 90eda7e0a364e1e1ef1e887a7c74324c3c6cecd0
+  metadata.gz: ae407cb3f846ef2c3da83f997e42b4b0da3e6b9e
+  data.tar.gz: 2e74ecbc15ed0a1363ad70d71605c69004b184ee
 SHA512:
-  metadata.gz: c8197313239e459ed3f37c86e1445b5799cc899e53bbde54408cf2f51a730195674c5fb0e2ca614d926ceaaa928b3085a40762ff79542a8177eec00e22e1d284
-  data.tar.gz: fdd6b229cb07839741bbe9612c18ef84b856f9dea72d7cc35ed5224d254e94db285025599015ea2c2cbe80df5282a9a05b10671c8576ba656d5f1f99aced7caf
+  metadata.gz: b66e244414a78a68ab0e841f10f531797098a19d054757b9e0d7cb2bceebe1e850a2e50aa73d9b096379a99e73b8a9d242afb5c477ecd2de2dddf7950d630404
+  data.tar.gz: 52c7ac2681b0a73e58e2e1a2cf13d2e448248703dbcd630823c221423a4ae1564a71f28e10a4896ce9be2ab3e1c64a0ee2e0fab735c93bd9619e33dc08ef7f3d

data/History.txt

@@ -1,3 +1,17 @@
+=== 3.2.0 / 2016-03-20
+
+* 1 deprecation removal:
+  * Delete capistrano.rb
+
+* 3 bug fixes:
+  * Detect gems.rb as well as Gemfile
+  * Simplify and fix logic for directory to use when restarting for all phases
+  * Speed up phased-restart start
+
+* 2 PRs merged:
+  * Merge pull request #927 from jlecour/gemfile_variants
+  * Merge pull request #931 from joneslee85/patch-10
+
 === 3.1.1 / 2016-03-17
 
 * 4 bug fixes:

data/Manifest.txt

@@ -29,7 +29,6 @@ lib/puma.rb
 lib/puma/accept_nonblock.rb
 lib/puma/app/status.rb
 lib/puma/binder.rb
-lib/puma/capistrano.rb
 lib/puma/cli.rb
 lib/puma/client.rb
 lib/puma/cluster.rb

data/lib/puma/cluster.rb

@@ -31,10 +31,9 @@ module Puma
 
       # Be sure to change the directory again before loading
       # the app. This way we can pick up new code.
-      if dir = @options[:worker_directory]
-        log "+ Changing to #{dir}"
-        Dir.chdir dir
-      end
+      dir = @launcher.restart_dir
+      log "+ Changing to #{dir}"
+      Dir.chdir dir
     end
 
     def redirect_io
@@ -219,8 +218,12 @@ module Puma
 
       # If we're not running under a Bundler context, then
       # report the info about the context we will be using
-      if !ENV['BUNDLE_GEMFILE'] and File.exist?("Gemfile")
-        log "+ Gemfile in context: #{File.expand_path("Gemfile")}"
+      if !ENV['BUNDLE_GEMFILE']
+        if File.exist?("Gemfile")
+          log "+ Gemfile in context: #{File.expand_path("Gemfile")}"
+        elsif File.exist?("gems.rb")
+          log "+ Gemfile in context: #{File.expand_path("gems.rb")}"
+        end
       end
 
       # Invoke any worker boot hooks so they can get
@@ -298,10 +301,9 @@ module Puma
     end
 
     def reload_worker_directory
-      if dir = @options[:worker_directory]
-        log "+ Changing to #{dir}"
-        Dir.chdir dir
-      end
+      dir = @launcher.restart_dir
+      log "+ Changing to #{dir}"
+      Dir.chdir dir
     end
 
     def stats
@@ -422,12 +424,21 @@ module Puma
       @launcher.events.fire_on_booted!
 
       begin
+        force_check = false
+
         while @status == :run
           begin
-            res = IO.select([read], nil, nil, 5)
+            if @phased_restart
+              start_phased_restart
+              @phased_restart = false
+            end
+
+            check_workers force_check
 
             force_check = false
 
+            res = IO.select([read], nil, nil, 5)
+
             if res
               req = read.read_nonblock(1)
 
@@ -453,13 +464,6 @@ module Puma
               end
             end
 
-            if @phased_restart
-              start_phased_restart
-              @phased_restart = false
-            end
-
-            check_workers force_check
-
           rescue Interrupt
             @status = :stop
           end

data/lib/puma/const.rb

@@ -100,8 +100,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.1.1".freeze
-    CODE_NAME = "El Niño Winter Wonderland".freeze
+    PUMA_VERSION = VERSION = "3.2.0".freeze
+    CODE_NAME = "Spring Is A Heliocentric Viewpoint".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
     
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/dsl.rb

@@ -312,13 +312,12 @@ module Puma
     # The directory to operate out of.
     def directory(dir)
       @options[:directory] = dir.to_s
-
-      worker_directory dir
     end
 
-    # Set the directory for workers to start in
+    # DEPRECATED: The directory to operate out of.
     def worker_directory(dir)
-      @options[:worker_directory] = dir.to_s
+      $stderr.puts "worker_directory is deprecated. Please use `directory`"
+      directory dir
     end
 
     # Run the app as a raw TCP app instead of an HTTP rack app

data/lib/puma/launcher.rb

@@ -54,8 +54,6 @@ module Puma
       @binder        = Binder.new(@events)
       @binder.import_from_env
 
-      generate_restart_data
-
       @environment = conf.environment
 
       # Advertise the Configuration
@@ -65,6 +63,8 @@ module Puma
 
       @options = @config.options
 
+      generate_restart_data
+
       if clustered? && (Puma.jruby? || Puma.windows?)
         unsupported 'worker mode not supported on JRuby or Windows'
       end
@@ -73,8 +73,7 @@ module Puma
         unsupported 'daemon mode not supported on Windows'
       end
 
-      dir = @options[:directory]
-      Dir.chdir(dir) if dir
+      Dir.chdir(@restart_dir)
 
       prune_bundler if prune_bundler?
 
@@ -93,7 +92,7 @@ module Puma
       @status = :run
     end
 
-    attr_reader :binder, :events, :config, :options
+    attr_reader :binder, :events, :config, :options, :restart_dir
 
     # Return stats about the server
     def stats
@@ -314,16 +313,18 @@ module Puma
 
 
     def generate_restart_data
-      # Use the same trick as unicorn, namely favor PWD because
-      # it will contain an unresolved symlink, useful for when
-      # the pwd is /data/releases/current.
-      if dir = ENV['PWD']
+      if dir = @options[:directory]
+        @restart_dir = dir
+
+        # Use the same trick as unicorn, namely favor PWD because
+        # it will contain an unresolved symlink, useful for when
+        # the pwd is /data/releases/current.
+      elsif dir = ENV['PWD']
         s_env = File.stat(dir)
         s_pwd = File.stat(Dir.pwd)
 
         if s_env.ino == s_pwd.ino and (Puma.jruby? or s_env.dev == s_pwd.dev)
           @restart_dir = dir
-          @config.configure { |c| c.worker_directory dir }
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -126,7 +126,6 @@ files:
 - lib/puma/accept_nonblock.rb
 - lib/puma/app/status.rb
 - lib/puma/binder.rb
-- lib/puma/capistrano.rb
 - lib/puma/cli.rb
 - lib/puma/client.rb
 - lib/puma/cluster.rb

data/lib/puma/capistrano.rb

@@ -1,94 +0,0 @@
-$stderr.puts "DEPRECATED: To manage puma with capistrano, use https://github.com/seuros/capistrano-puma"
-
-Capistrano::Configuration.instance.load do
-
-  # Ensure the tmp/sockets directory is created by the deploy:setup task and
-  # symlinked in by the deploy:update task. This is not handled by Capistrano
-  # v2 but is fixed in v3.
-  shared_children.push('tmp/sockets')
-
-  _cset(:puma_default_hooks)    { true }
-  _cset(:puma_cmd)    { "#{fetch(:bundle_cmd, 'bundle')} exec puma" }
-  _cset(:pumactl_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec pumactl" }
-  _cset(:puma_env)    { fetch(:rack_env, fetch(:rails_env, 'production')) }
-  _cset(:puma_state)  { "#{shared_path}/sockets/puma.state" }
-  _cset(:puma_socket) { "unix://#{shared_path}/sockets/puma.sock" }
-  _cset(:puma_role)   { :app }
-
-  if fetch(:puma_default_hooks)
-    after 'deploy:stop', 'puma:stop'
-    after 'deploy:start', 'puma:start'
-    after 'deploy:restart', 'puma:restart'
-  end
-
-  namespace :puma do
-    desc 'Start puma'
-    task :start, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{puma_rails_additional_env} #{puma_cmd} #{start_options}", :pty => false
-    end
-
-    desc 'Stop puma'
-    task :stop, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{pumactl_cmd} -S #{state_path} stop"
-    end
-
-    desc 'Restart puma'
-    task :restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      begin
-        run "cd #{current_path} && #{puma_rails_additional_env} #{pumactl_cmd} -S #{state_path} restart"
-      rescue Capistrano::CommandError => ex
-        puts "Failed to restart puma: #{ex}\nAssuming not started."
-        start
-      end
-    end
-
-    desc 'Restart puma (phased restart)'
-    task :phased_restart, :roles => lambda { puma_role }, :on_no_matching_servers => :continue do
-      begin
-        run "cd #{current_path} && #{puma_rails_additional_env} #{pumactl_cmd} -S #{state_path} phased-restart"
-      rescue Capistrano::CommandError => ex
-        puts "Failed to restart puma: #{ex}\nAssuming not started."
-        start
-      end
-    end
-
-  end
-
-  def start_options
-    if config_file
-      "-q -d -e #{puma_env} -C #{config_file}"
-    else
-      "-q -d -e #{puma_env} -b '#{puma_socket}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
-    end
-  end
-
-  def config_file
-    @_config_file ||= begin
-      file = fetch(:puma_config_file, nil)
-      file = "./config/puma/#{puma_env}.rb" if !file && File.exists?("./config/puma/#{puma_env}.rb")
-      file
-    end
-  end
-
-  def puma_env
-    fetch(:rack_env, fetch(:rails_env, 'production'))
-  end
-
-  #add additional env when start rails, such as : secret key, db username, db pwd or other what you want.
-  def puma_rails_additional_env
-    fetch(:puma_rails_additional_env, '')
-  end
-
-  def state_path
-    (config_file ? configuration.options[:state] : nil) || puma_state
-  end
-
-  def configuration
-    require 'puma'
-    require 'puma/configuration'
-
-    config = Puma::Configuration.new(:config_file => config_file)
-    config.load
-    config
-  end
-end