chef 11.10.0.rc.0 → 11.10.0.rc.1

data/spec/unit/knife/role_create_spec.rb

@@ -26,13 +26,13 @@ describe Chef::Knife::RoleCreate do
       :description => nil
     }
     @knife.name_args = [ "adam" ]
-    @knife.stub!(:output).and_return(true)
+    @knife.stub(:output).and_return(true)
     @role = Chef::Role.new()
-    @role.stub!(:save)
-    Chef::Role.stub!(:new).and_return(@role)
-    @knife.stub!(:edit_data).and_return(@role)
+    @role.stub(:save)
+    Chef::Role.stub(:new).and_return(@role)
+    @knife.stub(:edit_data).and_return(@role)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/role_delete_spec.rb

@@ -26,13 +26,13 @@ describe Chef::Knife::RoleDelete do
       :print_after => nil
     }
     @knife.name_args = [ "adam" ]
-    @knife.stub!(:output).and_return(true)
-    @knife.stub!(:confirm).and_return(true)
+    @knife.stub(:output).and_return(true)
+    @knife.stub(:confirm).and_return(true)
     @role = Chef::Role.new()
-    @role.stub!(:destroy).and_return(true)
-    Chef::Role.stub!(:load).and_return(@role)
+    @role.stub(:destroy).and_return(true)
+    Chef::Role.stub(:load).and_return(@role)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/role_edit_spec.rb

@@ -24,12 +24,12 @@ describe Chef::Knife::RoleEdit do
     @knife = Chef::Knife::RoleEdit.new
     @knife.config[:print_after] = nil
     @knife.name_args = [ "adam" ]
-    @knife.ui.stub!(:output).and_return(true)
+    @knife.ui.stub(:output).and_return(true)
     @role = Chef::Role.new()
-    @role.stub!(:save)
-    Chef::Role.stub!(:load).and_return(@role)
-    @knife.ui.stub!(:edit_data).and_return(@role)
-    @knife.ui.stub!(:msg)
+    @role.stub(:save)
+    Chef::Role.stub(:load).and_return(@role)
+    @knife.ui.stub(:edit_data).and_return(@role)
+    @knife.ui.stub(:msg)
   end
 
   describe "run" do

data/spec/unit/knife/role_from_file_spec.rb

@@ -28,13 +28,13 @@ describe Chef::Knife::RoleFromFile do
       :print_after => nil
     }
     @knife.name_args = [ "adam.rb" ]
-    @knife.stub!(:output).and_return(true)
-    @knife.stub!(:confirm).and_return(true)
+    @knife.stub(:output).and_return(true)
+    @knife.stub(:confirm).and_return(true)
     @role = Chef::Role.new()
-    @role.stub!(:save)
-    @knife.loader.stub!(:load_from).and_return(@role)
+    @role.stub(:save)
+    @knife.loader.stub(:load_from).and_return(@role)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/role_list_spec.rb

@@ -22,12 +22,12 @@ describe Chef::Knife::RoleList do
   before(:each) do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::RoleList.new
-    @knife.stub!(:output).and_return(true)
+    @knife.stub(:output).and_return(true)
     @list = {
       "foo" => "http://example.com/foo",
       "bar" => "http://example.com/foo"
     }
-    Chef::Role.stub!(:list).and_return(@list)
+    Chef::Role.stub(:list).and_return(@list)
   end
 
   describe "run" do

data/spec/unit/knife/ssh_spec.rb

@@ -45,8 +45,8 @@ describe Chef::Knife::Ssh do
       end
 
       def configure_query(node_array)
-        @query.stub!(:search).and_return([node_array])
-        Chef::Search::Query.stub!(:new).and_return(@query)
+        @query.stub(:search).and_return([node_array])
+        Chef::Search::Query.stub(:new).and_return(@query)
       end
 
       def self.should_return_specified_attributes
@@ -99,10 +99,10 @@ describe Chef::Knife::Ssh do
 
       context "when there are some hosts found but they do not have an attribute to connect with" do
         before do
-          @query.stub!(:search).and_return([[@node_foo, @node_bar]])
+          @query.stub(:search).and_return([[@node_foo, @node_bar]])
           @node_foo.automatic_attrs[:fqdn] = nil
           @node_bar.automatic_attrs[:fqdn] = nil
