puma 3.0.1-java → 3.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b281e8c01b8d7052006356e3d31f6e6c27257d7
-  data.tar.gz: 7cc629d6de4c943d751f472ba95c3c2933601ecb
+  metadata.gz: bdf67a2718833f75de9167501a9b2c731d3b0ce5
+  data.tar.gz: bf1d38a64c51f079d6f4f7e849b5fd6158265971
 SHA512:
-  metadata.gz: b4b5ede627fcd4b84140b44a108789afc46f7363ef4d2209412b1e4d5d3022676a1546a5b7c2ba986eb2d80afeecfcb56b26bf833794a2e6ed48a4058ec530d1
-  data.tar.gz: cc2143fae1fb0dd99476e66fa0b81f3bf5ac23cb8309ca740712efffcaa4ea885e60b64bfb309347b87a484ab581903ace064ef4b166d63a7b284e0c99d415f7
+  metadata.gz: b2310c30304035538c68828bde59aa8e3a07bdae4468f3152711dbeb6a3b0e7e4b59762e4271dd6e5ef1551bab761fad11b5550cb59babc4d9fa66243f7ba06b
+  data.tar.gz: 357210543f7b79b78fd63eafc760a0eaa36f828a2f2548d64cdea91a534a1479b5fb430f1636bcfbb93e9e5e61df1def96201f16e587e4af5ef47ee67df6ab94

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: java
 authors:
 - Evan Phoenix