chef 12.0.1-x86-mingw32 → 12.0.3-x86-mingw32

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

@@ -93,6 +93,27 @@ describe Chef::Provider::Package::Homebrew do
     }
   end
 
+  let(:keg_only_uninstalled_brew_info) do
+    {
+      'name' => 'emacs-kegger',
+      'homepage' => 'http://www.gnu.org/software/emacs/',
+      'versions' => {
+        'stable' => '24.3-keggy',
+        'bottle' => false,
+        'devel' => nil,
+        'head' => 'HEAD'
+      },
+      'revision' => 0,
+      'installed' => [],
+      'linked_keg' => nil,
+      'keg_only' => true,
+      'dependencies' => [],
+      'conflicts_with' => [],
+      'caveats' => '',
+      'options' => []
+    }
+  end
+
   before(:each) do
 
   end
@@ -141,6 +162,11 @@ describe Chef::Provider::Package::Homebrew do
       allow(provider).to receive(:brew_info).and_return(uninstalled_brew_info)
       expect(provider.current_installed_version).to be_nil
     end
+
+    it 'returns nil if the package is keg only and not installed' do
+      allow(provider).to receive(:brew_info).and_return(keg_only_uninstalled_brew_info)
+      expect(provider.current_installed_version).to be_nil
+    end
   end
 
   describe 'brew' do

data/spec/unit/provider/package/windows/msi_spec.rb

@@ -18,13 +18,22 @@
 
 require 'spec_helper'
 
-describe Chef::Provider::Package::Windows::MSI, :windows_only do
+describe Chef::Provider::Package::Windows::MSI do
   let(:node) { double('Chef::Node') }
   let(:events) { double('Chef::Events').as_null_object }  # mock all the methods
   let(:run_context) { double('Chef::RunContext', :node => node, :events => events) }
   let(:new_resource) { Chef::Resource::WindowsPackage.new("calculator.msi") }
   let(:provider) { Chef::Provider::Package::Windows::MSI.new(new_resource) }
 
+  before(:each) do
+    stub_const("File::ALT_SEPARATOR", "\\")
+    allow(::File).to receive(:absolute_path).with("calculator.msi").and_return("calculator.msi")
+  end
+
+  it "responds to shell_out!" do
+    expect(provider).to respond_to(:shell_out!)
+  end
+
   describe "expand_options" do
     it "returns an empty string if passed no options" do
       expect(provider.expand_options(nil)).to eql ""
@@ -51,10 +60,16 @@ describe Chef::Provider::Package::Windows::MSI, :windows_only do
   end
 
   describe "install_package" do
