Hello community, here is the log from the commit of package rubygem-puma for openSUSE:Factory checked in at 2015-08-29 20:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-puma (Old) and /work/SRC/openSUSE:Factory/.rubygem-puma.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-puma" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-puma/rubygem-puma.changes 2015-08-27 08:56:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-puma.new/rubygem-puma.changes 2015-08-29 20:05:22.000000000 +0200 @@ -1,0 +2,32 @@ +Mon Aug 24 04:30:05 UTC 2015 - coolo@suse.com + +- updated to version 2.13.4 + see installed History.txt + + === 2.13.4 / 2015-08-16 + + * 1 bug fix: + * Use the environment possible set by the config early and from + the config file later (if set). + + === 2.13.3 / 2015-08-15 + + Seriously, I need to revamp config with tests. + + * 1 bug fix: + * Fix preserving options before cleaning for state. Fixes #769 + + === 2.13.2 / 2015-08-15 + + The "clearly I don't have enough tests for the config" release. + + * 1 bug fix: + * Fix another place binds wasn't initialized. Fixes #767 + + === 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 + +------------------------------------------------------------------- Old: ---- puma-2.13.0.gem New: ---- puma-2.13.4.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-puma.spec ++++++ --- /var/tmp/diff_new_pack.LnWwNF/_old 2015-08-29 20:05:23.000000000 +0200 +++ /var/tmp/diff_new_pack.LnWwNF/_new 2015-08-29 20:05:23.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-puma -Version: 2.13.0 +Version: 2.13.4 Release: 0 %define mod_name puma %define mod_full_name %{mod_name}-%{version} ++++++ puma-2.13.0.gem -> puma-2.13.4.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/History.txt new/History.txt --- old/History.txt 2015-08-15 03:34:19.000000000 +0200 +++ new/History.txt 2015-08-16 18:21:02.000000000 +0200 @@ -1,3 +1,29 @@ +=== 2.13.4 / 2015-08-16 + +* 1 bug fix: + * Use the environment possible set by the config early and from + the config file later (if set). + +=== 2.13.3 / 2015-08-15 + +Seriously, I need to revamp config with tests. + +* 1 bug fix: + * Fix preserving options before cleaning for state. Fixes #769 + +=== 2.13.2 / 2015-08-15 + +The "clearly I don't have enough tests for the config" release. + +* 1 bug fix: + * Fix another place binds wasn't initialized. Fixes #767 + +=== 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: Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/binder.rb new/lib/puma/binder.rb --- old/lib/puma/binder.rb 2015-08-15 03:34:19.000000000 +0200 +++ new/lib/puma/binder.rb 2015-08-16 18:21:02.000000000 +0200 @@ -227,7 +227,7 @@ # 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/cli.rb new/lib/puma/cli.rb --- old/lib/puma/cli.rb 2015-08-15 03:34:19.000000000 +0200 +++ new/lib/puma/cli.rb 2015-08-16 18:21:02.000000000 +0200 @@ -96,7 +96,7 @@ end def env - @cli_options[:environment] || ENV['RACK_ENV'] || 'development' + @options[:environment] || @cli_options[:environment] || ENV['RACK_ENV'] || 'development' end def write_state @@ -300,13 +300,12 @@ # def setup_options - @cli_options = { - :binds => [] - } + @cli_options = {} + @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| @@ -352,7 +351,8 @@ o.on "-p", "--port PORT", "Define the TCP port to bind to", "Use -b for more advanced options" do |arg| - @cli_options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{arg}" + binds = (@cli_options[:binds] ||= []) + binds << "tcp://#{Configuration::DefaultTCPHost}:#{arg}" end o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/configuration.rb new/lib/puma/configuration.rb --- old/lib/puma/configuration.rb 2015-08-15 03:34:19.000000000 +0200 +++ new/lib/puma/configuration.rb 2015-08-16 18:21:02.000000000 +0200 @@ -35,7 +35,9 @@ attr_reader :options def initialize_copy(other) - @conf = @conf.dup + @conf = nil + @cli_options = nil + @options = @options.dup end def default_options @@ -55,7 +57,6 @@ # Load the options in the right priority # - @options = {} @options.merge! default_options @options.merge! @conf @options.merge! @cli_options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/const.rb new/lib/puma/const.rb --- old/lib/puma/const.rb 2015-08-15 03:34:19.000000000 +0200 +++ new/lib/puma/const.rb 2015-08-16 18:21:02.000000000 +0200 @@ -99,7 +99,7 @@ # too taxing on performance. module Const - PUMA_VERSION = VERSION = "2.13.0".freeze + PUMA_VERSION = VERSION = "2.13.4".freeze CODE_NAME = "A Midsummer Code's Dream".freeze FAST_TRACK_KA_TIMEOUT = 0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/puma/control_cli.rb new/lib/puma/control_cli.rb --- old/lib/puma/control_cli.rb 2015-08-15 03:34:19.000000000 +0200 +++ new/lib/puma/control_cli.rb 2015-08-16 18:21:02.000000000 +0200 @@ -17,37 +17,37 @@ @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 @@ 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(", ")}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-08-15 03:34:19.000000000 +0200 +++ new/metadata 2015-08-16 18:21:02.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: puma version: !ruby/object:Gem::Version - version: 2.13.0 + version: 2.13.4 platform: ruby authors: - Evan Phoenix autorequire: bindir: bin cert_chain: [] -date: 2015-08-15 00:00:00.000000000 Z +date: 2015-08-16 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rdoc