chef-cli 3.0.14 → 3.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32790ab3b088b47eecb22d5be42cb45915584d117687f6133f689fa7ae40b9b4
-  data.tar.gz: 3225502afa9009b0fb4d7cec8d0e1c5a2de851c8bcc982ef26a985e1e6e2aed1
+  metadata.gz: 577fd81ddfd9035362ceca91e8657bf85601baa80a3b810bb3a537fb1c138f55
+  data.tar.gz: f54bf84b3b02697a25a0b6df304255322a31baa22c8fff25dcdd3b917daac99f
 SHA512:
-  metadata.gz: 79d8e068694829682f02159f01ab4aeb38930ce9a1f967fb90dc89958a0870c0ad4b804f1a75da6dcc36174dafae0d18569ca3a20cb4448a1f55db23bc83baee
-  data.tar.gz: 7a708060fc06c798514384e6ac4f8367a138d0d37aae8cda9ccb5cecabff6c0a953880801f808e12774b6210c18d3c4dde761fe98b5a8a7c18a4d07f8b8864bb
+  metadata.gz: fa616d709e416e96c148010b895e5d7e95c440544d66e9e39f2768242443f3aecaafe0fbcc3c3fa6715fbe5426bf7b55ec939db0b31338943b1a84f6bdbb04bf
+  data.tar.gz: 691fd1a5d1cde311bbe3c6bb8678704857733261a1b19e83f2f418ac10d2af22e3fa09c5de26a4a5599bb50733d9deca2a4f70d937b63270ad747b405db31094

data/Gemfile

@@ -13,7 +13,7 @@ group :test do
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"
   gem "rspec-mocks", "~> 3.8"
-  gem "cookstyle", "6.13.3" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
+  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")
@@ -28,3 +28,9 @@ group :development do
   gem "pry-stack_explorer", "~> 0.4.0"
   gem "rb-readline"
 end
+
+group :profile do
+  gem "stackprof"
+  gem "stackprof-webnav"
+  gem "memory_profiler"
+end

data/chef-cli.gemspec

@@ -48,6 +48,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
   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"
+  gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ
+  gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3"
 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/cookbook.rb

@@ -187,27 +187,17 @@ 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
-          end
-
-          result
-        end
-
-        def contains_delivery_cli_toml?(path)
-          delivery_cli_path = path.join(".delivery/cli.toml")
-          delivery_cli_path.exist?
+          Pathname.pwd.ascend.any? { |path| path.join(".delivery/cli.toml").exist? }
         end
 
         def read_and_validate_params
@@ -215,7 +205,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/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/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/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

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

@@ -17,7 +17,7 @@
 
 require "diff/lcs"
 require "diff/lcs/hunk"
-require "paint"
+require "pastel"
 require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefCLI
@@ -215,9 +215,15 @@ module ChefCLI
         ui.print("\n")
       end
 
+      def pastel
+        @pastel ||= Pastel.new
+      end
+
       def print_color_diff(hunk)
         hunk.to_s.each_line do |line|
-          ui.print(Paint[line, color_for_line(line)])
+          line_color = color_for_line(line)
+          line = pastel.decorate(line, line_color) unless line_color.nil?
+          ui.print(line)
         end
       end
 

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/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.14".freeze
+  VERSION = "3.0.27".freeze
 end

data/lib/kitchen/provisioner/chef_zero_capture.rb

@@ -15,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"

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/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

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

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

data/spec/unit/policyfile/differ_spec.rb

@@ -243,7 +243,7 @@ describe ChefCLI::Policyfile::Differ do
 
   def output
     # ANSI codes make the tests harder to read
-    Paint.unpaint(ui.output)
+    Pastel.new.strip(ui.output)
   end
 
   subject(:differ) do

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "spec_helper"
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 require "chef/monkey_patches/net_http"
 require "chef-cli/service_exception_inspectors/http"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.27
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -173,45 +173,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A streamlined development and deployment workflow for Chef platform.
 email:
 - info@chef.io