-    # calls shell_out!
+    it "calls msiexec /qn /i" do
+      expect(provider).to receive(:shell_out!).with(/msiexec \/qn \/i \"calculator.msi\"/, kind_of(Hash))
+      provider.install_package("unused", "unused")
+    end
   end
 
   describe "remove_package" do
-    # calls shell_out!
+    it "calls msiexec /qn /x" do
+      expect(provider).to receive(:shell_out!).with(/msiexec \/qn \/x \"calculator.msi\"/, kind_of(Hash))
+      provider.remove_package("unused", "unused")
+    end
   end
 end

data/spec/unit/provider/subversion_spec.rb

@@ -198,7 +198,7 @@ describe Chef::Provider::Subversion do
   it "runs an export with the --force option" do
     allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn export --force -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
     @provider.run_action(:force_export)
     expect(@resource).to be_updated
   end
@@ -206,7 +206,7 @@ describe Chef::Provider::Subversion do
   it "runs the checkout command for action_checkout" do
     allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn checkout -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
     @provider.run_action(:checkout)
     expect(@resource).to be_updated
   end
@@ -230,7 +230,7 @@ describe Chef::Provider::Subversion do
     @resource.user "whois"
     @resource.group "thisis"
     expected_cmd = "svn checkout -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(command: expected_cmd, user: "whois", group: "thisis")
+    expect(@provider).to receive(:shell_out!).with(expected_cmd, {user: "whois", group: "thisis"})
     @provider.run_action(:checkout)
     expect(@resource).to be_updated
   end
@@ -255,7 +255,7 @@ describe Chef::Provider::Subversion do
     allow(@provider).to receive(:find_current_revision).and_return("11410")
     allow(@provider).to receive(:current_revision_matches_target_revision?).and_return(false)
     expected_cmd = "svn update -q  -r12345 /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
     @provider.run_action(:sync)
     expect(@resource).to be_updated
   end
@@ -272,7 +272,7 @@ describe Chef::Provider::Subversion do
   it "runs the export_command on action_export" do
     allow(::File).to receive(:directory?).with("/my/deploy").and_return(true)
     expected_cmd = "svn export --force -q  -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
-    expect(@provider).to receive(:shell_out!).with(command: expected_cmd)
+    expect(@provider).to receive(:shell_out!).with(expected_cmd, {})
     @provider.run_action(:export)
     expect(@resource).to be_updated
   end

data/spec/unit/provider_resolver_spec.rb

@@ -514,7 +514,7 @@ describe Chef::ProviderResolver do
         :deploy_revision, :directory, :dpkg_package, :easy_install_package,
         :erl_call, :execute, :file, :gem_package, :git, :http_request, :link, :log, :pacman_package, :paludis_package,
         :perl, :python, :remote_directory, :route, :rpm_package, :ruby, :ruby_block, :script,
-        :subversion, :template, :timestamped_deploy, :whyrun_safe_ruby_block, :yum_package,
+        :subversion, :template, :timestamped_deploy, :whyrun_safe_ruby_block, :yum_package, :homebrew_package,
       ]
 
       supported_providers.each do |static_resource|
@@ -530,7 +530,7 @@ describe Chef::ProviderResolver do
       end
 
       unsupported_providers = [
-        :bff_package, :dsc_script, :homebrew_package, :ips_package, :macports_package,
+        :bff_package, :dsc_script, :ips_package, :macports_package,
         :smartos_package, :solaris_package, :windows_package,
         :windows_service,
       ]

data/spec/unit/recipe_spec.rb

@@ -154,6 +154,7 @@ describe Chef::Recipe do
         zm_resource.recipe_name.should == "test"
         zm_resource.cookbook_name.should == "hjk"
         zm_resource.source_line.should include(__FILE__)
+        zm_resource.declared_type.should == :zen_master
       end
 
       it "does not add the resource to the resource collection" do

data/spec/unit/resource/apt_package_spec.rb

@@ -29,12 +29,10 @@ describe Chef::Resource::AptPackage, "initialize" do
     os: "linux",
   )
 
-  before(:each) do
-    @resource = Chef::Resource::AptPackage.new("foo")
-  end
+  let(:resource) { Chef::Resource::AptPackage.new("foo") }
 
   it "should support default_release" do
-    @resource.default_release("lenny-backports")
-    expect(@resource.default_release).to eql("lenny-backports")
+    resource.default_release("lenny-backports")
+    expect(resource.default_release).to eql("lenny-backports")
   end
 end

data/spec/unit/resource/resource_notification_spec.rb

