puma 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e39b5bfaf5412e8f121f6b9328daf7fa584660b
-  data.tar.gz: e51cb8a8d699a649016b13be0244a6cd3156f85a
+  metadata.gz: e38706b39e9afd3162b1c9ced04cb0f856e31706
+  data.tar.gz: b81aadfa3ed39aa205704e0d497c559be4e88259
 SHA512:
-  metadata.gz: bb73af5cfd7aa7e56c89356e1a0d1a2aba5fd8f479a92075d567d7edd46d73df1511802d6b5bec94e2086ad6391987bbc6ca84b2ba7187e19ba3e8acfc4de52e
-  data.tar.gz: 69a5de1661aad1e70548bf44043dbd2957cc8144f79b9b79cf50ba7ec24a072562301090cd2d2a7d6eeaf9e77994c16e80148f5c3ef832dd065058576bf4e48e
+  metadata.gz: 5ca710aedc31a5e20d37d1fe656892837225ba1980c6fc5c368d8fba6704493483ca8cee2668b4491d41523d193f921b4580b6f4441a13cb7405a33eacdd2d8e
+  data.tar.gz: e931f560ea6b6edee01240041c654099187d411f18a49c07709243740b52efad89c86b23500f0aeb067f0dfcfdb9455cc56e8d0289bcf232a5a80a909bc24629

data/History.txt

@@ -1,3 +1,19 @@
+=== 3.0.2 / 2016-02-26
+
+* 5 bug fixes:
+
+  * Fix 'undefined local variable or method `pid` for #<Puma::ControlCLI:0x007f185fcef968>' when execute pumactl with `--pid` option.
+  * Fix 'undefined method `windows?` for Puma:Module' when execute pumactl.
+  * Harden tmp_restart against errors related to the restart file
+  * Make `plugin :tmp_restart` behavior correct in Windows.
+  * fix uninitialized constant Puma::ControlCLI::StateFile
+
+* 3 PRs merged:
+
+  * Merge pull request #901 from mitto/fix-pumactl-uninitialized-constant-statefile
+  * Merge pull request #902 from corrupt952/fix_undefined_method_and_variable_when_execute_pumactl
+  * Merge pull request #905 from Eric-Guo/master
+
 === 3.0.1 / 2016-02-25
 
 * 1 bug fix:

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.0.1".freeze
+    PUMA_VERSION = VERSION = "3.0.2".freeze
     CODE_NAME = "Plethora of Penguin Pinatas".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/control_cli.rb

@@ -1,5 +1,7 @@
 require 'optparse'
+require 'puma'
 require 'puma/const'
+require 'puma/detect'
 require 'puma/configuration'
 require 'uri'
 require 'socket'
@@ -108,7 +110,7 @@ module Puma
           raise "State file not found: #{@state}"
         end
 
-        sf = StateFile.new
+        sf = Puma::StateFile.new
         sf.load @state
 
         @control_url = sf.control_url
@@ -177,24 +179,24 @@ module Puma
       end
 
       begin
-        Process.getpgid pid
+        Process.getpgid @pid
       rescue SystemCallError
         if @command == "restart"
           start
         else
-          raise "No pid '#{pid}' found"
+          raise "No pid '#{@pid}' found"
         end
       end
 
       case @command
       when "restart"
-        Process.kill "SIGUSR2", pid
+        Process.kill "SIGUSR2", @pid
 
       when "halt"
-        Process.kill "QUIT", pid
+        Process.kill "QUIT", @pid
 
       when "stop"
-        Process.kill "SIGTERM", pid
+        Process.kill "SIGTERM", @pid
 
       when "stats"
         puts "Stats not available via pid only"
@@ -205,7 +207,7 @@ module Puma
         return
 
       when "phased-restart"
-        Process.kill "SIGUSR1", pid
+        Process.kill "SIGUSR1", @pid
 
       else
         message "Puma is started"

data/lib/puma/plugin.rb

@@ -58,8 +58,21 @@ module Puma
   Plugins = PluginRegistry.new
 
   class Plugin
+    # Matches
+    #  "C:/Ruby22/lib/ruby/gems/2.2.0/gems/puma-3.0.1/lib/puma/plugin/tmp_restart.rb:3:in `<top (required)>'"
+    #  AS
+    #  C:/Ruby22/lib/ruby/gems/2.2.0/gems/puma-3.0.1/lib/puma/plugin/tmp_restart.rb
+    CALLER_FILE = /
+      \A       # start of string
+      .+       # file path (one or more characters)
+      (?=      # stop previous match when
+        :\d+     # a colon is followed by one or more digits
+        :in      # followed by a colon followed by in
+      )
+    /x
+
     def self.extract_name(ary)
-      path = ary.first.split(":").first
+      path = ary.first[CALLER_FILE]
 
       m = %r!puma/plugin/([^/]*)\.rb$!.match(path)
       return m[1]

data/lib/puma/plugin/tmp_restart.rb

@@ -4,17 +4,29 @@ Puma::Plugin.create do
   def start(launcher)
     path = File.join("tmp", "restart.txt")
 
-    File.write path, ""
+    orig = nil
 
-    orig = File.stat(path).mtime
+    # If we can't write to the path, then just don't bother with this plugin
+    begin
+      File.write path, ""
+      orig = File.stat(path).mtime
+    rescue SystemCallError
+      return
+    end
 
     in_background do
       while true
         sleep 2
 
-        if File.stat(path).mtime > orig
-          launcher.restart
-          break
+        begin
+          mtime = File.stat(path).mtime
+        rescue SystemCallError
+          # If the file has disappeared, assume that means don't restart
+        else
+          if mtime > orig
+            launcher.restart
+            break
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Evan Phoenix