foodcritic 3.0.1 → 3.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJhNGM0MDM4MWQ5OTdmOGQ0NjQzZTQwNWUxY2JkMTM1MjQwNjg2NA==
+    YWNiNzYyZTkwODc2YjJiZDdmMTVlMzk4OTQxZjQxYThhMWZhMGY1Nw==
   data.tar.gz: !binary |-
-    ZjFjMWI1OWQ0ZjJjYTA5OTJkY2IzNGNmODIyODVhZjkwNmFhMDc4Nw==
+    MmFhODIzYTlhYWZhMjI3MDlmMGE4ZWU1NmEwNTkwNDc0NTJiMDEzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjFlNWU2MGI0OGU2MjBhNGE1ZWQzY2VmMDUyOGI4NjMxMDM1MmUxMWJiODI4
-    ZmI0Njk1ZDdkYTczN2IxZjJlZDNlMzZlMjA2NTgxYzg1ODc2MGYzYmQ2MGRm
-    YmYyYTRhZWJiMGJkMzAwYmIyODA5ZTkyMGI3OWFhYzk4MzQ2MTU=
+    YjYxNjgwOWNkYTU4ZmQ2MmU4YzRjODc4OWM0NWEyN2MzMTQwYmViNjZiZmMw
+    OWE2MWNjOTI0ZjA3NTQyMTQyYmJhNzMwZjhlOTkxMDFiODM2YzI4ZDhkNTYx
+    ZDhhMDI5MjY3YzQ2YmRjMGY5OTRjNTk1NTcxNmE5MzA3NjIyZGY=
   data.tar.gz: !binary |-
