[DRE-commits] [foodcritic] 07/12: Refresh patches.

Sun Jan 3 18:13:07 UTC 2016

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

stefanor pushed a commit to branch master
in repository foodcritic.

commit 8d2f3b3ee443941e0be03680dd5d2978cbdc16fe
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sun Jan 3 18:26:00 2016 +0200

    Refresh patches.
    
    * Refresh patches.
    * Drop no-coverage and FC010-broken patches, superseded upstream.
---
 debian/changelog                                   |  2 +
 debian/patches/FC010-broken                        | 43 ----------------------
 ...t-load-minitest-autorun-in-cucumber-tests.patch |  6 +--
 debian/patches/no-coverage                         | 27 --------------
 debian/patches/no-rufus-lru                        |  2 +-
 debian/patches/series                              |  2 -
 debian/patches/system-install-layout               | 13 +------
 7 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc23236..712fb3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ foodcritic (5.0.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update copyright file.
+  * Refresh patches.
+  * Drop no-coverage and FC010-broken patches, superseded upstream.
   * Point Vcs-Browser at https cgit.
   * Bump debhelper compat level to 9.
   * Use https in the watch file.
diff --git a/debian/patches/FC010-broken b/debian/patches/FC010-broken
deleted file mode 100644
index 9c2669d..0000000
--- a/debian/patches/FC010-broken
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Currently FC010 isn't working, ignore the test failures
- Chef no longer bundles a lucene treetop spec.
-Author: Stefano Rivera <stefanor at debian.org>
-Bug-Upstream: https://github.com/acrmp/foodcritic/issues/199
-Last-Updated: 2014-01-10
-
---- a/features/010_check_search_syntax.feature
-+++ b/features/010_check_search_syntax.feature
-@@ -4,11 +4,6 @@
-   As a developer
-   I want to verify that search expressions use valid Lucene syntax
- 
--  Scenario: Invalid search syntax
--    Given a cookbook recipe that attempts to perform a search with invalid syntax
--    When I check the cookbook
--    Then the invalid search syntax warning 010 should be displayed
--
-   Scenario: Valid search syntax
-     Given a cookbook recipe that attempts to perform a search with valid syntax
-     When I check the cookbook
---- a/features/specify_search_grammar.feature
-+++ b/features/specify_search_grammar.feature
-@@ -4,11 +4,6 @@
- As a developer
- I want to be able to specify the grammar to use as a command line option
- 
--  Scenario: No grammar passed
--    Given a cookbook recipe that attempts to perform a search with invalid syntax
--    When I check the cookbook
--    Then the invalid search syntax warning 010 should be displayed
--
-   Scenario: Missing grammar passed
-     Given a cookbook recipe that attempts to perform a search with invalid syntax
-     When I check the cookbook specifying a search grammar that does not exist
-@@ -18,8 +13,3 @@
-     Given a cookbook recipe that attempts to perform a search with invalid syntax
-     When I check the cookbook specifying a search grammar that is not in treetop format
-     Then the check should abort with an error
--
--  Scenario: Valid grammar passed
--    Given a cookbook recipe that attempts to perform a search with invalid syntax
--    When I check the cookbook specifying a search grammar that is a valid treetop grammar
--    Then the invalid search syntax warning 010 should be displayed
diff --git a/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch b/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch
index a125b08..7fbcd34 100644
--- a/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch
+++ b/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch
@@ -2,9 +2,9 @@ Description: don't load minitest/autorun in cucumber tests
 Author: Antonio Terceiro <terceiro at debian.org>
 Bug-Debian: https://bugs.debian.org/795617
 
---- foodcritic-4.0.0.orig/features/support/env.rb
-+++ foodcritic-4.0.0/features/support/env.rb
-@@ -1,7 +1,6 @@
+--- a/features/support/env.rb
++++ b/features/support/env.rb
+@@ -10,7 +10,6 @@
  require 'aruba/cucumber'
  require 'foodcritic'
  
diff --git a/debian/patches/no-coverage b/debian/patches/no-coverage
deleted file mode 100644
index 6fc902b..0000000
--- a/debian/patches/no-coverage
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: We don't have simplecov in Debian, skip coverage
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: not-needed
-Last-Updated: 2013-06-05
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,8 +1,3 @@
--require 'simplecov'
--SimpleCov.start do
--  add_filter '/spec/'
--end
--
- require 'minitest/autorun'
- require 'minitest/pride'
- require 'minitest/spec'
---- a/features/support/env.rb
-+++ b/features/support/env.rb
-@@ -1,8 +1,3 @@
--require 'simplecov'
--SimpleCov.start do
--  add_filter '/features/'
--end
--
- require 'aruba/cucumber'
- require 'foodcritic'
- 
diff --git a/debian/patches/no-rufus-lru b/debian/patches/no-rufus-lru
index 22588f8..4eff4d4 100644
--- a/debian/patches/no-rufus-lru
+++ b/debian/patches/no-rufus-lru
@@ -32,7 +32,7 @@ Forwarded: not-needed
      # Retrieve a single-valued attribute from the specified resource.
 --- a/metadata.yml
 +++ b/metadata.yml
-@@ -94,20 +94,6 @@
+@@ -100,20 +100,6 @@
      - - ">="
        - !ruby/object:Gem::Version
          version: '0'
diff --git a/debian/patches/series b/debian/patches/series
index 8840222..ebd4bae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-no-coverage
 no-rubygems
 system-install-layout
-FC010-broken
 no-rufus-lru
 dont-load-minitest-autorun-in-cucumber-tests.patch
diff --git a/debian/patches/system-install-layout b/debian/patches/system-install-layout
index 8241663..252859d 100644
--- a/debian/patches/system-install-layout
+++ b/debian/patches/system-install-layout
@@ -13,7 +13,7 @@ Last-Updated: 2013-06-05
 +require 'foodcritic'
  module FoodCritic
    cmd_line = CommandLine.new(ARGV)
-   review, status = Linter.check(cmd_line)
+   review, status = Linter.run(cmd_line)
 --- a/lib/foodcritic/chef.rb
 +++ b/lib/foodcritic/chef.rb
 @@ -60,8 +60,13 @@
@@ -32,14 +32,3 @@ Last-Updated: 2013-06-05
      end
  
      def resource_check?(key, resource_type, field)
-@@ -87,9 +92,7 @@
-       #   could break our ability to load the grammar).
-       # Grammars are not available from Chef 11+.
-       def chef_search_grammars
--        Gem.path.map do |gem_path|
--          Dir["#{gem_path}/gems/chef-*/**/lucene.treetop"]
--        end.flatten.sort.reverse
-+        Dir["/usr/lib/ruby/vendor_ruby/chef/**/lucene.treetop"]
-       end
- 
-       # Create the search parser from the first loadable grammar.

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

