foodcritic 11.1.0 → 11.2.0

data/features/009_check_for_unrecognised_resource_attributes.feature

@@ -53,12 +53,3 @@ Feature: Check for unrecognised resource attributes
     Given a recipe that declares a resource with an attribute value set to the result of a method call
      When I check the cookbook
      Then the unrecognised attribute warning 009 should not be displayed
-
-  Scenario Outline: Create raid array with mdadm specifying layout
-    Given a recipe that creates a raid array with mdadm specifying layout
-     When I check the cookbook specifying <version> as the Chef version
-     Then the unrecognised attribute warning 009 should be <shown>
-  Examples:
-    | version  | shown |
-    | 12.6.0   | true  |
-    | 12.11.18 | false |

data/features/038_check_for_invalid_action.feature

@@ -37,12 +37,3 @@ Feature: Check for invalid resource actions
     | service  | enable, start        | should not |
     | service  | enble, start         | should     |
     | foo      | energize, revitalize | should not |
-
-  Scenario Outline: Try to mask a systemd service
-    Given a recipe that tries to mask a systemd service
-     When I check the cookbook specifying <version> as the Chef version
-     Then the invalid resource action warning 038 should be <shown>
-  Examples:
-    | version   | shown  |
-    | 12.8.1    | false  |
-    | 12.7.2    | true   |

data/features/step_definitions/cookbook_steps.rb

@@ -255,7 +255,7 @@ Given /^a cookbook recipe that declares a resource with a (.*)$/ do |conditional
   }
 end
 
-Given /^a cookbook recipe (?:that declares a resource with no conditions at all|with no notifications)$/ do
+Given "a cookbook recipe that declares a resource with no conditions at all" do
   write_recipe %q{
     service "apache" do
       action :enable
@@ -650,14 +650,6 @@ Given /^a cookbook recipe with a resource that (notifies|subscribes) a ([^ ]+) t
   }
 end
 
-Given "a cookbook recipe with a resource that uses the old notification syntax" do
-  write_recipe %q{
-    template "/etc/www/configures-apache.conf" do
-      notifies :restart, resources(:service => "apache")
-    end
-  }
-end
-
 Given /^a cookbook recipe with a '([^']+)' condition for flavours (.*)$/ do |type, flavours|
   platforms = %Q{"#{flavours.split(',').join('","')}"}
   if type == "case"
@@ -765,17 +757,6 @@ Given /^a cookbook that contains a (short|long) ruby block$/ do |length|
   recipe_with_ruby_block(length.to_sym)
 end
 
-Given "a cookbook that contains a definition" do
-  write_definition("apache_site", %q{
-    define :apache_site, :enable => true do
-      log "I am a definition"
-    end
-  })
-  write_recipe %q{
-    apache_site "default"
-  }
-end
-
 Given /^a cookbook that contains a LWRP (?:with a single notification|that uses the current notification syntax)$/ do
   cookbook_with_lwrp({ :notifies => :does_notify })
 end
@@ -880,13 +861,6 @@ Given /^a cookbook that declares ([a-z]+) attributes via symbols$/ do |attribute
   attributes_with_symbols(attribute_type)
 end
 