-    YTA2ZTU1OTQ3MzBiMjIwMWExZDYxNGE0OTJhOGQwMjMxYTE4NTUyZWU3YTYz
-    MGNkYTE0YTgzYzM0YTNiOGJhNGExODg0MjVkZWUyYzFjYTk1YWFlMGQyZDYz
-    MjhkNDQ2OGI3NTk0NzViYTUxN2VmY2IwMDc5OWE1NDY3NmI3MzU=
+    ODlhNjFlNjBiMjc5YTRjYjgxNWFhNDgwM2Y2NmFjNDYxNTZlMzFjOTNmYzYx
+    MTIyOGJlMDQ4NWQ5ZTNjNzNkODIwMzViNTVhMjk1MTllOWYwYWU4OWNhMGEw
+    NjIyNDBhMGFjN2NiOTBjMGU5Y2NlNTU3OTI5ZGQ2MmM4MTMyZDk=

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 3.0.2 (5th October, 2013)
+
+Bugfixes:
+
+  - [FC051: Template partials loop indefinitely](http://foodcritic.io/#FC051)
+    can cause foodcritic to exit with an error on encountering a file that
+    cannot be read as UTF-8. We now explicitly exclude `.DS_Store` and `*.swp`
+    as a workaround
+    ([related issue](https://github.com/acrmp/foodcritic/issues/172)). Thanks
+    @tmatilai, @claco.
+  - [FC022: Resource condition within loop may not behave as expected](http://foodcritic.io/#FC022)
+    would warn incorrectly against loops where the block accepts more than one
+    argument
+    ([related issue](https://github.com/acrmp/foodcritic/issues/69)). Thanks
+    @Ips1975, @jaymzh.
+
 ## 3.0.1 (25th September, 2013)
 
 Other:

data/features/022_check_for_dodgy_conditions_within_loop.feature

@@ -26,3 +26,8 @@ Feature: Check for dodgy resource conditions within a loop
     | "feed_pet"             | only_if "[ -f \"/tmp/#{pet_name}\" ]"             | should       |
     | "feed_pet_#{pet_name}" | not_if "[ -f \"/tmp/#{pet_name}\" ]"              | should not   |
     | pet_name               | not_if "[ -f \"/tmp/#{pet_name}\" ]"              | should not   |
+
+  Scenario: Resource within a multi-arg block
+    Given a resource declared with a guard within a loop with multiple block arguments
+    When I check the cookbook
+    Then the dodgy resource condition warning 022 should not be shown

data/features/051_check_for_template_partial_loops.feature

@@ -19,3 +19,13 @@ Feature: Check for template partial includes cycle
      When I check the cookbook
      Then the template partials loop indefinitely warning 051 should be displayed against the templates
       And no error should have occurred
+
+  Scenario Outline: Template directory contains binary files
+    Given a template directory that contains a binary file <file> that is not valid UTF-8
+     When I check the cookbook
+     Then the template partials loop indefinitely warning 051 should not be displayed against the templates
+      And no error should have occurred
+  Examples:
+    | file        |
+    | .DS_Store   |
+    | foo.erb.swp |

data/features/step_definitions/cookbook_steps.rb

@@ -1423,6 +1423,20 @@ Given 'a recipe that declares multiple resources of the same type of which one h
   }
 end
 
+Given 'a resource declared with a guard within a loop with multiple block arguments' do
+  write_recipe %q{
+    {
+    'foo' => 'bar',
+    'baz' => 'bing',
+    }.each do |foo, bar|
+      package bar do
+        not_if { node['foo'] == foo }
+        action :install
+      end
+    end
+  }
+end
+
 Given /^a rule that (declares|does not declare) a version constraint(?: of ([^ ]+)? to ([^ ]+)?)?$/ do |constraint, from, to|
   if from || to
     rule_with_version_constraint(from, to)
@@ -1624,6 +1638,13 @@ Given /^a ruby role that triggers FC049 with comment (.*)$/ do |comment|
   }.strip
 end
 
+Given /^a template directory that contains a binary file (.*) that is not valid UTF-8$/ do |filename|
+  template_dir = 'cookbooks/example/templates/default'
+  write_recipe ''
+  write_file "#{template_dir}/innocent_template.erb", '<%= hello %>'
+  File.open("#{current_dir}/#{template_dir}/#{filename}", 'wb'){|f| f.putc(0x93)}
+end
+
 Given 'each role directory has a role with a name that does not match the containing file name' do
   role(:dir => 'roles1', :role_name => '"apache"', :file_name => 'webserver.rb')
   role(:dir => 'roles2', :role_name => '"postgresql"', :file_name => 'database.rb')
@@ -1987,6 +2008,10 @@ Then /^the debugger breakpoint warning 030 should be (not )?shown against the (.
   expect_warning('FC030', :line => nil, :expect_warning => should_not.nil?, :file => filename)
 end
 
+Then 'the dodgy resource condition warning 022 should not be shown' do
+  expect_warning('FC022', {:line => nil, :expect_warning => false})
+end
+
 Then /^the warning (\d+) should be (valid|invalid)$/ do |code, valid|
   code = "FC#{code}"
   valid == 'valid' ? expect_no_warning(code) : expect_warning(code)

data/lib/foodcritic/api.rb

@@ -349,7 +349,11 @@ module FoodCritic
     # Templates in the current cookbook
     def template_paths(recipe_path)
       Dir.glob(Pathname.new(recipe_path).dirname.dirname + 'templates' +
-        '**/*', File::FNM_DOTMATCH).select{|path| File.file?(path)}
+        '**/*', File::FNM_DOTMATCH).select do |path|
+        File.file?(path)
+      end.reject do |path|
+        File.basename(path) == '.DS_Store' || File.extname(path) == '.swp'
+      end
     end
 
     private

data/lib/foodcritic/rules.rb

@@ -296,6 +296,8 @@ rule "FC022", "Resource condition within loop may not behave as expected" do
     ast.xpath("//call[ident/@value='each']/../do_block").map do |loop|
       block_vars = loop.xpath("block_var/params/child::*").map do |n|
         n.name.sub(/^ident/, '')
+      end + loop.xpath("block_var/params/child::*/descendant::ident").map do |v|
+        v['value']
       end
       find_resources(loop).map do |resource|
         # if any of the parameters to the block are used in a condition then we

data/lib/foodcritic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -260,5 +260,5 @@ rubyforge_project:
 rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: foodcritic-3.0.1
+summary: foodcritic-3.0.2
 test_files: []