microwave 1.0.4 → 11.400.2

data/spec/unit/provider/ruby_block_spec.rb

@@ -30,6 +30,14 @@ describe Chef::Provider::RubyBlock, "initialize" do
   end
 
   it "should call the block and flag the resource as updated" do
+    @provider.run_action(:run)
+    $evil_global_evil_laugh.should == :mwahahaha
+    @new_resource.should be_updated
+  end
+
+  it "accepts `create' as an alias for `run'" do
+    # SEE ALSO: CHEF-3500
+    # "create" used to be the default action, it was renamed.
     @provider.run_action(:create)
     $evil_global_evil_laugh.should == :mwahahaha
     @new_resource.should be_updated

data/spec/unit/provider/service/arch_service_spec.rb

@@ -27,7 +27,7 @@ require 'ostruct'
 describe Chef::Provider::Service::Arch, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
 
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
@@ -96,14 +96,14 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
   end
 
   it "should raise error if the node has a nil ps attribute and no other means to get status" do
-    @node[:command] = {:ps => nil}
+    @node.automatic_attrs[:command] = {:ps => nil}
     @provider.define_resource_requirements
     @provider.action = :start
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end
 
   it "should raise error if the node has an empty ps attribute and no other means to get status" do
-    @node[:command] = {:ps => ""}
+    @node.automatic_attrs[:command] = {:ps => ""}
     @provider.define_resource_requirements
     @provider.action = :start
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
@@ -130,7 +130,7 @@ DEFAULT_PS
       @status = mock("Status", :exitstatus => 0, :stdout => @stdout)
       @provider.stub!(:shell_out!).and_return(@status)
       
-      @node[:command] = {:ps => "ps -ef"}
+      @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     end
 
     it "determines the service is running when it appears in ps" do

data/spec/unit/provider/service/debian_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Debian, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => 'fuuuu'}
+    @node.automatic_attrs[:command] = {:ps => 'fuuuu'}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 

data/spec/unit/provider/service/freebsd_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Freebsd do
   before do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ax"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ax"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -115,13 +115,13 @@ RC_SAMPLE
     end
 
     it "should raise error if the node has a nil ps attribute and no other means to get status" do
-      @node[:command] = {:ps => nil}
+      @node.automatic_attrs[:command] = {:ps => nil}
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
     end
 
     it "should raise error if the node has an empty ps attribute and no other means to get status" do
-      @node[:command] = {:ps => ""}
+      @node.automatic_attrs[:command] = {:ps => ""}
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
     end
@@ -180,7 +180,7 @@ RC_SAMPLE
 
     describe "when we have a 'ps' attribute" do
       before do
-        @node[:command] = {:ps => "ps -ax"}
+        @node.automatic_attrs[:command] = {:ps => "ps -ax"}
       end
 
       it "should shell_out! the node's ps command" do

data/spec/unit/provider/service/init_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Init, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -93,10 +93,23 @@ PS
     
   end
   
+  describe "when an init command has been specified" do
+    before do
+      @new_resource.stub!(:init_command).and_return("/opt/chef-server/service/erchef")
+      @provider = Chef::Provider::Service::Init.new(@new_resource, @run_context)
+    end
+
+    it "should use the init_command if one has been specified" do
+      @provider.should_receive(:shell_out!).with("/opt/chef-server/service/erchef start")
+      @provider.start_service
+    end
+
+  end
+
   describe "when the node has not specified a ps command" do
     
     it "should raise an error if the node has a nil ps attribute" do
-      @node[:command] = {:ps => nil}
+      @node.automatic_attrs[:command] = {:ps => nil}
       @provider.load_current_resource
       @provider.action = :start
       @provider.define_resource_requirements
@@ -104,7 +117,7 @@ PS
     end
 
     it "should raise an error if the node has an empty ps attribute" do
-      @node[:command] = {:ps => ""}
+      @node.automatic_attrs[:command] = {:ps => ""}
       @provider.load_current_resource
       @provider.action = :start
       @provider.define_resource_requirements
@@ -209,4 +222,14 @@ RUNNING_PS
       @provider.reload_service()
     end
   end
