chef-cli 1.0.11 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc470c0fa3a1a6580b9272b8f37fd8f09d3e64942b0d11d77de031f09a47db0e
-  data.tar.gz: d7904dd289a5bac13b41199a2a2d446cd0b20d943887b8c0f013aa32ca9d429a
+  metadata.gz: 7b5f6126a4c90780ea0e12bfb21478a40bce4d2432735b5ce2e36c6114414d06
+  data.tar.gz: beed8e750ba8df274e82be2aa11238a07d55968d1686b7c1f0393c303639dc5f
 SHA512:
-  metadata.gz: 865e84c90ffabeb94b902be984d890d841e040ed95d245f24bcce166d0b94e422faaec5001d92dcfef28f2fea70247f464f0daff869010db5eab9211be317b90
-  data.tar.gz: 11511a9d36c5ff9c0fc1cdd969562c1550846707b0da2fe368289b93ef9e12d1cd31585ac4b8d7991ed7615b5a74cf265f0dd877a4babbd21db8651c01a70b69
+  metadata.gz: 82d425973ce0b4e17c55a2f536773a5c9ad40ba50bdcd2b537b64d04462d4b9d970d27d642574f86529839549235007778b8c77608dfb19352b1fdef79c11e0d
+  data.tar.gz: 041f50bcdc2cbaab8efdc1f51b53d279d6cf1b11a72deac5124885ad1e8acf52fb4ab052ff9dade90b60d2dcae7e88f7371bec74184504ff23655028bc0da13c

data/lib/chef-cli/cli.rb

@@ -96,11 +96,30 @@ module ChefCLI
     end
 
     def show_version
+      if omnibus_install?
+        show_version_via_version_manifest
+      else
+        show_version_via_shell_out
+      end
+    end
+
+    def show_version_via_version_manifest
+      msg("#{ChefCLI::Dist::PRODUCT} version: #{manifest_field("build_version")}")
+      { "#{ChefCLI::Dist::INFRA_CLIENT_PRODUCT}": "chef",
+        "#{ChefCLI::Dist::INSPEC_PRODUCT}": "#{ChefCLI::Dist::INSPEC_CLI}",
+        "Chef CLI": "chef-cli",
+        "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",
-        "Foodcritic": "foodcritic",
         "Cookstyle": "cookstyle",
       }.each do |name, cli|
         result = Bundler.with_clean_env { shell_out("#{cli} --version") }
@@ -155,6 +174,40 @@ module ChefCLI
 
     private
 
+    def manifest_field(field)
+      if manifest_hash[field]
+        manifest_hash[field]
+      else
+        "unknown"
+      end
+    end
+
+    def gem_version(name)
+      if gem_manifest_hash[name].is_a?(Array)
+        gem_manifest_hash[name].first
+      else
+        "unknown"
+      end
+    end
+
+    def manifest_hash
+      require "json"
+      @manifest_hash ||= JSON.parse(read_version_manifest_json)
+    end
+
+    def gem_manifest_hash
+      require "json"
+      @gem_manifest_hash ||= JSON.parse(read_gem_version_manifest_json)
+    end
+
+    def read_version_manifest_json
+      File.read(File.join(omnibus_root, "version-manifest.json"))
+    end
+
+    def read_gem_version_manifest_json
+      File.read(File.join(omnibus_root, "gem-version-manifest.json"))
+    end
+
     def normalized_exit_code(maybe_integer)
       if maybe_integer.is_a?(Integer) && (0..255).cover?(maybe_integer)
         maybe_integer

data/lib/chef-cli/helpers.rb

@@ -51,9 +51,9 @@ module ChefCLI
     # Locates the omnibus directories
     #
     def omnibus_install?
-      # We also checck if the location we're running from (omnibus_root is relative to currently-running ruby)
-      # includes the version manifest that omnibus packages ship with.  If it doesn't then we're running locally or
-      # out of a gem - so not as an 'omnibus install'
+      # We also check if the location we're running from (omnibus_root is relative to currently-running ruby)
+      # includes the version manifest that omnibus packages ship with. If it doesn't, then we're running locally
+      # or out of a gem - so not as an 'omnibus install'
       File.exist?(expected_omnibus_root) && File.exist?(File.join(expected_omnibus_root, "version-manifest.json"))
     end
 

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

@@ -195,7 +195,7 @@ module ChefCLI
       #
       # @return [String] Content of specified file for a given revision.
       def show_file(version, file)
