foodcritic 15.1.0 → 16.3.0

data/lib/foodcritic/rules/fc024.rb

@@ -3,11 +3,14 @@ rule "FC024", "Consider adding platform equivalents" do
   RHEL = %w{centos redhat scientific oracle}.freeze
   recipe do |ast, filename|
     next if Pathname.new(filename).basename.to_s == "metadata.rb"
+
     metadata_path = Pathname.new(
-      File.join(File.dirname(filename), "..", "metadata.rb")).cleanpath
+      File.join(File.dirname(filename), "..", "metadata.rb")
+    ).cleanpath
     md_platforms = if File.exist?(metadata_path)
                      supported_platforms(read_ast(
-                       metadata_path)).map { |p| p[:platform] }
+                       metadata_path
+                     )).map { |p| p[:platform] }
                    else
                      []
                    end
@@ -16,16 +19,16 @@ rule "FC024", "Consider adding platform equivalents" do
     ['//method_add_arg[fcall/ident/@value="platform?"]/
       arg_paren/args_add_block',
      "//when"].map do |expr|
-      ast.xpath(expr).map do |whn|
-        platforms = whn.xpath('args_add/
-                               descendant::tstring_content').map do |p|
-          p["value"]
-        end.sort
-        unless platforms.size == 1 || (md_platforms & platforms).empty?
-          whn unless (platforms & RHEL).empty? ||
-              ((md_platforms & RHEL) - (platforms & RHEL)).empty?
-        end
-      end.compact
-    end.flatten
+       ast.xpath(expr).map do |whn|
+         platforms = whn.xpath('args_add/
+                                descendant::tstring_content').map do |p|
+                                  p["value"]
+                                end.sort
+         unless platforms.size == 1 || (md_platforms & platforms).empty?
+           whn unless (platforms & RHEL).empty? ||
+             ((md_platforms & RHEL) - (platforms & RHEL)).empty?
+         end
+       end.compact
+     end.flatten
   end
 end

data/lib/foodcritic/rules/fc029.rb

@@ -3,6 +3,7 @@ rule "FC029", "No leading cookbook name in recipe metadata" do
   metadata do |ast, filename|
     field(ast, "recipe").map do |declared_recipe|
       next unless declared_recipe.xpath("count(//vcall|//var_ref)").to_i == 0
+
       recipe_name = declared_recipe.xpath('args_add_block/
         descendant::tstring_content[1]/@value').to_s
       unless recipe_name.empty? ||

data/lib/foodcritic/rules/fc031.rb

@@ -1,7 +1,7 @@
 rule "FC031", "Cookbook without metadata.rb file" do
   tags %w{correctness metadata}
   cookbook do |filename|
-    if !File.exist?(File.join(filename, "metadata.rb"))
+    unless File.exist?(File.join(filename, "metadata.rb"))
       [file_match(File.join(filename, "metadata.rb"))]
     end
   end

data/lib/foodcritic/rules/fc032.rb

@@ -2,9 +2,9 @@ rule "FC032", "Invalid notification timing" do
   tags %w{correctness notifications}
   recipe do |ast|
     valid_timings = if resource_attribute?("file", "notifies_before")
-                      [:delayed, :immediate, :before]
+                      %i{delayed immediate before}
                     else
-                      [:delayed, :immediate]
+                      %i{delayed immediate}
                     end
     find_resources(ast).select do |resource|
       notifications(resource).any? do |notification|

data/lib/foodcritic/rules/fc033.rb

@@ -9,7 +9,7 @@ rule "FC033", "Missing template file" do
     end.map do |resource|
       # fetch the specified file to the template
       file = template_file(resource_attributes(resource,
-                                               return_expressions: true))
+        return_expressions: true))
       { resource: resource, file: file }
     end.reject do |resource|
       # skip the check if the file path is derived since
@@ -25,7 +25,7 @@ rule "FC033", "Missing template file" do
           # templates/ubuntu/something.erb down to something.erb, which breaks
           # legit nested dirs in the templates dir like templates/something/something.erb
           break if template_path.dirname.basename.to_s == "templates" ||
-              template_path.dirname.dirname.basename.to_s == "templates"
+            template_path.dirname.dirname.basename.to_s == "templates"
         end
         File.join(relative_path.reverse) == resource[:file]
       end

data/lib/foodcritic/rules/fc034.rb

@@ -9,13 +9,16 @@ rule "FC034", "Unused template variables" do
         File.basename(path) == template_file(resource)
       end
       next unless template_paths.any?
+
       passed_vars = resource["variables"].xpath(
-        "symbol/ident/@value").map { |tv| tv.to_s }
+        "symbol/ident/@value"
+      ).map(&:to_s)
 
       unused_vars_exist = template_paths.all? do |template_path|
         begin
           template_vars = templates_included(
-            all_templates, template_path).map do |template|
+            all_templates, template_path
+          ).map do |template|
             read_ast(template).xpath("//var_ref/ivar/@value").map do |v|
               v.to_s.sub(/^@/, "")
             end