@@ -0,0 +1,170 @@
+#
+# Author:: Tyler Ball (<tball@chef.io>)
+# Copyright:: Copyright (c) 2014 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/resource/resource_notification'
+
+describe Chef::Resource::Notification do
+  before do
+    @notification = Chef::Resource::Notification.new(:service_apache, :restart, :template_httpd_conf)
+  end
+
+  it "has a resource to be notified" do
+    @notification.resource.should == :service_apache
+  end
+
+  it "has an action to take on the service" do
+    @notification.action.should == :restart
+  end
+
+  it "has a notifying resource" do
+    @notification.notifying_resource.should == :template_httpd_conf
+  end
+
+  it "is a duplicate of another notification with the same target resource and action" do
+    other = Chef::Resource::Notification.new(:service_apache, :restart, :sync_web_app_code)
+    @notification.duplicates?(other).should be_true
+  end
+
+  it "is not a duplicate of another notification if the actions differ" do
+    other = Chef::Resource::Notification.new(:service_apache, :enable, :install_apache)
+    @notification.duplicates?(other).should be_false
+  end
+
+  it "is not a duplicate of another notification if the target resources differ" do
+    other = Chef::Resource::Notification.new(:service_sshd, :restart, :template_httpd_conf)
+    @notification.duplicates?(other).should be_false
+  end
+
+  it "raises an ArgumentError if you try to check a non-ducktype object for duplication" do
+    lambda {@notification.duplicates?(:not_a_notification)}.should raise_error(ArgumentError)
+  end
+
+  it "takes no action to resolve a resource reference that doesn't need to be resolved" do
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    @resource_collection = Chef::ResourceCollection.new
+    # would raise an error since the resource is not in the collection
+    @notification.resolve_resource_reference(@resource_collection)
+    @notification.resource.should == @keyboard_cat
+  end
+
+  it "resolves a lazy reference to a resource" do
+    @notification.resource = {:cat => "keyboard_cat"}
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    @notification.resolve_resource_reference(@resource_collection)
+    @notification.resource.should == @keyboard_cat
+  end
+
+  it "resolves a lazy reference to its notifying resource" do
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    @notification.notifying_resource = {:cat => "long_cat"}
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @long_cat
+    @notification.resolve_resource_reference(@resource_collection)
+    @notification.notifying_resource.should == @long_cat
+  end
+
+  it "resolves lazy references to both its resource and its notifying resource" do
+    @notification.resource = {:cat => "keyboard_cat"}
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @notification.notifying_resource = {:cat => "long_cat"}
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @resource_collection << @long_cat
+    @notification.resolve_resource_reference(@resource_collection)
+    @notification.resource.should == @keyboard_cat
+    @notification.notifying_resource.should == @long_cat
+  end
+
+  it "raises a RuntimeError if you try to reference multiple resources" do
+    @notification.resource = {:cat => ["keyboard_cat", "cheez_cat"]}
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @resource_collection << @cheez_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises a RuntimeError if you try to reference multiple notifying resources" do
+    @notification.notifying_resource = {:cat => ["long_cat", "cheez_cat"]}
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @long_cat
+    @resource_collection << @cheez_cat
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises a RuntimeError if it can't find a resource in the resource collection when resolving a lazy reference" do
+    @notification.resource = {:cat => "keyboard_cat"}
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @cheez_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises a RuntimeError if it can't find a notifying resource in the resource collection when resolving a lazy reference" do
+    @notification.notifying_resource = {:cat => "long_cat"}
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @cheez_cat
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises an ArgumentError if improper syntax is used in the lazy reference to its resource" do
+    @notification.resource = "cat => keyboard_cat"
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
+  end
+
+  it "raises an ArgumentError if improper syntax is used in the lazy reference to its notifying resource" do
+    @notification.notifying_resource = "cat => long_cat"
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @long_cat
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
+  end
+
+  # Create test to resolve lazy references to both notifying resource and dest. resource
+  # Create tests to check proper error raising
+
+end

data/spec/unit/resource_spec.rb

@@ -855,154 +855,3 @@ describe Chef::Resource do
 
   end
 end
