foodcritic 7.0.1 → 7.1.0

data/spec/foodcritic/chef_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
 describe FoodCritic::Chef do
 
@@ -6,28 +6,28 @@ describe FoodCritic::Chef do
 
   describe "#chef_dsl_methods" do
     it "returns an enumerable" do
-      api.chef_dsl_methods.each{|m| m}
+      api.chef_dsl_methods.each { |m| m }
     end
     it "does not return an empty" do
       api.chef_dsl_methods.wont_be_empty
     end
     it "returns dsl methods as symbols" do
-      assert api.chef_dsl_methods.all?{|m| m == m.to_sym}
+      assert api.chef_dsl_methods.all? { |m| m == m.to_sym }
     end
   end
 
   describe "#resource_attribute?" do
     it "raises if the resource_type is nil" do
-      lambda{api.resource_attribute?(nil, :name)}.must_raise(ArgumentError)
+      lambda { api.resource_attribute?(nil, :name) }.must_raise(ArgumentError)
     end
     it "raises if the resource_type is empty" do
-      lambda{api.resource_attribute?('', :name)}.must_raise(ArgumentError)
+      lambda { api.resource_attribute?("", :name) }.must_raise(ArgumentError)
     end
     it "raises if the attribute_name is nil" do
-      lambda{api.resource_attribute?(:file, nil)}.must_raise(ArgumentError)
+      lambda { api.resource_attribute?(:file, nil) }.must_raise(ArgumentError)
     end
     it "raises if the attribute_name is empty" do
-      lambda{api.resource_attribute?(:file, '')}.must_raise(ArgumentError)
+      lambda { api.resource_attribute?(:file, "") }.must_raise(ArgumentError)
     end
     it "returns true if the resource attribute is known" do
       assert api.resource_attribute?(:file, :name)
@@ -42,21 +42,21 @@ describe FoodCritic::Chef do
       refute api.resource_attribute?("file", :size)
     end
     it "allows the attribute_name to be passed as a string" do
-      assert api.resource_attribute?(:file, 'mode')
+      assert api.resource_attribute?(:file, "mode")
     end
   end
 
   describe "#valid_query?" do
     it "raises if the query is nil" do
-      lambda{api.valid_query?(nil)}.must_raise(ArgumentError)
+      lambda { api.valid_query?(nil) }.must_raise(ArgumentError)
     end
     it "raises if the query is empty" do
-      lambda{api.valid_query?('')}.must_raise(ArgumentError)
+      lambda { api.valid_query?("") }.must_raise(ArgumentError)
     end
     it "coerces the provided object to a string" do
       query = Class.new do
         def to_s
-          '*:*'
+          "*:*"
         end
       end.new
       assert api.valid_query?(query)

data/spec/foodcritic/command_line_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
 describe FoodCritic::CommandLine do
   it "is instantiable" do
@@ -15,7 +15,7 @@ describe FoodCritic::CommandLine do
     end
 
     it "returns multiple items for multiple specified directories" do
-      FoodCritic::CommandLine.new(["example", "another_example"]).cookbook_paths.must_equal ["example", "another_example"]
+      FoodCritic::CommandLine.new(%w{example another_example}).cookbook_paths.must_equal %w{example another_example}
     end
 
     it "ignores known arguments" do
@@ -28,11 +28,11 @@ describe FoodCritic::CommandLine do
       FoodCritic::CommandLine.new([]).role_paths.must_be_empty
     end
     it "returns the provided role path" do
-      FoodCritic::CommandLine.new(['-R', 'roles']).role_paths.must_equal(%w{roles})
+      FoodCritic::CommandLine.new(["-R", "roles"]).role_paths.must_equal(%w{roles})
     end
     it "returns the provided role paths when there are multiple" do
-      FoodCritic::CommandLine.new(['-R', 'roles1',
-        '-R', 'roles2']).role_paths.must_equal(%w{roles1 roles2})
+      FoodCritic::CommandLine.new(["-R", "roles1",
+        "-R", "roles2"]).role_paths.must_equal(%w{roles1 roles2})
     end
   end
 
@@ -58,7 +58,7 @@ describe FoodCritic::CommandLine do
     end
 
     it "returns false if any on the specified paths do not exist" do
-      refute FoodCritic::CommandLine.new(["lib", "lib2"]).valid_paths?
+      refute FoodCritic::CommandLine.new(%w{lib lib2}).valid_paths?
     end
   end
 
