chef-cli 3.0.9 → 3.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fc888d7c983f9da1ef82774b394d549bc13117d8525d5a9013840864baf5c11
-  data.tar.gz: 67b55563d7c9e4ee3ce36d5bdb30fa61f63f4712debc20c25f4c97b95cce1515
+  metadata.gz: f4ad30b471d00e7b8b9d9b2c94a9722d4fa2dbd5a2b8db6eaf6340ad5cbee006
+  data.tar.gz: e925152292893332d5f846db05bc52299823f6e4e7043cc23783ed1ffd7b3a17
 SHA512:
-  metadata.gz: 2ce7bfb0348f1b680cdddf6add8944ecaa31ea46a8f18b4e3f2360503bb73c01e9108b5f37bcf671429c4ea7328edf39af44d0219449380486f3e8e2eeb0e625
-  data.tar.gz: c3940d5992bd129b359184cdbda5503ce21f3b04f12d0283882cee32c553a0e659f15db1effeac396e35007067f94330c3a562e63726f848984d7e7d1e09a399
+  metadata.gz: 7f1860d196d449214a2e5511c4add38e0b50a39c660837a1f6052fe145e274706f80dc44c474f0480c2b16518c08f77b424c902b1664cfa9bb7ab63408d3dc07
+  data.tar.gz: b1ad7b8563c1389e9ae62e906c998be45ee23d3bb2f044c7cc62fe4fd061577d33d70ab46e00445cb3d84d3754d033432c8cdbd553b9a263b8a5bc5eddb1ce23

data/Gemfile

@@ -13,8 +13,8 @@ group :test do
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"
   gem "rspec-mocks", "~> 3.8"
-  gem "cookstyle"
-  gem "chefstyle"
+  gem "cookstyle", "6.14.7" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
+  gem "chefstyle", "1.2.0"
   gem "test-kitchen", "> 2.5"
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
     gem "chef-zero", "~> 14"

data/chef-cli.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
-  gem.add_dependency "diff-lcs", "~> 1.0"
+  gem.add_dependency "diff-lcs", ">= 1.0", "< 1.4" # 1.4 changes the output
   gem.add_dependency "paint", ">= 1", "< 3"
   gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 end

data/lib/chef-cli/cli.rb

@@ -59,7 +59,7 @@ module ChefCLI
     end
 
     def run(enforce_license: false)
-      sanity_check!
+      path_check!
 
       subcommand_name, *subcommand_params = argv
 
@@ -99,42 +99,21 @@ module ChefCLI
       if omnibus_install?
         show_version_via_version_manifest
       else
-        show_version_via_shell_out
+        msg("#{ChefCLI::Dist::CLI_PRODUCT} version: #{ChefCLI::VERSION}")
       end
     end
 
     def show_version_via_version_manifest
