chef-cli 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 179c29f00c37fe62da52748abb225ff5d69af99d02ae5dba65c5c717af18daf6
-  data.tar.gz: c1872be5f67110ce510c2a6e071afd127921bd40d3a789a25bf93ece784f9177
+  metadata.gz: 1985081b5bf2886c0caecfd05a999a3b57e772cbac8a9ae359052f555eef721c
+  data.tar.gz: ebe9aa6a7395a044c28e352c019dff6a94ade162c4313ca266f4ce3e24666100
 SHA512:
-  metadata.gz: a0e0e9e83ee7c53cb2002f481eaf73a8419a9678583636be01f9355e4c51df0f280b583087693592d329e9c76b3712626bc1931d210f7906c5175a11f344dabb
-  data.tar.gz: 28d71f03e2c067f17a48e33862934189564c038ec3b52ccf2e32d6734d2638a5cf978c7bea5d1a83c4706a157a178d55473cc97cb84efa52964abd68d7942da2
+  metadata.gz: 332b60af49070b9a9450e34d8782c760ccd319f801a45e423a66050af2202071dede00f605181c1c232e0e7bbb1c69f83845baadfb8bfedd37d9139d5705b361
+  data.tar.gz: ae9f8a2ec4a7c6c8f2e34fdc06925f3747cd6f9742d99e130cea3bfc3043186e59a3e8bb55fb018d53a4efee32f128d817c8b742e9babdd91d54e510756ba5ab

data/Gemfile

@@ -9,6 +9,10 @@ group :docs do
 end
 
 group :test do
+  # For ruby 2.4 testing we need to use ohai 14
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5")
+    gem "ohai", "~> 14"
+  end
   gem "rake"
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"

data/chef-cli.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.4"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.6"
-  gem.add_dependency "chef", "~> 15.0"
+  gem.add_dependency "chef", ">= 14.0"
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.6"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"

data/lib/chef-cli/builtin_commands.rb

@@ -59,4 +59,7 @@ ChefCLI.commands do |c|
                                                     desc: "Prints cookbook checksum information used for cookbook identifier"
 
   c.builtin "verify", :Verify, desc: "Test the embedded #{ChefCLI::Dist::PRODUCT} applications", hidden: true
+
+  # deprecated command that throws a failure warning if used. This was removed 4.2019
+  c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook", hidden: true
 end

data/lib/chef-cli/cli.rb

@@ -120,6 +120,7 @@ module ChefCLI
       justify_length = subcommands.map(&:length).max + 2
       subcommand_specs.each do |name, spec|
         next if spec.hidden
