[DRE-commits] [berkshelf-api] 08/15: fix patches

[Hleb Valoshka]

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.

commit d7d8c825c81aff9b3f62600fe888dd2bf3aab3ab
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Mar 14 15:09:27 2016 +0300

    fix patches
---
 ...re-rubygems-bundler-don-t-change-in-tests.patch | 20 -------------
 ...re-rubygems-bundler-spork-don-t-change-in.patch | 35 ++++++++++++++++++++++
 .../0004-Workaround-rspec-core-bug-2064.patch      |  6 ++--
 debian/patches/series                              |  2 +-
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch b/debian/patches/0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch
deleted file mode 100644
index 98eb7a6..0000000
--- a/debian/patches/0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 17 Aug 2015 17:25:48 +0300
-Subject: Don't require rubygems & bundler, don't change $: in tests
-
----
- spec/spec_helper.rb | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index d8644cb..7ba7757 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,7 +1,3 @@
--$:.push File.expand_path("../../lib", __FILE__)
--
--require 'rubygems'
--require 'bundler'
- require 'rspec'
- require 'spork'
- require 'rack/test'
diff --git a/debian/patches/0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch b/debian/patches/0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
new file mode 100644
index 0000000..0386688
--- /dev/null
+++ b/debian/patches/0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
@@ -0,0 +1,35 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 17 Aug 2015 17:25:48 +0300
+Subject: Don't require rubygems, bundler & spork, don't change $: in tests
+
+---
+ spec/spec_helper.rb | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index d8644cb..6ea4a7a 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,12 +1,7 @@
+-$:.push File.expand_path("../../lib", __FILE__)
+-
+-require 'rubygems'
+-require 'bundler'
+ require 'rspec'
+-require 'spork'
+ require 'rack/test'
++require 'berkshelf/api'
+ 
+-Spork.prefork do
+   Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
+ 
+   RSpec.configure do |config|
+@@ -48,8 +43,3 @@ Spork.prefork do
+     FileUtils.rm_rf(tmp_path)
+     FileUtils.mkdir_p(tmp_path)
+   end
+-end
+-
+-Spork.each_run do
+-  require 'berkshelf/api'
+-end
diff --git a/debian/patches/0004-Workaround-rspec-core-bug-2064.patch b/debian/patches/0004-Workaround-rspec-core-bug-2064.patch
index df71440..f975a6a 100644
--- a/debian/patches/0004-Workaround-rspec-core-bug-2064.patch
+++ b/debian/patches/0004-Workaround-rspec-core-bug-2064.patch
@@ -7,10 +7,10 @@ Subject: Workaround rspec-core bug 2064
  1 file changed, 9 insertions(+)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 7ba7757..9575dd1 100644
+index 6ea4a7a..65c23b6 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -20,6 +20,15 @@ Spork.prefork do
+@@ -19,6 +19,15 @@ require 'berkshelf/api'
      config.before(:suite) { Berkshelf::RSpec::ChefServer.start }
      config.before(:all) { Berkshelf::API::Logging.init(location: '/dev/null') }
  
@@ -18,7 +18,7 @@ index 7ba7757..9575dd1 100644
 +    #
 +    # When `true', spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
 +    # will hang on `it_behaves_like "a human-readable string"', which is
-+    # spec/support/human_reaable.rb `expect(subject.to_s).to_not ...'
++    # spec/support/human_readable.rb `expect(subject.to_s).to_not ...'
 +    #
 +    # This feature is introduced in rspec 3.3, so rspec <= 3.2 works fine.
 +    config.threadsafe = false
diff --git a/debian/patches/series b/debian/patches/series
index 250d477..eca6197 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 0001-Don-t-require-archive-gem.patch
 0002-Allow-ruby-hashie-3.patch
-0003-Don-t-require-rubygems-bundler-don-t-change-in-tests.patch
+0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
 0004-Workaround-rspec-core-bug-2064.patch
 0005-RSA-private-key-for-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/berkshelf-api.git