+
+  describe "when a custom command has been specified" do
+    before do
+      @new_resource.start_command("/etc/init.d/chef startyousillysally")
+    end
+
+    it "should still pass all why run assertions" do
+      lambda { @provider.run_action(:start) }.should_not raise_error(Chef::Exceptions::Service)
+    end
+  end
 end

data/spec/unit/provider/service/insserv_service_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Provider::Service::Insserv do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @node[:command] = {:ps => "ps -ax"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ax"}
 
     @new_resource = Chef::Resource::Service.new("initgrediant")
     @current_resource = Chef::Resource::Service.new("initgrediant")

data/spec/unit/provider/service/invokercd_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Invokercd, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -95,14 +95,14 @@ PS
   
   describe "when the node has not specified a ps command" do
     it "should raise error if the node has a nil ps attribute and no other means to get status" do
-      @node[:command] = {:ps => nil}
+      @node.automatic_attrs[:command] = {:ps => nil}
       @provider.action = :start
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
     end
 
     it "should raise error if the node has an empty ps attribute and no other means to get status" do
-      @node[:command] = {:ps => ""}
+      @node.automatic_attrs[:command] = {:ps => ""}
       @provider.action = :start
       @provider.define_resource_requirements
       lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)

data/spec/unit/provider/service/redhat_spec.rb

@@ -44,7 +44,7 @@ describe "Chef::Provider::Service::Redhat" do
 
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => 'foo'}
+    @node.automatic_attrs[:command] = {:ps => 'foo'}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
  

data/spec/unit/provider/service/simple_service_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::Service::Simple, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node[:command] = {:ps => "ps -ef"}
+    @node.automatic_attrs[:command] = {:ps => "ps -ef"}
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -51,13 +51,13 @@ NOMOCKINGSTRINGSPLZ
   end
 
   it "should raise error if the node has a nil ps attribute and no other means to get status" do
-    @node[:command] = {:ps => nil}
+    @node.automatic_attrs[:command] = {:ps => nil}
     @provider.define_resource_requirements
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end
 
   it "should raise error if the node has an empty ps attribute and no other means to get status" do
-    @node[:command] = {:ps => ""}
+    @node.automatic_attrs[:command] = {:ps => ""}
     @provider.define_resource_requirements
     lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
   end

data/spec/unit/provider/service/upstart_service_spec.rb

@@ -21,9 +21,9 @@ require 'spec_helper'
 describe Chef::Provider::Service::Upstart do
   before(:each) do
     @node =Chef::Node.new
-    @node[:name] = 'upstarter'
-    @node[:platform] = 'ubuntu'
-    @node[:platform_version] = '9.10'
+    @node.name('upstarter')
+    @node.automatic_attrs[:platform] = 'ubuntu'
+    @node.automatic_attrs[:platform_version] = '9.10'
 
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
@@ -38,7 +38,7 @@ describe Chef::Provider::Service::Upstart do
     end
 
     it "should return /etc/event.d as the upstart job directory when running on Ubuntu 9.04" do
-      @node[:platform_version] = '9.04'
+      @node.automatic_attrs[:platform_version] = '9.04'
       #Chef::Platform.stub!(:find_platform_and_version).and_return([ "ubuntu", "9.04" ])
       @provider = Chef::Provider::Service::Upstart.new(@new_resource, @run_context)
       @provider.instance_variable_get(:@upstart_job_dir).should == "/etc/event.d"
@@ -46,14 +46,14 @@ describe Chef::Provider::Service::Upstart do
     end
 
     it "should return /etc/init as the upstart job directory when running on Ubuntu 9.10" do
-      @node[:platform_version] = '9.10'
+      @node.automatic_attrs[:platform_version] = '9.10'
       @provider = Chef::Provider::Service::Upstart.new(@new_resource, @run_context)
       @provider.instance_variable_get(:@upstart_job_dir).should == "/etc/init"
       @provider.instance_variable_get(:@upstart_conf_suffix).should == ".conf"
     end
 
     it "should return /etc/init as the upstart job directory by default" do