-Given /^a cookbook that does not contain a definition and has (no|a) definitions directory$/ do |has_dir|
-  create_directory "cookbooks/example/definitions/" unless has_dir == "no"
-  write_recipe %q{
-    log "A defining characteristic of this cookbook is that it has no definitions"
-  }
-end
-
 Given /^a cookbook that has ([^ ]+) problems$/ do |problems|
   cookbook_that_matches_rules(
     problems.split(",").map do |problem|
@@ -1397,21 +1371,12 @@ Given "unit tests under a top-level test directory" do
   minitest_spec_attributes
 end
 
-Given "a recipe that creates a raid array with mdadm specifying layout" do
+Given "a recipe that includes dsc_resource with the module_version attribute" do
   write_recipe %q{
-    mdadm '/dev/md0' do
-      devices [ '/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd' ]
-      level 5
-      layout 'left-asymmetric'
-      action [ :create, :assemble ]
-    end
-  }
-end
-
-Given "a recipe that tries to mask a systemd service" do
-  write_recipe %q{
-    service 'foo' do
-       action :mask
+    dsc_resource 'foo' do
+      resource :something
+      module_name 'foo'
+      module_version '1.0.0.0'
     end
   }
 end
@@ -1869,10 +1834,6 @@ Then /^the unrecognised attribute warning 009 should be (true|false)$/ do |shown
   shown == "true" ? expect_warning("FC009") : expect_no_warning("FC009")
 end
 
-Then /^the invalid resource action warning 038 should be (true|false)$/ do |shown|
-  shown == "true" ? expect_warning("FC038") : expect_no_warning("FC038")
-end
-
 Then "the unrecognised attribute warning 009 should be displayed against the correct resource" do
   expect_warning("FC009", :line => 7)
 end
@@ -1912,82 +1873,3 @@ Given(/^a cookbook with an? (.*) file with an interpolated name$/) do |file_type
   write_definition "apache_site", content if file_type == "definition"
   write_library "lib", content if file_type == "library"
 end
-
-Given /^a cookbook that contains a LWRP provider (with|without) use_inline_resources( and uses def action_create)?$/ do |with_use_inline_resources, uses_def|
-  write_resource("site", %q{
-    actions :create
-    attribute :name, :kind_of => String, :name_attribute => true
-  })
-  provider_file = ""
-  if with_use_inline_resources == "with"
-    provider_file += %q{
-      use_inline_resources
-    }
-  end
-  if uses_def
-    provider_file += %q{
-      def action_create
-    }
-  else
-    provider_file += %q{
-      action :create do
-    }
-  end
-  provider_file += %q{
-       file "/tmp/foo.txt"
-    end
-  }
-  write_provider("site", provider_file)
-end
-
-Given /^a cookbook that contains a library provider (with|without) use_inline_resources( and uses def action_create)?$/ do |with_use_inline_resources, uses_def|
-  library_file = %q{
-    class MyResources
-      class Site < Chef::Resource::LWRPBase
-        provides :site
-        resource_name :site
-        actions :create
-        attribute :name, :kind_of => String, :name_attribute => true
-      end
-    end
-
-    class MyProviders
-      class Site < Chef::Provider::LWRPBase
-        provides :site
-  }
-  if with_use_inline_resources == "with"
-    library_file += %q{
-        use_inline_resources
-    }
-  end
-  if uses_def
-    library_file += %q{
-          def action_create
-    }
-  else
-    library_file += %q{
-          action :create do
-    }
-  end
-  library_file += %q{
-          file "/tmp/foo.txt"
-        end
-      end
-    end
-  }
-  write_library("lib", library_file)
-end
-
-Given /^a cookbook that contains a library resource$/ do
-  library_file = %q{
-    class MyResources
-      class Site < Chef::Resource::LWRPBase
-        provides :site
-        resource_name :site
-        actions :create
-        attribute :name, :kind_of => String, :name_attribute => true
-      end
-    end
-  }
-  write_library("lib", library_file)
-end

data/lib/foodcritic/command_line.rb

@@ -16,7 +16,7 @@ module FoodCritic
       @args = args
       @original_args = args.dup
       @options = {
-        fail_tags: ["any"],
+        fail_tags: ["~opensource"],
         tags: [],
         include_rules: [],
         cookbook_paths: [],

data/lib/foodcritic/linter.rb

@@ -9,7 +9,7 @@ module FoodCritic
 
     # The default version that will be used to determine relevant rules. This
     # can be over-ridden at the command line with the `--chef-version` option.
-    DEFAULT_CHEF_VERSION = "12.20.3"
+    DEFAULT_CHEF_VERSION = "13.1.31"
     attr_reader :chef_version
 
     # Perform a lint check. This method is intended for use by the command-line

data/lib/foodcritic/rules/fc091.rb

@@ -0,0 +1,10 @@
+rule "FC091", "Use property not attribute in custom resources" do
+  tags %w{correctness}
+
+  resource do |ast|
+    # Make sure we're in a custom resource not an LWRP
+    if ast.xpath("//command/ident/@value='action'")
+      ast.xpath("//command[ident/@value='attribute']")
+    end
+  end
+end

data/lib/foodcritic/rules/fc092.rb

@@ -0,0 +1,10 @@
+rule "FC092", "Custom resources should not define actions" do
+  tags %w{correctness}
+
+  resource do |ast|
+    # Make sure we're in a custom resource not an LWRP
+    if ast.xpath("//command/ident/@value='action'")
+      ast.xpath("//command[ident/@value='actions']")
+    end
+  end
+end

data/lib/foodcritic/version.rb

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

data/spec/functional/fc008_spec.rb

@@ -3,31 +3,31 @@ require "spec_helper"
 describe "FC008" do
   context "with a cookbook with a metadata file containing boilerplate maintainer from knife CLI" do
     metadata_file "maintainer 'YOUR_COMPANY_NAME'"
-    it { is_expected.to violate_rule("FC008") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook with a metadata file containing boilerplate maintainer from chef CLI" do
     metadata_file "maintainer 'The Authors'"
-    it { is_expected.to violate_rule("FC008") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook with a metadata file containing boilerplate maintainer_email from knife CLI" do
     metadata_file "maintainer_email 'YOUR_EMAIL'"
-    it { is_expected.to violate_rule("FC008") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook with a metadata file containing boilerplate maintainer_email from chef CLI" do
     metadata_file "maintainer_email 'you@example.com'"
-    it { is_expected.to violate_rule("FC008") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook with a metadata file containing non-boilerplate maintainer and maintainer_email" do
     metadata_file "maintainer 'John Smith'\nmaintainer_email 'john@smith.com'"
-    it { is_expected.not_to violate_rule("FC008") }
+    it { is_expected.not_to violate_rule }
   end
 
   context "with a cookbook with a metadata file not containing maintainer or maintainer_email" do
     metadata_file
-    it { is_expected.not_to violate_rule("FC008") }
+    it { is_expected.not_to violate_rule }
   end
 end

data/spec/functional/fc009_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe "FC009" do
+  context "on chef 13.0.133 with a cookbook that new dsc_resource attributes" do
+    foodcritic_command("--chef-version", "13.0.133", "--no-progress", ".")
+    recipe_file <<-EOH
+      dsc_resource 'foo' do
+        resource :something
+        module_name 'foo'
+        module_version '1.0.0.0'
+      end
+    EOH
+    it { is_expected.not_to violate_rule }
+  end
+
+  context "on chef 12.18.31 with a cookbook that new dsc_resource attributes" do
+    foodcritic_command("--chef-version", "12.18.31", "--no-progress", ".")
+    recipe_file <<-EOH
+      dsc_resource 'foo' do
+        resource :something
+        module_name 'foo'
+        module_version '1.0.0.0'
+      end
+    EOH
+    it { is_expected.to violate_rule }
+  end
+end

data/spec/functional/fc010_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe "FC010" do
+  context "with a cookbook with a recipe that attempts to perform a search with invalid syntax" do
+    recipe_file <<-EOH
+    search(:node, 'run_list:recipe[foo::bar]') do |matching_node|
+      puts matching_node.to_s
+    end
+    EOH
+    it { is_expected.to violate_rule }
+  end
+
+  context "with a cookbook with a recipe that attempts to perform a search with valid syntax" do
+    recipe_file <<-EOH
+    search(:node, 'run_list:recipe\\[foo\\:\\:bar\\]') do |matching_node|
+      puts matching_node.to_s
+    end
+    EOH
+
+    it { is_expected.not_to violate_rule }
+  end
+
+  context "with a cookbook with a recipe that attempts to perform a search with a subexpression" do
+    recipe_file <<-EOH
+    search(:node, "roles:\#{node['foo']['role']}") do |matching_node|
+      puts matching_node.to_s
+    end
+    EOH
+
+    it { is_expected.not_to violate_rule }
+  end
+end

data/spec/functional/fc011_spec.rb

@@ -4,17 +4,17 @@ describe "FC011" do
   context "with a cookbook with a README.md file" do
     metadata_file "name 'mycookbook'"
     file("README.md")
-    it { is_expected.not_to violate_rule("FC011") }
+    it { is_expected.not_to violate_rule }
   end
 
   context "with a cookbook without a README.md file" do
     metadata_file "name 'mycookbook'"
-    it { is_expected.to violate_rule("FC011") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook with a README.rdoc file" do
     metadata_file "name 'mycookbook'"
     file("README.rdoc")
-    it { is_expected.to violate_rule("FC011") }
+    it { is_expected.to violate_rule }
   end
 end

data/spec/functional/fc012_spec.rb

@@ -4,17 +4,17 @@ describe "FC012" do
   context "with a cookbook with a README.md file" do
     metadata_file "name 'mycookbook'"
     file("README.md")
-    it { is_expected.not_to violate_rule("FC012") }
+    it { is_expected.not_to violate_rule }
   end
 
   context "with a cookbook without a README file" do
     metadata_file "name 'mycookbook'"
-    it { is_expected.not_to violate_rule("FC012") }
+    it { is_expected.not_to violate_rule }
   end
 
   context "with a cookbook with a README.rdoc file" do
     metadata_file "name 'mycookbook'"
     file("README.rdoc")
-    it { is_expected.to violate_rule("FC012") }
+    it { is_expected.to violate_rule }
   end
 end

data/spec/functional/fc013_spec.rb

@@ -7,7 +7,7 @@ describe "FC013" do
         source "http://www.example.org/large-file.tar.gz"
       end
     EOH
-    it { is_expected.to violate_rule("FC013") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook that downloads a file to /tmp with an expression" do
@@ -16,7 +16,7 @@ describe "FC013" do
         source "http://www.example.org/large-file.tar.gz"
       end
     EOH
-    it { is_expected.to violate_rule("FC013") }
+    it { is_expected.to violate_rule }
   end
 
   context "with a cookbook that downloads a file to a users home directory" do
@@ -25,7 +25,7 @@ describe "FC013" do
         source "http://www.example.org/large-file.tar.gz"
       end
     EOH
-    it { is_expected.not_to violate_rule("FC013") }
+    it { is_expected.not_to violate_rule }
   end
 
   context "with a cookbook that downloads a file to the Chef file cache" do
@@ -34,6 +34,6 @@ describe "FC013" do
         source "http://www.example.org/large-file.tar.gz"
       end
     EOH
-    it { is_expected.not_to violate_rule("FC013") }
+    it { is_expected.not_to violate_rule }
   end
 end

data/spec/functional/fc015_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "FC015" do
+  context "with a cookbook that contains a definition" do
+    definition_file <<-EOH
+    define :apache_site, :enable => true do
+      log "I am a definition"
+    end
+    EOH
+    it { is_expected.to violate_rule }
+  end
+
+  context "with a cookbook that does not contain a definition" do
+    recipe_file <<-EOH
+      cookbook_file "/etc/foo"
+    EOH
+    it { is_expected.not_to violate_rule }
+  end
+end