-          Chef::Search::Query.stub!(:new).and_return(@query)
+          Chef::Search::Query.stub(:new).and_return(@query)
         end
 
         it "should raise a specific error (CHEF-3402)" do
@@ -175,7 +175,7 @@ describe Chef::Knife::Ssh do
     before :each do
       @knife.instance_variable_set(:@longest, 0)
       ssh_config = {:timeout => 50, :user => "locutus", :port => 23 }
-      Net::SSH.stub!(:configuration_for).with('the.b.org').and_return(ssh_config)
+      Net::SSH.stub(:configuration_for).with('the.b.org').and_return(ssh_config)
     end
 
     it "uses the port from an ssh config file" do
@@ -257,7 +257,7 @@ describe Chef::Knife::Ssh do
     before do
       @query = Chef::Search::Query.new
       @query.should_receive(:search).and_return([[@node_foo]])
-      Chef::Search::Query.stub!(:new).and_return(@query)
+      Chef::Search::Query.stub(:new).and_return(@query)
       @knife.stub(:ssh_command).and_return(exit_code)
       @knife.name_args = ['*:*', 'false']
     end

data/spec/unit/knife/status_spec.rb

@@ -25,12 +25,12 @@ describe Chef::Knife::Status do
       n.automatic_attrs["fqdn"] = "foobar"
       n.automatic_attrs["ohai_time"] = 1343845969
     end
-    query = mock("Chef::Search::Query")
-    query.stub!(:search).and_yield(node)
-    Chef::Search::Query.stub!(:new).and_return(query)
+    query = double("Chef::Search::Query")
+    query.stub(:search).and_yield(node)
+    Chef::Search::Query.stub(:new).and_return(query)
     @knife  = Chef::Knife::Status.new
     @stdout = StringIO.new
-    @knife.stub!(:highline).and_return(HighLine.new(StringIO.new, @stdout))
+    @knife.stub(:highline).and_return(HighLine.new(StringIO.new, @stdout))
   end
 
   describe "run" do

data/spec/unit/knife/tag_create_spec.rb

@@ -7,10 +7,10 @@ describe Chef::Knife::TagCreate do
     @knife.name_args = [ Chef::Config[:node_name], "happytag" ]
 
     @node = Chef::Node.new
-    @node.stub! :save
-    Chef::Node.stub!(:load).and_return @node
+    @node.stub :save
+    Chef::Node.stub(:load).and_return @node
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/tag_delete_spec.rb

@@ -7,11 +7,11 @@ describe Chef::Knife::TagDelete do
     @knife.name_args = [ Chef::Config[:node_name], "sadtag" ]
 
     @node = Chef::Node.new
-    @node.stub! :save
+    @node.stub :save
     @node.tags << "sadtag" << "happytag"
-    Chef::Node.stub!(:load).and_return @node
+    Chef::Node.stub(:load).and_return @node
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/tag_list_spec.rb

@@ -7,9 +7,9 @@ describe Chef::Knife::TagList do
     @knife.name_args = [ Chef::Config[:node_name], "sadtag" ]
 
     @node = Chef::Node.new
-    @node.stub! :save
+    @node.stub :save
     @node.tags << "sadtag" << "happytag"
-    Chef::Node.stub!(:load).and_return @node
+    Chef::Node.stub(:load).and_return @node
   end
 
   describe "run" do

data/spec/unit/knife/user_create_spec.rb

@@ -30,14 +30,14 @@ describe Chef::Knife::UserCreate do
     @user_with_private_key = Chef::User.new
     @user_with_private_key.name "a_user"
     @user_with_private_key.private_key 'private_key'
-    @user.stub!(:create).and_return(@user_with_private_key)
-    Chef::User.stub!(:new).and_return(@user)
-    Chef::User.stub!(:from_hash).and_return(@user)
-    @knife.stub!(:edit_data).and_return(@user.to_hash)
+    @user.stub(:create).and_return(@user_with_private_key)
+    Chef::User.stub(:new).and_return(@user)
+    Chef::User.stub(:from_hash).and_return(@user)
+    @knife.stub(:edit_data).and_return(@user.to_hash)
     @stdout = StringIO.new
     @stderr = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