-      msg("#{ChefCLI::Dist::PRODUCT} version: #{manifest_field("build_version")}")
-      { "#{ChefCLI::Dist::INFRA_CLIENT_PRODUCT}": "#{ChefCLI::Dist::INFRA_CLIENT_GEM}",
-        "#{ChefCLI::Dist::INSPEC_PRODUCT}": "#{ChefCLI::Dist::INSPEC_CLI}",
-        "#{ChefCLI::Dist::CLI_PRODUCT}": "#{ChefCLI::Dist::CLI_GEM}",
+      msg("#{ChefCLI::Dist::PRODUCT} version: #{component_version("build_version")}")
+
+      { "#{ChefCLI::Dist::INFRA_CLIENT_PRODUCT}": ChefCLI::Dist::INFRA_CLIENT_GEM,
+        "#{ChefCLI::Dist::INSPEC_PRODUCT}": ChefCLI::Dist::INSPEC_CLI,
+        "#{ChefCLI::Dist::CLI_PRODUCT}": ChefCLI::Dist::CLI_GEM,
+        "#{ChefCLI::Dist::HAB_PRODUCT}": ChefCLI::Dist::HAB_SOFTWARE_NAME,
         "Test Kitchen": "test-kitchen",
         "Cookstyle": "cookstyle",
-      }.each do |name, gem|
-        msg("#{name} version: #{gem_version(gem)}")
-      end
-    end
-
-    def show_version_via_shell_out
-      msg("#{ChefCLI::Dist::PRODUCT} version: #{ChefCLI::VERSION}")
-      { "#{ChefCLI::Dist::INFRA_CLIENT_PRODUCT}": "#{ChefCLI::Dist::INFRA_CLIENT_CLI}",
-        "#{ChefCLI::Dist::INSPEC_PRODUCT}": "#{ChefCLI::Dist::INSPEC_CLI}",
-        "Test Kitchen": "kitchen",
-        "Cookstyle": "cookstyle",
-      }.each do |name, cli|
-        # @todo when Ruby 2.5/2.6 support goes away this if statement can go away
-        if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new("2")
-          result = Bundler.with_unbundled_env { shell_out("#{cli} --version") }
-        else
-          result = Bundler.with_clean_env { shell_out("#{cli} --version") }
-        end
-
-        if result.exitstatus != 0
-          msg("#{name} version: ERROR")
-        else
-          version = result.stdout.lines.first.scan(/(?:master\s)?[\d+\.\(\)]+\S+/).join("\s")
-          msg("#{name} version: #{version}")
-        end
+      }.each do |prod_name, component|
+        msg("#{prod_name} version: #{component_version(component)}")
       end
     end
 
@@ -170,8 +149,15 @@ module ChefCLI
       commands_map.command_specs
     end
 
+    #
+    # Is a passed parameter actually an option aka does it start with '-'
+    #
+    # @param [String] param The passed parameter to check
+    #
+    # @return [Boolean]
+    #
     def option?(param)
-      param =~ /^-/
+      param[0] == "-"
     end
 
     def instantiate_subcommand(name)
@@ -188,21 +174,23 @@ module ChefCLI
       end
     end
 
-    def gem_version(name)
+    def component_version(name)
       if gem_manifest_hash[name].is_a?(Array)
         gem_manifest_hash[name].first
+      elsif manifest_hash.key? name
+        manifest_field(name)
       else
-        "unknown"
+        manifest_hash.dig("software", name, "locked_version") || "unknown"
       end
     end
 
     def manifest_hash
-      require "json"
+      require "json" unless defined?(JSON)
       @manifest_hash ||= JSON.parse(read_version_manifest_json)
     end
 
     def gem_manifest_hash
-      require "json"
+      require "json" unless defined?(JSON)
       @gem_manifest_hash ||= JSON.parse(read_gem_version_manifest_json)
     end
 
@@ -243,7 +231,7 @@ module ChefCLI
     # catch the cases where users setup only the embedded_bin_dir in their path, or
     # when they have the embedded_bin_dir before the omnibus_bin_dir -- both of which will
     # defeat appbundler and interact very badly with our intent.
-    def sanity_check!
+    def path_check!
       # When installed outside of omnibus, trust the user to configure their PATH
       return true unless omnibus_install?
 

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

@@ -21,7 +21,7 @@ require_relative "../ui"
 require_relative "../version"
 require_relative "../dist"
 require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
-require "yaml"
+require "yaml" unless defined?(YAML)
 
 module ChefCLI
   module Command

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

@@ -20,7 +20,6 @@ require_relative "../dist"
 require "rubygems" unless defined?(Gem)
 require "rubygems/gem_runner"
 require "rubygems/exceptions"
-require "pp" unless defined?(PP)
 
 module ChefCLI
   module Command

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

@@ -16,7 +16,6 @@
 #
 
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "rbconfig"
 require "pathname" unless defined?(Pathname)
 require_relative "base"
 require_relative "../chef_runner"
@@ -38,7 +37,7 @@ module ChefCLI
         long: "--license LICENSE",
         description: "all_rights, apachev2, mit, gplv2, gplv3 - defaults to all_rights",
         proc: Proc.new { |l|
-          l =~ /apache2/ ? "apachev2" : l
+          /apache2/.match?(l) ? "apachev2" : l
         },
         default: nil
 

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

