chef 11.6.2 → 11.8.0.rc.1

data/spec/unit/mixin/securable_spec.rb

@@ -45,7 +45,6 @@ describe Chef::Mixin::Securable do
   describe "unix-specific behavior" do
     before(:each) do
       platform_mock :unix do
-        @original_config = Chef::Config.hash_dup
         load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "config.rb")
         load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         @securable = Object.new
@@ -54,10 +53,6 @@ describe Chef::Mixin::Securable do
       end
     end
 
-    after(:each) do
-      Chef::Config.configuration = @original_config
-    end
-
     it "should accept a group name or id for group with spaces and backslashes" do
       lambda { @securable.group 'test\ group' }.should_not raise_error(ArgumentError)
     end
@@ -109,7 +104,6 @@ describe Chef::Mixin::Securable do
   describe "windows-specific behavior" do
     before(:each) do
       platform_mock :windows do
-        @original_config = Chef::Config.hash_dup
         load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "config.rb")
         load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         SECURABLE_CLASS = Class.new do
@@ -120,14 +114,6 @@ describe Chef::Mixin::Securable do
       end
     end
 
-    after(:all) do
-      Chef::Config.configuration = @original_config if @original_config
-    end
-
-    after(:each) do
-      Chef::Config.configuration = @original_config if @original_config
-    end
-
     it "should not accept a group name or id for group with spaces and multiple backslashes" do
       lambda { @securable.group 'test\ \group' }.should raise_error(ArgumentError)
     end

data/spec/unit/mixin/shell_out_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Mixin::ShellOut do
     let(:cmd) { "echo '#{rand(1000)}'" }
 
     let(:output) { StringIO.new }
-    let(:capture_log_output) { Chef::Log.logger = Logger.new(output)  }
+    let!(:capture_log_output) { Chef::Log.logger = Logger.new(output)  }
     let(:assume_deprecation_log_level) { Chef::Log.stub!(:level).and_return(:warn) }
 
     context 'without options' do

data/spec/unit/mixin/template_spec.rb

@@ -33,6 +33,40 @@ describe Chef::Mixin::Template, "render_template" do
     output.should == "bar"
   end
 
+  template_contents = [ "Fancy\r\nTemplate\r\n\r\n",
+                        "Fancy\nTemplate\n\n",
+                        "Fancy\r\nTemplate\n\r\n"]
+
+  describe "when running on windows" do
+    before do
+      Chef::Platform.stub!(:windows?).and_return(true)
+    end
+
+    it "should render the templates with windows line endings" do
+      template_contents.each do |template_content|
+        output = @context.render_template_from_string(template_content)
+        output.each_line do |line|
+          line.should end_with("\r\n")
+        end
+      end
+    end
+  end
+
+  describe "when running on unix" do
+    before do
+      Chef::Platform.stub!(:windows?).and_return(false)
+    end
+
+    it "should render the templates with unix line endings" do
+      template_contents.each do |template_content|
+        output = @context.render_template_from_string(template_content)
+        output.each_line do |line|
+          line.should end_with("\n")
+        end
+      end
+    end
+  end
+
   it "should provide a node method to access @node" do
     @context[:node] = "tehShizzle"
     output = @context.render_template_from_string("<%= @node %>")

data/spec/unit/mixin/windows_architecture_helper_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.
@@ -32,7 +32,7 @@ describe Chef::Mixin::WindowsArchitectureHelper do
     @node_i386 = Chef::Node.new
     @node_x86_64 = Chef::Node.new
   end
-  
+
   it "returns true when valid architectures are passed to valid_windows_architecture?" do
     @valid_architectures.each do | architecture |
       valid_windows_architecture?(architecture).should == true
@@ -67,7 +67,7 @@ describe Chef::Mixin::WindowsArchitectureHelper do
   it "returns false for each unsupported desired architecture for all nodes with each valid architecture passed to node_supports_windows_architecture?" do
     enumerate_architecture_node_combinations(true)
   end
-  
+
   def enumerate_architecture_node_combinations(only_valid_combinations)
     @valid_architectures.each do | node_architecture |
       new_node = Chef::Node.new
@@ -76,7 +76,7 @@ describe Chef::Mixin::WindowsArchitectureHelper do
 
       @valid_architectures.each do | supported_architecture |
         node_supports_windows_architecture?(new_node, supported_architecture).should == true if only_valid_combinations && (supported_architecture != :x86_64 && node_architecture != :i386 )
-        node_supports_windows_architecture?(new_node, supported_architecture).should == false if ! only_valid_combinations && (supported_architecture == :x86_64 && node_architecture == :i386 )        
+        node_supports_windows_architecture?(new_node, supported_architecture).should == false if ! only_valid_combinations && (supported_architecture == :x86_64 && node_architecture == :i386 )
       end
     end
   end

data/spec/unit/mixin/xml_escape_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/node/attribute_spec.rb

@@ -7,9 +7,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,9 +20,9 @@
 require 'spec_helper'
 require 'chef/node/attribute'
 
