chef-cli 3.0.14 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32790ab3b088b47eecb22d5be42cb45915584d117687f6133f689fa7ae40b9b4
-  data.tar.gz: 3225502afa9009b0fb4d7cec8d0e1c5a2de851c8bcc982ef26a985e1e6e2aed1
+  metadata.gz: 3ba95803ebaddd3034b21130fda13e0a001c5ef02b304897d7808c0286268d9b
+  data.tar.gz: 7c64aed7f98666dc5677f11036cbbb7671cc9d8d09f410f25222332c1fd10ac6
 SHA512:
-  metadata.gz: 79d8e068694829682f02159f01ab4aeb38930ce9a1f967fb90dc89958a0870c0ad4b804f1a75da6dcc36174dafae0d18569ca3a20cb4448a1f55db23bc83baee
-  data.tar.gz: 7a708060fc06c798514384e6ac4f8367a138d0d37aae8cda9ccb5cecabff6c0a953880801f808e12774b6210c18d3c4dde761fe98b5a8a7c18a4d07f8b8864bb
+  metadata.gz: a42c1780fe0865c527c8787bd1122abcb06867b0f3e01e142684ac2cda519215c9801d031c6266ac94c7965d890dd5c6e0af8eebb195aecdfd0fa36f0691422c
+  data.tar.gz: 3133b68e4e51bd548e180bdbf3d8bae0735834118e0c9b81a781b0e869196a4108ea72ea38904cc1662a3d1863af4dcdf92a5508073efcd53408e7704f792c9e

data/lib/chef-cli/cli.rb

@@ -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
 
@@ -188,11 +167,13 @@ 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
 

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/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.16".freeze
 end

data/spec/unit/cli_spec.rb

@@ -53,8 +53,6 @@ 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!)
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.16
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli