[DRE-commits] [foodcritic] 03/04: Refresh patches.

[Stefano Rivera]

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

stefanor pushed a commit to branch master
in repository foodcritic.

commit c103496c2e632a4636fb9c2188083c8952f85202
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sat Aug 20 09:41:41 2016 -0700

    Refresh patches.
---
 debian/changelog                     |  1 +
 debian/patches/autopkgtests-no-lib   | 14 +++++++-------
 debian/patches/hashery-lru           | 22 +++++++++++-----------
 debian/patches/system-install-layout | 24 ++++++++++++------------
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1356688..b8d173d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 foodcritic (7.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Stefano Rivera <stefanor at debian.org>  Sat, 20 Aug 2016 09:40:57 -0700
 
diff --git a/debian/patches/autopkgtests-no-lib b/debian/patches/autopkgtests-no-lib
index 1789140..b77fcd9 100644
--- a/debian/patches/autopkgtests-no-lib
+++ b/debian/patches/autopkgtests-no-lib
@@ -29,22 +29,22 @@ Forwarded: not-needed
      end
  
      it "returns false if any on the specified paths do not exist" do
--      refute FoodCritic::CommandLine.new(["lib", "lib2"]).valid_paths?
-+      refute FoodCritic::CommandLine.new(["spec", "spec2"]).valid_paths?
+-      refute FoodCritic::CommandLine.new(%w{lib lib2}).valid_paths?
++      refute FoodCritic::CommandLine.new(%w{spec lib2}).valid_paths?
      end
    end
  
 --- a/spec/foodcritic/linter_spec.rb
 +++ b/spec/foodcritic/linter_spec.rb
-@@ -54,6 +54,7 @@
+@@ -53,6 +53,7 @@
+     end
    end
  
- 
-+ if !ENV.has_key? 'ADTTMP'
++ if !ENV.has_key? "ADTTMP"
    describe "#load_files!" do
      let(:default_rules_file) do
-       File.expand_path(File.join(File.dirname(__FILE__), '../../lib/foodcritic/rules.rb'))
-@@ -96,5 +97,6 @@
+       File.expand_path(File.join(File.dirname(__FILE__), "../../lib/foodcritic/rules.rb"))
+@@ -95,5 +96,6 @@
      end
  
    end
diff --git a/debian/patches/hashery-lru b/debian/patches/hashery-lru
index a4c0879..7b2d83e 100644
--- a/debian/patches/hashery-lru
+++ b/debian/patches/hashery-lru
@@ -8,9 +8,9 @@ Forwarded: not-needed
 --- a/lib/foodcritic/api.rb
 +++ b/lib/foodcritic/api.rb
 @@ -1,5 +1,5 @@
- require 'nokogiri'
--require 'rufus-lru'
-+require 'hashery/lru_hash'
+ require "nokogiri"
+-require "rufus-lru"
++require "hashery/lru_hash"
  
  module FoodCritic
    # Helper methods that form part of the Rules DSL.
@@ -26,11 +26,11 @@ Forwarded: not-needed
 --- a/foodcritic.gemspec
 +++ b/foodcritic.gemspec
 @@ -17,7 +17,7 @@
-   s.add_dependency('treetop', '~> 1.4')
-   s.add_dependency('yajl-ruby', '~> 1.1')
-   s.add_dependency('erubis')
--  s.add_dependency('rufus-lru', '~> 1.0')
-+  s.add_dependency('hashery')
-   s.files = Dir['chef_dsl_metadata/*.json'] +
-     Dir['lib/**/*.rb'] +
-     Dir['misc/**/*']
+   s.add_dependency("treetop", "~> 1.4")
+   s.add_dependency("yajl-ruby", "~> 1.1")
+   s.add_dependency("erubis")
+-  s.add_dependency("rufus-lru", "~> 1.0")
++  s.add_dependency("hashery")
+   s.files = Dir["chef_dsl_metadata/*.json"] +
+     Dir["lib/**/*.rb"] +
+     Dir["misc/**/*"]
diff --git a/debian/patches/system-install-layout b/debian/patches/system-install-layout
index 10c3081..016c9b7 100644
--- a/debian/patches/system-install-layout
+++ b/debian/patches/system-install-layout
@@ -9,8 +9,8 @@ Last-Updated: 2013-06-05
 +++ b/bin/foodcritic
 @@ -1,5 +1,5 @@
  #!/usr/bin/env ruby
--require_relative '../lib/foodcritic'
-+require 'foodcritic'
+-require_relative "../lib/foodcritic"
++require "foodcritic"
  module FoodCritic
    cmd_line = CommandLine.new(ARGV)
    review, status = Linter.run(cmd_line)
@@ -20,10 +20,10 @@ Last-Updated: 2013-06-05
      end
  
      def metadata_path(chef_version)
--      File.join(File.dirname(__FILE__), '..', '..',
+-      File.join(File.dirname(__FILE__), "..", "..",
 -                "chef_dsl_metadata/chef_#{chef_version}.json")
-+      local_metadata = File.join(File.dirname(__FILE__), '..', '..',
-+                                 'chef_dsl_metadata')
++      local_metadata = File.join(File.dirname(__FILE__), "..", "..",
++                                 "chef_dsl_metadata")
 +      if Dir.exists? local_metadata
 +        "#{local_metadata}/chef_#{chef_version}.json"
 +      else
@@ -36,12 +36,12 @@ Last-Updated: 2013-06-05
        # lucene.treetop used to be provided by chef gem
        # We're keeping a local copy from chef 10.x
        def chef_search_grammars
--        [File.expand_path('../../..', __FILE__) + "/misc/lucene.treetop"]
-+        local_grammar = File.expand_path('../../../misc/lucene.treetop', __FILE__)
+-        [File.expand_path("../../..", __FILE__) + "/misc/lucene.treetop"]
++        local_grammar = File.expand_path("../../../misc/lucene.treetop", __FILE__)
 +        if File.exists? local_grammar
 +          [local_grammar]
 +        else
-+          ['/usr/share/foodcritic/misc/lucene.treetop']
++          ["/usr/share/foodcritic/misc/lucene.treetop"]
 +        end
        end
  
@@ -49,8 +49,8 @@ Last-Updated: 2013-06-05
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -10,4 +10,4 @@
- require 'minitest/pride'
- require 'minitest/spec'
+ require "minitest/pride"
+ require "minitest/spec"
  
--require_relative '../lib/foodcritic'
-+require 'foodcritic'
+-require_relative "../lib/foodcritic"
++require "foodcritic"

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