-
-describe Chef::Resource::Notification do
-  before do
-    @notification = Chef::Resource::Notification.new(:service_apache, :restart, :template_httpd_conf)
-  end
-
-  it "has a resource to be notified" do
-    @notification.resource.should == :service_apache
-  end
-
-  it "has an action to take on the service" do
-    @notification.action.should == :restart
-  end
-
-  it "has a notifying resource" do
-    @notification.notifying_resource.should == :template_httpd_conf
-  end
-
-  it "is a duplicate of another notification with the same target resource and action" do
-    other = Chef::Resource::Notification.new(:service_apache, :restart, :sync_web_app_code)
-    @notification.duplicates?(other).should be_true
-  end
-
-  it "is not a duplicate of another notification if the actions differ" do
-    other = Chef::Resource::Notification.new(:service_apache, :enable, :install_apache)
-    @notification.duplicates?(other).should be_false
-  end
-
-  it "is not a duplicate of another notification if the target resources differ" do
-    other = Chef::Resource::Notification.new(:service_sshd, :restart, :template_httpd_conf)
-    @notification.duplicates?(other).should be_false
-  end
-
-  it "raises an ArgumentError if you try to check a non-ducktype object for duplication" do
-    lambda {@notification.duplicates?(:not_a_notification)}.should raise_error(ArgumentError)
-  end
-
-  it "takes no action to resolve a resource reference that doesn't need to be resolved" do
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @notification.resource = @keyboard_cat
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @notification.notifying_resource = @long_cat
-    @resource_collection = Chef::ResourceCollection.new
-    # would raise an error since the resource is not in the collection
-    @notification.resolve_resource_reference(@resource_collection)
-    @notification.resource.should == @keyboard_cat
-  end
-
-  it "resolves a lazy reference to a resource" do
-    @notification.resource = {:cat => "keyboard_cat"}
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @keyboard_cat
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @notification.notifying_resource = @long_cat
-    @notification.resolve_resource_reference(@resource_collection)
-    @notification.resource.should == @keyboard_cat
-  end
-
-  it "resolves a lazy reference to its notifying resource" do
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @notification.resource = @keyboard_cat
-    @notification.notifying_resource = {:cat => "long_cat"}
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @long_cat
-    @notification.resolve_resource_reference(@resource_collection)
-    @notification.notifying_resource.should == @long_cat
-  end
-
-  it "resolves lazy references to both its resource and its notifying resource" do
-    @notification.resource = {:cat => "keyboard_cat"}
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @keyboard_cat
-    @notification.notifying_resource = {:cat => "long_cat"}
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @resource_collection << @long_cat
-    @notification.resolve_resource_reference(@resource_collection)
-    @notification.resource.should == @keyboard_cat
-    @notification.notifying_resource.should == @long_cat
-  end
-
-  it "raises a RuntimeError if you try to reference multiple resources" do
-    @notification.resource = {:cat => ["keyboard_cat", "cheez_cat"]}
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @keyboard_cat
-    @resource_collection << @cheez_cat
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @notification.notifying_resource = @long_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
-  end
-
-  it "raises a RuntimeError if you try to reference multiple notifying resources" do
-    @notification.notifying_resource = {:cat => ["long_cat", "cheez_cat"]}
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @long_cat
-    @resource_collection << @cheez_cat
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @notification.resource = @keyboard_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
-  end
-
-  it "raises a RuntimeError if it can't find a resource in the resource collection when resolving a lazy reference" do
-    @notification.resource = {:cat => "keyboard_cat"}
-    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @cheez_cat
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @notification.notifying_resource = @long_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
-  end
-
-  it "raises a RuntimeError if it can't find a notifying resource in the resource collection when resolving a lazy reference" do
-    @notification.notifying_resource = {:cat => "long_cat"}
-    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @cheez_cat
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @notification.resource = @keyboard_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
-  end
-
-  it "raises an ArgumentError if improper syntax is used in the lazy reference to its resource" do
-    @notification.resource = "cat => keyboard_cat"
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @keyboard_cat
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @notification.notifying_resource = @long_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
-  end
-
-  it "raises an ArgumentError if improper syntax is used in the lazy reference to its notifying resource" do
-    @notification.notifying_resource = "cat => long_cat"
-    @long_cat = Chef::Resource::Cat.new("long_cat")
-    @resource_collection = Chef::ResourceCollection.new
-    @resource_collection << @long_cat
-    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
-    @notification.resource = @keyboard_cat
-    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
-  end
-
-  # Create test to resolve lazy references to both notifying resource and dest. resource
-  # Create tests to check proper error raising
-
-end