@@ -68,7 +68,7 @@ describe FoodCritic::CommandLine do
     end
 
     it "returns true if --list is specified" do
-      assert FoodCritic::CommandLine.new(['--list']).list_rules?
+      assert FoodCritic::CommandLine.new(["--list"]).list_rules?
     end
   end
 end

data/spec/foodcritic/domain_spec.rb

@@ -1,24 +1,24 @@
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
 describe FoodCritic::Review do
   it "is instantiable with no warnings" do
-    FoodCritic::Review.new('example', [])
+    FoodCritic::Review.new("example", [])
   end
   describe "#cookbook_paths" do
     it "returns the cookbook paths provided" do
-      FoodCritic::Review.new(['example'], []).cookbook_paths.must_equal ['example']
+      FoodCritic::Review.new(["example"], []).cookbook_paths.must_equal ["example"]
     end
     it "returns the cookbook paths provided when there are multiple" do
-      FoodCritic::Review.new(['example', 'example2'], []).cookbook_paths.must_equal ['example', 'example2']
+      FoodCritic::Review.new(%w{example example2}, []).cookbook_paths.must_equal %w{example example2}
     end
   end
   describe "#warnings" do
     it "returns empty when there are no warnings" do
-      FoodCritic::Review.new('example', []).warnings.must_be_empty
+      FoodCritic::Review.new("example", []).warnings.must_be_empty
     end
     it "makes the warnings available" do
-      warning = 'Danger Will Robinson'
-      FoodCritic::Review.new('example', [warning]).warnings.must_equal [warning]
+      warning = "Danger Will Robinson"
+      FoodCritic::Review.new("example", [warning]).warnings.must_equal [warning]
     end
   end
 end
@@ -28,51 +28,51 @@ describe FoodCritic::RuleList do
     FoodCritic::RuleList.new([])
   end
 
-  let(:rule) { FoodCritic::Rule.new('FCTEST001', 'Test rule') }
+  let(:rule) { FoodCritic::Rule.new("FCTEST001", "Test rule") }
 
   describe "#rules" do
 
-    it 'is empty when instantiated with an empty rule list' do
+    it "is empty when instantiated with an empty rule list" do
       assert FoodCritic::RuleList.new([]).rules.empty?
     end
 
-    it 'contains the given rule' do
+    it "contains the given rule" do
       assert FoodCritic::RuleList.new([rule]).rules.include?(rule)
     end
   end
 end
 
 describe FoodCritic::Rule do
-  let(:rule) { FoodCritic::Rule.new('FCTEST001', 'Test rule') }
+  let(:rule) { FoodCritic::Rule.new("FCTEST001", "Test rule") }
 
   describe '#matches_tags?' do
     it "matches the rule's code" do
-      rule.matches_tags?(['FCTEST001']).must_equal true
+      rule.matches_tags?(["FCTEST001"]).must_equal true
     end
 
     it "doesn't match an unrelated code" do
-      rule.matches_tags?(['FCTEST999']).must_equal false
+      rule.matches_tags?(["FCTEST999"]).must_equal false
     end
   end
 
   describe '#tags' do
     it "returns any + the rule's code" do
-      rule.tags.must_equal ['any', 'FCTEST001']
+      rule.tags.must_equal %w{any FCTEST001}
     end
   end
 end
 
 describe FoodCritic::Warning do
-  let(:rule) { FoodCritic::Rule.new('FCTEST001', 'Test rule') }
-  let(:match_opts) { {:filename => 'foo/recipes.default.rb', :line => 5, :column=> 40} }
+  let(:rule) { FoodCritic::Rule.new("FCTEST001", "Test rule") }
+  let(:match_opts) { { :filename => "foo/recipes.default.rb", :line => 5, :column => 40 } }
 
   describe "failure indication" do
-    it 'is false if no fail_tags match' do
-      FoodCritic::Warning.new(rule, match_opts, {:fail_tags => []}).failed?.must_equal false
+    it "is false if no fail_tags match" do
+      FoodCritic::Warning.new(rule, match_opts, { :fail_tags => [] }).failed?.must_equal false
     end
 
-    it 'is true if fail_tags do match' do
-      FoodCritic::Warning.new(rule, match_opts, {:fail_tags => ['any']}).failed?.must_equal true
+    it "is true if fail_tags do match" do
+      FoodCritic::Warning.new(rule, match_opts, { :fail_tags => ["any"] }).failed?.must_equal true
     end
   end
 end

