puma 3.0.2-java → 3.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf67a2718833f75de9167501a9b2c731d3b0ce5
-  data.tar.gz: bf1d38a64c51f079d6f4f7e849b5fd6158265971
+  metadata.gz: cd667f4be1193acbc7a84148f9b993a3618d40a6
+  data.tar.gz: c108707140d918a74f59b31de2a6fcfa818f5768
 SHA512:
-  metadata.gz: b2310c30304035538c68828bde59aa8e3a07bdae4468f3152711dbeb6a3b0e7e4b59762e4271dd6e5ef1551bab761fad11b5550cb59babc4d9fa66243f7ba06b
-  data.tar.gz: 357210543f7b79b78fd63eafc760a0eaa36f828a2f2548d64cdea91a534a1479b5fb430f1636bcfbb93e9e5e61df1def96201f16e587e4af5ef47ee67df6ab94
+  metadata.gz: 4510ea74d1d6588cd34cb0c1b9d7283bb37fbead2722f11eae592867cc387e1ea432eac6f93125551026596bd394a78365486c24bd4cfb4273548fec65df1a8c
+  data.tar.gz: 2a7b31a4d8a65ecdceb3e183bbdbbee3155a636c91263d527c8089e3f39f589d6f3d3b40af083781531d67c6877a4a5dfaf335bc7b8965d1a86111ad8fb82acf

data/History.txt

@@ -1,3 +1,14 @@
+=== 3.1.0 / 2016-03-05
+
+* 1 minor feature:
+  * Add 'import' directive to config file. Fixes #916
+
+* 5 bug fixes:
+  * Add 'fetch' to options. Fixes #913
+  * Fix jruby daemonization. Fixes #918
+  * Recreate the proper args manually. Fixes #910
+  * Require 'time' to get iso8601. Fixes #914
+
 === 3.0.2 / 2016-02-26
 
 * 5 bug fixes:

data/lib/puma/cluster.rb

@@ -1,4 +1,5 @@
 require 'puma/runner'
+require 'time'
 
 module Puma
   class Cluster < Runner

data/lib/puma/configuration.rb

@@ -44,6 +44,12 @@ module Puma
       end
     end
 
+    def fetch(key, default=nil)
+      val = self[key]
+      return val if val
+      default
+    end
+
     attr_reader :cur
 
     def all_of(key)

data/lib/puma/const.rb

@@ -99,8 +99,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "3.0.2".freeze
-    CODE_NAME = "Plethora of Penguin Pinatas".freeze
+    PUMA_VERSION = VERSION = "3.1.0".freeze
+    CODE_NAME = "El Niño Winter Wonderland".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/control_cli.rb

@@ -237,15 +237,14 @@ module Puma
     def start
       require 'puma/cli'
 
-      run_args = @argv
-
-      if path = @state
-        run_args = ["-S", path] + run_args
-      end
-
-      if path = @config_file
-        run_args = ["-C", path] + run_args
-      end
+      run_args = []
+
+      run_args += ["-S", @state]  if @state
+      run_args += ["-q"] if @quiet
+      run_args += ["--pidfile", @pidfile] if @pidfile
+      run_args += ["--control", @control_url] if @control_url
+      run_args += ["--control-token", @control_auth_token] if @control_auth_token
+      run_args += ["-C", @config_file] if @config_file
 
       events = Puma::Events.new @stdout, @stderr
 

data/lib/puma/dsl.rb

@@ -21,7 +21,10 @@ module Puma
     end
 
     def _load_from(path)
-      instance_eval(File.read(path), path, 1) if path
+      if path
+        @path = path
+        instance_eval(File.read(path), path, 1)
+      end
     ensure
       _offer_plugins
     end
@@ -47,6 +50,26 @@ module Puma
       instance_eval(&blk)
     end
 
+    # Load configuration from another named file. If the file name is absolute,
+    # load the file as an absolute path. Otherwise load it relative to the
+    # current config file.
+    #
+    def import(file)
+      if File.extname(file) == ""
+        file += ".rb"
+      end
+
+      if file[0,1] == "/"
+        path = file
+      elsif @path
+        path = File.join File.dirname(@path), file
+      else
+        raise "No original configuration path to import relative to"
+      end
+
+      DSL.new(@options, @config)._load_from(path)
+    end
+
     def get(key,default=nil)
       @options[key.to_sym] || default
     end

data/lib/puma/jruby_restart.rb

@@ -61,7 +61,7 @@ module Puma
     end
 
     def self.daemon_start(dir, argv)
-      ENV['PUMA_DAEMON_RESTART'] = Process.pid.to_s
+      ENV[RestartKey] = Process.pid.to_s
 
       if k = ENV['PUMA_JRUBY_DAEMON_OPTS']
         ENV['JRUBY_OPTS'] = k

data/lib/puma/launcher.rb

@@ -191,6 +191,15 @@ module Puma
       @binder.connected_port
     end
 
+    def restart_args
+      cmd = @options[:restart_cmd]
+      if cmd
+        cmd.split(' ') + @original_argv
+      else
+        @restart_argv
+      end
+    end
+
     private
 
     def reload_worker_directory
@@ -260,15 +269,6 @@ module Puma
       (@options[:workers] || 0) > 0
     end
 
-    def restart_args
-      cmd = @options[:restart_cmd]
-      if cmd
-        cmd.split(' ') + @original_argv
-      else
-        @restart_argv
-      end
-    end
-
     def unsupported(str)
       @events.error(str)
       raise UnsupportedOption

data/lib/puma/single.rb

@@ -32,7 +32,7 @@ module Puma
 
     def jruby_daemon_start
       require 'puma/jruby_restart'
-      JRubyRestart.daemon_start(@restart_dir, restart_args)
+      JRubyRestart.daemon_start(@restart_dir, @launcher.restart_args)
     end
 
     def run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement