chef 12.0.3 → 12.1.0.rc.0

data/spec/unit/provider/package/zypper_spec.rb

@@ -27,14 +27,10 @@ describe Chef::Provider::Package::Zypper do
 
     @current_resource = Chef::Resource::Package.new("cups")
 
-    @status = double("Status", :exitstatus => 0)
-
     @provider = Chef::Provider::Package::Zypper.new(@new_resource, @run_context)
     allow(Chef::Resource::Package).to receive(:new).and_return(@current_resource)
-    allow(@provider).to receive(:popen4).and_return(@status)
-    @stderr = StringIO.new
-    @stdout = StringIO.new
-    @pid = double("PID")
+    @status = double(:stdout => "\n", :exitstatus => 0)
+    allow(@provider).to receive(:shell_out).and_return(@status)
     allow(@provider).to receive(:`).and_return("2.0")
   end
 
@@ -50,27 +46,28 @@ describe Chef::Provider::Package::Zypper do
     end
 
     it "should run zypper info with the package name" do
-      expect(@provider).to receive(:popen4).with("zypper --non-interactive info #{@new_resource.package_name}").and_return(@status)
+      expect(@provider).to receive(:shell_out).with("zypper --non-interactive info #{@new_resource.package_name}").and_return(@status)
       @provider.load_current_resource
     end
 
     it "should set the installed version to nil on the current resource if zypper info installed version is (none)" do
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      allow(@provider).to receive(:shell_out).and_return(@status)
       expect(@current_resource).to receive(:version).with(nil).and_return(true)
       @provider.load_current_resource
     end
 
     it "should set the installed version if zypper info has one" do
-      @stdout = StringIO.new("Version: 1.0\nInstalled: Yes\n")
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      status = double(:stdout => "Version: 1.0\nInstalled: Yes\n", :exitstatus => 0)
+
+      allow(@provider).to receive(:shell_out).and_return(status)
       expect(@current_resource).to receive(:version).with("1.0").and_return(true)
       @provider.load_current_resource
     end
 
     it "should set the candidate version if zypper info has one" do
-      @stdout = StringIO.new("Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)")
+      status = double(:stdout => "Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)", :exitstatus => 0)
 
-      allow(@provider).to receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      allow(@provider).to receive(:shell_out).and_return(status)
       @provider.load_current_resource
       expect(@provider.candidate_version).to eql("1.0")
     end

data/spec/unit/provider/package_spec.rb

@@ -152,7 +152,7 @@ describe Chef::Provider::Package do
 
     it "should print the word 'uninstalled' if there was no original version" do
       allow(@current_resource).to receive(:version).and_return(nil)
-      expect(Chef::Log).to receive(:info).with("package[emacs] upgraded from uninstalled to 1.0")
+      expect(Chef::Log).to receive(:info).with("package[emacs] upgraded emacs to 1.0")
       @provider.run_action(:upgrade)
       expect(@new_resource).to be_updated_by_last_action
     end
@@ -376,7 +376,7 @@ describe Chef::Provider::Package do
       end
 
       it "should never back up the cached response file" do
-        expect(@provider.preseed_resource('java', '6').backup).to be_false
+        expect(@provider.preseed_resource('java', '6').backup).to be_falsey
       end
 
       it "sets the install path of the resource to $file_cache/$cookbook/$pkg_name-$pkg_version.seed" do
@@ -425,3 +425,277 @@ describe Chef::Provider::Package do
 
   end
 end
+
+describe "Chef::Provider::Package - Multi" do
+  before do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::Package.new(['emacs', 'vi'])
+    @current_resource = Chef::Resource::Package.new(['emacs', 'vi'])
+    @provider = Chef::Provider::Package.new(@new_resource, @run_context)
+    @provider.current_resource = @current_resource
+    @provider.candidate_version = ['1.0', '6.2']
+  end
+
+  describe "when installing multiple packages" do
+    before(:each) do
+      @provider.current_resource = @current_resource
+      allow(@provider).to receive(:install_package).and_return(true)
+    end
+
+    it "installs the candidate versions when none are installed" do
+      expect(@provider).to receive(:install_package).with(
+        ["emacs", "vi"],
+        ["1.0", "6.2"]
+      ).and_return(true)
+      @provider.run_action(:install)
+      expect(@new_resource).to be_updated
+    end
+
+    it "installs the candidate versions when some are installed" do
+      expect(@provider).to receive(:install_package).with(
+        [ 'vi' ],
+        [ '6.2' ]
+      ).and_return(true)
+      @current_resource.version(['1.0', nil])
+      @provider.run_action(:install)
+      expect(@new_resource).to be_updated
+    end
+
+    it "installs the specified version when some are out of date" do
+      @current_resource.version(['1.0', '6.2'])
+      @new_resource.version(['1.0', '6.1'])
+      @provider.run_action(:install)
+      expect(@new_resource).to be_updated
+    end
+
+    it "does not install any version if all are installed at the right version" do
+      @current_resource.version(['1.0', '6.2'])
+      @new_resource.version(['1.0', '6.2'])
+      @provider.run_action(:install)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+
+    it "does not install any version if all are installed, and no version was specified" do
+      @current_resource.version(['1.0', '6.2'])
+      @provider.run_action(:install)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+
+    it "raises an exception if both are not installed and no caondidates are available" do
+      @current_resource.version([nil, nil])
+      @provider.candidate_version = [nil, nil]
+      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+    end
+
+    it "raises an exception if one is not installed and no candidates are available" do
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = ['1.0', nil]
+      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+    end
+
+    it "does not raise an exception if the packages are installed or have a candidate" do
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = [nil, '6.2']
+      expect { @provider.run_action(:install) }.not_to raise_error
+    end
+
+    it "raises an exception if an explicit version is asked for, an old version is installed, but no candidate" do
+      @new_resource.version ['1.0', '6.2']
+      @current_resource.version(['1.0', '6.1'])
+      @provider.candidate_version = ['1.0', nil]
+      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+    end
+
+    it "does not raise an exception if an explicit version is asked for, and is installed, but no candidate" do
+      @new_resource.version ['1.0', '6.2']
+      @current_resource.version(['1.0', '6.2'])
+      @provider.candidate_version = ['1.0', nil]
+      expect { @provider.run_action(:install) }.not_to raise_error
+    end
+
+    it "raise an exception if an explicit version is asked for, and is not installed, and no candidate" do
+      @new_resource.version ['1.0', '6.2']
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = ['1.0', nil]
+      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+    end
+
+    it "does not raise an exception if an explicit version is asked for, and is not installed, and there is a candidate" do
+      @new_resource.version ['1.0', '6.2']
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = ['1.0', '6.2']
+      expect { @provider.run_action(:install) }.not_to raise_error
+    end
+  end
+
+  describe "when upgrading multiple packages" do
+    before(:each) do
+      @provider.current_resource = @current_resource
+      allow(@provider).to receive(:upgrade_package).and_return(true)
+    end
+
+    it "should upgrade the package if the current versions are not the candidate version" do
+      @current_resource.version ['0.9', '6.1']
+      expect(@provider).to receive(:upgrade_package).with(
+        @new_resource.package_name,
+        @provider.candidate_version
+      ).and_return(true)
+      @provider.run_action(:upgrade)
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should upgrade the package if some of current versions are not the candidate versions" do
+      @current_resource.version ['1.0', '6.1']
+      expect(@provider).to receive(:upgrade_package).with(
+        ["vi"],
+        ["6.2"]
+      ).and_return(true)
+      @provider.run_action(:upgrade)
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should not install the package if the current versions are the candidate version" do
+      @current_resource.version ['1.0', '6.2']
+      expect(@provider).not_to receive(:upgrade_package)
+      @provider.run_action(:upgrade)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+
+    it "should raise an exception if both are not installed and no caondidates are available" do
+      @current_resource.version([nil, nil])
+      @provider.candidate_version = [nil, nil]
+      expect { @provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
+    end
+
+    it "should raise an exception if one is not installed and no candidates are available" do
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = ['1.0', nil]
+      expect { @provider.run_action(:upgrade) }.to raise_error(Chef::Exceptions::Package)
+    end
+
+    it "should not raise an exception if the packages are installed or have a candidate" do
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = [nil, '6.2']
+      expect { @provider.run_action(:upgrade) }.not_to raise_error
+    end
+
+    it "should not raise an exception if the packages are installed or have a candidate" do
+      @current_resource.version(['1.0', nil])
+      @provider.candidate_version = [nil, '6.2']
+      expect { @provider.run_action(:upgrade) }.not_to raise_error
+    end
+  end
+
+  describe "When removing multiple packages " do
+    before(:each) do
+      allow(@provider).to receive(:remove_package).and_return(true)
+      @current_resource.version ['1.0', '6.2']
+    end
+
+    it "should remove the packages if all are installed" do
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], nil)
+      @provider.run_action(:remove)
+      expect(@new_resource).to be_updated
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should remove the packages if some are installed" do
+      @current_resource.version ['1.0', nil]
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], nil)
+      @provider.run_action(:remove)
+      expect(@new_resource).to be_updated
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should remove the packages at a specific version if they are installed at that version" do
+      @new_resource.version ['1.0', '6.2']
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], ['1.0', '6.2'])
+      @provider.run_action(:remove)
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should remove the packages at a specific version any are is installed at that version" do
+      @new_resource.version ['0.5', '6.2']
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:remove_package).with(['emacs', 'vi'], ['0.5', '6.2'])
+      @provider.run_action(:remove)
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should not remove the packages at a specific version if they are not installed at that version" do
+      @new_resource.version ['0.5', '6.0']
+      expect(@provider).not_to be_removing_package
+      expect(@provider).not_to receive(:remove_package)
+      @provider.run_action(:remove)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+
+    it "should not remove the packages if they are not installed" do
+      expect(@provider).not_to receive(:remove_package)
+      allow(@current_resource).to receive(:version).and_return(nil)
+      @provider.run_action(:remove)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+
+  end
+
+  describe "When purging multiple packages " do
+    before(:each) do
+      allow(@provider).to receive(:purge_package).and_return(true)
+      @current_resource.version ['1.0', '6.2']
+    end
+
+    it "should purge the packages if all are installed" do
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], nil)
+      @provider.run_action(:purge)
+      expect(@new_resource).to be_updated
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should purge the packages if some are installed" do
+      @current_resource.version ['1.0', nil]
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], nil)
+      @provider.run_action(:purge)
+      expect(@new_resource).to be_updated
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should purge the packages at a specific version if they are installed at that version" do
+      @new_resource.version ['1.0', '6.2']
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], ['1.0', '6.2'])
+      @provider.run_action(:purge)
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should purge the packages at a specific version any are is installed at that version" do
+      @new_resource.version ['0.5', '6.2']
+      expect(@provider).to be_removing_package
+      expect(@provider).to receive(:purge_package).with(['emacs', 'vi'], ['0.5', '6.2'])
+      @provider.run_action(:purge)
+      expect(@new_resource).to be_updated_by_last_action
+    end
+
+    it "should not purge the packages at a specific version if they are not installed at that version" do
+      @new_resource.version ['0.5', '6.0']
+      expect(@provider).not_to be_removing_package
+      expect(@provider).not_to receive(:purge_package)
+      @provider.run_action(:purge)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+
+    it "should not purge the packages if they are not installed" do
+      expect(@provider).not_to receive(:purge_package)
+      allow(@current_resource).to receive(:version).and_return(nil)
+      @provider.run_action(:purge)
+      expect(@new_resource).not_to be_updated_by_last_action
+    end
+  end
+end

data/spec/unit/provider/remote_directory_spec.rb

@@ -84,7 +84,7 @@ describe Chef::Provider::RemoteDirectory do
       expect(directory_resource.mode).to  eq("0750")
       expect(directory_resource.group).to eq("wheel")
       expect(directory_resource.owner).to eq("root")
-      expect(directory_resource.recursive).to be_true
+      expect(directory_resource.recursive).to be_truthy
     end
 
     it "configures access control on files in the directory" do
@@ -116,17 +116,17 @@ describe Chef::Provider::RemoteDirectory do
     it "creates the toplevel directory without error " do
       @resource.recursive(false)
       @provider.run_action(:create)
-      expect(::File.exist?(@destination_dir)).to be_true
+      expect(::File.exist?(@destination_dir)).to be_truthy
     end
 
     it "transfers the directory with all contents" do
       @provider.run_action(:create)
-      expect(::File.exist?(@destination_dir + '/remote_dir_file1.txt')).to be_true
-      expect(::File.exist?(@destination_dir + '/remote_dir_file2.txt')).to be_true
-      expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')).to be_true
-      expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file2.txt')).to be_true
-      expect(::File.exist?(@destination_dir + '/remotesubdir/.a_dotfile')).to be_true
-      expect(::File.exist?(@destination_dir + '/.a_dotdir/.a_dotfile_in_a_dotdir')).to be_true
+      expect(::File.exist?(@destination_dir + '/remote_dir_file1.txt')).to be_truthy
+      expect(::File.exist?(@destination_dir + '/remote_dir_file2.txt')).to be_truthy
+      expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')).to be_truthy
+      expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file2.txt')).to be_truthy
+      expect(::File.exist?(@destination_dir + '/remotesubdir/.a_dotfile')).to be_truthy
+      expect(::File.exist?(@destination_dir + '/.a_dotdir/.a_dotfile_in_a_dotdir')).to be_truthy
     end
 
     describe "only if it is missing" do
@@ -141,8 +141,8 @@ describe Chef::Provider::RemoteDirectory do
 
         @provider.run_action(:create_if_missing)
 
-        expect(file1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + '/remote_dir_file1.txt')))).to be_true
-        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')))).to be_true
+        expect(file1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + '/remote_dir_file1.txt')))).to be_truthy
+        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')))).to be_truthy
       end
     end
 
@@ -155,13 +155,13 @@ describe Chef::Provider::RemoteDirectory do
         FileUtils.touch(@destination_dir + '/remotesubdir/marked_for_death_again.txt')
         @provider.run_action(:create)
 
-        expect(::File.exist?(@destination_dir + '/remote_dir_file1.txt')).to be_true
-        expect(::File.exist?(@destination_dir + '/remote_dir_file2.txt')).to be_true
-        expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')).to be_true
-        expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file2.txt')).to be_true
+        expect(::File.exist?(@destination_dir + '/remote_dir_file1.txt')).to be_truthy
+        expect(::File.exist?(@destination_dir + '/remote_dir_file2.txt')).to be_truthy
+        expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')).to be_truthy
+        expect(::File.exist?(@destination_dir + '/remotesubdir/remote_subdir_file2.txt')).to be_truthy
 
-        expect(::File.exist?(@destination_dir + '/marked_for_death.txt')).to be_false
-        expect(::File.exist?(@destination_dir + '/remotesubdir/marked_for_death_again.txt')).to be_false
+        expect(::File.exist?(@destination_dir + '/marked_for_death.txt')).to be_falsey
+        expect(::File.exist?(@destination_dir + '/remotesubdir/marked_for_death_again.txt')).to be_falsey
       end
 
       it "removes files in subdirectories before files above" do
@@ -172,10 +172,10 @@ describe Chef::Provider::RemoteDirectory do
         FileUtils.touch(@destination_dir + '/a/multiply/nested/baz.txt')
         FileUtils.touch(@destination_dir + '/a/multiply/nested/directory/qux.txt')
         @provider.run_action(:create)
-        expect(::File.exist?(@destination_dir + '/a/foo.txt')).to be_false
-        expect(::File.exist?(@destination_dir + '/a/multiply/bar.txt')).to be_false
-        expect(::File.exist?(@destination_dir + '/a/multiply/nested/baz.txt')).to be_false
-        expect(::File.exist?(@destination_dir + '/a/multiply/nested/directory/qux.txt')).to be_false
+        expect(::File.exist?(@destination_dir + '/a/foo.txt')).to be_falsey
+        expect(::File.exist?(@destination_dir + '/a/multiply/bar.txt')).to be_falsey
+        expect(::File.exist?(@destination_dir + '/a/multiply/nested/baz.txt')).to be_falsey
+        expect(::File.exist?(@destination_dir + '/a/multiply/nested/directory/qux.txt')).to be_falsey
       end
 
       it "removes directory symlinks properly", :not_supported_on_win2k3 do
@@ -188,12 +188,12 @@ describe Chef::Provider::RemoteDirectory do
         Dir.mktmpdir do |tmp_dir|
           begin
             @fclass.file_class.symlink(tmp_dir.dup, symlinked_dir_path)
-            expect(::File.exist?(symlinked_dir_path)).to be_true
+            expect(::File.exist?(symlinked_dir_path)).to be_truthy
 
             @provider.run_action
 
-            expect(::File.exist?(symlinked_dir_path)).to be_false
-            expect(::File.exist?(tmp_dir)).to be_true
+            expect(::File.exist?(symlinked_dir_path)).to be_falsey
+            expect(::File.exist?(tmp_dir)).to be_truthy
           rescue Chef::Exceptions::Win32APIError => e
             pending "This must be run as an Administrator to create symlinks"
           end
@@ -212,8 +212,8 @@ describe Chef::Provider::RemoteDirectory do
         file1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt'))
         subdirfile1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt'))
         @provider.run_action(:create)
-        expect(file1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt')))).to be_true
-        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')))).to be_true
+        expect(file1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt')))).to be_truthy
+        expect(subdirfile1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt')))).to be_truthy
       end
     end