foodcritic 8.2.0 → 9.0.0

data/features/007_check_for_undeclared_recipe_dependencies.feature

@@ -52,4 +52,3 @@ Feature: Check for undeclared recipe dependencies
     Given a cookbook that does not have defined metadata
     When I check the cookbook
     Then the undeclared dependency warning 007 should not be displayed
-     And no error should have occurred

data/features/009_check_for_unrecognised_resource_attributes.feature

@@ -28,7 +28,6 @@ Feature: Check for unrecognised resource attributes
     Given a recipe that declares a user-defined resource
     When I check the cookbook
     Then the unrecognised attribute warning 009 should not be displayed
-     And no error should have occurred
 
   Scenario: Resource declared with only a name attribute
     Given a recipe that declares a resource with only a name attribute

data/features/014_check_for_long_ruby_blocks.feature

@@ -27,4 +27,4 @@ Feature: Check for overly long ruby blocks
   Scenario: Missing block attribute
     Given a recipe that contains a ruby block without a block attribute
      When I check the cookbook
-     Then no error should have occurred
+     Then the long ruby block warning 014 should not be displayed

data/features/015_check_for_definitions.feature

@@ -13,7 +13,6 @@ Feature: Check for use of definitions
     Given a cookbook that does not contain a definition and has no definitions directory
     When I check the cookbook
     Then the definitions are deprecated warning 015 should not be displayed against the definition file
-     And no error should have occurred
 
   Scenario: Cookbook does not contain a definition - directory
     Given a cookbook that does not contain a definition and has a definitions directory

data/features/033_check_for_missing_template.feature

@@ -25,6 +25,15 @@ Feature: Check for missing template
     | uses an inferred template                                                 | should not be displayed |
     | uses a template from another cookbook                                     | should not be displayed |
 
+  Scenario Outline: Template in the root of the templates directory
+    Given a cookbook recipe that refers to a template in the root of the templates directory
+     When I check the cookbook specifying <version> as the Chef version
+     Then the missing template warning 033 <warning>
+  Examples:
+    | version   | warning                   |
+    | 11.18.12  | should be displayed       |
+    | 12.0.0    | should not be displayed   |
+
   Scenario: Template within deploy resource
     Given a cookbook recipe with a deploy resource that contains a template resource
      When I check the cookbook

data/features/034_check_for_unused_template_variables.feature

@@ -78,4 +78,3 @@ Feature: Check for unused template variables
     Given a template that includes a partial that includes the original template again
      When I check the cookbook
      Then the unused template variables warning 034 should not be displayed
-      And no error should have occurred

data/features/041_check_raw_download.feature

@@ -1,6 +1,6 @@
 Feature: Check for direct usage of curl or wget
 
-  In order to fetch remote artefacts idiomatically
+  In order to fetch remote artifacts idiomatically
   As a developer
   I want to use resources to download rather than using curl or wget
 

data/features/051_check_for_template_partial_loops.feature

@@ -18,25 +18,22 @@ Feature: Check for template partial includes cycle
     Given a template that includes a partial that includes the original template again
      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: Relative partial
     Given a template that includes a partial with a relative subdirectory path
      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
 
   Scenario: Missing partial
     Given a template that includes a missing partial with a relative subdirectory path
      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
 
   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   |

data/features/061_valid_cookbook_version_should_be_defined.feature

@@ -2,7 +2,7 @@ Feature: Defined cookbook version should be valid
 
   In order to ensure that recipe metadata is stable
   As a developer
-  I want to identify metadata that does not define a valid verison for the cookbook
+  I want to identify metadata that does not define a valid version for the cookbook
 
   Scenario: Metadata with the version keyword and a valid version
     Given a cookbook with metadata that includes the version keyword and a valid version string

data/features/063_cookbook_incorrectly_depends_on_itself.feature

@@ -2,14 +2,14 @@ Feature: Check for metadata using suggests keyword
 
   In order to avoid pathological depsolving issues
   As a developer
-  I want to identify cookboks that depend on themselves and remove that (unnecessary) dependency
+  I want to identify cookbooks that depend on themselves and remove that (unnecessary) dependency
 
   Scenario: Metadata with self dependency
     Given a cookbook with metadata that includes a self dependency
      When I check the cookbook
      Then the metadata with self dependency warning 063 should be shown against the metadata file
 