-    @knife.ui.stub!(:stderr).and_return(@stderr)
+    @knife.ui.stub(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   it "creates a new user" do
@@ -78,7 +78,7 @@ describe Chef::Knife::UserCreate do
 
   it "writes the private key to a file when --file is specified" do
     @knife.config[:file] = "/tmp/a_file"
-    filehandle = mock("filehandle")
+    filehandle = double("filehandle")
     filehandle.should_receive(:print).with('private_key')
     File.should_receive(:open).with("/tmp/a_file", "w").and_yield(filehandle)
     @knife.run

data/spec/unit/knife/user_reregister_spec.rb

@@ -23,10 +23,10 @@ describe Chef::Knife::UserReregister do
     Chef::Knife::UserReregister.load_deps
     @knife = Chef::Knife::UserReregister.new
     @knife.name_args = [ 'a_user' ]
-    @user_mock = mock('user_mock', :private_key => "private_key")
-    Chef::User.stub!(:load).and_return(@user_mock)
+    @user_mock = double('user_mock', :private_key => "private_key")
+    Chef::User.stub(:load).and_return(@user_mock)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   it 'prints usage and exits when a user name is not provided' do

data/spec/unit/knife/user_show_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::UserShow do
     Chef::Knife::UserShow.load_deps
     @knife = Chef::Knife::UserShow.new
     @knife.name_args = [ 'my_user' ]
-    @user_mock = mock('user_mock')
+    @user_mock = double('user_mock')
   end
 
   it 'loads and displays the user' do

data/spec/unit/knife_spec.rb

@@ -29,14 +29,14 @@ describe Chef::Knife do
 
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife.new
-    @knife.ui.stub!(:puts)
-    @knife.ui.stub!(:print)
-    Chef::Log.stub!(:init)
-    Chef::Log.stub!(:level)
+    @knife.ui.stub(:puts)
+    @knife.ui.stub(:print)
+    Chef::Log.stub(:init)
+    Chef::Log.stub(:level)
     [:debug, :info, :warn, :error, :crit].each do |level_sym|
-      Chef::Log.stub!(level_sym)
+      Chef::Log.stub(level_sym)
     end
-    Chef::Knife.stub!(:puts)
+    Chef::Knife.stub(:puts)
     @stdout = StringIO.new
   end
 
@@ -52,7 +52,7 @@ describe Chef::Knife do
           ENV.should_receive(:[]).with("PWD").and_return("/home/someuser/prod/chef-repo")
         end
 
-        Dir.stub!(:pwd).and_return("/home/someuser/codes/chef-repo")
+        Dir.stub(:pwd).and_return("/home/someuser/codes/chef-repo")
       end
 
       after do
@@ -183,7 +183,7 @@ describe Chef::Knife do
     end
 
     it "exits if no subcommand matches the CLI args" do
-      Chef::Knife.ui.stub!(:stdout).and_return(@stdout)
+      Chef::Knife.ui.stub(:stdout).and_return(@stdout)
       Chef::Knife.ui.should_receive(:fatal)
       lambda {Chef::Knife.run(%w{fuuu uuuu fuuuu})}.should raise_error(SystemExit) { |e| e.status.should_not == 0 }
     end
@@ -264,8 +264,8 @@ describe Chef::Knife do
     it "formats 401s nicely" do
       response = Net::HTTPUnauthorized.new("1.1", "401", "Unauthorized")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "y u no syncronize your clock?"))
-      @knife.stub!(:run).and_raise(Net::HTTPServerException.new("401 Unauthorized", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "y u no syncronize your clock?"))
+      @knife.stub(:run).and_raise(Net::HTTPServerException.new("401 Unauthorized", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(/ERROR: Failed to authenticate to/)
       @stdout.string.should match(/Response:  y u no syncronize your clock\?/)
@@ -274,9 +274,9 @@ describe Chef::Knife do
     it "formats 403s nicely" do
       response = Net::HTTPForbidden.new("1.1", "403", "Forbidden")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "y u no administrator"))
