[rubygem-thin] Update to Thin 1.3.1.
Vít Ondruch
vondruch at fedoraproject.org
Mon Dec 5 12:25:36 UTC 2011
commit c1552a6854d3cec5e8e5e9d78260b6f3d13824e0
Author: Vít Ondruch <vondruch at redhat.com>
Date: Mon Dec 5 13:24:54 2011 +0100
Update to Thin 1.3.1.
.gitignore | 1 +
rubygem-thin-fix-install-spec.patch | 13 ++++++++++++
rubygem-thin-fix-parser-load-path.patch | 14 ++++++------
rubygem-thin-remove-rspec1-require.patch | 10 +++++++++
rubygem-thin-rspec2-null-object.patch | 31 ++++++++++++++++++++++++++++++
sources | 2 +-
6 files changed, 63 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8de8bc8..680b2cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ thin-1.2.5.gem
/thin-1.2.7.gem
/thin-1.2.8.gem
/thin-1.2.11.gem
+/thin-1.3.1.gem
diff --git a/rubygem-thin-fix-install-spec.patch b/rubygem-thin-fix-install-spec.patch
new file mode 100644
index 0000000..d6e6f52
--- /dev/null
+++ b/rubygem-thin-fix-install-spec.patch
@@ -0,0 +1,13 @@
+diff --git a/spec/controllers/service_spec.rb b/spec/controllers/service_spec.rb
+index 10abdaf..3cff608 100644
+--- a/spec/controllers/service_spec.rb
++++ b/spec/controllers/service_spec.rb
+@@ -28,7 +28,7 @@ describe Service do
+
+ File.exist?(Service::INITD_PATH).should be_true
+ File.read(Service::INITD_PATH).should include('CONFIG_PATH=tmp/sandbox/etc/thin',
+- 'SCRIPT_NAME=tmp/sandbox/etc/init.d/thin',
++ 'SCRIPT_NAME=tmp/sandbox' + (File.directory?('/etc/rc.d') ? '/etc/rc.d/thin' : '/etc/init.d/thin'),
+ 'DAEMON=' + Command.script)
+ end
+
diff --git a/rubygem-thin-fix-parser-load-path.patch b/rubygem-thin-fix-parser-load-path.patch
index 22ed033..8cd9790 100644
--- a/rubygem-thin-fix-parser-load-path.patch
+++ b/rubygem-thin-fix-parser-load-path.patch
@@ -1,11 +1,11 @@
--- lib/thin.rb.orig 2011-07-22 13:25:23.734862201 -0400
+++ lib/thin.rb 2011-07-22 13:25:48.477055427 -0400
-@@ -44,7 +44,7 @@ if Thin.win?
- major_ruby_version = RUBY_VERSION[/^(\d+\.\d+)/]
- require "#{Thin::ROOT}/#{major_ruby_version}/thin_parser"
- else
-- require "#{Thin::ROOT}/thin_parser"
-+ require 'thin_parser'
- end
+@@ -38,7 +38,7 @@
+ require "#{Thin::ROOT}/thin/version"
+ require "#{Thin::ROOT}/thin/statuses"
+ require "#{Thin::ROOT}/rack/adapter/loader"
+-require "#{Thin::ROOT}/thin_parser"
++require "thin_parser"
module Rack
+ module Adapter
diff --git a/rubygem-thin-remove-rspec1-require.patch b/rubygem-thin-remove-rspec1-require.patch
new file mode 100644
index 0000000..7447a8a
--- /dev/null
+++ b/rubygem-thin-remove-rspec1-require.patch
@@ -0,0 +1,10 @@
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,7 +1,5 @@
+ require 'rubygems'
+ require 'thin'
+-gem "rspec", "~> 1.2.9"
+-require 'spec'
+ require 'benchmark'
+ require 'timeout'
+ require 'fileutils'
diff --git a/rubygem-thin-rspec2-null-object.patch b/rubygem-thin-rspec2-null-object.patch
new file mode 100644
index 0000000..fca3ef4
--- /dev/null
+++ b/rubygem-thin-rspec2-null-object.patch
@@ -0,0 +1,31 @@
+--- a/spec/backends/swiftiply_client_spec.rb
++++ b/spec/backends/swiftiply_client_spec.rb
+@@ -3,7 +3,7 @@
+ describe Backends::SwiftiplyClient do
+ before do
+ @backend = Backends::SwiftiplyClient.new('0.0.0.0', 3333)
+- @backend.server = mock('server', :null_object => true)
++ @backend.server = mock('server').as_null_object
+ end
+
+ it "should connect" do
+@@ -26,7 +26,7 @@
+ before do
+ @connection = SwiftiplyConnection.new(nil)
+ @connection.backend = Backends::SwiftiplyClient.new('0.0.0.0', 3333)
+- @connection.backend.server = mock('server', :null_object => true)
++ @connection.backend.server = mock('server').as_null_object
+ end
+
+ it do
+--- a/spec/connection_spec.rb
++++ b/spec/connection_spec.rb
+@@ -2,7 +2,7 @@
+
+ describe Connection do
+ before do
+- @connection = Connection.new(mock('EM', :null_object => true))
++ @connection = Connection.new(mock('EM').as_null_object)
+ @connection.post_init
+ @connection.backend = mock("backend", :ssl? => false)
+ @connection.app = proc do |env|
diff --git a/sources b/sources
index f3c8b2b..726c20f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9040330417adda974c07006762b537f2 thin-1.2.11.gem
+cf179ba7e0b443eb1c82c38f6586b684 thin-1.3.1.gem
More information about the scm-commits
mailing list