puma 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38706b39e9afd3162b1c9ced04cb0f856e31706
-  data.tar.gz: b81aadfa3ed39aa205704e0d497c559be4e88259
+  metadata.gz: 830c9d3efc0d75b127a845f9598ae5c1059de586
+  data.tar.gz: 1dda7e6c8f4de27b0443f8a686ec251251ac40da
 SHA512:
-  metadata.gz: 5ca710aedc31a5e20d37d1fe656892837225ba1980c6fc5c368d8fba6704493483ca8cee2668b4491d41523d193f921b4580b6f4441a13cb7405a33eacdd2d8e
-  data.tar.gz: e931f560ea6b6edee01240041c654099187d411f18a49c07709243740b52efad89c86b23500f0aeb067f0dfcfdb9455cc56e8d0289bcf232a5a80a909bc24629
+  metadata.gz: 967d992a2f7d569ba91881649d7acdc8a9782ec3ee0a992d5eee4b4ab999b786189b6c5b33f530c63ca6bb4cc42ac0ddf22b0061da0c6dd656c28fd71594c40f
+  data.tar.gz: 43a7eb4409820f3b031f9bb5684c60787e755862c1cf249d66bf9a35e1b48e35dc383b74983838091463abca4c5bd154a9cef8fed4234e81ecefbf08c612dcb2

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: ruby
 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
   name: rdoc