@@ -28,6 +28,7 @@ module ChefCLI
     # takes to create a cookbook.
     class GeneratorDesc < Chef::Resource
       resource_name :generator_desc
+      provides :generator_desc
 
       property :message, String, name_property: true
 

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

@@ -187,27 +187,30 @@ module ChefCLI
           @verbose
         end
 
+        #
+        # Is there a .delivery/cli.toml in the current dir or any of the parent dirs
+        #
+        # @return [Boolean]
+        #
         def have_delivery_config?
           # delivery-cli's logic is to look recursively upward for
           # .delivery/cli.toml starting from pwd:
           # https://github.com/chef/delivery-cli/blob/22cbef3987ebd0aee98405b7e161a100edc87e49/src/delivery/config/mod.rs#L225-L247
 
-          path_to_check = File.expand_path(Dir.pwd)
-          result = false
-
-          Pathname.new(path_to_check).ascend do |path|
-            if contains_delivery_cli_toml?(path)
-              result = true
-              break
-            end
+          Pathname.new(Dir.pwd).ascend do |path|
+            return true if contains_delivery_cli_toml?(path)
           end
 
-          result
+          false # nothing was found
         end
 
+        #
+        # @param [Pathname] path a directory
+        #
+        # @return [Boolean] delivery cli.toml exists
+        #
         def contains_delivery_cli_toml?(path)
-          delivery_cli_path = path.join(".delivery/cli.toml")
-          delivery_cli_path.exist?
+          path.join(".delivery/cli.toml").exist?
         end
 
         def read_and_validate_params
@@ -215,7 +218,7 @@ module ChefCLI
           @cookbook_name_or_path = arguments[0]
           if !@cookbook_name_or_path
             @params_valid = false
-          elsif /-/ =~ File.basename(@cookbook_name_or_path)
+          elsif File.basename(@cookbook_name_or_path).include?("-")
             msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef/#chef-generate-cookbook for more information.")
           end
 

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

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-require "ostruct"
-
 require_relative "base"
 require_relative "../chef_runner"
 require_relative "../dist"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "erb"
+require "erb" unless defined?(ERB)
 
 require_relative "../commands_map"
 require_relative "../builtin_commands"

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

@@ -70,7 +70,7 @@ module ChefCLI
 
       option :exclude_deps,
         long:         "--exclude-deps",
-        description:  "Only update cookbooks explicitely mentioned on the command line",
+        description:  "Only update cookbooks explicitly mentioned on the command line",
         boolean:      true,
         default:      false
 

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

@@ -31,7 +31,7 @@ module ChefCLI
         @unborn_branch_ref = nil
       end
 