-describe Chef::Node::Attribute do 
+describe Chef::Node::Attribute do
   before(:each) do
-    @attribute_hash = 
+    @attribute_hash =
       {"dmi"=>{},
         "command"=>{"ps"=>"ps -ef"},
         "platform_version"=>"10.5.7",
@@ -193,7 +193,7 @@ describe Chef::Node::Attribute do
     @default_hash = {
       "domain" => "opscode.com",
       "hot" => { "day" => "saturday" },
-      "music" => { 
+      "music" => {
         "jimmy_eat_world" => "is fun!",
         "mastodon" => "rocks",
         "mars_volta" => "is loud and nutty",
@@ -225,7 +225,7 @@ describe Chef::Node::Attribute do
     [ :normal, :default, :override, :automatic ].each do |accessor|
       it "should set #{accessor}" do
         na = Chef::Node::Attribute.new({ :normal => true }, { :default => true }, { :override => true }, { :automatic => true })
-        na.send(accessor).should == { accessor.to_s => true } 
+        na.send(accessor).should == { accessor.to_s => true }
       end
     end
 
@@ -520,7 +520,7 @@ describe Chef::Node::Attribute do
 
     [:include?, :key?, :member?].each do |method|
       it "should alias the method #{method} to itself" do
-        @attributes.should respond_to(method) 
+        @attributes.should respond_to(method)
       end
 
       it "#{method} should behave like has_key?" do
@@ -582,7 +582,7 @@ describe Chef::Node::Attribute do
       collect.include?("snakes").should == true
       collect.include?("snack").should == true
       collect.include?("place").should == true
-      collect.length.should == 5 
+      collect.length.should == 5
     end
 
     it "should yield lower if we go deeper" do
@@ -593,7 +593,7 @@ describe Chef::Node::Attribute do
       collect.include?("two").should == true
       collect.include?("four").should == true
       collect.include?("six").should == true
-      collect.length.should == 3 
+      collect.length.should == 3
     end
 
     it "should not raise an exception if one of the hashes has a nil value on a deep lookup" do
@@ -667,7 +667,7 @@ describe Chef::Node::Attribute do
       @attributes.each_key do |k|
         collect << k
       end
-     
+
       collect.should include("one")
       collect.should include("snack")
       collect.should include("hut")
@@ -710,7 +710,7 @@ describe Chef::Node::Attribute do
       collect["snack"].should == "cookies"
     end
   end
-  
+
   describe "each_value" do
     before do
       @attributes = Chef::Node::Attribute.new(

data/spec/unit/node/immutable_collections_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/node_spec.rb

@@ -204,6 +204,11 @@ describe Chef::Node do
         node.fuu.bahrr.baz.should == "qux"
       end
 
+      it "should let you use tag as a convience method for the tags attribute" do
+        node.normal['tags'] = ['one', 'two']
+        node.tag('three', 'four')
+        node['tags'].should == ['one', 'two', 'three', 'four']
+      end
     end
 
     describe "default attributes" do

data/spec/unit/platform_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,10 +28,11 @@ describe "Chef::Platform supports" do
     :centos,
     :fedora,
     :suse,
+    :opensuse,
     :redhat,
     :oracle,
     :gentoo,
-    :arch, 
+    :arch,
     :solaris,
     :mswin,
     :mingw32,
@@ -49,11 +50,11 @@ describe Chef::Platform do
   before :all do
     @original_platform_map = Chef::Platform.platforms
   end
-  
+
   after :all do ||
     Chef::Platform.platforms = @original_platform_map
   end
-  
+
   before(:each) do
     Chef::Platform.platforms = {
       :darwin => {
@@ -79,13 +80,13 @@ describe Chef::Platform do
     }
     @events = Chef::EventDispatch::Dispatcher.new
   end
-  
+
   it "should allow you to look up a platform by name and version, returning the provider map for it" do
     pmap = Chef::Platform.find("Darwin", "9.2.2")
     pmap.should be_a_kind_of(Hash)
     pmap[:file].should eql("darwinian")
   end
-  
+
   it "should allow you to look up a platform by name and version using \"greater than\" style operators" do
     pmap = Chef::Platform.find("Darwin", "11.1.0")
     pmap.should be_a_kind_of(Hash)
@@ -97,46 +98,46 @@ describe Chef::Platform do
     pmap.should be_a_kind_of(Hash)
     pmap[:file].should eql("old school")
   end
-  
+
   it "should use the default providers if the os doesn't give me a default, but does exist" do
     pmap = Chef::Platform.find("mars_volta", "1")
     pmap.should be_a_kind_of(Hash)
     pmap[:file].should eql(Chef::Provider::File)
   end
-  
+
   it "should use the default provider if the os does not exist" do
     pmap = Chef::Platform.find("AIX", "1")
     pmap.should be_a_kind_of(Hash)
     pmap[:file].should eql(Chef::Provider::File)
   end
-  
+
   it "should merge the defaults for an os with the specific version" do
     pmap = Chef::Platform.find("Darwin", "9.2.2")
     pmap[:file].should eql("darwinian")
     pmap[:snicker].should eql("snack")
   end
-  
+
   it "should merge the defaults for an os with the universal defaults" do
     pmap = Chef::Platform.find("Darwin", "9.2.2")
     pmap[:file].should eql("darwinian")
     pmap[:pax].should eql("brittania")
   end
-  
+
   it "should allow you to look up a provider for a platform directly by symbol" do
     Chef::Platform.find_provider("Darwin", "9.2.2", :file).should eql("darwinian")
   end
-  
+
   it "should raise an exception if a provider cannot be found for a resource type" do
     lambda { Chef::Platform.find_provider("Darwin", "9.2.2", :coffee) }.should raise_error(ArgumentError)
   end
-  
+
   it "should look up a provider for a resource with a Chef::Resource object" do
     kitty = Chef::Resource::Cat.new("loulou")
     Chef::Platform.find_provider("Darwin", "9.2.2", kitty).should eql("nice")
   end
-  
+
   it "should look up a provider with a node and a Chef::Resource object" do
-    kitty = Chef::Resource::Cat.new("loulou")    
+    kitty = Chef::Resource::Cat.new("loulou")
     node = Chef::Node.new
     node.name("Intel")
     node.automatic_attrs[:platform] = "mac_os_x"
@@ -149,7 +150,7 @@ describe Chef::Platform do
   end
 
   it "should prefer an explicit provider" do
-    kitty = Chef::Resource::Cat.new("loulou")    
+    kitty = Chef::Resource::Cat.new("loulou")
     kitty.stub!(:provider).and_return(Chef::Provider::File)
     node = Chef::Node.new
     node.name("Intel")
@@ -168,7 +169,7 @@ describe Chef::Platform do
     node.automatic_attrs[:platform_version] = "8.5"
     Chef::Platform.find_provider_for_node(node, kitty).should eql(Chef::Provider::Cat)
   end
- 
+
   def setup_file_resource
     node = Chef::Node.new
     node.automatic_attrs[:platform] = "mac_os_x"
@@ -184,7 +185,7 @@ describe Chef::Platform do
     provider.new_resource.should equal(file)
     provider.run_context.should equal(run_context)
   end
-  
+
   it "returns a provider object given a Chef::Resource object which has a valid run context without an action" do
     file, run_context = setup_file_resource
     provider = Chef::Platform.provider_for_resource(file)
@@ -192,7 +193,7 @@ describe Chef::Platform do
     provider.new_resource.should equal(file)
     provider.run_context.should equal(run_context)
   end
-  
+
   it "raises an error when trying to find the provider for a resource with no run context" do
     file = Chef::Resource::File.new("whateva")
     lambda {Chef::Platform.provider_for_resource(file)}.should raise_error(ArgumentError)
@@ -202,44 +203,44 @@ describe Chef::Platform do
     lambda {Chef::Platform.provider_for_node('node', 'resource')}.should raise_error(NotImplementedError)
   end
 
-  it "should update the provider map with map" do  
+  it "should update the provider map with map" do
     Chef::Platform.set(
          :platform => :darwin,
          :version => "9.2.2",
-         :resource => :file, 
+         :resource => :file,
          :provider => "masterful"
     )
     Chef::Platform.platforms[:darwin]["9.2.2"][:file].should eql("masterful")
     Chef::Platform.set(
          :platform => :darwin,
          :resource => :file,
-         :provider => "masterful" 
+         :provider => "masterful"
     )
     Chef::Platform.platforms[:darwin][:default][:file].should eql("masterful")
     Chef::Platform.set(
-         :resource => :file, 
+         :resource => :file,
          :provider => "masterful"
-    )   
+    )
     Chef::Platform.platforms[:default][:file].should eql("masterful")
-    
+
     Chef::Platform.set(
          :platform => :hero,
          :version => "9.2.2",
-         :resource => :file, 
+         :resource => :file,
          :provider => "masterful"
     )
     Chef::Platform.platforms[:hero]["9.2.2"][:file].should eql("masterful")
-    
+
     Chef::Platform.set(
-         :resource => :file, 
+         :resource => :file,
          :provider => "masterful"
     )
     Chef::Platform.platforms[:default][:file].should eql("masterful")
-    
+
     Chef::Platform.platforms = {}
-    
+
     Chef::Platform.set(
-         :resource => :file, 
+         :resource => :file,
          :provider => "masterful"
     )
     Chef::Platform.platforms[:default][:file].should eql("masterful")
@@ -247,8 +248,8 @@ describe Chef::Platform do
     Chef::Platform.platforms = { :neurosis => {} }
     Chef::Platform.set(:platform => :neurosis, :resource => :package, :provider => "masterful")
     Chef::Platform.platforms[:neurosis][:default][:package].should eql("masterful")
-    
+
   end
-  
-  
+
+
 end