[DRE-commits] [ruby-simplecov-html] 04/06: Refresh patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-simplecov-html.

commit 5beabc71709a98c261117de2121f1b155f0424a8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Sep 15 11:39:27 2015 -0300

    Refresh patches
---
 debian/changelog                             |  1 +
 debian/patches/fix-paths.patch               | 30 ++++++++++++------------
 debian/patches/remove-rubygems-bundler.patch | 35 +++++++++++-----------------
 3 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3765ee2..dbfcd67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-simplecov-html (0.10.0-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #709441)
     (previous version was never actually uploaded)
+  * Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 15 Sep 2015 11:31:05 -0300
 
diff --git a/debian/patches/fix-paths.patch b/debian/patches/fix-paths.patch
index d3fc243..b21302f 100644
--- a/debian/patches/fix-paths.patch
+++ b/debian/patches/fix-paths.patch
@@ -6,21 +6,21 @@ Last-update: 2013-05-28
 
 --- a/lib/simplecov-html.rb
 +++ b/lib/simplecov-html.rb
-@@ -12,7 +12,7 @@
+@@ -15,7 +15,7 @@ module SimpleCov
+   module Formatter
+     class HTMLFormatter
+       def format(result)
+-        Dir[File.join(File.dirname(__FILE__), "../public/*")].each do |path|
++        Dir[File.join(File.dirname(__FILE__), '../../../share/ruby-simplecov-html/public/*')].each do |path|
+           FileUtils.cp_r(path, asset_output_path)
+         end
  
- class SimpleCov::Formatter::HTMLFormatter
-   def format(result)
--    Dir[File.join(File.dirname(__FILE__), '../public/*')].each do |path|
-+    Dir[File.join(File.dirname(__FILE__), '../../../share/ruby-simplecov-html/public/*')].each do |path|
-       FileUtils.cp_r(path, asset_output_path)
-     end
+@@ -33,7 +33,7 @@ module SimpleCov
  
-@@ -30,7 +30,7 @@
+       # Returns the an erb instance for the template of given name
+       def template(name)
+-        ERB.new(File.read(File.join(File.dirname(__FILE__), "../views/", "#{name}.erb")))
++        ERB.new(File.read(File.join(File.dirname(__FILE__), '../../../share/ruby-simplecov-html/views/', "#{name}.erb")))
+       end
  
-   # Returns the an erb instance for the template of given name
-   def template(name)
--    ERB.new(File.read(File.join(File.dirname(__FILE__), '../views/', "#{name}.erb")))
-+    ERB.new(File.read(File.join(File.dirname(__FILE__), '../../../share/ruby-simplecov-html/views/', "#{name}.erb")))
-   end
- 
-   def output_path
+       def output_path
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
index ff50363..ff89050 100644
--- a/debian/patches/remove-rubygems-bundler.patch
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -6,28 +6,19 @@ Last-Updated: 2013-05-23
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,5 +1,5 @@
--require 'rubygems'
--require 'bundler/setup'
-+#require 'rubygems'
-+#require 'bundler/setup'
- require 'simplecov'
- require 'simplecov-html'
- 
+@@ -1,4 +1,3 @@
+-require "bundler/setup"
+ require "simplecov"
+ require "simplecov-html"
+ require "test/unit"
 --- a/lib/simplecov-html.rb
 +++ b/lib/simplecov-html.rb
-@@ -4,10 +4,11 @@
- require 'digest/sha1'
- require 'time'
- 
-+# debian/control has ruby-simplecov (>= 0.7.1)
- # Ensure we are using a compatible version of SimpleCov
--if Gem::Version.new(SimpleCov::VERSION) < Gem::Version.new("0.7.1")
--  raise RuntimeError, "The version of SimpleCov you are using is too old. Please update with `gem install simplecov` or `bundle update simplecov`"
--end
-+# if Gem::Version.new(SimpleCov::VERSION) < Gem::Version.new("0.7.1")
-+#   raise RuntimeError, "The version of SimpleCov you are using is too old. Please update with `gem install simplecov` or `bundle update simplecov`"
-+# end
+@@ -8,7 +8,7 @@ require "time"
+ major, minor, patch =  SimpleCov::VERSION.scan(/\d+/).first(3).map(&:to_i)
+ if major < 0 || minor < 9 || patch < 0
+   fail "The version of SimpleCov you are using is too old. "\
+-  "Please update with `gem install simplecov` or `bundle update simplecov`"
++  "Please update"
+ end
  
- class SimpleCov::Formatter::HTMLFormatter
-   def format(result)
+ module SimpleCov

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