-      @knife.stub!(:run).and_raise(Net::HTTPServerException.new("403 Forbidden", response))
-      @knife.stub!(:username).and_return("sadpanda")
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "y u no administrator"))
+      @knife.stub(:run).and_raise(Net::HTTPServerException.new("403 Forbidden", response))
+      @knife.stub(:username).and_return("sadpanda")
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action])
       @stdout.string.should match(%r[Response:  y u no administrator])
@@ -285,8 +285,8 @@ describe Chef::Knife do
     it "formats 400s nicely" do
       response = Net::HTTPBadRequest.new("1.1", "400", "Bad Request")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "y u search wrong"))
-      @knife.stub!(:run).and_raise(Net::HTTPServerException.new("400 Bad Request", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "y u search wrong"))
+      @knife.stub(:run).and_raise(Net::HTTPServerException.new("400 Bad Request", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: The data in your request was invalid])
       @stdout.string.should match(%r[Response: y u search wrong])
@@ -295,8 +295,8 @@ describe Chef::Knife do
     it "formats 404s nicely" do
       response = Net::HTTPNotFound.new("1.1", "404", "Not Found")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "nothing to see here"))
-      @knife.stub!(:run).and_raise(Net::HTTPServerException.new("404 Not Found", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "nothing to see here"))
+      @knife.stub(:run).and_raise(Net::HTTPServerException.new("404 Not Found", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: The object you are looking for could not be found])
       @stdout.string.should match(%r[Response: nothing to see here])
@@ -305,8 +305,8 @@ describe Chef::Knife do
     it "formats 500s nicely" do
       response = Net::HTTPInternalServerError.new("1.1", "500", "Internal Server Error")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "sad trombone"))
-      @knife.stub!(:run).and_raise(Net::HTTPFatalError.new("500 Internal Server Error", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "sad trombone"))
+      @knife.stub(:run).and_raise(Net::HTTPFatalError.new("500 Internal Server Error", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: internal server error])
       @stdout.string.should match(%r[Response: sad trombone])
@@ -315,8 +315,8 @@ describe Chef::Knife do
     it "formats 502s nicely" do
       response = Net::HTTPBadGateway.new("1.1", "502", "Bad Gateway")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "sadder trombone"))
-      @knife.stub!(:run).and_raise(Net::HTTPFatalError.new("502 Bad Gateway", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "sadder trombone"))
+      @knife.stub(:run).and_raise(Net::HTTPFatalError.new("502 Bad Gateway", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: bad gateway])
       @stdout.string.should match(%r[Response: sadder trombone])
@@ -325,8 +325,8 @@ describe Chef::Knife do
     it "formats 503s nicely" do
       response = Net::HTTPServiceUnavailable.new("1.1", "503", "Service Unavailable")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "saddest trombone"))
-      @knife.stub!(:run).and_raise(Net::HTTPFatalError.new("503 Service Unavailable", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "saddest trombone"))
+      @knife.stub(:run).and_raise(Net::HTTPFatalError.new("503 Service Unavailable", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: Service temporarily unavailable])
       @stdout.string.should match(%r[Response: saddest trombone])
@@ -335,15 +335,15 @@ describe Chef::Knife do
     it "formats other HTTP errors nicely" do
       response = Net::HTTPPaymentRequired.new("1.1", "402", "Payment Required")
       response.instance_variable_set(:@read, true) # I hate you, net/http.
-      response.stub!(:body).and_return(Chef::JSONCompat.to_json(:error => "nobugfixtillyoubuy"))
-      @knife.stub!(:run).and_raise(Net::HTTPServerException.new("402 Payment Required", response))
+      response.stub(:body).and_return(Chef::JSONCompat.to_json(:error => "nobugfixtillyoubuy"))
+      @knife.stub(:run).and_raise(Net::HTTPServerException.new("402 Payment Required", response))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: Payment Required])
       @stdout.string.should match(%r[Response: nobugfixtillyoubuy])
     end
 
     it "formats NameError and NoMethodError nicely" do
-      @knife.stub!(:run).and_raise(NameError.new("Undefined constant FUUU"))
+      @knife.stub(:run).and_raise(NameError.new("Undefined constant FUUU"))
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: knife encountered an unexpected error])
       @stdout.string.should match(%r[This may be a bug in the 'knife' knife command or plugin])
@@ -351,15 +351,15 @@ describe Chef::Knife do
     end
 
     it "formats missing private key errors nicely" do
