chef-cli 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e2fef23b0a30ce5f7dcc08bb3a72a2166c7944e2edf80b79a01975f4721029
-  data.tar.gz: 1270d7ff326fb8460a31b71b2fde6ec940a3700627a62aec10c14926c01b258e
+  metadata.gz: a10a665d45110e002c2e070387a8d91e0f6cdb365c8ed20b7f181739c0612e74
+  data.tar.gz: 8ee4a30784d2f1784a40d3be7bb5ef670970b6e9e55f922b1944d80253567ae1
 SHA512:
-  metadata.gz: 0130ff765efec8876f369244a8b77ded247fe8a58a24b60561d361a0f9577a72a61db8d8ec34f8cd9e5e4b3f95eb9c0d1618211cf2dcce1a8be5b402be8a2028
-  data.tar.gz: b7ee1e7672559a167b511afe308642eb13d28eaa89aaff9f0ac44bf3968aa049c8978df63b6e3d4ee66a17ab66539ef7337afa452194055773b7bb76110c5e9f
+  metadata.gz: '019fa209b216d7719c8c53ce8df805bd973edeeb84a386d2fc1d0dcc08e5094953ed952e8d1e21a31d85053ab9b752e40160674139e6e0929433c8d26ab59896'
+  data.tar.gz: 4f147e219f59c6b9d1ddf864c20aed77bdd99dc4165c5035b823f084824f10772518ff9e30a95f110a5270d7fd5a9c2551f9ffc542c7e21bf20e000370083851

data/lib/chef-cli/helpers.rb

@@ -117,11 +117,11 @@ module ChefCLI
       @omnibus_env ||=
         begin
           user_bin_dir = File.expand_path(File.join(Gem.user_dir, "bin"))
-          path = [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"] ]
+          path = [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ]
           path << git_bin_dir if Dir.exist?(git_bin_dir)
           path << git_windows_bin_dir if Dir.exist?(git_windows_bin_dir)
           {
-            "PATH" => path.join(File::PATH_SEPARATOR),
+            "PATH" => path.flatten.uniq.join(File::PATH_SEPARATOR),
             "GEM_ROOT" => Gem.default_dir,
             "GEM_HOME" => Gem.user_dir,
             "GEM_PATH" => Gem.path.join(File::PATH_SEPARATOR),
@@ -129,8 +129,6 @@ module ChefCLI
         end
     end
 
-    private
-
     def omnibus_expand_path(*paths)
       dir = File.expand_path(File.join(paths))
       raise OmnibusInstallNotFound.new unless dir && File.directory?(dir)
@@ -138,6 +136,8 @@ module ChefCLI
       dir
     end
 
+    private
+
     def expected_omnibus_root
       File.expand_path(File.join(Gem.ruby, "..", "..", ".."))
     end

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "4.0.0".freeze
+  VERSION = "4.0.1".freeze
 end

data/spec/unit/helpers_spec.rb

@@ -0,0 +1,111 @@
+# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef-cli/helpers"
+
+describe ChefCLI::Helpers do
+  context "path_check!" do
+
+    before do
+      allow(Gem).to receive(:ruby).and_return(ruby_path)
+    end
+
+    context "when installed via omnibus" do
+      before do
+        allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return true
+      end
+
+      context "on unix" do
+
+        let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
+        let(:omnibus_embedded_bin_dir) { "/opt/chef-workstation/embedded/bin" }
+        let(:omnibus_bin_dir) { "/opt/chef-workstation/bin" }
+        let(:expected_PATH) { [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ] }
+        let(:expected_GEM_ROOT) { Gem.default_dir }
+        let(:expected_GEM_HOME) { Gem.user_dir }
+        let(:expected_GEM_PATH) { Gem.path.join(File::PATH_SEPARATOR) }
+        let(:ruby_path) { "/opt/chef-workstation/embedded/bin/ruby" }
+
+        it "#omnibus_env path" do
+          allow(ChefCLI::Helpers).to receive(:omnibus_bin_dir).and_return("/opt/chef-workstation/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chef-workstation/embedded/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_env).and_return(
+            "PATH" => expected_PATH.flatten.uniq.join(File::PATH_SEPARATOR),
+            "GEM_ROOT" => expected_GEM_ROOT,
+            "GEM_HOME" => expected_GEM_HOME,
+            "GEM_PATH" => expected_GEM_PATH
+          )
+        end
+      end
+
+      context "on windows" do
+        let(:ruby_path) { "c:/opscode/chef-workstation/embedded/bin/ruby.exe" }
+        let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
+        let(:omnibus_embedded_bin_dir) { "c:/opscode/chef-workstation/embedded/bin" }
+        let(:omnibus_bin_dir) { "c:/opscode/chef-workstation/bin" }
+        let(:expected_GEM_ROOT) { Gem.default_dir }
+        let(:expected_GEM_HOME) { Gem.user_dir }
+        let(:expected_GEM_PATH) { Gem.path.join(File::PATH_SEPARATOR) }
+        let(:omnibus_root) { "c:/opscode/chef-workstation" }
+        let(:expected_PATH) { [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ] }
+
+        before do
+          allow(ChefCLI::Helpers).to receive(:expected_omnibus_root).and_return(ruby_path)
+          allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return(true)
+          allow(Chef::Platform).to receive(:windows?).and_return(true)
+        end
+
+        it "#omnibus_env path" do
+          allow(ChefCLI::Helpers).to receive(:omnibus_bin_dir).and_return("c:/opscode/chef-workstation/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chef-workstation/embedded/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_env).and_return(
+            "PATH" => expected_PATH.flatten.uniq.join(File::PATH_SEPARATOR),
+            "GEM_ROOT" => expected_GEM_ROOT,
+            "GEM_HOME" => expected_GEM_HOME,
+            "GEM_PATH" => expected_GEM_PATH
+          )
+        end
+      end
+    end
+
+    context "when not installed via omnibus" do
+
+      before do
+        allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return false
+      end
+      let(:ruby_path) { "/Users/bog/.lots_o_rubies/2.1.2/bin/ruby" }
+      let(:expected_root_path) { "/Users/bog/.lots_o_rubies" }
+
+      before do
+        allow(File).to receive(:exist?).with(expected_root_path).and_return(false)
+
+        %i{
+          omnibus_root
+          omnibus_bin_dir
+          omnibus_embedded_bin_dir
+        }.each do |method_name|
+          allow(ChefCLI::Helpers).to receive(method_name).and_raise(ChefCLI::OmnibusInstallNotFound.new)
+        end
+      end
+
+      it "skips the sanity check without error" do
+
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -529,6 +529,7 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb
@@ -744,6 +745,7 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb