Hello community,
here is the log from the commit of package rubygem-puma for openSUSE:Factory
checked in at 2016-03-26 15:28:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-03-07 13:29:21.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-puma.new/rubygem-puma.changes
2016-03-26 18:14:25.000000000 +0100
@@ -1,0 +2,36 @@
+Sat Mar 19 05:30:57 UTC 2016 - co...@suse.com
+
+- updated to version 3.1.1
+ see installed History.txt
+
+ === 3.1.1 / 2016-03-17
+
+ * 4 bug fixes:
+ * Disable USR1 usage on JRuby
+ * Fixes #922 - Correctly define file encoding as UTF-8
+ * Set a more explicit SERVER_SOFTWARE Rack variable
+ * Show RUBY_ENGINE_VERSION if available. Fixes #923
+
+ * 3 PRs merged:
+ * Merge pull request #912 from tricknotes/fix-allow-failures-in-travis-yml
+ * Merge pull request #921 from swrobel/patch-1
+ * Merge pull request #924 from tbrisker/patch-1
+
+-------------------------------------------------------------------
+Sun Mar 6 05:32:14 UTC 2016 - co...@suse.com
+
+- updated to version 3.1.0
+ see installed History.txt
+
+ === 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
+
+-------------------------------------------------------------------
Old:
----
puma-3.0.2.gem
New:
----
puma-3.1.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-puma.spec ++++++
--- /var/tmp/diff_new_pack.V3hlId/_old 2016-03-26 18:14:26.000000000 +0100
+++ /var/tmp/diff_new_pack.V3hlId/_new 2016-03-26 18:14:26.000000000 +0100
@@ -24,7 +24,7 @@
#
Name: rubygem-puma
-Version: 3.0.2
+Version: 3.1.1
Release: 0
%define mod_name puma
%define mod_full_name %{mod_name}-%{version}
++++++ puma-3.0.2.gem -> puma-3.1.1.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/History.txt new/History.txt
--- old/History.txt 2016-02-26 19:35:20.000000000 +0100
+++ new/History.txt 2016-03-18 05:32:21.000000000 +0100
@@ -1,3 +1,27 @@
+=== 3.1.1 / 2016-03-17
+
+* 4 bug fixes:
+ * Disable USR1 usage on JRuby
+ * Fixes #922 - Correctly define file encoding as UTF-8
+ * Set a more explicit SERVER_SOFTWARE Rack variable
+ * Show RUBY_ENGINE_VERSION if available. Fixes #923
+
+* 3 PRs merged:
+ * Merge pull request #912 from tricknotes/fix-allow-failures-in-travis-yml
+ * Merge pull request #921 from swrobel/patch-1
+ * Merge pull request #924 from tbrisker/patch-1
+
+=== 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:
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 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/binder.rb 2016-03-18 05:32:21.000000000 +0100
@@ -28,7 +28,7 @@
"QUERY_STRING".freeze => "",
SERVER_PROTOCOL => HTTP_11,
- SERVER_SOFTWARE => PUMA_VERSION,
+ SERVER_SOFTWARE => PUMA_SERVER_STRING,
GATEWAY_INTERFACE => CGI_VER
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/cluster.rb new/lib/puma/cluster.rb
--- old/lib/puma/cluster.rb 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/cluster.rb 2016-03-18 05:32:21.000000000 +0100
@@ -1,4 +1,5 @@
require 'puma/runner'
+require 'time'
module Puma
class Cluster < Runner
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 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/configuration.rb 2016-03-18 05:32:21.000000000 +0100
@@ -44,6 +44,12 @@
end
end
+ def fetch(key, default=nil)
+ val = self[key]
+ return val if val
+ default
+ end
+
attr_reader :cur
def all_of(key)
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 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/const.rb 2016-03-18 05:32:21.000000000 +0100
@@ -1,3 +1,4 @@
+#encoding: utf-8
module Puma
class UnsupportedOption < RuntimeError
end
@@ -99,9 +100,10 @@
# 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.1".freeze
+ CODE_NAME = "El Niño Winter Wonderland".freeze
+ PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
+
FAST_TRACK_KA_TIMEOUT = 0.2
# The default number of seconds for another request within a persistent
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 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/control_cli.rb 2016-03-18 05:32:21.000000000 +0100
@@ -237,15 +237,14 @@
def start
require 'puma/cli'
- run_args = @argv
+ run_args = []
- if path = @state
- run_args = ["-S", path] + run_args
- end
-
- if path = @config_file
- run_args = ["-C", path] + run_args
- end
+ 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/dsl.rb new/lib/puma/dsl.rb
--- old/lib/puma/dsl.rb 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/dsl.rb 2016-03-18 05:32:21.000000000 +0100
@@ -21,7 +21,10 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/jruby_restart.rb
new/lib/puma/jruby_restart.rb
--- old/lib/puma/jruby_restart.rb 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/jruby_restart.rb 2016-03-18 05:32:21.000000000 +0100
@@ -61,7 +61,7 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/launcher.rb new/lib/puma/launcher.rb
--- old/lib/puma/launcher.rb 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/launcher.rb 2016-03-18 05:32:21.000000000 +0100
@@ -191,6 +191,15 @@
@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 @@
(@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
@@ -361,12 +361,14 @@
log "*** SIGUSR2 not implemented, signal based restart unavailable!"
end
- begin
- Signal.trap "SIGUSR1" do
- phased_restart
+ unless Puma.jruby?
+ begin
+ Signal.trap "SIGUSR1" do
+ phased_restart
+ end
+ rescue Exception
+ log "*** SIGUSR1 not implemented, signal based restart unavailable!"
end
- rescue Exception
- log "*** SIGUSR1 not implemented, signal based restart unavailable!"
end
begin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/runner.rb new/lib/puma/runner.rb
--- old/lib/puma/runner.rb 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/runner.rb 2016-03-18 05:32:21.000000000 +0100
@@ -72,7 +72,11 @@
if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
"ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
else
- "#{RUBY_ENGINE} #{RUBY_VERSION}"
+ if defined?(RUBY_ENGINE_VERSION)
+ "#{RUBY_ENGINE} #{RUBY_ENGINE_VERSION} - ruby #{RUBY_VERSION}"
+ else
+ "#{RUBY_ENGINE} #{RUBY_VERSION}"
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/puma/single.rb new/lib/puma/single.rb
--- old/lib/puma/single.rb 2016-02-26 19:35:20.000000000 +0100
+++ new/lib/puma/single.rb 2016-03-18 05:32:21.000000000 +0100
@@ -32,7 +32,7 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2016-02-26 19:35:20.000000000 +0100
+++ new/metadata 2016-03-18 05:32:21.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: puma
version: !ruby/object:Gem::Version
- version: 3.0.2
+ version: 3.1.1
platform: ruby
authors:
- Evan Phoenix
autorequire:
bindir: bin
cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rdoc
