[DRE-commits] [ruby-thor] 02/03: Update 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 01c31e272d65db23a320c3b30440e0e5bf6a3920
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sun Mar 30 17:27:39 2014 +0200

    Update patches
---
 debian/patches/disable-some-tests     | 60 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  3 +-
 debian/patches/tests-disable-coverage | 36 ---------------------
 3 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/debian/patches/disable-some-tests b/debian/patches/disable-some-tests
new file mode 100644
index 0000000..0a324f8
--- /dev/null
+++ b/debian/patches/disable-some-tests
@@ -0,0 +1,60 @@
+This patch disables usage of simplecov, coveralls and fakeweb in the
+test suite, and is intended to be removed once these packages enter
+Debian.
+
+It also disables two tests that only test for correct usage of white-
+space and quoting, which fail because of encoding issues during build.
+
+diff --git a/spec/helper.rb b/spec/helper.rb
+index fbdb4ce..ab1e4d9 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,6 @@ 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).
+ 
+ # Set shell to basic
+ $0 = "thor"
+diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
+index 94f5100..23864ef 100644
+--- a/spec/quality_spec.rb
++++ b/spec/quality_spec.rb
+@@ -48,7 +48,7 @@ describe "The library itself" do
+     end
+   end
+ 
+-  it "has no malformed whitespace" do
++  xit "has no malformed whitespace" do
+     exempt = /\.gitmodules|\.marshal|fixtures|vendor|spec|ssl_certs|LICENSE/
+     error_messages = []
+     Dir.chdir(File.expand_path("../..", __FILE__)) do
+@@ -61,7 +61,7 @@ describe "The library itself" do
+     expect(error_messages.compact).to be_well_formed
+   end
+ 
+-  it "uses double-quotes consistently in specs" do
++  xit "uses double-quotes consistently in specs" do
+     included = /spec/
+     error_messages = []
+     Dir.chdir(File.expand_path("../", __FILE__)) do
diff --git a/debian/patches/series b/debian/patches/series
index 712848f..3d8fbd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-tests-disable-coverage
-git-version-fix
+disable-some-tests
diff --git a/debian/patches/tests-disable-coverage b/debian/patches/tests-disable-coverage
deleted file mode 100644
index f579d01..0000000
--- a/debian/patches/tests-disable-coverage
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch disables usage of simplecov, coveralls and fakeweb in the
-test suite, and is intended to be removed once these packages enter
-Debian.
-
-Index: ruby-thor/spec/helper.rb
-===================================================================
---- 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'
--
--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