-      @node[:platform_version] = '9000'
+      @node.automatic_attrs[:platform_version] = '9000'
       @provider = Chef::Provider::Service::Upstart.new(@new_resource, @run_context)
       @provider.instance_variable_get(:@upstart_job_dir).should == "/etc/init"
       @provider.instance_variable_get(:@upstart_conf_suffix).should == ".conf"
@@ -62,7 +62,7 @@ describe Chef::Provider::Service::Upstart do
 
   describe "load_current_resource" do
     before(:each) do
-      @node[:command] = {:ps => "ps -ax"}
+      @node.automatic_attrs[:command] = {:ps => "ps -ax"}
 
       @current_resource = Chef::Resource::Service.new("rsyslog")
       Chef::Resource::Service.stub!(:new).and_return(@current_resource)

data/spec/unit/provider/service_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Provider::Service do
       @current_resource.enabled(false)
       @provider.should_receive(:enable_service).and_return(true)
       @provider.action_enable
-      @provider.converge
+      @provider.set_updated_status
       @provider.new_resource.should be_updated
     end
 
@@ -44,7 +44,7 @@ describe Chef::Provider::Service do
       @current_resource.enabled(true)
       @provider.should_not_receive(:enable_service)
       @provider.action_enable
-      @provider.converge
+      @provider.set_updated_status
       @provider.new_resource.should_not be_updated
     end
   end

data/spec/unit/provider/subversion_spec.rb

@@ -63,7 +63,7 @@ describe Chef::Provider::Subversion do
                           "Last Changed Author: codeninja\n" +
                           "Last Changed Rev: 11410\n" + # Last Changed Rev is preferred to Revision
                           "Last Changed Date: 2009-03-25 06:09:56 -0600 (Wed, 25 Mar 2009)\n\n"
-      ::File.should_receive(:exist?).with("/my/deploy/dir/.svn").and_return(true)
+      ::File.should_receive(:exist?).at_least(1).times.with("/my/deploy/dir/.svn").and_return(true)
       ::File.should_receive(:directory?).with("/my/deploy/dir").and_return(true)
       ::Dir.should_receive(:chdir).with("/my/deploy/dir").and_yield
       @stdout.stub!(:string).and_return(example_svn_info)

data/spec/unit/provider/template_spec.rb

@@ -26,7 +26,9 @@ describe Chef::Provider::Template do
     Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, @cookbook_repo) }
 
     @node = Chef::Node.new
-    @cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(@cookbook_repo))
+    cl = Chef::CookbookLoader.new(@cookbook_repo)
+    cl.load_cookbooks
+    @cookbook_collection = Chef::CookbookCollection.new(cl)
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
 
@@ -45,16 +47,16 @@ describe Chef::Provider::Template do
                     else
                       Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
                     end
-    group_struct = OpenStruct.new(:name => "root", :passwd => "x", :gid => 0)
+    group_struct = mock("Group Ent", :name => "root", :passwd => "x", :gid => 0)
     Etc.stub!(:getpwuid).and_return(passwd_struct)
     Etc.stub!(:getgrgid).and_return(group_struct)
   end
 
   describe "when creating the template" do
 
-    before do 
-
+    before do
     end
+
     after do
       FileUtils.rm(@rendered_file_location) if ::File.exist?(@rendered_file_location)
     end
@@ -87,7 +89,7 @@ describe Chef::Provider::Template do
       it "creates the template with the rendered content" do
         @access_controls.stub!(:requires_changes?).and_return(true)
         @access_controls.should_receive(:set_all!)
-        @node[:slappiness] = "a warm gun"
+        @node.normal[:slappiness] = "a warm gun"
         @provider.should_receive(:backup)
         @provider.run_action(:create)
         IO.read(@rendered_file_location).should == "slappiness is a warm gun"
@@ -107,12 +109,35 @@ describe Chef::Provider::Template do
       it "creates the template with the rendered content for the create if missing action" do
         @access_controls.stub!(:requires_changes?).and_return(true)
         @access_controls.should_receive(:set_all!)
-        @node[:slappiness] = "happiness"
+        @node.normal[:slappiness] = "happiness"
         @provider.should_receive(:backup)
         @provider.run_action(:create_if_missing)
         IO.read(@rendered_file_location).should == "slappiness is happiness"
         @resource.should be_updated_by_last_action
       end