-      # @return [Hash] Hashed used for pinning cookbook versions within a Policfile.lock
+      # @return [Hash] Hashed used for pinning cookbook versions within a Policyfile.lock
       def profile_data
         {
           "scm" => "git",

data/lib/chef-cli/dist.rb

@@ -35,5 +35,10 @@ module ChefCLI
 
     # Chef-Zero's product name
     ZERO_PRODUCT = "Chef Infra Zero".freeze
+
+    HAB_PRODUCT = "Chef Habitat".freeze
+    HAB_SOFTWARE_NAME = "habitat".freeze
+
+    HAB_CLI = "hab".freeze
   end
 end

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require "json"
+require "json" unless defined?(JSON)
 require_relative "../cookbook_omnifetch"
 require_relative "source_uri"
 require_relative "../exceptions"
-require "chef/http/simple"
+require "chef/http/simple" unless defined?(Chef::HTTP::Simple)
 
 module ChefCLI
   module Policyfile

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef/mash"
+require "chef/mash" unless defined?(Mash)
 
 module ChefCLI
   module Policyfile

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

@@ -67,7 +67,7 @@ module ChefCLI
         errors.empty?
       end
 
-      # Check the options provided when craeting this class for errors
+      # Check the options provided when creating this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "json"
+require "json" unless defined?(JSON)
 require_relative "../cookbook_omnifetch"
 require_relative "../exceptions"
 require "chef/http/simple"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "semverse"
+require "semverse" unless defined?(Semverse)
 require_relative "../cookbook_omnifetch"
 require_relative "storage_config"
 

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

@@ -400,8 +400,8 @@ module ChefCLI
 
         dot_git = Pathname.new(".git")
         Pathname.new(cookbook_path).ascend do |parent_dir|
-          possbile_git_dir = parent_dir + dot_git
-          if possbile_git_dir.exist?
+          possible_git_dir = parent_dir + dot_git
+          if possible_git_dir.exist?
             @cookbook_in_git_repo = true
             break
           end

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

@@ -16,9 +16,7 @@
 #
 
 require "forwardable" unless defined?(Forwardable)
-
-require "semverse"
-
+require "semverse" unless defined?(Semverse)
 require_relative "community_cookbook_source"
 
 module ChefCLI
@@ -39,7 +37,7 @@ module ChefCLI
     # * Version numbers for cookbooks that pass through the Ci pipeline always
     #   increase over time (so that largest version number == newest)
     #
-    # In the future, alternative approaches may be persued to achieve the goal
+    # In the future, alternative approaches may be pursued to achieve the goal
     # of continuously integrating at the cookbook level without imposing those
     # constraints.
     #

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

@@ -233,7 +233,7 @@ module ChefCLI
             message = "#{run_list_desc} has invalid cookbook name '#{cookbook}'.\nCookbook names can only contain alphanumerics, hyphens, and underscores."
 
             # Special case when there's only one colon instead of two:
-            if cookbook =~ /[^:]:[^:]/
+            if /[^:]:[^:]/.match?(cookbook)
               message << "\nDid you mean '#{item.sub(":", "::")}'?"
             end
 

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

@@ -48,7 +48,7 @@ module ChefCLI
         errors.empty?
       end
 
-      # Check the options provided when craeting this class for errors
+      # Check the options provided when creating this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

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

@@ -85,7 +85,7 @@ module ChefCLI
         errors.empty?
       end
 
-      # Check the options provided when craeting this class for errors
+      # Check the options provided when creating this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

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

@@ -89,9 +89,9 @@ module ChefCLI
         @cookbook_version ||=
           begin
             cookbook_version = loader.cookbook_version
-            # TODO: dont do this for non-compat mode
+            # TODO: don't do this for non-compat mode
             cookbook_version.version = version_override
-            # TODO: dont do this either
+            # TODO: don't do this either
 
             # Fixup manifest.
             # What happens is, the 'manifest' representation of cookbook

data/lib/chef-cli/policyfile_compiler.rb

@@ -274,7 +274,7 @@ module ChefCLI
     # compared to an unmodified copy upstream. For example, the community site
     # may have a cookbook "apache2" at version "1.10.4", which the user has
     # forked on github and modified the dependencies without changing the
-    # version number. To accomodate this, the local_artifacts_graph should be
+    # version number. To accommodate this, the local_artifacts_graph should be
     # merged over the upstream's artifacts graph.
     def local_artifacts_graph
       cookbook_location_specs.inject({}) do |local_artifacts, (cookbook_name, cookbook_location_spec)|

data/lib/chef-cli/policyfile_lock.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -362,7 +361,7 @@ module ChefCLI
         # doubles give 15-17 digits of precision, so we err on the safe side
         # and only use 15 digits in the string conversion. We use the `g`
         # format, which is a documented-enough "do what I mean" where floats
-        # >= 0.1 and < precsion are represented as floating point literals, and
+        # >= 0.1 and < precision are represented as floating point literals, and
         # other numbers use the exponent notation with a lowercase 'e'. Note
         # that both Ruby and Erlang document what their `g` does but have some
         # differences both subtle and non-subtle:

data/lib/chef-cli/skeletons/code_generator/files/default/chefignore

@@ -9,6 +9,7 @@ ehthumbs.db
 Icon?
 nohup.out
 Thumbs.db
+.envrc
 
 # EDITORS #
 ###########
@@ -45,17 +46,23 @@ mkmf.log
 ###########
 .circleci/*
 .codeclimate.yml
+.delivery/*
 .foodcritic
 .kitchen*
+.mdlrc
+.overcommit.yml
 .rspec
 .rubocop.yml
 .travis.yml
 .watchr
+.yamllint
 azure-pipelines.yml
+Dangerfile
 examples/*
 features/*
 Guardfile
 kitchen.yml*
+mlc_config.json
 Procfile
 Rakefile
 spec/*
@@ -68,6 +75,7 @@ test/*
 .gitconfig
 .github/*
 .gitignore
+.gitkeep
 .gitmodules
 .svn
 */.bzr/*
@@ -95,10 +103,11 @@ Policyfile.lock.json
 
 # Documentation #
 #############
-CHANGELOG*
+CODE_OF_CONDUCT*
 CONTRIBUTING*
+documentation/*
 TESTING*
-CODE_OF_CONDUCT*
+UPGRADING*
 
 # Vagrant #
 ###########

data/lib/chef-cli/skeletons/code_generator/templates/default/inspec_default_test.rb.erb

@@ -1,7 +1,7 @@
 # InSpec test for recipe <%= cookbook_name %>::<%= recipe_name %>
 
 # The InSpec reference, with examples and extensive documentation, can be
-# found at https://www.inspec.io/docs/reference/resources/
+# found at https://docs.chef.io/inspec/resources/
 
 unless os.windows?
   # This is an example test, replace with your own test.

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.9".freeze
+  VERSION = "3.0.22".freeze
 end

data/lib/kitchen/provisioner/chef_zero_capture.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Marc Paradise <marc@chef.io>
 #
@@ -16,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "json"
+require "json" unless defined?(JSON)
 require "kitchen"
 require "kitchen/provisioner/base"
 require "kitchen/provisioner/chef_zero"
@@ -45,7 +44,7 @@ module Kitchen
     #
     # This provisioner does not do any cookbook dependency
     # resolution and will not pull in external cookbooks.  All cookbooks
-    # or cookbook artificats  + policy data as captured from the live node and are
+    # or cookbook artifacts + policy data as captured from the live node and are
     # expected to be available for chef-zero to provide to the client.
     class ChefZeroCapture < ChefZero
       # Declaring these ensure that they're available to the sandbox - it's initialized
@@ -55,7 +54,7 @@ module Kitchen
       default_config :cookbook_artifacts_path, "cookbook_artifacts"
 
       # This will load policyfile/berkshelf.  We don't want either - the client resolves all
-      # dependencies from chef-zero, exactly as preppped in the captured repository.
+      # dependencies from chef-zero, exactly as prepped in the captured repository.
       def load_needed_dependencies!; end
 
       def create_sandbox
@@ -73,7 +72,7 @@ module Kitchen
       end
 
       # Overriding the private ProviderChefZero#default_config_rb
-      # so that we can add additional configuratoin required for  chef-zeor
+      # so that we can add additional configuration required for chef-zero
       # to be able to locate our policies/, policy groups, and cookbook artifacts
       # at run-time.
       def default_config_rb

data/lib/kitchen/provisioner/policyfile_zero.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -54,7 +53,7 @@ module Kitchen
     # @author Daniel DeLeo <dan@chef.io>
     class PolicyfileZero < ChefBase
 
-      # This provsioner will forcibly set the following config options:
+      # This provisioner will forcibly set the following config options:
       # * `use_policyfile`: `true`
       # * `versioned_cookbooks`: `true`
       # * `deployment_group`: `POLICY_NAME-local`

data/spec/unit/cli_spec.rb

@@ -53,11 +53,9 @@ describe ChefCLI::CLI do
     E
   end
 
-  let(:version_message) { "#{ChefCLI::Dist::PRODUCT} version: #{ChefCLI::VERSION}\n" }
-
   def run_cli(expected_exit_code)
     expect(cli).to receive(:exit).with(expected_exit_code)
-    expect(cli).to receive(:sanity_check!)
+    expect(cli).to receive(:path_check!)
     cli.run
   end
 
@@ -66,16 +64,6 @@ describe ChefCLI::CLI do
     cli.run
   end
 
-  def run_cli_and_validate_tool_versions
-    full_version_message = version_message
-    tools.each do |name, details|
-      expect(cli).to receive(:shell_out).with("#{details["command"]} --version").and_return(mock_shell_out(0, "#{details["version_output"]}", ""))
-      full_version_message += "#{name} version: #{details["expected_version"]}\n"
-    end
-    run_cli(0)
-    expect(stdout).to eq(full_version_message)
-  end
-
   def mock_shell_out(exitstatus, stdout, stderr)
     shell_out = double("mixlib_shell_out")
     allow(shell_out).to receive(:exitstatus).and_return(exitstatus)
@@ -121,12 +109,17 @@ describe ChefCLI::CLI do
   context "given -v" do
     let(:argv) { %w{-v} }
 
-    context "#via_version_manifest" do
+    context "when installed via omnibus" do
       let(:mocked_version_manifest_json) do
         <<~E
           {
             "manifest_format": 2,
-            "build_version": "d.e.v"
+            "build_version": "d.e.v",
+            "software": {
+              "habitat": {
+                "locked_version": "1.2.3"
+              }
+            }
           }
         E
       end
@@ -160,6 +153,7 @@ describe ChefCLI::CLI do
           Chef Infra Client version: 0.0.2
           Chef InSpec version: 0.0.3
           Chef CLI version: 0.0.1
+          Chef Habitat version: 1.2.3
           Test Kitchen version: 0.0.4
           Cookstyle version: 0.0.6
         E
@@ -171,6 +165,7 @@ describe ChefCLI::CLI do
           Chef Infra Client version: unknown
           Chef InSpec version: unknown
           Chef CLI version: unknown
+          Chef Habitat version: unknown
           Test Kitchen version: unknown
           Cookstyle version: unknown
         E
@@ -195,49 +190,15 @@ describe ChefCLI::CLI do
       end
     end
 
-    context "#via_shell_out" do
-      let(:tools) do
-        {
-          "Chef Infra Client" => {
-            "command" => "chef-client",
-            "version_output" => "Chef Infra Client: 15.0.300",
-            "expected_version" => "15.0.300",
-          },
-          "Chef InSpec" => {
-            "command" => "inspec",
-            "version_output" => "4.6.2\n\nYour version of InSpec is out of date! The latest version is 4.6.4.",
-            "expected_version" => "4.6.2",
-          },
-          "Test Kitchen" => {
-            "command" => "kitchen",
-            "version_output" => "Test Kitchen version 2.2.5",
-            "expected_version" => "2.2.5",
-          },
-          "Cookstyle" => {
-            "command" => "cookstyle",
-            "version_output" => "Cookstyle 4.0.0\n  * RuboCop 0.62.0",
-            "expected_version" => "4.0.0",
-          },
-        }
-      end
-
-      it "does not print versions of tools with missing or errored tools" do
-        full_version_message = version_message
-        tools.each do |name, details|
-          if name == "inspec"
-            expect(cli).to receive(:shell_out).with("#{details["command"]} --version").and_return(mock_shell_out(1, "#{details["version_output"]}", ""))
-            full_version_message += "#{name} version: ERROR\n"
-          else
-            expect(cli).to receive(:shell_out).with("#{details["command"]} --version").and_return(mock_shell_out(0, "#{details["version_output"]}", ""))
-            full_version_message += "#{name} version: #{details["expected_version"]}\n"
-          end
-        end
-        run_cli(0)
-        expect(stdout).to eq(full_version_message)
+    context "when installed as a gem" do
+      let(:gem_version_message) { "#{ChefCLI::Dist::CLI_PRODUCT} version: #{ChefCLI::VERSION}\n" }
+      before do
+        allow(cli).to receive(:omnibus_install?).and_return false
       end
 
       it "prints the version and versions of chef-cli tools" do
-        run_cli_and_validate_tool_versions
+        run_cli(0)
+        expect(stdout).to eq(gem_version_message)
       end
     end
   end
@@ -295,7 +256,7 @@ describe ChefCLI::CLI do
     end
   end
 
-  context "sanity_check!" do
+  context "path_check!" do
 
     before do
       allow(Gem).to receive(:ruby).and_return(ruby_path)

data/spec/unit/command/clean_policy_cookbooks_spec.rb

@@ -50,9 +50,9 @@ describe ChefCLI::Command::CleanPolicyCookbooks do
 
     context "when given a path to the config" do
 
-      let(:params) { %w{ -c ~/otherstuff/config.rb } }
+      let(:params) { %w{ -c ~/other_stuff/config.rb } }
 
-      let(:config_arg) { "~/otherstuff/config.rb" }
+      let(:config_arg) { "~/other_stuff/config.rb" }
 
       before do
         expect(chef_config_loader).to receive(:load)

data/spec/unit/command/env_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "spec_helper"
-require "yaml"
+require "yaml" unless defined?(YAML)
 require "chef-cli/command/env"
 
 describe ChefCLI::Command::Env do
@@ -69,7 +69,7 @@ describe ChefCLI::Command::Env do
       it "output should be valid yaml" do
         expect { yaml }.not_to raise_error
       end
-      it "Workstation version should indicate that that we're not runnign from a WS install" do
+      it "Workstation version should indicate that that we're not running from a WS install" do
         expect(yaml).to have_key ChefCLI::Dist::PRODUCT
         expect(yaml[ChefCLI::Dist::PRODUCT]["Version"]).to eql "Not running from within Workstation"
       end

data/spec/unit/command/exec_spec.rb

@@ -59,7 +59,7 @@ describe ChefCLI::Command::Exec do
     before do
       allow(Gem).to receive(:ruby).and_return(ruby_path)
 
-      # Using a fake path separator to keep to prevent people from accidently
+      # Using a fake path separator to keep to prevent people from accidentally
       # getting things correct on their system. This enforces that, in general,
       # you should use the path separator ruby is telling you to use.
       stub_const("File::PATH_SEPARATOR", "<>")

data/spec/unit/commands_map_spec.rb

@@ -25,7 +25,7 @@ describe ChefCLI::CommandsMap do
 
   before do
     mapping.builtin("example", :Example)
-    mapping.builtin("hypenated-example", :HyphenatedExample)
+    mapping.builtin("hyphenated-example", :HyphenatedExample)
     mapping.builtin("explicit-path-example", :ExplicitPathExample, require_path: "unit/fixtures/command/explicit_path_example")
     mapping.builtin("documented-example", :DocumentedExample, desc: "I have documentation")
   end
@@ -34,16 +34,16 @@ describe ChefCLI::CommandsMap do
     expect(mapping.have_command?("example")).to be true
   end
 
-  it "infers a non-hypenated command's require path" do
+  it "infers a non-hyphenated command's require path" do
     expect(mapping.spec_for("example").require_path).to eq("chef-cli/command/example")
   end
 
   it "infers a hyphenated command's require path" do
-    expect(mapping.spec_for("hypenated-example").require_path).to eq("chef-cli/command/hypenated_example")
+    expect(mapping.spec_for("hyphenated-example").require_path).to eq("chef-cli/command/hyphenated_example")
   end
 
   it "lists the available commands" do
-    expect(mapping.command_names).to match_array(%w{example hypenated-example explicit-path-example documented-example})
+    expect(mapping.command_names).to match_array(%w{example hyphenated-example explicit-path-example documented-example})
   end
 
   it "keeps the docstring of a command" do

data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb

@@ -1,6 +1,6 @@
 require "openssl"
 require "net/https"
-require "json"
+require "json" unless defined?(JSON)
 require "pp"
 require "uri"
 

data/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Marc Paradsie <marc.paradise@gmail.com>
 #

data/spec/unit/policyfile_includes_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/policyfile_install_with_includes_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2017 Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/policyfile_lock_build_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
 # License:: Apache License, Version 2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.22
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -156,16 +156,22 @@ dependencies:
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement