[DRE-commits] [ruby-coveralls] 05/15: Refresh other patches

[Lucas Kanashiro]

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

kanashiro pushed a commit to branch master
in repository ruby-coveralls.

commit 41942595498121b62011fad607f7bb9bb40157fd
Author: Lucas Kanashiro <kanashiro at debian.org>
Date:   Fri Sep 1 18:08:52 2017 -0300

    Refresh other patches
---
 debian/changelog                     |  1 +
 debian/patches/02_disable_vcr.diff   | 25 ++++++++++++-------------
 debian/patches/04_include_rspec.diff | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aeae972..4064212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ruby-coveralls (0.8.21-1) UNRELEASED; urgency=medium
     reproducibly. Thanks to Eduard Sanou for providing the patch.
     (Closes: #818430).
   * Build depends on ruby-webmock to enable the execution of some tests
+  * Refresh other patches
 
  -- Lucas Kanashiro <kanashiro at debian.org>  Fri, 01 Sep 2017 17:52:52 -0300
 
diff --git a/debian/patches/02_disable_vcr.diff b/debian/patches/02_disable_vcr.diff
index f096dc4..8b97c51 100644
--- a/debian/patches/02_disable_vcr.diff
+++ b/debian/patches/02_disable_vcr.diff
@@ -3,30 +3,29 @@ Author: Miguel Landaeta <nomadium at debian.org>
 Forwarded: no
 Last-Update: 2014-03-04
 
---- ruby-coveralls-0.7.0.orig/spec/spec_helper.rb
-+++ ruby-coveralls-0.7.0/spec/spec_helper.rb
-@@ -1,7 +1,8 @@
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,6 +1,7 @@
  require 'simplecov'
- # webmock tests are excluded because is not available in Debian yet: #695194.
- #require 'webmock'
+ require 'webmock'
 -require 'vcr'
 +# vcr tests are excluded because is not available in Debian yet: #695195.
 +#require 'vcr'
  
- class InceptionFormatter
-   def format(result)
-@@ -28,10 +29,10 @@ setup_formatter
+ require 'pry' if RUBY_VERSION > "1.8.7"
+ 
+@@ -29,10 +30,10 @@ setup_formatter
  
  require 'coveralls'
  
--VCR.config do |c|
+-VCR.configure do |c|
 -  c.cassette_library_dir = 'fixtures/vcr_cassettes'
--  c.stub_with :webmock
+-  c.hook_into :webmock
 -end
-+#VCR.config do |c|
++#VCR.configure do |c|
 +#  c.cassette_library_dir = 'fixtures/vcr_cassettes'
-+#  c.stub_with :webmock
++#  c.hook_into :webmock
 +#end
  
  RSpec.configure do |config|
-   config.treat_symbols_as_metadata_keys_with_true_values = true
+   config.run_all_when_everything_filtered = true
diff --git a/debian/patches/04_include_rspec.diff b/debian/patches/04_include_rspec.diff
index f75f51a..a72ccf2 100644
--- a/debian/patches/04_include_rspec.diff
+++ b/debian/patches/04_include_rspec.diff
@@ -3,14 +3,14 @@ Author: Miguel Landaeta <nomadium at debian.org>
 Forwarded: no
 Last-Update: 2014-03-04
 
---- ruby-coveralls-0.7.0.orig/spec/spec_helper.rb
-+++ ruby-coveralls-0.7.0/spec/spec_helper.rb
-@@ -3,6 +3,8 @@ require 'simplecov'
- #require 'webmock'
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -2,6 +2,8 @@ require 'simplecov'
+ require 'webmock'
  # vcr tests are excluded because is not available in Debian yet: #695195.
  #require 'vcr'
 +# For some reason rspec wasn't included
 +require 'rspec'
  
- class InceptionFormatter
-   def format(result)
+ require 'pry' if RUBY_VERSION > "1.8.7"
+ 

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