data/lib/foodcritic/rules/fc039.rb

@@ -3,17 +3,17 @@ rule "FC039", "Node method cannot be accessed with key" do
   recipe do |ast|
     [{ type: :string, path: "@value" },
      { type: :symbol, path: "ident/@value" }].map do |access_type|
-      attribute_access(ast, type: access_type[:type]).select do |att|
-        att_name = att.xpath(access_type[:path]).to_s.to_sym
-        att_name != :tags && chef_node_methods.include?(att_name)
-      end.select do |att|
-        !att.xpath('ancestor::args_add_block[position() = 1]
-          [preceding-sibling::vcall | preceding-sibling::var_ref]').empty?
-      end.select do |att|
-        att_type = att.xpath('ancestor::args_add_block[position() = 1]
-          /../var_ref/ident/@value').to_s
-        ast.xpath("//assign/var_field/ident[@value='#{att_type}']").empty?
-      end
-    end.flatten
+       attribute_access(ast, type: access_type[:type]).select do |att|
+         att_name = att.xpath(access_type[:path]).to_s.to_sym
+         att_name != :tags && chef_node_methods.include?(att_name)
+       end.select do |att|
+         !att.xpath('ancestor::args_add_block[position() = 1]
+           [preceding-sibling::vcall | preceding-sibling::var_ref]').empty?
+       end.select do |att|
+         att_type = att.xpath('ancestor::args_add_block[position() = 1]
+           /../var_ref/ident/@value').to_s
+         ast.xpath("//assign/var_field/ident[@value='#{att_type}']").empty?
+       end
+     end.flatten
   end
 end

data/lib/foodcritic/rules/fc040.rb

@@ -5,7 +5,7 @@ rule "FC040", "Execute resource used to run git commands" do
     find_resources(ast, type: "execute").select do |cmd|
       cmd_str = (resource_attribute(cmd, "command") || resource_name(cmd)).to_s
 
-      actual_git_commands = cmd_str.scan(/git ([a-z]+)/).map { |c| c.first }
+      actual_git_commands = cmd_str.scan(/git ([a-z]+)/).map(&:first)
       (possible_git_commands & actual_git_commands).any?
     end
   end

data/lib/foodcritic/rules/fc044.rb

@@ -1,22 +1,18 @@
 rule "FC044", "Avoid bare attribute keys" do
   tags %w{style}
   attributes do |ast|
-    declared = ast.xpath("//descendant::var_field/ident/@value").map do |v|
-      v.to_s
-    end
+    declared = ast.xpath("//descendant::var_field/ident/@value").map(&:to_s)
 
     ast.xpath('//assign/*[self::vcall or self::var_ref]
               [count(child::kw) = 0]/ident').select do |v|
 
-      local_declared = v.xpath("ancestor::*[self::brace_block or self::do_block]
-                                /block_var/descendant::ident/@value").map do |val|
-        val.to_s
-      end
+                local_declared = v.xpath("ancestor::*[self::brace_block or self::do_block]
+                                          /block_var/descendant::ident/@value").map(&:to_s)
 
-      (v["value"] != "secure_password") &&
-        !(declared + local_declared).uniq.include?(v["value"]) &&
-        !v.xpath("ancestor::*[self::brace_block or self::do_block]/block_var/
-                  descendant::ident/@value='#{v['value']}'")
-    end
+                (v["value"] != "secure_password") &&
+                  !(declared + local_declared).uniq.include?(v["value"]) &&
+                  !v.xpath("ancestor::*[self::brace_block or self::do_block]/block_var/
+                            descendant::ident/@value='#{v["value"]}'")
+              end
   end
 end

data/lib/foodcritic/rules/fc048.rb

@@ -7,6 +7,7 @@ rule "FC048", "Prefer shell_out helper method to shelling out with Ruby" do
     ast.xpath('//*[self::command or self::fcall]/ident[@value="system"]').select do |x|
       resource_name = x.xpath("ancestor::do_block/preceding-sibling::command/ident/@value")
       next false if resource_name.any? && resource_name.all? { |r| resource_attribute?(r.to_s, "system") }
+
       next x.xpath('count(following-sibling::args_add_block/descendant::kw[@value="true" or @value="false"]) = 0')
     end
   end

data/lib/foodcritic/rules/fc121.rb

@@ -1,10 +1,6 @@
-# I'm disabling this rule until Chef 13 goes EOL
-# It's causing a lot of confusion and resulting in folks dropping support
-# for Chef 13 before they need to.
-#
-# rule "FC121", "Cookbook depends on cookbook made obsolete by Chef 14" do
-#   tags %w{correctness}
-#   metadata do |ast, filename|
-#     [file_match(filename)] unless (declared_dependencies(ast) & %w{build-essential dmg chef_handler chef_hostname mac_os_x swap sysctl}).empty?
-#   end
-# end
+rule "FC121", "Cookbook depends on cookbook made obsolete by Chef 14" do
+  tags %w{correctness}
+  metadata do |ast, filename|
+    [file_match(filename)] unless (declared_dependencies(ast) & %w{build-essential dmg chef_handler chef_hostname mac_os_x swap sysctl}).empty?
+  end
+end

data/lib/foodcritic/rules/fc123.rb

@@ -0,0 +1,16 @@
+rule "FC123", "Content of a cookbook file is larger than 1MB" do
+  tags %w{files}
+  cookbook do |path|
+    values = []
+    files_path = File.join(path, "files")
+    if File.exist?(files_path)
+      Dir.glob("#{files_path}/**/*").each do |file|
+        size = File.size(file)
+        if size > 1024 * 1024 # 1 megabyte
+          values += [file_match(file)]
+        end
+      end
+    end
+    values
+  end
+end

data/lib/foodcritic/template.rb

@@ -20,14 +20,11 @@ module FoodCritic
         end
       end
 
-      def add_text(src, text)
-      end
+      def add_text(src, text); end
 
-      def add_preamble(codebuf)
-      end
+      def add_preamble(codebuf); end
 
-      def add_postamble(codebuf)
-      end
+      def add_postamble(codebuf); end
 
       def add_stmt(src, code)
         @expressions << { type: :statement, code: code.strip }

data/lib/foodcritic/version.rb

@@ -1,4 +1,4 @@
 module FoodCritic
   # The current version of foodcritic
-  VERSION = "15.1.0".freeze
+  VERSION = "16.3.0".freeze
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 15.1.0
+  version: 16.3.0
 platform: ruby
 authors:
 - Andrew Crump
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: cucumber-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +100,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -162,8 +162,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Lint tool for Chef cookbooks.
-email: 
+description: A code linting tool for Chef Infra cookbooks.
+email:
 executables:
 - foodcritic
 extensions: []
@@ -172,8 +172,8 @@ files:
 - Gemfile
 - LICENSE
 - bin/foodcritic
-- chef_dsl_metadata/chef_13.12.3.json
-- chef_dsl_metadata/chef_14.8.12.json
+- chef_dsl_metadata/chef_14.14.29.json
+- chef_dsl_metadata/chef_15.4.45.json
 - foodcritic.gemspec
 - lib/foodcritic.rb
 - lib/foodcritic/api.rb
@@ -183,6 +183,8 @@ files:
 - lib/foodcritic/domain.rb
 - lib/foodcritic/dsl.rb
 - lib/foodcritic/error_checker.rb
+- lib/foodcritic/gerkin/tag.rb
+- lib/foodcritic/gerkin/tag_expression.rb
 - lib/foodcritic/linter.rb
 - lib/foodcritic/notifications.rb
 - lib/foodcritic/output.rb
@@ -298,6 +300,7 @@ files:
 - lib/foodcritic/rules/fc120.rb
 - lib/foodcritic/rules/fc121.rb
 - lib/foodcritic/rules/fc122.rb
+- lib/foodcritic/rules/fc123.rb
 - lib/foodcritic/template.rb
 - lib/foodcritic/version.rb
 - lib/foodcritic/xml.rb
@@ -306,7 +309,7 @@ homepage: http://foodcritic.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -321,9 +324,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
-summary: foodcritic-15.1.0
+summary: foodcritic-16.3.0
 test_files: []