-  Scenario: Metadata without self depenency
+  Scenario: Metadata without self dependency
     Given a cookbook with metadata that does not include a self dependency
      When I check the cookbook
      Then the metadata with self dependency warning 063 should be not shown against the metadata file

data/features/continuous_integration_support.feature

@@ -17,13 +17,13 @@ Feature: Continuous Integration Support
 
   Examples:
     | cookbook_matches  | tag_arguments       | warnings_shown    | build_status |
-    | FC002,FC003,FC004 |                     | FC002,FC003,FC004 | successful   |
-    | FC002,FC003,FC004 | -t style            | FC002,FC004       | successful   |
-    | FC002,FC003,FC004 | -f style            | FC002,FC003,FC004 | failed       |
+    | FC002,FC003,FC004 |                     | FC002,FC003,FC004 | failed       |
+    | FC002,FC003,FC004 | -t style            | FC002,FC004       | failed       |
+    | FC002,FC003,FC004 | -t style -f ~any    | FC002,FC004       | successful   |
     | FC002,FC003,FC004 | -f FC005            | FC002,FC003,FC004 | successful   |
     | FC002,FC003,FC004 | -f FC003,FC004      | FC002,FC003,FC004 | failed       |
     | FC002,FC003,FC004 | --epic-fail FC003   | FC002,FC003,FC004 | failed       |
-    | FC002,FC003       | -f any              | FC002,FC003       | failed       |
+    | FC002,FC003       | -f ~any             | FC002,FC003       | successful   |
     | FC002,FC003       | -f any -f ~FC014    | FC002,FC003       | failed       |
     | FC002,FC003       | -f any,~FC014       | FC002,FC003       | failed       |
     | FC002             | -f ~FC002           | FC002             | successful   |

data/features/exclude_paths_to_lint.feature

@@ -4,13 +4,6 @@ Feature: Exclude paths from being linted
   As a developer
   I want to be able to exclude some files or directories from the passed paths
 
-  Scenario: Don't exclude a non cookbook directory
-    Given a cookbook that has style problems
-      And unit tests under a top-level test directory
-     When I check the cookbook without excluding the test directory
-     Then warnings will be displayed against the tests
-      And the style warning 002 should be displayed
-
   Scenario: Exclude a non cookbook directory
     Given a cookbook that has style problems
       And unit tests under a top-level test directory

data/features/step_definitions/cookbook_steps.rb

@@ -261,12 +261,10 @@ Given /^a cookbook recipe that declares (a resource|multiple resources) nested i
     #{conds.first} node['foo'] == 'bar'
       service "apache" do
         action :enable
-        #{
-          case condition_attribute
+        #{case condition_attribute
             when /(only_if|not_if) block/ then "#{$1} #{blk}"
             when /(only_if|not_if) string/ then "#{$1} #{str}"
-          end
-        }
+          end}
       end
       #{%q{service "httpd" do
         action :enable
@@ -556,6 +554,20 @@ Given /^a cookbook recipe that refers to a (missing |local )?template( in a subd
   end
 end
 
+Given /^a cookbook recipe that refers to a template in the root of the templates directory$/ do
+  write_recipe %q{
+    template "/tmp/config.conf" do
+      source "config.conf.erb"
+      variables({
+        :config_var => 'foo'
+      })
+    end
+  }
+  write_file "cookbooks/example/templates/config.conf.erb", %q{
+    <%= @config_var %>
+  }
+end
+
 Given "a cookbook recipe that refers to a template without an erb extension" do
   write_recipe %q{
     template '/etc/resolv.conf' do
@@ -2313,7 +2325,7 @@ end
 
 Then "the usage text should include an option for specifying tags that will fail the build" do
   expect_usage_option("f", "epic-fail TAGS",
-    "Fail the build based on tags. Use 'any' to fail on all warnings.")
+    "Fail the build based on tags. Default of 'any' to fail on all warnings.")
 end
 
 Then /^the warnings shown should be (.*)$/ do |warnings|

data/features/support/command_helpers.rb

@@ -195,7 +195,7 @@ module FoodCritic
           :description => "Only check against rules valid for this version of Chef." },
 
         { :short => "f", :long => "epic-fail TAGS",
-          :description => "Fail the build based on tags. Use 'any' to fail on all warnings." },
+          :description => "Fail the build based on tags. Default of 'any' to fail on all warnings." },
 
         { :short => "l", :long => "list",
           :description => "List all enabled rules and their descriptions." },
