[DRE-commits] [nanoc] 03/03: refresh patches; drop deactivate_uglify_test.patch (not needed anymore); add set-load_paths-for-sass-tests.patch

Cédric Boutillier boutil at moszumanska.debian.org
Wed Jun 3 14:26:32 UTC 2015 

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

boutil pushed a commit to branch master
in repository nanoc.

commit 9f7ae9e089bad1434eeacdd181095683b01be062
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jun 3 16:24:36 2015 +0200

    refresh patches; drop deactivate_uglify_test.patch (not needed anymore); add set-load_paths-for-sass-tests.patch
---
 debian/changelog                                   | 10 +++++
 debian/patches/deactivate_rubygems_in_tests.patch  |  4 +-
 debian/patches/deactivate_test_huge_site.patch     |  6 +--
 debian/patches/deactivate_uglify_test.patch        | 18 ---------
 debian/patches/no_bundler_no_loadpath_modif.patch  |  4 +-
 debian/patches/no_privacy_breach.patch             |  4 +-
 debian/patches/no_rdoc4.patch                      |  6 +--
 debian/patches/no_vcr.patch                        |  4 +-
 debian/patches/series                              |  2 +-
 debian/patches/set-load_paths-for-sass-tests.patch | 44 ++++++++++++++++++++++
 10 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fa98ce..a1704b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nanoc (3.8.0-1) UNRELEASED; urgency=medium
+
+  * Imported Upstream version 3.8.0
+  * Refresh patches
+    + drop deactivate_uglify_test.patch (not needed anymore)
+    + add set-load_paths-for-sass-tests.patch because of a change in default
+      options of ruby-sass 3.4.14
+
+ -- Cédric Boutillier <boutil at debian.org>  Wed, 03 Jun 2015 16:25:18 +0200
+
 nanoc (3.7.3-1) unstable; urgency=medium
 
   * Imported Upstream version 3.7.3
diff --git a/debian/patches/deactivate_rubygems_in_tests.patch b/debian/patches/deactivate_rubygems_in_tests.patch
index 3668b87..a3fbeee 100644
--- a/debian/patches/deactivate_rubygems_in_tests.patch
+++ b/debian/patches/deactivate_rubygems_in_tests.patch
@@ -2,7 +2,7 @@ Description: do not use gem_loader.rb, which relies on rubygems
 Origin: vendor
 Forwarded: not-needed
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-05-09
+Last-Update: 2015-06-03
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
@@ -14,4 +14,4 @@ Last-Update: 2014-05-09
 +#require File.dirname(__FILE__) + '/gem_loader.rb'
  
  # Load unit testing stuff
- require 'minitest/unit'
+ require 'minitest/test'
diff --git a/debian/patches/deactivate_test_huge_site.patch b/debian/patches/deactivate_test_huge_site.patch
index 8992372..7725200 100644
--- a/debian/patches/deactivate_test_huge_site.patch
+++ b/debian/patches/deactivate_test_huge_site.patch
@@ -3,11 +3,11 @@ Description: deactivate test about compiling huge sites
  Errno::EMLINK: Too many links
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2014-08-21
+Last-Update: 2015-06-03
 
 --- a/test/data_sources/test_filesystem_unified.rb
 +++ b/test/data_sources/test_filesystem_unified.rb
-@@ -497,7 +497,7 @@
+@@ -499,7 +499,7 @@
      assert_equal nil,            data_source.send(:filename_for, '/foo', nil)
    end
  
@@ -18,7 +18,7 @@ Last-Update: 2014-08-21
        data_source = new_data_source
 --- a/test/data_sources/test_filesystem_verbose.rb
 +++ b/test/data_sources/test_filesystem_verbose.rb
-@@ -334,7 +334,7 @@
+@@ -333,7 +333,7 @@
      assert_equal 'foo/bar/index', data_source.send(:filename_for, 'foo/bar', '')
    end
  
diff --git a/debian/patches/deactivate_uglify_test.patch b/debian/patches/deactivate_uglify_test.patch
deleted file mode 100644
index 6660f0e..0000000
--- a/debian/patches/deactivate_uglify_test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: deactivate test failing with ruby-uglifier 1.x
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-10-01
-
---- a/test/filters/test_uglify_js.rb
-+++ b/test/filters/test_uglify_js.rb
-@@ -22,8 +22,8 @@
-       result = filter.setup_and_run(input, :output => { :beautify => false })
-       assert_equal 'donkey&&alert("It is a donkey!");', result
- 
--      result = filter.setup_and_run(input, :output => { :beautify => true })
--      assert_equal 'donkey && alert("It is a donkey!");', result
-+      # result = filter.setup_and_run(input, :output => { :beautify => true })
-+      # assert_equal 'donkey && alert("It is a donkey!");', result
-     end
-   end
- 
diff --git a/debian/patches/no_bundler_no_loadpath_modif.patch b/debian/patches/no_bundler_no_loadpath_modif.patch
index 3773b5a..7ffad25 100644
--- a/debian/patches/no_bundler_no_loadpath_modif.patch
+++ b/debian/patches/no_bundler_no_loadpath_modif.patch
@@ -2,7 +2,7 @@ Description: do not use bundler or mess with the load path
 Origin: vendor
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
-Last-Update: 2014-08-21
+Last-Update: 2015-06-03
 
 --- a/bin/nanoc
 +++ b/bin/nanoc
@@ -21,7 +21,7 @@ Last-Update: 2014-08-21
 -  end
 -rescue LoadError
 -  # no problem
--end
+-end if File.file?('Gemfile')
 -
 -# Add lib to load path
 -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
