chef-cli 3.0.40 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 589401fa72480dd7b3e4ad63f7023af6ad9cc312c105978667d7b164df0144ad
-  data.tar.gz: de56186f0f6a2e9fe5e2aa1b21abe467dc97548710e1a92bec0adaa5d7c82a64
+  metadata.gz: ad936b7c0a024d571d22f4de9c78681906f98c07190e66ef723d07f680e3611d
+  data.tar.gz: 4e18354644f446734170b934fa9a1899a2178a121a62c64779e29995f5fad7be
 SHA512:
-  metadata.gz: de377459543532084875b808fd2b7c0ab897fe2bae2b54bca4f82c90a59c565f1d0a04c8ccaf19710a5b9982d09a6bf2f805371b83a7ae77ae68656e0b1299d4
-  data.tar.gz: 64e33de89273df76855c56b599e4b8da396df569c7c787100f3b22640675dfbb47ad5dd9546b20eb072e1cebd2ffce29687297e0ee94962758745cbf26d4ead9
+  metadata.gz: adad25885aea41a51a851f1958f1c43668530d7a4eefaa4e4dffade6291f117836bb8f8908ac5d1ef0a2e13a0ab9ef3a689af6a5c8c874f370de7399c69e76c1
+  data.tar.gz: c89105687373b57a2809f5c540828c45a633b2872a73d4e926fd1e3aa189938be05d0a23ee8fc1f173bff5d3834826e1199a7c566cc09fa3fa835e8e1ddcaa6b

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

@@ -91,7 +91,7 @@ module ChefCLI
       def run(params = [])
         return 1 unless apply_params!(params)
 
-        attributes_updater.run
+        attributes_updater.run if update_attributes_only?
         installer.run(@cookbooks_to_update, config[:exclude_deps]) unless update_attributes_only?
         0
       rescue PolicyfileServiceError => e

data/lib/chef-cli/policyfile_services/install.rb

@@ -61,7 +61,7 @@ module ChefCLI
 
         if installing_from_lock?
           install_from_lock
-        elsif cookbooks_to_update.empty? # means update everything
+        elsif cookbooks_to_update.empty? || policyfile_lock.nil? # means update everything
           generate_lock_and_install
         else
           update_lock_and_install(cookbooks_to_update, exclude_deps)

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.40".freeze
+  VERSION = "3.1.0".freeze
 end

data/spec/unit/command/update_spec.rb

@@ -132,10 +132,6 @@ describe ChefCLI::Command::Update do
     context "when the command is successful" do
       before do
         expect(install_service).to receive(:run)
-        expect(ChefCLI::PolicyfileServices::UpdateAttributes).to receive(:new)
-          .with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything)
-          .and_return(update_attrs_service)
-        expect(update_attrs_service).to receive(:run)
       end
 
       it "returns 0" do
@@ -159,10 +155,6 @@ describe ChefCLI::Command::Update do
 
       before do
         expect(install_service).to receive(:run).and_raise(exception)
-        expect(ChefCLI::PolicyfileServices::UpdateAttributes).to receive(:new)
-          .with(policyfile: nil, ui: command.ui, root_dir: Dir.pwd, chef_config: anything)
-          .and_return(update_attrs_service)
-        expect(update_attrs_service).to receive(:run)
       end
 
       it "returns 1" do

data/spec/unit/policyfile_services/install_spec.rb

@@ -54,6 +54,10 @@ describe ChefCLI::PolicyfileServices::Install do
 
   let(:overwrite) { false }
 
+  let(:cookbooks_to_update) { [] || [ "my_cookbook" ] }
+
+  let(:cookbooks_to_update_empty) { false }
+
   let(:ui) { TestHelpers::TestUI.new }
 
   let(:install_service) { described_class.new(policyfile: policyfile_rb_name, ui: ui, root_dir: working_dir, overwrite: overwrite) }
@@ -153,6 +157,90 @@ describe ChefCLI::PolicyfileServices::Install do
 
     end
 
+    context "when cookbook to update is empty and no policy lock exist" do
+
+      let(:cookbooks_to_update_empty) { true }
+
+      it "create the policy lock" do
+        install_service.run(:cookbooks_to_update)
+        generated_lock = result_policyfile_lock
+        expect(generated_lock.name).to eq("install-example")
+        expect(generated_lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+      it "checks for policy lock" do
+        lock = install_service.policyfile_lock
+        expect(lock).to eq(nil)
+      end
+
+    end
+
+    context "when cookbook to update is empty and policy lock exist" do
+
+      before do
+        install_service.dup.run
+      end
+
+      let(:cookbooks_to_update_empty) { true }
+
+      it "create the policy lock" do
+        install_service.run(:cookbooks_to_update)
+        generated_lock = result_policyfile_lock
+        expect(generated_lock.name).to eq("install-example")
+        expect(generated_lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+      it "checks for policy lock" do
+        lock = install_service.policyfile_lock
+        expect(lock).to be_an_instance_of(ChefCLI::PolicyfileLock)
+        expect(lock.name).to eq("install-example")
+        expect(lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+    end
+
+    context "when cookbook to update is not empty and no policy lock exist" do
+
+      let(:cookbooks_to_update) { [ "my_cookbook" ] }
+
+      it "create the policy lock" do
+        install_service.run(:cookbooks_to_update)
+        generated_lock = result_policyfile_lock
+        expect(generated_lock.name).to eq("install-example")
+        expect(generated_lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+      it "checks for policy lock" do
+        lock = install_service.policyfile_lock
+        expect(lock).to eq(nil)
+      end
+
+    end
+
+    context "when cookbook to update is not empty and policy lock exist" do
+
+      before do
+        install_service.dup.run
+      end
+
+      let(:cookbooks_to_update) { [ "my_cookbook" ] }
+
+      it "create the policy lock" do
+        install_service.run(:cookbooks_to_update)
+        generated_lock = result_policyfile_lock
+        expect(generated_lock.name).to eq("install-example")
+        expect(generated_lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+      it "create the policy lock" do
+        lock = install_service.policyfile_lock
+        expect(lock).to be_an_instance_of(ChefCLI::PolicyfileLock)
+        expect(lock.name).to eq("install-example")
+        expect(lock.cookbook_locks).to have_key("local-cookbook")
+      end
+
+    end
+
     context "and a lockfile exists and `overwrite` is specified" do
 
       let(:overwrite) { true }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.40
+  version: 3.1.0
 platform: ruby
 authors:
 - Chef Software, Inc.