puma 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adcb4384f1d28b84c63041a1b78402482a6db2ce
-  data.tar.gz: ce554d8a2caa636a2a9607d4a2c4aebee5e494e6
+  metadata.gz: d505f8f40445ce6e34221fcfcf2f7def6d70b62e
+  data.tar.gz: 6faf73b68c407a10fecc11b733f94ab912d897cf
 SHA512:
-  metadata.gz: 297c51791e245bb2da548687422d1558d4996006a90d6774a792e7d7ba5f274584c17a8779324650ef369c2e22f3c1d2a1fe297e248b12e593bf8f9182b6ef03
-  data.tar.gz: c80e343900046c22ab04f769fe93f23a21ee049ced503651e2ce308318442de6ede044ea9427d0f385c183435ad9f6c63289a58220f1df854fdcf077e50d1553
+  metadata.gz: ccdefc0d6b175fd1bc478957bd2716659a6d251f05600d6b4627068340fab45d47aafdb581d8c235cd68602ab23b4cf4ce697ac978f68b21b48ac64bd8855174
+  data.tar.gz: a2847c2cc742ce254aaa6b8f235941bf4b1742ab02a1c98ec4761320adf1e0ab12a6e5c984ef9e59e685f31a24e570041520c80c0da184f094e179db412c7d1b

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.13.1 / 2015-08-15
+
+* 2 bug fixes:
+  * Fix binds being masked in config files. Fixes #765
+  * Use options from the config file properly in pumactl. Fixes #764
+
 === 2.13.0 / 2015-08-14
 
 * 1 minor feature:

data/lib/puma/binder.rb

@@ -227,7 +227,7 @@ module Puma
     # allow to accumulate before returning connection refused.
     #
     def add_tcp_listener(host, port, optimize_for_latency=true, backlog=1024)
-      host = host[1..-2] if host[0..0] == '['
+      host = host[1..-2] if host and host[0..0] == '['
       s = TCPServer.new(host, port)
       if optimize_for_latency
         s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)

data/lib/puma/cli.rb

@@ -300,13 +300,11 @@ module Puma
     #
 
     def setup_options
-      @cli_options = {
-        :binds => []
-      }
+      @cli_options = {}
 
       @parser = OptionParser.new do |o|
         o.on "-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)" do |arg|
-          @cli_options[:binds] << arg
+          (@cli_options[:binds] ||= []) << arg
         end
 
         o.on "-C", "--config PATH", "Load PATH as a config file" do |arg|

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.13.0".freeze
+    PUMA_VERSION = VERSION = "2.13.1".freeze
     CODE_NAME = "A Midsummer Code's Dream".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/control_cli.rb

@@ -17,37 +17,37 @@ module Puma
       @argv = argv
       @stdout = stdout
       @stderr = stderr
-      @options = {}
+      @cli_options = {}
 
       opts = OptionParser.new do |o|
         o.banner = "Usage: pumactl (-p PID | -P pidfile | -S status_file | -C url -T token | -F config.rb) (#{COMMANDS.join("|")})"
 
         o.on "-S", "--state PATH", "Where the state file to use is" do |arg|
-          @options[:state] = arg
+          @cli_options[:state] = arg
         end
 
         o.on "-Q", "--quiet", "Not display messages" do |arg|
-          @options[:quiet_flag] = true
+          @cli_options[:quiet_flag] = true
         end
 
         o.on "-P", "--pidfile PATH", "Pid file" do |arg|
-          @options[:pidfile] = arg
+          @cli_options[:pidfile] = arg
         end
 
         o.on "-p", "--pid PID", "Pid" do |arg|
-          @options[:pid] = arg.to_i
+          @cli_options[:pid] = arg.to_i
         end
 
         o.on "-C", "--control-url URL", "The bind url to use for the control server" do |arg|
-          @options[:control_url] = arg
+          @cli_options[:control_url] = arg
         end
 
         o.on "-T", "--control-token TOKEN", "The token to use as authentication for the control server" do |arg|
-          @options[:control_auth_token] = arg
+          @cli_options[:control_auth_token] = arg
         end
 
         o.on "-F", "--config-file PATH", "Puma config script" do |arg|
-          @options[:config_file] = arg
+          @cli_options[:config_file] = arg
         end
 
         o.on_tail("-H", "--help", "Show this message") do
@@ -64,18 +64,24 @@ module Puma
       opts.order!(argv) { |a| opts.terminate a }
 
       command = argv.shift
-      @options[:command] = command if command
+      @cli_options[:command] = command if command
 
-      unless @options[:config_file] == '-'
-        if @options[:config_file].nil? and File.exist?('config/puma.rb')
-          @options[:config_file] = 'config/puma.rb'
+      @options = nil
+
+      unless @cli_options[:config_file] == '-'
+        if @cli_options[:config_file].nil? and File.exist?('config/puma.rb')
+          @cli_options[:config_file] = 'config/puma.rb'
         end
 
-        if @options[:config_file]
-          Puma::Configuration.new(@options).load
+        if @cli_options[:config_file]
+          config = Puma::Configuration.new(@cli_options)
+          config.load
+          @options = config.options
         end
       end
 
+      @options ||= @cli_options
+
       # check present of command
       unless @options[:command]
         raise "Available commands: #{COMMANDS.join(", ")}"

metadata

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