foodcritic 10.1.0 → 10.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13edaa29dc5980c6783c28bdfa72c6ae5624ecd
-  data.tar.gz: 95e285806cc9168efa32ab6e1511e291bff66e3e
+  metadata.gz: bf1400039591c18cb681dc2add6b181ea08cd506
+  data.tar.gz: a54e351dc350f646a429ec9a266c4d67f09979d0
 SHA512:
-  metadata.gz: b1d7d8da69d8092724ccc970aa9a236175af58bb2c76a77582e6792ae3732efc924b98496faefecc3f02be8ce8315f61a412f2b71e80916c066956a1e7f5b5e9
-  data.tar.gz: 22c4676382a67e8c685af190bd473f22cdb161397e84479f4fa76666e4f89fff60d64fc88d121e808d3bbf9a32aea9fa754a79f9232abe08553afc42bd9b8112
+  metadata.gz: 7fc6031eb6d2c0a25d59871f9412decb490e455a2e0be5617c6473ab7c32a0642005023da4918cb55c03d02399b413bf8327ba68528dc9a88c908292f270e728
+  data.tar.gz: 9d9f373826b4e3996dfd41a7a0227210bc8ab601668a8eef96eeda39bac179752b59bcc8e7fae3dbe9d956c385707138593573ec3026cfa416400899fac91e3a

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Foodcritic Changelog:
 
-## [10.1.0](https://github.com/acrmp/foodcritic/tree/10.1.0) (2017-03-29)
+## [10.1.1](https://github.com/acrmp/foodcritic/tree/v10.1.1) (2017-03-29)
+[Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.1.0...v10.1.1)
 
+**Fixed bugs:**
+
+- Fix FC016 triggering on custom resources [\#525](https://github.com/acrmp/foodcritic/pull/525) ([tas50](https://github.com/tas50))
+
+## [v10.1.0](https://github.com/acrmp/foodcritic/tree/v10.1.0) (2017-03-29)
 [Full Changelog](https://github.com/acrmp/foodcritic/compare/v10.0.0...v10.1.0)
 
 **Implemented enhancements:**

data/features/016_check_for_no_lwrp_default_action.feature

@@ -18,3 +18,8 @@ Feature: Check for no LWRP default action
     Given a cookbook that contains a LWRP with a default action defined via a constructor
     When I check the cookbook
     Then the LWRP has no default action warning 016 should not be displayed against the resource file
+
+  Scenario: Custom resource with no default action
+    Given a cookbook that contains a custom resource with no default action
+    When I check the cookbook
+    Then the LWRP has no default action warning 016 should not be displayed against the resource file

data/features/step_definitions/cookbook_steps.rb

@@ -984,6 +984,10 @@ Given /^a cookbook that contains a LWRP with (no|a) default action( defined via
                        :notifies => :does_notify })
 end
 
+Given "a cookbook that contains a custom resource with no default action" do
+  cookbook_with_custom_resource
+end
+
 Given "a cookbook that contains no ruby blocks" do
   write_recipe %q{
     package "tar" do

data/features/support/cookbook_helpers.rb

@@ -94,6 +94,27 @@ module FoodCritic
       }.strip)
     end
 
+    # Create a cookbook with a custom resource
+    #
+    # @author Tim Smith - tsmith@chef.io
+    # @since 10.1.1
+    def cookbook_with_custom_resource
+      write_resource("site", %Q{
+        property :name, String, name_property: true
+        property :variables, Hash, default: {}
+
+        action :create do
+          log "Here is where I would create a " + thing
+        end
+
+        action_class do
+          def thing
+            return "site"
+          end
+        end
+      })
+    end
+
     # Create a cookbook with a LRWP
     #
     # @param [Hash] lwrp The options to use for the created LWRP

data/lib/foodcritic/api.rb

@@ -85,7 +85,7 @@ module FoodCritic
     # The absolute path of a cookbook from the specified file.
     #
     # @author Tim Smith - tsmith@chef.io
-    # @since 11.0
+    # @since 10.1
     # @param file [String, Pathname] relative or absolute path to a file in the cookbook
     # @return [String] the absolute path to the base of the cookbook
     def cookbook_base_path(file)

data/lib/foodcritic/rules/fc016.rb

@@ -1,6 +1,8 @@
 rule "FC016", "LWRP does not declare a default action" do
   tags %w{correctness lwrp}
   resource do |ast, filename|
+    # See if we're in a custom resource not an LWRP. Only LWRPs need the default_action
+    next if ast.xpath("//ident/@value='property'")
     unless ["//ident/@value='default_action'",
      "//def/bodystmt/descendant::assign/
       var_field/ivar/@value='@action'"].any? { |expr| ast.xpath(expr) }

data/lib/foodcritic/version.rb

@@ -1,4 +1,4 @@
 module FoodCritic
   # The current version of foodcritic
-  VERSION = "10.1.0"
+  VERSION = "10.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.1.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -355,5 +355,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: foodcritic-10.1.0
+summary: foodcritic-10.1.1
 test_files: []