+
+      context "and no access control settings are set on the resource" do
+        context "on a Unix system" do
+          before do
+            Chef::Platform.stub!(:windows?).and_return(false)
+          end
+
+          it "sets access control metadata on the new resource" do
+            @access_controls.stub!(:requires_changes?).and_return(false)
+            @access_controls.should_receive(:set_all!)
+            @node.normal[:slappiness] = "happiness"
+            @provider.should_receive(:backup)
+            @provider.run_action(:create)
+            IO.read(@rendered_file_location).should == "slappiness is happiness"
+            @resource.should be_updated_by_last_action
+
+            # Veracity of actual data checked in functional tests
+            @resource.owner.should be_a_kind_of(String)
+            @resource.group.should be_a_kind_of(String)
+            @resource.mode.should be_a_kind_of(String)
+          end
+        end
+      end
     end
 
     describe "when the target file has the wrong content" do
@@ -121,7 +146,7 @@ describe Chef::Provider::Template do
       end
 
       it "overwrites the file with the updated content when the create action is run" do
-        @node[:slappiness] = "a warm gun"
+        @node.normal[:slappiness] = "a warm gun"
         @access_controls.stub!(:requires_changes?).and_return(false)
         @access_controls.should_receive(:set_all!)
         @provider.should_receive(:backup)
@@ -144,7 +169,7 @@ describe Chef::Provider::Template do
       it "doesn't overwrite the file when the create if missing action is run" do
         @access_controls.stub!(:requires_changes?).and_return(false)
         @access_controls.should_not_receive(:set_all!)
-        @node[:slappiness] = "a warm gun"
+        @node.normal[:slappiness] = "a warm gun"
         @provider.should_not_receive(:backup)
         @provider.run_action(:create_if_missing)
         IO.read(@rendered_file_location).should == "blargh"
@@ -154,7 +179,6 @@ describe Chef::Provider::Template do
 
     describe "when the target has the correct content" do
       before do
-        Chef::ChecksumCache.instance.reset!
         File.open(@rendered_file_location, "w") { |f| f.print "slappiness is a warm gun" }
         @current_resource.checksum('4ff94a87794ed9aefe88e734df5a66fc8727a179e9496cbd88e3b5ec762a5ee9')
         @access_controls = mock("access controls")
@@ -162,7 +186,7 @@ describe Chef::Provider::Template do
       end
 
       it "does not backup the original or overwrite it" do
-        @node[:slappiness] = "a warm gun"
+        @node.normal[:slappiness] = "a warm gun"
         @access_controls.stub!(:requires_changes?).and_return(false)
         @provider.should_not_receive(:backup)
         FileUtils.should_not_receive(:mv)
@@ -171,7 +195,7 @@ describe Chef::Provider::Template do
       end
 
       it "does not backup the original or overwrite it on create if missing" do
-        @node[:slappiness] = "a warm gun"
+        @node.normal[:slappiness] = "a warm gun"
         @access_controls.stub!(:requires_changes?).and_return(false)
         @provider.should_not_receive(:backup)
         FileUtils.should_not_receive(:mv)

data/spec/unit/provider/user/dscl_spec.rb

@@ -54,6 +54,12 @@ describe Chef::Provider::User::Dscl do
       @provider.should_receive(:shell_out).with('dscl . -cmd /Path args').and_return(shell_return)
       lambda { @provider.safe_dscl("cmd /Path args") }.should raise_error(Chef::Exceptions::DsclCommandFailed)
     end
+
+    it "raises an exception when dscl reports 'eDSRecordNotFound'" do
+      shell_return = ShellCmdResult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", 'err', -14136)
+      @provider.should_receive(:shell_out).with('dscl . -cmd /Path args').and_return(shell_return)
+      lambda { @provider.safe_dscl("cmd /Path args") }.should raise_error(Chef::Exceptions::DsclCommandFailed)
+    end
   end
 
   describe "get_free_uid" do