-        git("show #{version}:#{file}", cwd: cache_path)
+        git("show #{version}:#{file}", cwd: cache_path.to_s)
       end
 
       # COPYPASTA from CookbookOmnifetch

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "1.0.11".freeze
+  VERSION = "1.0.13".freeze
 end

data/spec/unit/cli_spec.rb

@@ -124,53 +124,124 @@ describe ChefCLI::CLI do
   context "given -v" do
     let(:argv) { %w{-v} }
 
-    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",
-        },
-        "Foodcritic" => {
-          "command" => "foodcritic",
-          "version_output" => "foodcritic 16.0.0",
-          "expected_version" => "16.0.0",
-        },
-        "Cookstyle" => {
-          "command" => "cookstyle",
-          "version_output" => "Cookstyle 4.0.0\n  * RuboCop 0.62.0",
-          "expected_version" => "4.0.0",
-        },
-      }
+    context "#via_version_manifest" do
+      let(:mocked_version_manifest_json) do
+        <<~E
+          {
+            "manifest_format": 2,
+            "build_version": "d.e.v"
+          }
+        E
+      end
+
+      let(:mocked_gem_version_manifest_json) do
+        <<~E
+          {
+            "chef-cli": [
+              "0.0.1"
+            ],
+            "chef": [
+              "0.0.2"
+            ],
+            "inspec": [
+              "0.0.3"
+            ],
+            "test-kitchen": [
+              "0.0.4"
+            ],
+            "cookstyle": [
+              "0.0.6"
+            ]
+          }
+        E
+      end
+
+      # rubocop:disable Layout/TrailingWhitespace
+      let(:full_table_with_version_message) do
+        <<~E
+          Chef Workstation version: d.e.v
+          Chef Infra Client version: 0.0.2
+          Chef InSpec version: 0.0.3
+          Chef CLI version: 0.0.1
+          Test Kitchen version: 0.0.4
+          Cookstyle version: 0.0.6
+        E
+      end
+
+      let(:full_table_with_unknown_version_message) do
+        <<~E
+          Chef Workstation version: unknown
+          Chef Infra Client version: unknown
+          Chef InSpec version: unknown
+          Chef CLI version: unknown
+          Test Kitchen version: unknown
+          Cookstyle version: unknown
+        E
+      end
+
+      before do
+        allow(cli).to receive(:omnibus_install?).and_return true
+        allow(cli).to receive(:read_version_manifest_json).and_return(mocked_version_manifest_json)
+        allow(cli).to receive(:read_gem_version_manifest_json).and_return(mocked_gem_version_manifest_json)
+      end
+
+      it "does not print versions of tools with missing or errored tools" do
+        allow(cli).to receive(:read_gem_version_manifest_json).and_return("{}")
+        allow(cli).to receive(:read_version_manifest_json).and_return("{}")
+        run_cli(0)
+        expect(stdout).to eq(full_table_with_unknown_version_message)
+      end
+
+      it "prints a table with the version of all the tools" do
+        run_cli(0)
+        expect(stdout).to eq(full_table_with_version_message)
+      end
     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"
+    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)
       end
-      run_cli(0)
-      expect(stdout).to eq(full_version_message)
-    end
 
-    it "prints the version and versions of chef-cli tools" do
-      run_cli_and_validate_tool_versions
+      it "prints the version and versions of chef-cli tools" do
+        run_cli_and_validate_tool_versions
+      end
     end
   end
 

data/spec/unit/policyfile/git_lock_fetcher_spec.rb

@@ -120,6 +120,17 @@ describe ChefCLI::Policyfile::GitLockFetcher do
       expect(lock_data).to include(minimal_lockfile_modified)
     end
 
+    # Shellout libraries on Windows expect cwd to be provided as a string, not Pathname object
+    it "provides the working directory as a string" do
+      expect(Mixlib::ShellOut).to receive(:new).with(/git clone/, {}).and_return(shellout)
+      expect(Mixlib::ShellOut).to receive(:new).with(/git show/, { cwd: /cache/ }).and_return(shellout)
+      allow(shellout).to receive(:error?).and_return(false)
+      allow(shellout).to receive(:stdout).and_return(minimal_lockfile_json)
+      allow(Dir).to receive(:chdir).and_return(0)
+
+      expect(lock_data).to include(minimal_lockfile_modified)
+    end
+
     context "when using a relative path for the policyfile" do
       let(:source_options_rel) do
         source_options.collect { |k, v| [k.to_s, v] }.to_h.merge({ "rel" => rel })

metadata

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