@@ -225,7 +225,7 @@ module FoodCritic
           :description => "Display the foodcritic version." },
 
         { :short => "X", :long => "exclude PATH",
-          :description => "Exclude path(s) from being linted." },
+          :description => "Exclude path(s) from being linted. PATH is relative to the cookbook, not an absolute PATH. Default test/**/*,spec/**/*,features/**/*" },
 
       ]
     end

data/lib/foodcritic/command_line.rb

@@ -8,13 +8,14 @@ module FoodCritic
       @args = args
       @original_args = args.dup
       @options = {
-        fail_tags: [],
+        fail_tags: ["any"],
         tags: [],
         include_rules: [],
         cookbook_paths: [],
         role_paths: [],
         environment_paths: [],
-        exclude_paths: [],
+        exclude_paths: ["test/**/*", "spec/**/*", "features/**/*"],
+        progress: true,
       }
       @parser = OptionParser.new do |opts|
         opts.banner = "foodcritic [cookbook_paths]"
@@ -28,7 +29,7 @@ module FoodCritic
           @options[:list] = t
         end
         opts.on("-f", "--epic-fail TAGS",
-                "Fail the build based on tags. Use 'any' to fail "\
+                "Fail the build based on tags. Default of 'any' to fail "\
                 "on all warnings.") do |t|
           @options[:fail_tags] << t
         end
@@ -59,9 +60,9 @@ module FoodCritic
                 "foodcritic/rules/**/*.rb") do |g|
           @options[:search_gems] = true
         end
-        opts.on("-P", "--progress",
-                "Show progress of files being checked") do
-          @options[:progress] = true
+        opts.on("-P", "--[no-]progress",
+                "Show progress of files being checked. default: true") do |q|
+          @options[:progress] = q
         end
         opts.on("-R", "--role-path PATH",
                 "Role path(s) to check.") do |r|
@@ -76,7 +77,7 @@ module FoodCritic
           @options[:version] = true
         end
         opts.on("-X", "--exclude PATH",
-                "Exclude path(s) from being linted. PATH is relative to the cookbook, not an absolute PATH") do |e|
+                "Exclude path(s) from being linted. PATH is relative to the cookbook, not an absolute PATH. Default test/**/*,spec/**/*,features/**/*") do |e|
           options[:exclude_paths] << e
         end
       end

data/lib/foodcritic/domain.rb

@@ -33,7 +33,7 @@ module FoodCritic
     end
 
     def to_s
-      @rules.sort { |a, b| a.code <=> b.code }.
+      @rules.sort_by(&:code).
         map { |r| r.to_s }.join("\n")
     end
 

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.17.44"
+    DEFAULT_CHEF_VERSION = "12.18.31"
     attr_reader :chef_version
 
     # Perform a lint check. This method is intended for use by the command-line

data/lib/foodcritic/rules.rb

@@ -502,6 +502,8 @@ rule "FC033", "Missing template" do
         relative_path = []
         Pathname.new(path).ascend do |template_path|
           relative_path << template_path.basename
+          break if gem_version(chef_version) >= gem_version("12.0.0") &&
+              template_path.dirname.basename.to_s == "templates"
           break if template_path.dirname.dirname.basename.to_s == "templates"
         end
         File.join(relative_path.reverse) == resource[:file]

data/lib/foodcritic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -141,6 +141,7 @@ files:
 - chef_dsl_metadata/chef_12.15.19.json
 - chef_dsl_metadata/chef_12.16.42.json
 - chef_dsl_metadata/chef_12.17.44.json
+- chef_dsl_metadata/chef_12.18.31.json
 - chef_dsl_metadata/chef_12.2.1.json
 - chef_dsl_metadata/chef_12.3.0.json
 - chef_dsl_metadata/chef_12.4.0.json
@@ -280,8 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: foodcritic-8.2.0
+summary: foodcritic-9.0.0
 test_files: []