foodcritic 2.0.0 → 2.0.1

data/lib/foodcritic/api.rb

@@ -333,6 +333,10 @@ module FoodCritic
       atts
     end
 
+    def block_depth(resource)
+      resource.path.split('/').group_by{|e|e}['method_add_block'].size
+    end
+
     # Recurse the nested arrays provided by Ripper to create a tree we can more
     # easily apply expressions to.
     def build_xml(node, doc = nil, xml_node=nil)
@@ -393,12 +397,8 @@ module FoodCritic
       atts = {}
       resource.xpath('do_block/descendant::*[self::command or
         self::method_add_arg][count(ancestor::do_block) >= 1]').each do |att|
-          next unless %w{block not_if only_if restart_command before_migrate
-            before_symlink before_restart after_restart}.all? do |block_att|
-              att.xpath("count(ancestor::method_add_block/method_add_arg/
-                fcall[ident/@value='#{block_att}']) = 0")
-          end
-
+          blocks = att.xpath('ancestor::method_add_block/method_add_arg/fcall')
+          next if blocks.any?{|a| block_depth(a) > block_depth(resource)}
           att_name = att.xpath('string(ident/@value |
             fcall/ident[@value="variables"]/@value)')
           unless att_name.empty?

data/lib/foodcritic/linter.rb

@@ -99,8 +99,9 @@ module FoodCritic
 
     def remove_ignored(matches, rule, file)
       matches.reject do |m|
-        (line = m[:line]) && File.exist?(file) &&
-           ignore_line_match?(File.readlines(file)[line-1], rule)
+        matched_file = m[:filename] || file
+        (line = m[:line]) && File.exist?(matched_file) &&
+           ignore_line_match?(File.readlines(matched_file)[line-1], rule)
       end
     end
 

data/lib/foodcritic/version.rb

@@ -1,4 +1,4 @@
 module FoodCritic
   # The current version of foodcritic
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -153,11 +153,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3521344391599734133
+      hash: 118769465480030125
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: foodcritic-2.0.0
+summary: foodcritic-2.0.1
 test_files: []