[DRE-commits] [ruby-thor] 04/05: Refresh patches

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository ruby-thor.

commit 9d2175492c5d96344a0698ac09da4e2f3fae67e9
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Jan 16 12:36:06 2014 +0100

    Refresh patches
---
 debian/patches/tests-disable-coverage | 25 +++++++++++++------------
 spec/helper.rb                        | 15 +--------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/debian/patches/tests-disable-coverage b/debian/patches/tests-disable-coverage
index a7c6fc1..f579d01 100644
--- a/debian/patches/tests-disable-coverage
+++ b/debian/patches/tests-disable-coverage
@@ -4,10 +4,10 @@ Debian.
 
 Index: ruby-thor/spec/helper.rb
 ===================================================================
---- ruby-thor.orig/spec/helper.rb	2013-05-07 17:54:44.000000000 +0200
-+++ ruby-thor/spec/helper.rb	2013-05-07 17:56:33.951392230 +0200
-@@ -1,23 +1,15 @@
- $TESTING=true
+--- ruby-thor.orig/spec/helper.rb	2014-01-16 12:34:51.310162823 +0100
++++ ruby-thor/spec/helper.rb	2014-01-16 12:35:40.357865727 +0100
+@@ -1,18 +1,5 @@
+ $TESTING = true
  
 -require 'simplecov'
 -require 'coveralls'
@@ -16,20 +16,21 @@ Index: ruby-thor/spec/helper.rb
 -  SimpleCov::Formatter::HTMLFormatter,
 -  Coveralls::SimpleCov::Formatter
 -]
--SimpleCov.start
 -
-+puts File.join(File.dirname(__FILE__), "..", "lib")
- $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+-SimpleCov.start do
+-  add_filter '/spec/'
+-  minimum_coverage(92.21)
+-end
+-
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
  require 'thor'
  require 'thor/group'
- require 'stringio'
- 
--require 'rdoc'
-+require 'rdoc/rdoc'
+@@ -21,7 +8,7 @@ require 'stringio'
+ require 'rdoc'
  require 'rspec'
  require 'diff/lcs' # You need diff/lcs installed to run specs (but not to run Thor).
 -require 'fakeweb'  # You need fakeweb installed to run specs (but not to run Thor).
 +#require 'fakeweb'  # You need fakeweb installed to run specs (but not to run Thor).
  
  # Set shell to basic
- $0 = "thor"
+ $0 = 'thor'
diff --git a/spec/helper.rb b/spec/helper.rb
index 49577dd..c5a5a45 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -1,18 +1,5 @@
 $TESTING = true
 
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-
-SimpleCov.start do
-  add_filter '/spec/'
-  minimum_coverage(92.21)
-end
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'thor'
 require 'thor/group'
@@ -21,7 +8,7 @@ require 'stringio'
 require 'rdoc'
 require 'rspec'
 require 'diff/lcs' # You need diff/lcs installed to run specs (but not to run Thor).
-require 'fakeweb'  # You need fakeweb installed to run specs (but not to run Thor).
+#require 'fakeweb'  # You need fakeweb installed to run specs (but not to run Thor).
 
 # Set shell to basic
 $0 = 'thor'

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