foodcritic 2.0.1 → 2.1.0

data/lib/foodcritic/ast.rb

@@ -8,7 +8,7 @@ module FoodCritic
     end
 
     def ast_node_has_children?(node)
-      node.respond_to?(:first)
+      node.respond_to?(:first) and ! node.respond_to?(:match)
     end
 
     # If the provided node is the line / column information.

data/lib/foodcritic/chef.rb

@@ -45,20 +45,23 @@ module FoodCritic
     # To avoid the runtime hit of loading the Chef gem and its dependencies
     # we load the DSL metadata from a JSON file shipped with our gem.
     #
-    # The DSL metadata therefore reflects the version of Chef in the gemset
-    # where foodcritic was built, rather than the version in the local user
-    # gemset.
-    #
-    # TODO: Now that the effective version of Chef to check with can be passed
-    # on the command-line we should bundle metadata for historical Chef gem
-    # versions.
+    # The DSL metadata doesn't necessarily reflect the version of Chef in the
+    # local user gemset.
     def load_metadata
-      metadata_path = File.join(File.dirname(__FILE__), '..', '..',
-        'chef_dsl_metadata.json')
+      version = self.respond_to?(:chef_version) ? chef_version : Linter::DEFAULT_CHEF_VERSION
+      metadata_path = [version, version.sub(/\.[a-z].*/, ''),
+	               Linter::DEFAULT_CHEF_VERSION].map do |version|
+	metadata_path(version)
+      end.find{|m| File.exists?(m)}
       @dsl_metadata ||= Yajl::Parser.parse(IO.read(metadata_path),
         :symbolize_keys => true)
     end
 
+    def metadata_path(chef_version)
+      File.join(File.dirname(__FILE__), '..', '..',
+        "chef_dsl_metadata/chef_#{chef_version}.json")
+    end
+
     def resource_check?(key, resource_type, field)
       if resource_type.to_s.empty? || field.to_s.empty?
         raise ArgumentError, "Arguments cannot be nil or empty."

data/lib/foodcritic/dsl.rb

@@ -23,9 +23,14 @@ module FoodCritic
 
   class RuleDsl
     attr_reader :rules
+    attr_reader :chef_version
 
     include Api
 
+    def initialize(chef_version=Linter::DEFAULT_CHEF_VERSION)
+      @chef_version = chef_version
+    end
+
     # Define a new rule, the outer block of a rule definition.
     def rule(code, name, &block)
       @rules = [] if @rules.nil?
@@ -65,8 +70,8 @@ module FoodCritic
     rule_block :template
 
     # Load the ruleset(s).
-    def self.load(paths)
-      dsl = RuleDsl.new
+    def self.load(paths, chef_version=Linter::DEFAULT_CHEF_VERSION)
+      dsl = RuleDsl.new(chef_version)
       paths.map do |path|
         File.directory?(path) ? Dir["#{path}/**/*.rb"].sort : path
       end.flatten.each do |path|

data/lib/foodcritic/linter.rb

@@ -12,7 +12,8 @@ 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 = "0.10.10"
+    DEFAULT_CHEF_VERSION = "11.4.0"
+    attr_reader :chef_version
 
     # Perform a lint check. This method is intended for use by the command-line
     # wrapper. If you are programatically using foodcritic you should use
@@ -47,6 +48,7 @@ module FoodCritic
       cookbook_paths = sanity_check_cookbook_paths(cookbook_paths)
       options = setup_defaults(options)
       @options = options
+      @chef_version = options[:chef_version] || DEFAULT_CHEF_VERSION
 
       warnings = []; last_dir = nil; matched_rule_tags = Set.new
 
@@ -92,7 +94,7 @@ module FoodCritic
 
     def load_rules!(options)
       @rules = RuleDsl.load([File.join(File.dirname(__FILE__), 'rules.rb')] +
-        options[:include_rules])
+        options[:include_rules], chef_version)
     end
 
     private
@@ -123,7 +125,7 @@ module FoodCritic
     def active_rules(options)
       @rules.select do |rule|
         matching_tags?(options[:tags], rule.tags) and
-        applies_to_version?(rule, options[:chef_version] || DEFAULT_CHEF_VERSION)
+        applies_to_version?(rule, chef_version)
       end
     end
 
@@ -188,7 +190,7 @@ module FoodCritic
 
     # We use the Gherkin (Cucumber) syntax to specify tags.
     def matching_tags?(tag_expr, tags)
-      Gherkin::TagExpression.new(tag_expr).eval(tags.map do |t|
+      Gherkin::TagExpression.new(tag_expr).evaluate(tags.map do |t|
         Gherkin::Formatter::Model::Tag.new(t, 1)
       end)
     end

data/lib/foodcritic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.11.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.11.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- chef_dsl_metadata/chef_10.20.0.json
+- chef_dsl_metadata/chef_10.12.0.json
+- chef_dsl_metadata/chef_10.18.2.json
+- chef_dsl_metadata/chef_0.10.10.json
+- chef_dsl_metadata/chef_0.9.4.json
+- chef_dsl_metadata/chef_0.10.8.json
+- chef_dsl_metadata/chef_10.14.4.json
+- chef_dsl_metadata/chef_0.9.12.json
+- chef_dsl_metadata/chef_10.22.0.json
+- chef_dsl_metadata/chef_0.10.6.json
+- chef_dsl_metadata/chef_11.0.0.json
+- chef_dsl_metadata/chef_0.9.8.json
+- chef_dsl_metadata/chef_11.4.0.json
+- chef_dsl_metadata/chef_0.8.14.json
+- chef_dsl_metadata/chef_0.9.18.json
+- chef_dsl_metadata/chef_10.16.0.json
+- chef_dsl_metadata/chef_0.9.16.json
+- chef_dsl_metadata/chef_0.9.2.json
+- chef_dsl_metadata/chef_0.9.6.json
+- chef_dsl_metadata/chef_10.16.6.json
+- chef_dsl_metadata/chef_10.16.4.json
+- chef_dsl_metadata/chef_0.9.14.json
+- chef_dsl_metadata/chef_10.18.0.json
+- chef_dsl_metadata/chef_0.10.2.json
+- chef_dsl_metadata/chef_0.9.0.json
+- chef_dsl_metadata/chef_0.8.16.json
+- chef_dsl_metadata/chef_0.10.4.json
+- chef_dsl_metadata/chef_0.10.0.json
+- chef_dsl_metadata/chef_10.16.2.json
+- chef_dsl_metadata/chef_10.24.0.json
+- chef_dsl_metadata/chef_10.14.2.json
+- chef_dsl_metadata/chef_10.14.0.json
+- chef_dsl_metadata/chef_11.2.0.json
+- chef_dsl_metadata/chef_0.9.10.json
 - lib/foodcritic/dsl.rb
 - lib/foodcritic/command_line.rb
 - lib/foodcritic/rake_task.rb
@@ -130,7 +164,6 @@ files:
 - lib/foodcritic/version.rb
 - lib/foodcritic/notifications.rb
 - lib/foodcritic.rb
-- chef_dsl_metadata.json
 - bin/foodcritic
 homepage: http://acrmp.github.com/foodcritic
 licenses:
@@ -153,11 +186,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 118769465480030125
+      hash: 1124034577266906098
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: foodcritic-2.0.1
+summary: foodcritic-2.1.0
 test_files: []