+
         msg("    #{"#{name}".ljust(justify_length)}#{spec.description}")
       end
     end
@@ -155,7 +156,7 @@ module ChefCLI
     private
 
     def normalized_exit_code(maybe_integer)
-      if maybe_integer.kind_of?(Integer) && (0..255).cover?(maybe_integer)
+      if maybe_integer.is_a?(Integer) && (0..255).cover?(maybe_integer)
         maybe_integer
       else
         0
@@ -186,6 +187,7 @@ module ChefCLI
     def sanity_check!
       # When installed outside of omnibus, trust the user to configure their PATH
       return true unless omnibus_install?
+
       paths = env[path_key].split(File::PATH_SEPARATOR)
       paths.map! { |p| drive_upcase(Chef::Util::PathHelper.cleanpath(p)) }
       embed_index = paths.index(drive_upcase(Chef::Util::PathHelper.cleanpath(omnibus_embedded_bin_dir)))

data/lib/chef-cli/command/clean_policy_cookbooks.rb

@@ -71,6 +71,7 @@ module ChefCLI
 
       def run(params)
         return 1 unless apply_params!(params)
+
         clean_policy_cookbooks_service.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-cli/command/clean_policy_revisions.rb

@@ -68,6 +68,7 @@ module ChefCLI
 
       def run(params)
         return 1 unless apply_params!(params)
+
         clean_policies_service.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-cli/command/delete_policy.rb

@@ -68,6 +68,7 @@ module ChefCLI
 
       def run(params)
         return 1 unless apply_params!(params)
+
         rm_policy_service.run
         ui.msg("This operation can be reversed by running `#{ChefCLI::Dist::EXEC} undelete --last`.")
         0

data/lib/chef-cli/command/delete_policy_group.rb

@@ -68,6 +68,7 @@ module ChefCLI
 
       def run(params)
         return 1 unless apply_params!(params)
+
         rm_policy_group_service.run
         ui.msg("This operation can be reversed by running `#{ChefCLI::Dist::EXEC} undelete --last`.")
         0

data/lib/chef-cli/command/describe_cookbook.rb

@@ -63,6 +63,7 @@ module ChefCLI
       def run(params = [])
         return 1 unless apply_params!(params)
         return 1 unless check_cookbook_path
+
         IdDumper.new(ui, cookbook_path).run
       end
 

data/lib/chef-cli/command/diff.rb

@@ -125,6 +125,7 @@ module ChefCLI
 
       def run(params = [])
         return 1 unless apply_params!(params)
+
         print_diff
         0
       rescue PolicyfileServiceError => e
@@ -153,7 +154,7 @@ module ChefCLI
         end
       end
 
-      def differ(ui = self.ui())
+      def differ(ui = self.ui)
         Policyfile::Differ.new(old_name: old_base.name,
                                old_lock: old_lock,
                                new_name: new_base.name,
@@ -163,8 +164,8 @@ module ChefCLI
 
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                             signing_key_filename: chef_config.client_key,
-                                             client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
 
       def old_lock
@@ -290,6 +291,7 @@ module ChefCLI
       def policy_group_comparison?(args)
         return false if args.empty?
         return true if args.size > 1
+
         !(args.first =~ /\.rb\Z/)
       end
 

data/lib/chef-cli/command/env.rb

@@ -57,10 +57,10 @@ module ChefCLI
       end
 
       def ruby_info
-        Hash.new.tap do |ruby|
+        {}.tap do |ruby|
           ruby["Executable"] = Gem.ruby
           ruby["Version"] = RUBY_VERSION
-          ruby["RubyGems"] = Hash.new.tap do |rubygems|
+          ruby["RubyGems"] = {}.tap do |rubygems|
             rubygems["RubyGems Version"] = Gem::VERSION
             rubygems["RubyGems Platforms"] = Gem.platforms.map(&:to_s)
             rubygems["Gem Environment"] = gem_environment
@@ -88,7 +88,7 @@ module ChefCLI
       end
 
       def policyfile_config
-        Hash.new.tap do |h|
+        {}.tap do |h|
           h["Cache Path"] = CookbookOmnifetch.cache_path
           h["Storage Path"] = CookbookOmnifetch.storage_path.to_s
         end

data/lib/chef-cli/command/export.rb

@@ -84,6 +84,7 @@ module ChefCLI
 
       def run(params = [])
         return 1 unless apply_params!(params)
+
         export_service.run
         ui.msg("Exported policy '#{export_service.policyfile_lock.name}' to #{export_target}")
         unless archive?

data/lib/chef-cli/command/generate.rb

@@ -111,6 +111,7 @@ module ChefCLI
       # we delegate the request to the specified generator.
       def needs_help?(params)
         return false if have_generator?(params[0])
+
         super
       end
 

data/lib/chef-cli/command/generator_commands/chef_exts/quieter_doc_formatter.rb

@@ -28,11 +28,9 @@ module ChefCLI
     cli_name(:chefcli_doc)
 
     # Called when starting to collect gems from the cookbooks
-    def cookbook_gem_start(gems)
-    end
+    def cookbook_gem_start(gems); end
 
     # Called when cookbook loading starts.
-    def library_load_start(file_count)
-    end
+    def library_load_start(file_count); end
   end
 end

data/lib/chef-cli/command/generator_commands/generator_generator.rb

@@ -47,6 +47,7 @@ module ChefCLI
 
         def run
           return 1 unless verify_params!
+
           FileUtils.cp_r(source, destination_dir)
           update_metadata_rb
           ui.msg("Copied built-in generator cookbook to #{created_cookbook_path}")

data/lib/chef-cli/command/install.rb

@@ -71,6 +71,7 @@ module ChefCLI
 
       def run(params = [])
         return 1 unless apply_params!(params)
+
         # Force config file to be loaded. We don't use the configuration
         # directly, but the user may have SSL configuration options that they
         # need to talk to a private supermarket (e.g., trusted_certs or

data/lib/chef-cli/command/push.rb

@@ -72,6 +72,7 @@ module ChefCLI
 
       def run(params = [])
         return 1 unless apply_params!(params)
+
         push.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-cli/command/push_archive.rb

@@ -98,7 +98,7 @@ module ChefCLI
             policy_group: policy_group,
             ui: ui,
             config: chef_config
-        )
+          )
       end
 
       def archive_file