diff --git a/debian/patches/no_privacy_breach.patch b/debian/patches/no_privacy_breach.patch
index 1d4849a..d0893cf 100644
--- a/debian/patches/no_privacy_breach.patch
+++ b/debian/patches/no_privacy_breach.patch
@@ -6,7 +6,7 @@ Description: remove privacy breaches from the documentation
 Origin: vendor
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2014-04-15
+Last-Update: 2015-06-03
 
 --- a/doc/yardoc_templates/default/layout/html/footer.erb
 +++ b/doc/yardoc_templates/default/layout/html/footer.erb
@@ -37,7 +37,7 @@ Last-Update: 2014-04-15
 -[![Build status](http://img.shields.io/travis/nanoc/nanoc.svg)](https://travis-ci.org/nanoc/nanoc)
 -[![Code Climate](http://img.shields.io/codeclimate/github/nanoc/nanoc.svg)](https://codeclimate.com/github/nanoc/nanoc)
 -[![Code Coverage](http://img.shields.io/coveralls/nanoc/nanoc.svg)](https://coveralls.io/r/nanoc/nanoc)
--[![Documentation Coverage](http://inch-pages.github.io/github/nanoc/nanoc.svg)](http://inch-pages.github.io/github/nanoc/nanoc/)
+-[![Documentation Coverage](http://inch-ci.org/github/nanoc/nanoc.svg)](http://inch-ci.org/github/nanoc/nanoc/)
 -
 -![nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
 -
diff --git a/debian/patches/no_rdoc4.patch b/debian/patches/no_rdoc4.patch
index f1384b4..c5faceb 100644
--- a/debian/patches/no_rdoc4.patch
+++ b/debian/patches/no_rdoc4.patch
@@ -1,11 +1,11 @@
 Description: do not force RDoc v4 with rubygems
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-08-21
+Last-Update: 2015-06-03
 
 --- a/lib/nanoc/filters/rdoc.rb
 +++ b/lib/nanoc/filters/rdoc.rb
-@@ -5,11 +5,6 @@
- 
+@@ -4,11 +4,6 @@
+   class RDoc < Nanoc::Filter
      requires 'rdoc'
  
 -    def self.setup
diff --git a/debian/patches/no_vcr.patch b/debian/patches/no_vcr.patch
index 76af752..6b265e4 100644
--- a/debian/patches/no_vcr.patch
+++ b/debian/patches/no_vcr.patch
@@ -4,7 +4,7 @@ Description: ruby-vcr is not yet available in Debian archive
 Author: Cédric Boutillier <boutil at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695195
 Forwarded: not-needed
-Last-Update: 2014-06-09
+Last-Update: 2015-06-03
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
@@ -26,5 +26,5 @@ Last-Update: 2014-06-09
 -end
 -
  module Nanoc::TestHelpers
- 
    LIB_DIR = File.expand_path(File.dirname(__FILE__) + '/../lib')
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c3fb585..d43055c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 deactivate_rubygems_in_tests.patch
 deactivate_test_huge_site.patch
 no_rdoc4.patch
-deactivate_uglify_test.patch
 no_bundler_no_loadpath_modif.patch
 no_privacy_breach.patch
 no_vcr.patch
+set-load_paths-for-sass-tests.patch
diff --git a/debian/patches/set-load_paths-for-sass-tests.patch b/debian/patches/set-load_paths-for-sass-tests.patch
new file mode 100644
index 0000000..fa94c5d
--- /dev/null
+++ b/debian/patches/set-load_paths-for-sass-tests.patch
@@ -0,0 +1,44 @@
+Description: Set :load_paths options for some Sass tests
+ ruby-sass 3.4.14 changed the default value of the :load_paths option from
+ ['.'] to [] causing some test to loose the ability of finding the files they
+ had to import.
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2015-06-03
+
+--- a/test/filters/test_sass.rb
++++ b/test/filters/test_sass.rb
+@@ -53,7 +53,7 @@
+       File.open('moo.sass', 'w') { |io| io.write "body\n  color: red" }
+ 
+       # Run filter
+-      filter.setup_and_run('@import moo')
++      filter.setup_and_run('@import moo',load_paths: ['.'])
+     end
+   end
+ 
+@@ -68,7 +68,7 @@
+       File.open('subdir/relative.sass', 'w') { |io| io.write "body\n  color: red" }
+ 
+       # Run filter
+-      filter.setup_and_run('@import moo')
++      filter.setup_and_run('@import moo', load_paths: ['.'])
+     end
+   end
+ 
+@@ -81,7 +81,7 @@
+       File.open('moo.sass', 'w') { |io| io.write "body\n  color: red" }
+ 
+       # Run filter
+-      filter.setup_and_run('@import moo')
++      filter.setup_and_run('@import moo', load_paths: ['.'])
+     end
+   end
+ 
+--- /dev/null
++++ b/coverage/.last_run.json
+@@ -0,0 +1 @@
++{"result":{"covered_percent":18.98}}
+--- /dev/null
++++ b/coverage/.resultset.json
+@@ -0,0 +1 @@
++{"Unknown Test Framework":{"coverage":{"/home/boutil/debian/pkg-ruby-extras/nanoc/lib/nanoc.rb":[null,null,1,null,null,1,0,0,0,0,0,0,null,null,null,1,1,null,null,null,1,null,null,1,1,1,1,1,1,1,1,1,1,1,1,null,null,1,1,1,1,1,1],"/home/boutil/debian/pkg-ruby-extras/nanoc/lib/nanoc/version.rb":[null,null,1,null,1,null],"/home/boutil/debian/pkg-ruby-extras/nanoc/lib/nanoc/base.rb":[null,null,1,1,null,null,1,1,1,1,1,1,1,1,1,null,null,1,1,1,1,1,1,1,null,null,1,null,null,1,1,1,1,1,1,1,1,1,1,1,1 [...]

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

More information about the Pkg-ruby-extras-commits mailing list