data/spec/foodcritic/linter_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
 describe FoodCritic::Linter do
   let(:linter) { FoodCritic::Linter.new }
@@ -18,25 +18,25 @@ describe FoodCritic::Linter do
   describe "#check" do
 
     it "requires a cookbook_path, role_path or environment_path to be specified" do
-      lambda{ linter.check({}) }.must_raise ArgumentError
+      lambda { linter.check({}) }.must_raise ArgumentError
     end
 
     [:cookbook, :role, :environment].each do |path_type|
       key = "#{path_type}_paths".to_sym
       it "requires a #{path_type}_path by itself not to be nil" do
-        lambda{ linter.check(key => nil) }.must_raise ArgumentError
+        lambda { linter.check(key => nil) }.must_raise ArgumentError
       end
       it "requires a #{path_type}_path by itself not to be empty" do
-        lambda{ linter.check(key => []) }.must_raise ArgumentError
+        lambda { linter.check(key => []) }.must_raise ArgumentError
       end
       it "accepts a scalar with a single #{path_type} path" do
-        linter.check(key => '.')
+        linter.check(key => ".")
       end
       it "accepts an array of #{path_type} paths" do
-        linter.check(key => ['.'])
+        linter.check(key => ["."])
       end
       it "returns a review when a #{path_type} path is provided" do
-        linter.check(key => ['.']).must_respond_to(:warnings)
+        linter.check(key => ["."]).must_respond_to(:warnings)
       end
     end
 
@@ -53,10 +53,9 @@ describe FoodCritic::Linter do
     end
   end
 
-
   describe "#load_files!" do
     let(:default_rules_file) do
-      File.expand_path(File.join(File.dirname(__FILE__), '../../lib/foodcritic/rules.rb'))
+      File.expand_path(File.join(File.dirname(__FILE__), "../../lib/foodcritic/rules.rb"))
     end
 
     let(:rule_dsl_load_mock) { MiniTest::Mock.new }
@@ -67,7 +66,7 @@ describe FoodCritic::Linter do
     end
 
     it "should include rules found in gems if the :search_gems option is true" do
-      gem_rules = ['/path/to/rules1.rb', '/path/to/rules2.rb']
+      gem_rules = ["/path/to/rules1.rb", "/path/to/rules2.rb"]
       expected_rules = [default_rules_file, gem_rules].flatten
       rule_dsl_load_mock.expect(:call, nil, [expected_rules, nil])
 
@@ -80,7 +79,7 @@ describe FoodCritic::Linter do
     end
 
     it "should include files found in :include_rules option" do
-      include_rules = ['/path/to/rules1.rb', '/path/to/rules2.rb']
+      include_rules = ["/path/to/rules1.rb", "/path/to/rules2.rb"]
       expected_rules = [default_rules_file, include_rules].flatten
       rule_dsl_load_mock.expect(:call, nil, [expected_rules, nil])
 

data/spec/foodcritic/template_spec.rb

@@ -1,10 +1,10 @@
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
 describe FoodCritic::Template::ExpressionExtractor do
-  let(:extractor){ FoodCritic::Template::ExpressionExtractor.new }
+  let(:extractor) { FoodCritic::Template::ExpressionExtractor.new }
   describe "#expressions" do
     it "returns empty if the template is empty" do
-      extractor.extract('').must_be_empty
+      extractor.extract("").must_be_empty
     end
     it "returns empty if the template contains no erb at all" do
       extractor.extract(%q{
@@ -16,8 +16,8 @@ describe FoodCritic::Template::ExpressionExtractor do
         <% if true %>
           Hello World!
         <% end %>
-      }).must_equal([{:type => :statement, :code => 'if true', :line => 2},
-                     {:type => :statement, :code => 'end', :line => 4}])
+      }).must_equal([{ :type => :statement, :code => "if true", :line => 2 },
+                     { :type => :statement, :code => "end", :line => 4 }])
     end
     it "does not evaluate erb statements" do
       extractor.extract(%q{
@@ -27,7 +27,7 @@ describe FoodCritic::Template::ExpressionExtractor do
     it "extracts an expression from within the template" do
       extractor.extract(%q{
         <%= foo %>
-      }).must_equal([{:type => :expression, :code => 'foo', :line => 2}])
+      }).must_equal([{ :type => :expression, :code => "foo", :line => 2 }])
     end
     it "does not evaluate erb expressions" do
       extractor.extract(%q{
@@ -41,8 +41,8 @@ describe FoodCritic::Template::ExpressionExtractor do
                    URIEncoding="UTF-8"
                    redirectPort="<%= node["tomcat"]["ssl_port"] %>" />
       }).must_equal([
-        {:type => :expression, :code => 'node["tomcat"]["port"]', :line => 2},
-        {:type => :expression, :code => 'node["tomcat"]["ssl_port"]', :line => 5}
+        { :type => :expression, :code => 'node["tomcat"]["port"]', :line => 2 },
+        { :type => :expression, :code => 'node["tomcat"]["ssl_port"]', :line => 5 },
       ])
     end
     it "excludes comment-only expressions" do

