chef 11.6.2 → 11.8.0.rc.1

data/spec/unit/knife/role_create_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -27,7 +27,7 @@ describe Chef::Knife::RoleCreate do
     }
     @knife.name_args = [ "adam" ]
     @knife.stub!(:output).and_return(true)
-    @role = Chef::Role.new() 
+    @role = Chef::Role.new()
     @role.stub!(:save)
     Chef::Role.stub!(:new).and_return(@role)
     @knife.stub!(:edit_data).and_return(@role)

data/spec/unit/knife/role_delete_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -28,7 +28,7 @@ describe Chef::Knife::RoleDelete do
     @knife.name_args = [ "adam" ]
     @knife.stub!(:output).and_return(true)
     @knife.stub!(:confirm).and_return(true)
-    @role = Chef::Role.new() 
+    @role = Chef::Role.new()
     @role.stub!(:destroy).and_return(true)
     Chef::Role.stub!(:load).and_return(@role)
     @stdout = StringIO.new

data/spec/unit/knife/role_list_spec.rb

@@ -6,9 +6,9 @@
 # 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.

data/spec/unit/knife/ssh_spec.rb

@@ -21,17 +21,10 @@ require 'net/ssh'
 require 'net/ssh/multi'
 
 describe Chef::Knife::Ssh do
-  before(:all) do
-    @original_config = Chef::Config.hash_dup
-    @original_knife_config = Chef::Config[:knife].dup
+  before(:each) do
     Chef::Config[:client_key] = CHEF_SPEC_DATA + "/ssl/private_key.pem"
   end
 
-  after(:all) do
-    Chef::Config.configuration = @original_config
-    Chef::Config[:knife] = @original_knife_config
-  end
-
   before do
     @knife = Chef::Knife::Ssh.new
     @knife.merge_configs

data/spec/unit/knife_spec.rb

@@ -203,7 +203,6 @@ describe Chef::Knife do
         KnifeSpecs::TestYourself.option(:opt_with_default,
                                         :short => "-D VALUE",
                                         :default => "default-value")
-        Chef::Config[:knife] = {}
       end
 
       it "prefers the default value if no config or command line value is present" do
@@ -227,7 +226,6 @@ describe Chef::Knife do
       end
     end
 
-
   end
 
   describe "when first created" do

data/spec/unit/log_spec.rb

@@ -6,9 +6,9 @@
 # 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.

data/spec/unit/mash_spec.rb

@@ -35,7 +35,7 @@ describe Mash do
     @copy = @orig.dup
     @copy.to_hash.should == Mash.new(data).to_hash
     @copy[:z] << 4
-    @orig[:z].should == [1,2,3] 
+    @orig[:z].should == [1,2,3]
   end
 
   it "should duplicate a nested mash to a new mash" do
@@ -44,7 +44,7 @@ describe Mash do
     @copy = @orig.dup
     @copy.to_hash.should == Mash.new(data).to_hash
     @copy[:z][:a] << 4
-    @orig[:z][:a].should == [1,2,3] 
+    @orig[:z][:a].should == [1,2,3]
   end
 
   # add more!

data/spec/unit/mixin/checksum_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -20,7 +20,7 @@ require 'spec_helper'
 require 'chef/mixin/checksum'
 require 'stringio'
 
-class Chef::CMCCheck 
+class Chef::CMCCheck
   include Chef::Mixin::Checksum
 end
 

data/spec/unit/mixin/command_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe Chef::Mixin::Command do
+describe Chef::Mixin::Command, :volatile do
 
   if windows?
 

data/spec/unit/mixin/convert_to_class_name_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -23,23 +23,23 @@ class ConvertToClassTestHarness
 end
 
 describe Chef::Mixin::ConvertToClassName do
-  
+
   before do
     @convert = ConvertToClassTestHarness.new
   end
-  
+
   it "converts a_snake_case_word to a CamelCaseWord" do
     @convert.convert_to_class_name("now_camelized").should == "NowCamelized"
   end
-  
+
   it "converts a CamelCaseWord to a snake_case_word" do
     @convert.convert_to_snake_case("NowImASnake").should == "now_im_a_snake"
   end
-  
+
   it "removes the base classes before snake casing" do
     @convert.convert_to_snake_case("NameSpaced::Class::ThisIsWin", "NameSpaced::Class").should == "this_is_win"
   end
-  
+
   it "removes the base classes without explicitly naming them and returns snake case" do
     @convert.snake_case_basename("NameSpaced::Class::ExtraWin").should == "extra_win"
   end

data/spec/unit/mixin/deprecation_spec.rb

@@ -6,9 +6,9 @@
 # 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.

data/spec/unit/mixin/params_validate_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -20,7 +20,7 @@ require 'spec_helper'
 
 class TinyClass
   include Chef::Mixin::ParamsValidate
-  
+
   def music(is_good=true)
     is_good
   end
@@ -30,136 +30,136 @@ describe Chef::Mixin::ParamsValidate do
   before(:each) do
      @vo = TinyClass.new()
   end
-  
+
   it "should allow a hash and a hash as arguments to validate" do
     lambda { @vo.validate({:one => "two"}, {}) }.should_not raise_error(ArgumentError)
   end
-  
+
   it "should raise an argument error if validate is called incorrectly" do
     lambda { @vo.validate("one", "two") }.should raise_error(ArgumentError)
   end
-  
+
   it "should require validation map keys to be symbols or strings" do
     lambda { @vo.validate({:one => "two"}, { :one => true }) }.should_not raise_error(ArgumentError)
     lambda { @vo.validate({:one => "two"}, { "one" => true }) }.should_not raise_error(ArgumentError)
     lambda { @vo.validate({:one => "two"}, { Hash.new => true }) }.should raise_error(ArgumentError)
   end