-      @knife.stub!(:run).and_raise(Chef::Exceptions::PrivateKeyMissing.new('key not there'))
-      @knife.stub!(:api_key).and_return("/home/root/.chef/no-key-here.pem")
+      @knife.stub(:run).and_raise(Chef::Exceptions::PrivateKeyMissing.new('key not there'))
+      @knife.stub(:api_key).and_return("/home/root/.chef/no-key-here.pem")
       @knife.run_with_pretty_exceptions
       @stderr.string.should match(%r[ERROR: Your private key could not be loaded from /home/root/.chef/no-key-here.pem])
       @stdout.string.should match(%r[Check your configuration file and ensure that your private key is readable])
     end
 
     it "formats connection refused errors nicely" do
-      @knife.stub!(:run).and_raise(Errno::ECONNREFUSED.new('y u no shut up'))
+      @knife.stub(:run).and_raise(Errno::ECONNREFUSED.new('y u no shut up'))
       @knife.run_with_pretty_exceptions
       # Errno::ECONNREFUSED message differs by platform
       # *nix = Errno::ECONNREFUSED: Connection refused

data/spec/unit/lwrp_spec.rb

@@ -33,7 +33,7 @@ describe "LWRP" do
 
   describe "when overriding an existing class" do
     before :each do
-      $stderr.stub!(:write)
+      $stderr.stub(:write)
     end
 
     it "should log if attempting to load resource of same name" do
@@ -179,7 +179,7 @@ describe "LWRP" do
     end
 
     it "should create a method for each attribute" do
-      new_resource = mock("new resource", :null_object=>true)
+      new_resource = double("new resource").as_null_object
       Chef::Provider::LwrpBuckPasser.new(nil, new_resource).methods.map{|m|m.to_sym}.should include(:action_pass_buck)
       Chef::Provider::LwrpThumbTwiddler.new(nil, new_resource).methods.map{|m|m.to_sym}.should include(:action_twiddle_thumbs)
     end

data/spec/unit/mixin/checksum_spec.rb

@@ -29,8 +29,8 @@ describe Chef::Mixin::Checksum do
     @checksum_user = Chef::CMCCheck.new
     @cache = Chef::Digester.instance
     @file = CHEF_SPEC_DATA + "/checksum/random.txt"
-    @stat = mock("File::Stat", { :mtime => Time.at(0) })
-    File.stub!(:stat).and_return(@stat)
+    @stat = double("File::Stat", { :mtime => Time.at(0) })
+    File.stub(:stat).and_return(@stat)
   end
 
   it "gets the checksum of a file" do

data/spec/unit/mixin/command_spec.rb

@@ -76,7 +76,7 @@ describe Chef::Mixin::Command, :volatile do
       include Chef::Mixin::Command
 
       it "logs the command's stderr and stdout output if the command failed" do
-        Chef::Log.stub!(:level).and_return(:debug)
+        Chef::Log.stub(:level).and_return(:debug)
         begin
           run_command(:command => "sh -c 'echo hello; echo world >&2; false'")
           violated "Exception expected, but nothing raised."

data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb

@@ -56,8 +56,8 @@ describe Chef::Mixin::EnforceOwnershipAndPermissions do
                         Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
                       end
       group_struct = OpenStruct.new(:name => "root", :passwd => "x", :gid => 0)
-      Etc.stub!(:getpwuid).and_return(passwd_struct)
-      Etc.stub!(:getgrgid).and_return(group_struct)
+      Etc.stub(:getpwuid).and_return(passwd_struct)
+      Etc.stub(:getgrgid).and_return(group_struct)
     end
 
     it "does not set updated_by_last_action on the new resource" do
@@ -80,8 +80,8 @@ describe Chef::Mixin::EnforceOwnershipAndPermissions do
                         Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
                       end
       group_struct = OpenStruct.new(:name => "root", :passwd => "x", :gid => 0)
-      Etc.stub!(:getpwuid).and_return(passwd_struct)
-      Etc.stub!(:getgrgid).and_return(group_struct)
+      Etc.stub(:getpwuid).and_return(passwd_struct)
+      Etc.stub(:getgrgid).and_return(group_struct)
     end
 
     it "sets updated_by_last_action on the new resource" do