data/spec/regression/regression_spec.rb

@@ -1,9 +1,9 @@
-require_relative '../regression_helpers'
+require_relative "../regression_helpers"
 
-describe 'regression test' do
+describe "regression test" do
 
   let(:expected_lint_output) do
-    File.read('spec/regression/expected-output.txt')
+    File.read("spec/regression/expected-output.txt")
   end
 
   let(:actual_lint_output) do

data/spec/regression_helpers.rb

@@ -1,12 +1,12 @@
-require_relative 'spec_helper'
-require 'fileutils'
-require 'pathname'
+require_relative "spec_helper"
+require "fileutils"
+require "pathname"
 
 def lint_regression_cookbooks
-  working_dir = Pathname.new('tmp/regression')
+  working_dir = Pathname.new("tmp/regression")
   FileUtils.mkdir_p(working_dir)
 
-  pinned_cookbooks('spec/regression/cookbooks.txt').each do |cbk|
+  pinned_cookbooks("spec/regression/cookbooks.txt").each do |cbk|
     clone_cookbook(working_dir, cbk)
   end
 
@@ -15,23 +15,23 @@ end
 
 def pinned_cookbooks(path)
   File.read(path).lines.map do |line|
-    name, ref = line.strip.split(':')
-    {:name => name, :ref => ref}
+    name, ref = line.strip.split(":")
+    { :name => name, :ref => ref }
   end
 end
 
 def clone_cookbook(clone_path, cbk)
   target_path = clone_path + cbk[:name]
   unless Dir.exist?(target_path)
-    %x{git clone -q git://github.com/chef-cookbooks/#{cbk[:name]}.git #{target_path}}
+    `git clone -q git://github.com/chef-cookbooks/#{cbk[:name]}.git #{target_path}`
     raise "Unable to clone git://github.com/chef-cookbooks/#{cbk[:name]}.git" unless $?.success?
   end
-  %x{cd #{target_path} && git checkout -q #{cbk[:ref]}}
+  `cd #{target_path} && git checkout -q #{cbk[:ref]}`
   raise "Unable to checkout revision for #{cbk[:name]}" unless $?.success?
 end
 
 def lint_cookbooks(cookbook_path)
-  result = %x{cd #{cookbook_path} && foodcritic .}
+  result = `cd #{cookbook_path} && foodcritic .`
   raise "Unable to lint #{cookbook_path}" unless $?.success?
   result
 end

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 begin
-  require 'simplecov'
+  require "simplecov"
   SimpleCov.start do
-    add_filter '/spec/'
+    add_filter "/spec/"
   end
 rescue LoadError
-  warn 'warning: simplecov gem not found; skipping coverage'
+  warn "warning: simplecov gem not found; skipping coverage"
 end
 
-require 'minitest/pride'
-require 'minitest/spec'
+require "minitest/pride"
+require "minitest/spec"
 
-require_relative '../lib/foodcritic'
+require_relative "../lib/foodcritic"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-core
@@ -159,6 +159,8 @@ files:
 - chef_dsl_metadata/chef_12.1.2.json
 - chef_dsl_metadata/chef_12.10.24.json
 - chef_dsl_metadata/chef_12.11.18.json
+- chef_dsl_metadata/chef_12.12.13.json
+- chef_dsl_metadata/chef_12.13.37.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
@@ -301,5 +303,5 @@ rubyforge_project:
 rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: foodcritic-7.0.1
+summary: foodcritic-7.1.0
 test_files: []