-  
+
   it "should allow options to be required with true" do
     lambda { @vo.validate({:one => "two"}, { :one => true }) }.should_not raise_error(ArgumentError)
   end
-  
+
   it "should allow options to be optional with false" do
     lambda { @vo.validate({}, {:one => false})}.should_not raise_error(ArgumentError)
-  end    
-  
+  end
+
   it "should allow you to check what kind_of? thing an argument is with kind_of" do
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => "string"}, 
+        {:one => "string"},
         {
           :one => {
             :kind_of => String
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
-    
-    lambda { 
+
+    lambda {
       @vo.validate(
-        {:one => "string"}, 
+        {:one => "string"},
         {
           :one => {
             :kind_of => Array
           }
         }
-      ) 
+      )
     }.should raise_error(ArgumentError)
   end
-  
+
   it "should allow you to specify an argument is required with required" do
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => "string"}, 
+        {:one => "string"},
         {
           :one => {
             :required => true
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
-    
-    lambda { 
+
+    lambda {
       @vo.validate(
-        {:two => "string"}, 
+        {:two => "string"},
         {
           :one => {
             :required => true
           }
         }
-      ) 
+      )
     }.should raise_error(ArgumentError)
-    
-    lambda { 
+
+    lambda {
       @vo.validate(
-        {:two => "string"}, 
+        {:two => "string"},
         {
           :one => {
             :required => false
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
   end
-  
+
   it "should allow you to specify whether an object has a method with respond_to" do
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => @vo}, 
+        {:one => @vo},
         {
           :one => {
             :respond_to => "validate"
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
-    
-    lambda { 
+
+    lambda {
       @vo.validate(
-        {:one => @vo}, 
+        {:one => @vo},
         {
           :one => {
             :respond_to => "monkey"
           }
         }
-      ) 
+      )
     }.should raise_error(ArgumentError)
   end
-  
+
   it "should allow you to specify whether an object has all the given methods with respond_to and an array" do
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => @vo}, 
+        {:one => @vo},
         {
           :one => {
             :respond_to => ["validate", "music"]
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
-    
-    lambda { 
+
+    lambda {
       @vo.validate(
-        {:one => @vo}, 
+        {:one => @vo},
         {
           :one => {
             :respond_to => ["monkey", "validate"]
           }
         }
-      ) 
+      )
     }.should raise_error(ArgumentError)
   end
-  
+
   it "should let you set a default value with default => value" do
     arguments = Hash.new
     @vo.validate(arguments, {
@@ -169,9 +169,9 @@ describe Chef::Mixin::ParamsValidate do
     })
     arguments[:one].should == "is the loneliest number"
   end
-  
+
   it "should let you check regular expressions" do
-    lambda { 
+    lambda {
       @vo.validate(
         { :one => "is good" },
         {
@@ -181,8 +181,8 @@ describe Chef::Mixin::ParamsValidate do
         }
       )
     }.should_not raise_error(ArgumentError)
-    
-    lambda { 
+
+    lambda {
       @vo.validate(
         { :one => "is good" },
         {
@@ -193,9 +193,9 @@ describe Chef::Mixin::ParamsValidate do
       )
     }.should raise_error(ArgumentError)
   end
-  
+
   it "should let you specify your own callbacks" do
-    lambda { 
+    lambda {
       @vo.validate(
         { :one => "is good" },
         {
@@ -208,9 +208,9 @@ describe Chef::Mixin::ParamsValidate do
           }
         }
       )
-    }.should_not raise_error(ArgumentError) 
-    
-    lambda { 
+    }.should_not raise_error(ArgumentError)
+
+    lambda {
       @vo.validate(
         { :one => "is bad" },
         {
@@ -223,12 +223,12 @@ describe Chef::Mixin::ParamsValidate do
           }
         }
       )
-    }.should raise_error(ArgumentError)   
+    }.should raise_error(ArgumentError)
   end
-  
+
   it "should let you combine checks" do
     args = { :one => "is good", :two => "is bad" }
-    lambda { 
+    lambda {
       @vo.validate(
         args,
         {
@@ -276,7 +276,7 @@ describe Chef::Mixin::ParamsValidate do
       )
     }.should raise_error(ArgumentError)
   end
-  
+
   it "should raise an ArgumentError if the validation map has an unknown check" do
     lambda { @vo.validate(
         { :one => "two" },
@@ -288,43 +288,43 @@ describe Chef::Mixin::ParamsValidate do
       )
     }.should raise_error(ArgumentError)
   end
-  
+
   it "should accept keys that are strings in the options" do
     lambda {
-      @vo.validate({ "one" => "two" }, { :one => { :regex => /^two$/ }}) 
+      @vo.validate({ "one" => "two" }, { :one => { :regex => /^two$/ }})
     }.should_not raise_error(ArgumentError)
   end
-  
+
   it "should allow an array to kind_of" do
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => "string"}, 
+        {:one => "string"},
         {
           :one => {
             :kind_of => [ String, Array ]
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => ["string"]}, 
+        {:one => ["string"]},
         {
           :one => {
             :kind_of => [ String, Array ]
           }
         }
-      ) 
+      )
     }.should_not raise_error(ArgumentError)
-    lambda { 
+    lambda {
       @vo.validate(
-        {:one => Hash.new}, 
+        {:one => Hash.new},
         {
           :one => {
             :kind_of => [ String, Array ]
           }
         }
-      ) 
+      )
     }.should raise_error(ArgumentError)
   end
 
@@ -403,5 +403,5 @@ describe Chef::Mixin::ParamsValidate do
     @vo.set_or_return(:test, nil, {}).object_id.should == value.object_id
     @vo.set_or_return(:test, nil, {}).should be_a(Proc)
   end
-  
+
 end