data/lib/chef-cli/command/shell_init.rb

@@ -96,7 +96,7 @@ module ChefCLI
           return 1
         elsif !SUPPORTED_SHELLS.include?(shell_name)
           err("Shell `#{shell_name}' is not currently supported")
-          err("Supported shells are: #{SUPPORTED_SHELLS.join(' ')}")
+          err("Supported shells are: #{SUPPORTED_SHELLS.join(" ")}")
           return 1
         end
 
@@ -117,6 +117,7 @@ module ChefCLI
 
       def completion_for(shell)
         return "" unless (completion_template_basename = completion_template_for(shell))
+
         completion_template_path = expand_completion_template_path(completion_template_basename)
         erb = ERB.new(File.read(completion_template_path), nil, "-")
         context_binding = shell_completion_template_context.get_binding
@@ -166,7 +167,7 @@ module ChefCLI
         # /dev/null to avoid Fish's helpful warnings about nonexistent
         # PATH elements.
         if var == "PATH"
-          emit_shell_cmd(%Q{set -gx #{var} "#{val.split(':').join('" "')}" 2>/dev/null;})
+          emit_shell_cmd(%Q{set -gx #{var} "#{val.split(":").join('" "')}" 2>/dev/null;})
         else
           emit_shell_cmd(%Q{set -gx #{var} "#{val}";})
         end

data/lib/chef-cli/command/show_policy.rb

@@ -87,6 +87,7 @@ module ChefCLI
 
       def run(params)
         return 1 unless apply_params!(params)
+
         show_policy_service.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-cli/command/undelete.rb

@@ -89,6 +89,7 @@ module ChefCLI
 
       def run(params)
         return 1 unless apply_params!(params)
+
         if list_undo_records?
           undelete_service.list
         else

data/lib/chef-cli/command/update.rb

@@ -90,6 +90,7 @@ module ChefCLI
 
       def run(params = [])
         return 1 unless apply_params!(params)
+
         attributes_updater.run
         installer.run(@cookbooks_to_update, config[:exclude_deps]) unless update_attributes_only?
         0

data/lib/chef-cli/component_test.rb

@@ -125,7 +125,7 @@ module ChefCLI
     # the return value of the test block. For tests that run a lot of commands,
     # this is inconvenient so you can use #sh! instead.
     def sh!(*args)
-      sh(*args).tap { |result| result.error! }
+      sh(*args).tap(&:error!)
     end
 
     # Run a command, if the command returns zero, raise an error,
@@ -197,6 +197,7 @@ module ChefCLI
 
     def gem_base_dir
       return nil if @gem_name_for_base_dir.nil?
+
       # There is no way to say "give me the latest prerelease OR normal version of this gem.
       # So we first ask if there is a normal version, and if there is not, we ask if there
       # is a prerelease version.  ">= 0.a" is how we ask for a prerelease version, because a

data/lib/chef-cli/configurable.rb

@@ -49,6 +49,7 @@ module ChefCLI
 
     def chef_config
       return @chef_config if @chef_config
+
       config_loader.load
       @chef_config = Chef::Config
       CookbookOmnifetch.integration.default_chef_server_http_client = default_chef_server_http_client
@@ -79,8 +80,8 @@ module ChefCLI
     def default_chef_server_http_client
       lambda do
         ChefServerAPIMulti.new(@chef_config.chef_server_url,
-                               signing_key_filename: @chef_config.client_key,
-                               client_name: @chef_config.node_name)
+          signing_key_filename: @chef_config.client_key,
+          client_name: @chef_config.node_name)
       end
     end
 

data/lib/chef-cli/cookbook_profiler/null_scm.rb

@@ -19,8 +19,7 @@ module ChefCLI
   module CookbookProfiler
     class NullSCM
 
-      def initialize(cookbook_path)
-      end
+      def initialize(cookbook_path); end
 
       def profile_data
         nil

data/lib/chef-cli/generator.rb

@@ -24,7 +24,7 @@ module ChefCLI
       def self.add_attr(name)
         @attributes ||= [ ]
 
-        if !@attributes.include?(name)
+        unless @attributes.include?(name)
           @attributes << name
           attr_accessor(name)
         end

data/lib/chef-cli/helpers.rb

@@ -130,7 +130,8 @@ module ChefCLI
 
     def omnibus_expand_path(*paths)
       dir = File.expand_path(File.join(paths))
-      raise OmnibusInstallNotFound.new() unless dir && File.directory?(dir)
+      raise OmnibusInstallNotFound.new unless dir && File.directory?(dir)
+
       dir
     end
 

data/lib/chef-cli/policyfile/artifactory_cookbook_source.rb

@@ -42,7 +42,7 @@ module ChefCLI
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
+        other.is_a?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
       end
 
       def preferred_for(*cookbook_names)

data/lib/chef-cli/policyfile/attribute_merge_checker.rb

@@ -89,7 +89,7 @@ module ChefCLI
       def fill!(acc, source_name, path, hash)
         hash.each do |(key, val)|
           new_path = "#{path}[#{key}]"
-          if val.kind_of?(Hash)
+          if val.is_a?(Hash)
             acc[key] ||= Mash.new
             fill!(acc[key], source_name, new_path, val)
           else

data/lib/chef-cli/policyfile/chef_repo_cookbook_source.rb

@@ -54,7 +54,7 @@ module ChefCLI
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.path == path && other.preferred_cookbooks == preferred_cookbooks
+        other.is_a?(self.class) && other.path == path && other.preferred_cookbooks == preferred_cookbooks
       end
 
       # Calls the slurp_metadata! helper once to calculate the @universe_graph

data/lib/chef-cli/policyfile/chef_server_cookbook_source.rb

@@ -40,7 +40,7 @@ module ChefCLI
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
+        other.is_a?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
       end
 
       def preferred_for(*cookbook_names)
@@ -84,8 +84,8 @@ module ChefCLI
       def http_connection_for(base_url)
         @http_connections[base_url] ||=
           ChefServerAPIMulti.new(base_url,
-                                 signing_key_filename: chef_config.client_key,
-                                 client_name: chef_config.node_name)
+            signing_key_filename: chef_config.client_key,
+            client_name: chef_config.node_name)
       end
 
       def full_chef_server_graph

data/lib/chef-cli/policyfile/chef_server_lock_fetcher.rb

@@ -73,11 +73,11 @@ module ChefCLI
       def errors
         error_messages = []
 
-        [:server, :policy_name].each do |key|
+        %i{server policy_name}.each do |key|
           error_messages << "include_policy for #{name} is missing key #{key}" unless source_options[key]
         end
 
-        if [:policy_revision_id, :policy_group].all? { |key| source_options[key].nil? }
+        if %i{policy_revision_id policy_group}.all? { |key| source_options[key].nil? }
           error_messages << "include_policy for #{name} must specify policy_revision_id or policy_group"
         end
 
@@ -101,7 +101,7 @@ module ChefCLI
           acc
         end
         source_options.merge!(options)
-        raise ChefCLI::InvalidLockfile, "Invalid source_options provided from lock data: #{options_from_lock_file.inspect}" if !valid?
+        raise ChefCLI::InvalidLockfile, "Invalid source_options provided from lock data: #{options_from_lock_file.inspect}" unless valid?
       end
 
       # @return [String] of the policyfile lock data
@@ -158,8 +158,8 @@ module ChefCLI
       # @return [Hash] Returns a parsed JSON object... I think.
       def http_client
         @http_client ||= Chef::ServerAPI.new(source_options[:server],
-                                             signing_key_filename: chef_config.client_key,
-                                             client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
 
     end

data/lib/chef-cli/policyfile/community_cookbook_source.rb

@@ -48,7 +48,7 @@ module ChefCLI
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
+        other.is_a?(self.class) && other.uri == uri && other.preferred_cookbooks == preferred_cookbooks
       end
 
       def universe_graph

data/lib/chef-cli/policyfile/comparison_base.rb

@@ -38,6 +38,7 @@ module ChefCLI
         def lock
           raise LockfileNotFound, "Expected lockfile at #{policyfile_lock_relpath} does not exist" unless File.exist?(policyfile_lock_relpath)
           raise LockfileNotFound, "Expected lockfile at #{policyfile_lock_relpath} cannot be read" unless File.readable?(policyfile_lock_relpath)
+
           FFI_Yajl::Parser.parse(IO.read(policyfile_lock_relpath))
         rescue FFI_Yajl::ParseError => e
           raise MalformedLockfile, "Invalid JSON in lockfile at #{policyfile_lock_relpath}:\n  #{e.message}"

data/lib/chef-cli/policyfile/cookbook_location_specification.rb

@@ -29,7 +29,7 @@ module ChefCLI
       # API contract
       include StorageConfigDelegation
 
-      SOURCE_TYPES = [:git, :github, :path, :artifactserver, :chef_server, :chef_server_artifact, :artifactory].freeze
+      SOURCE_TYPES = %i{git github path artifactserver chef_server chef_server_artifact artifactory}.freeze
 
       #--
       # Required by CookbookOmnifetch API contract
@@ -54,7 +54,7 @@ module ChefCLI
       end
 
       def ==(other)
-        other.kind_of?(self.class) &&
+        other.is_a?(self.class) &&
           other.name == name &&
           other.version_constraint == version_constraint &&
           other.source_options == source_options
@@ -69,7 +69,7 @@ module ChefCLI
       end
 
       def mirrors_canonical_upstream?
-        [:git, :github, :artifactserver, :chef_server, :chef_server_artifact, :artifactory].include?(source_type)
+        %i{git github artifactserver chef_server chef_server_artifact artifactory}.include?(source_type)
       end
 
       def installed?
@@ -112,7 +112,7 @@ module ChefCLI
       end
 
       def version_fixed?
-        [:git, :github, :path, :chef_server_artifact].include?(@source_type)
+        %i{git github path chef_server_artifact}.include?(@source_type)
       end
 
       def version

data/lib/chef-cli/policyfile/cookbook_locks.rb

@@ -82,6 +82,7 @@ module ChefCLI
       def cookbook_location_spec
         raise InvalidCookbookLockData, "Cannot create CookbookLocationSpecification for #{name} without version" if version.nil?
         raise InvalidCookbookLockData, "Cannot create CookbookLocationSpecification for #{name} without source options" if source_options.nil?
+
         @location_spec ||= CookbookLocationSpecification.new(name, "= #{version}", source_options, storage_config)
       end
 
@@ -170,22 +171,22 @@ module ChefCLI
         end
 
         version = lock_data["version"]
-        unless version.kind_of?(String)
+        unless version.is_a?(String)
           raise InvalidLockfile, "Lockfile cookbook_lock for #{name} `version' attribute must be a string (got: #{version})"
         end
 
         identifier = lock_data["identifier"]
-        unless identifier.kind_of?(String)
+        unless identifier.is_a?(String)
           raise InvalidLockfile, "Lockfile cookbook_lock for #{name} `identifier' attribute must be a string (got: #{identifier})"
         end
 
         cache_key = lock_data["cache_key"]
-        unless cache_key.kind_of?(String) || cache_key.nil?
+        unless cache_key.is_a?(String) || cache_key.nil?
           raise InvalidLockfile, "Lockfile cookbook_lock for #{name} `cache_key' attribute must be a string (got: #{cache_key})"
         end
 
         source_options = lock_data["source_options"]
-        unless source_options.kind_of?(Hash)
+        unless source_options.is_a?(Hash)
           raise InvalidLockfile, "Lockfile cookbook_lock for #{name} `source_options' attribute must be a Hash (JSON object) (got: #{source_options})"
         end
       end
@@ -220,6 +221,7 @@ module ChefCLI
         if cache_key.nil?
           raise MissingCookbookLockData, "Cannot locate cached cookbook `#{name}' because the `cache_key' attribute is not set"
         end
+
         File.join(cache_path, cache_key)
       end
 
@@ -340,6 +342,7 @@ module ChefCLI
         unless File.exist?(cookbook_path)
           raise LocalCookbookNotFound, "Cookbook `#{name}' not found at path source `#{source}` (full path: `#{cookbook_path}')"
         end
+
         unless cookbook_version.name.to_s == name
           msg = "The cookbook at path source `#{source}' is expected to be named `#{name}', but is now named `#{cookbook_version.name}' (full path: #{cookbook_path})"
           raise MalformedCookbook, msg
@@ -385,7 +388,7 @@ module ChefCLI
           raise InvalidLockfile, "Lockfile cookbook_lock for #{name} is invalid. Lock data for a local cookbook must have a `source' attribute"
         end
 
-        unless source.kind_of?(String)
+        unless source.is_a?(String)
           raise InvalidLockfile, "Lockfile cookbook_lock for #{name} is invalid: `source' attribute must be a String (got: #{source.inspect})"
         end
       end

data/lib/chef-cli/policyfile/delivery_supermarket_source.rb

@@ -60,7 +60,7 @@ module ChefCLI
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.uri == uri
+        other.is_a?(self.class) && other.uri == uri
       end
 
       def default_source_args

data/lib/chef-cli/policyfile/differ.rb

@@ -95,6 +95,7 @@ module ChefCLI
 
       def report_run_list_changes
         return nil unless updated_sections.include?("run_list")
+
         h1("RUN LIST CHANGED")
 
         old_run_list = old_lock["run_list"]
@@ -105,6 +106,7 @@ module ChefCLI
 
       def report_removed_cookbooks
         return nil if removed_cookbooks.empty?
+
         h1("REMOVED COOKBOOKS")
         removed_cookbooks.each do |cb_name|
           ui.print("\n")
@@ -117,6 +119,7 @@ module ChefCLI
 
       def report_added_cookbooks
         return nil if added_cookbooks.empty?
+
         h1("ADDED COOKBOOKS")
         added_cookbooks.each do |cb_name|
           ui.print("\n")
@@ -129,6 +132,7 @@ module ChefCLI
 
       def report_modified_cookbooks
         return nil if modified_cookbooks.empty?
+
         h1("MODIFIED COOKBOOKS")
         modified_cookbooks.each do |cb_name|
           ui.print("\n")
@@ -202,7 +206,7 @@ module ChefCLI
 
           maybe_contiguous_hunks = (previous_hunk.nil? || hunk.merge(previous_hunk))
 
-          if !maybe_contiguous_hunks
+          unless maybe_contiguous_hunks
             print_color_diff("#{previous_hunk.diff(FORMAT)}\n")
           end
           previous_hunk = hunk
@@ -231,7 +235,7 @@ module ChefCLI
       end
 
       def pretty_json(data)
-        FFI_Yajl::Encoder.encode(data, pretty: true).lines.map { |l| l.chomp }
+        FFI_Yajl::Encoder.encode(data, pretty: true).lines.map(&:chomp)
       end
 
       def detect_cookbook_changes