@@ -324,42 +330,62 @@ describe Chef::Provider::User::Dscl do
   end
 
   describe "when the user does not yet exist and chef is creating it" do
-    before do
-      @new_resource.comment "#mockssuck"
-      @new_resource.gid 1001
-    end
-    
-    it "creates the user, comment field, sets uid, gid, configures the home directory, sets the shell, and sets the password" do
-      @provider.should_receive :dscl_create_user
-      @provider.should_receive :dscl_create_comment
-      @provider.should_receive :set_uid
-      @provider.should_receive :dscl_set_gid
-      @provider.should_receive :modify_home
-      @provider.should_receive :dscl_set_shell
-      @provider.should_receive :modify_password
-      @provider.create_user
-    end
+    context "with a numeric gid" do
+      before do
+        @new_resource.comment "#mockssuck"
+        @new_resource.gid 1001
+      end
 
-    it "creates the user and sets the comment field" do
-      @provider.should_receive(:safe_dscl).with("create /Users/toor").and_return(true)
-      @provider.dscl_create_user
-    end
-    
-    it "sets the comment field" do
-      @provider.should_receive(:safe_dscl).with("create /Users/toor RealName '#mockssuck'").and_return(true)
-      @provider.dscl_create_comment
-    end
+      it "creates the user, comment field, sets uid, gid, configures the home directory, sets the shell, and sets the password" do
+        @provider.should_receive :dscl_create_user
+        @provider.should_receive :dscl_create_comment
+        @provider.should_receive :set_uid
+        @provider.should_receive :dscl_set_gid
+        @provider.should_receive :modify_home
+        @provider.should_receive :dscl_set_shell
+        @provider.should_receive :modify_password
+        @provider.create_user
+      end
 
-    it "should run safe_dscl with create /Users/user PrimaryGroupID to set the users primary group" do
-      @provider.should_receive(:safe_dscl).with("create /Users/toor PrimaryGroupID '1001'").and_return(true)
-      @provider.dscl_set_gid
-    end
+      it "creates the user and sets the comment field" do
+        @provider.should_receive(:safe_dscl).with("create /Users/toor").and_return(true)
+        @provider.dscl_create_user
+      end
+
+      it "sets the comment field" do
+        @provider.should_receive(:safe_dscl).with("create /Users/toor RealName '#mockssuck'").and_return(true)
+        @provider.dscl_create_comment
+      end
+
+      it "should run safe_dscl with create /Users/user PrimaryGroupID to set the users primary group" do
+        @provider.should_receive(:safe_dscl).with("create /Users/toor PrimaryGroupID '1001'").and_return(true)
+        @provider.dscl_set_gid
+      end
 
-    it "should run safe_dscl with create /Users/user UserShell to set the users login shell" do
-      @provider.should_receive(:safe_dscl).with("create /Users/toor UserShell '/usr/bin/false'").and_return(true)
-      @provider.dscl_set_shell
+      it "should run safe_dscl with create /Users/user UserShell to set the users login shell" do
+        @provider.should_receive(:safe_dscl).with("create /Users/toor UserShell '/usr/bin/false'").and_return(true)
+        @provider.dscl_set_shell
+      end
     end
 
+    context "with a non-numeric gid" do
+      before do
+        @new_resource.comment "#mockssuck"
+        @new_resource.gid "newgroup"
+      end
+
+      it "should map the group name to a numeric ID when the group exists" do
+        @provider.should_receive(:safe_dscl).with("read /Groups/newgroup PrimaryGroupID").ordered.and_return("PrimaryGroupID: 1001\n")
+        @provider.should_receive(:safe_dscl).with("create /Users/toor PrimaryGroupID '1001'").ordered.and_return(true)
+        @provider.dscl_set_gid
+      end
+
+      it "should raise an exception when the group does not exist" do
+        shell_return = ShellCmdResult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", 'err', -14136)
+        @provider.should_receive(:shell_out).with('dscl . -read /Groups/newgroup PrimaryGroupID').and_return(shell_return)
+        lambda { @provider.dscl_set_gid }.should raise_error(Chef::Exceptions::GroupIDNotFound)
+      end
+    end
   end
 
   describe "when the user exists and chef is managing it" do