chef 10.28.2 → 10.30.0.rc.0

data/spec/unit/monkey_patches/uri_spec.rb

@@ -0,0 +1,34 @@
+#--
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, 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'
+describe URI do
+
+  describe "when a URI contains an IPv6 literal" do
+
+    let(:ipv6_uri) do
+      URI.parse("https://[2a00:1450:4009:809::1008]:8443")
+    end
+
+    it "returns the hostname without brackets" do
+      ipv6_uri.hostname.should == "2a00:1450:4009:809::1008"
+    end
+
+  end
+
+end

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 => true } 
+        na.send(accessor).should == { accessor => true }
       end
     end
 
@@ -403,6 +403,21 @@ describe Chef::Node::Attribute do
       hash.class.should == Hash
       hash["day"].should == "sunday"
     end
+
+    # Regression test for CHEF-4631
+    context "when merging array values" do
+      before do
+        @default_attrs = {"foo" => {"bar" => ["default"]}}
+        @override_attrs = {"foo" => {"bar" => ["override"]}}
+
+        #(normal, default, override, automatic, state=[])
+        @attributes = Chef::Node::Attribute.new({ }, @default_attrs, @override_attrs, { })
+      end
+
+      it "should return the override" do
+        @attributes["foo"].to_hash["bar"].should == [ "override" ]
+      end
+    end
   end
 
   describe "has_key?" do
@@ -426,10 +441,10 @@ describe Chef::Node::Attribute do
       @attributes["music"]
       @attributes.has_key?("apophis").should == true
     end
-    
+
     it "should find keys at the current nesting level" do
       @attributes["music"]
-      @attributes.has_key?("mastodon").should == true 
+      @attributes.has_key?("mastodon").should == true
       @attributes.has_key?("whitesnake").should == false
     end
 
@@ -443,7 +458,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
@@ -463,7 +478,7 @@ describe Chef::Node::Attribute do
 
     it "should be looking at the current position of the object" do
       @attributes["music"]
-      @attributes.attribute?("mastodon").should == true 
+      @attributes.attribute?("mastodon").should == true
       @attributes.attribute?("whitesnake").should == false
     end
   end
@@ -516,7 +531,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
@@ -527,7 +542,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
@@ -601,7 +616,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")
@@ -644,7 +659,7 @@ describe Chef::Node::Attribute do
       collect["snack"].should == "cookies"
     end
   end
-  
+
   describe "each_value" do
     before do
       @attributes = Chef::Node::Attribute.new(
@@ -1027,7 +1042,27 @@ describe Chef::Node::Attribute do
     it "returns the automatic (highest precedence) value when deleting a key" do
       @attributes["foo"].delete("bar").should == "automatic_value"
     end
+  end
+
+  describe "regression test for CHEF-4631" do
+    before(:each) do
+      @default_attrs = {"foo" => {"bar" => ["default"]}}
+      @override_attrs = {"foo" => {"bar" => ["override"]}}
+
+      #(normal, default, override, automatic, state=[])
+      @attributes = Chef::Node::Attribute.new({ }, @default_attrs, @override_attrs, { })
+    end
 
+    it "array values in the role default attributes should be concatanated to the nodes default attributes" do
+      @default_attrs = {"foo" => {"bar" => ["1", "2"]}}
+      @attributes = Chef::Node::Attribute.new({ }, @default_attrs, { }, { })
+
+      expansion = mock("Expansion", :default_attrs => { "foo" => {"bar" => ["3", "2"]}}, :override_attributes => { })
+
+    end
+
+    it "array values in the role override attributes should override the nodes default attributes" do
+    end
   end
 
 end

data/spec/unit/node_spec.rb

@@ -741,4 +741,35 @@ describe Chef::Node do
 
   end
 
+  describe "regression test for CHEF-4631" do
+    before(:each) do
+      @node.stub!(:chef_environment).and_return("_default")
+    end
+
+    it "array values in the role default attributes should be concatanated to the nodes default attributes" do
+      @node.default_attrs = {"foo" => {"bar" => ["1", "2"]}}
+      expansion = mock("Expansion", :default_attrs => { "foo" => {"bar" => ["3", "2"]}}, :override_attrs => { })
+      @node.apply_expansion_attributes(expansion)
+      @node["foo"]["bar"].should == ["1", "2", "3", "2"]
+      @node["foo"].to_hash["bar"].should == ["1", "2", "3", "2"]
+    end
+
+    it "array values in the role override attributes should override the nodes default attributes" do
+      @node.default_attrs = {"foo" => {"bar" => ["1", "2"]}}
+      expansion = mock("Expansion", :default_attrs => { "foo" => {"bar" => ["3", "2"]}}, :override_attrs => { "foo" => {"bar" => ["5"] } })
+      @node.apply_expansion_attributes(expansion)
+      @node["foo"]["bar"].should == ["5"]
+      @node["foo"].to_hash["bar"].should == ["5"]
+    end
+
+    it "array values in the role override attributes should merge with the nodes override attributes" do
+      @node.default_attrs = {"foo" => {"bar" => ["1", "2"]}}
+      @node.override_attrs = {"foo" => {"bar" => ["5", "0"]}}
+      expansion = mock("Expansion", :default_attrs => { "foo" => {"bar" => ["3", "2"]}}, :override_attrs => { "foo" => {"bar" => ["5"] } })
+      @node.apply_expansion_attributes(expansion)
+      @node["foo"]["bar"].should == ["5", "0", "5"]
+      @node["foo"].to_hash["bar"].should == ["5", "0", "5"]
+    end
+  end
+
 end

data/spec/unit/provider/file_spec.rb

@@ -56,68 +56,68 @@ describe Chef::Provider::File do
   context "load_current_resource_attrs", :unix_only do
     it "should collect the current state of the file on the filesystem and populate current_resource" do
       # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      ::File.should_receive(:stat).exactly(3).with(@resource.path).and_return(stat_struct)
-      
-      # test execution 
+      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+      ::File.should_receive(:stat).exactly(2).with(@resource.path).and_return(stat_struct)
+
+      # test execution
       @provider.load_current_resource
-  
+
       # post-condition checks
       @provider.current_resource.mode.should == 0600
       @provider.current_resource.owner.should == 0
       @provider.current_resource.group.should == 0
     end
-  
+
     it "should NOT update the new_resource state with the current_resourse state if new_resource state is already specified" do
       # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      ::File.should_receive(:stat).exactly(3).with(@resource.path).and_return(stat_struct)
-  
+      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+      ::File.should_receive(:stat).exactly(2).with(@resource.path).and_return(stat_struct)
+
       @provider.new_resource.group(1)
       @provider.new_resource.owner(1)
       @provider.new_resource.mode(0644)
-  
-      # test execution 
+
+      # test execution
       @provider.load_current_resource
-  
+
       # post-condition checks
       @provider.new_resource.group.should == 1
       @provider.new_resource.owner.should == 1
       @provider.new_resource.mode.should == 0644
     end
-  
+
     it "should update the new_resource state with the current_resource state if the new_resource state is not specified." do
       # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      ::File.should_receive(:stat).exactly(3).with(@resource.path).and_return(stat_struct)
-  
+      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+      ::File.should_receive(:stat).exactly(2).with(@resource.path).and_return(stat_struct)
+
       @provider.new_resource.group(nil)
       @provider.new_resource.owner(nil)
       @provider.new_resource.mode(nil)
-  
-      # test execution 
+
+      # test execution
       @provider.load_current_resource
-  
+
       # post-condition checks
       @provider.new_resource.group.should eql(@provider.current_resource.group)
       @provider.new_resource.owner.should eql(@provider.current_resource.owner)
       @provider.new_resource.mode.should eql(@provider.current_resource.mode)
     end
-  
+
     it "should update the new_resource when attempting to set the new state" do
       # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
+      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
       # called once in update_new_file_state and once in checksum
-      ::File.should_receive(:stat).twice.with(@provider.new_resource.path).and_return(stat_struct)  
+      ::File.should_receive(:stat).twice.with(@provider.new_resource.path).and_return(stat_struct)
       ::File.should_receive(:directory?).once.with(@provider.new_resource.path).and_return(false)
-  
+
       @provider.new_resource.group(nil)
       @provider.new_resource.owner(nil)
       @provider.new_resource.mode(nil)
-      
-      # test exectution 
+
+      # test exectution
       @provider.update_new_file_state
-  
+
       # post-condition checks
       @provider.new_resource.group.should == 0
       @provider.new_resource.owner.should == 0
@@ -487,7 +487,7 @@ describe Chef::Provider::File do
     it "should return valid diff output when content does not match the string content provided" do
        Tempfile.open("some-temp") do |file|
          @resource.path file.path
-         @provider = Chef::Provider::File.new(@resource, @run_context) 
+         @provider = Chef::Provider::File.new(@resource, @run_context)
          @provider.load_current_resource
          result = @provider.diff_current_from_content "foo baz"
          # remove the file name info which varies.

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

@@ -265,6 +265,7 @@ describe Chef::Provider::Group::Dscl do
     it "should manage the group_name if it changed and the new resources group_name is not null" do
       @current_resource.group_name("oldval")
       @new_resource.group_name("newname")
+      @provider.should_receive(:set_members).and_return(true)
       @provider.should_receive(:safe_dscl).with("create /Groups/newname")
       @provider.should_receive(:safe_dscl).with("create /Groups/newname Password '*'")
       @provider.manage_group

data/spec/unit/provider/group/gpasswd_spec.rb

@@ -76,8 +76,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
         @new_resource.members([])
       end
 
-      it "logs a message and does not modify group membership" do
-        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members to add")
+      it "does not modify group membership" do
         @provider.should_not_receive(:shell_out!)
         @provider.modify_group_members
       end
@@ -85,7 +84,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
 
     describe "when the resource specifies group members" do
       it "should log an appropriate debug message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] setting group members to lobster, rage, fist")
+        Chef::Log.should_receive(:debug).with("group[wheel] setting group members to: lobster, rage, fist")
         @provider.stub!(:shell_out!)
         @provider.modify_group_members
       end
@@ -95,12 +94,20 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
         @provider.modify_group_members
       end
 
-      it "should run gpasswd individually for each user when the append option is set" do
-        @new_resource.append(true)
-        @provider.should_receive(:shell_out!).with("gpasswd -a lobster wheel")
-        @provider.should_receive(:shell_out!).with("gpasswd -a rage wheel")
-        @provider.should_receive(:shell_out!).with("gpasswd -a fist wheel")
-        @provider.modify_group_members
+      describe "when no user exists in the system" do
+        before do
+          current_resource = @new_resource.dup
+          current_resource.members([ ])
+          @provider.current_resource = current_resource
+        end
+
+        it "should run gpasswd individually for each user when the append option is set" do
+          @new_resource.append(true)
+          @provider.should_receive(:shell_out!).with("gpasswd -a lobster wheel")
+          @provider.should_receive(:shell_out!).with("gpasswd -a rage wheel")
+          @provider.should_receive(:shell_out!).with("gpasswd -a fist wheel")
+          @provider.modify_group_members
+        end
       end
 
     end

data/spec/unit/provider/group/groupadd_spec.rb

@@ -129,10 +129,9 @@ describe Chef::Provider::Group::Groupadd do
     end
   end
 
-  describe "modify_group_members" do
-
-    it "should raise an error when calling modify_group_members" do
-      lambda { @provider.modify_group_members }.should raise_error(Chef::Exceptions::Group, "you must override modify_group_members in #{@provider.to_s}")
+  [:add_member, :remove_member, :set_members].each do |m|
+    it "should raise an error when calling #{m}" do
+      lambda { @provider.send(m, [ ]) }.should raise_error(Chef::Exceptions::Group, "you must override #{m} in #{@provider.to_s}")
     end
   end
 

data/spec/unit/provider/group/groupmod_spec.rb

@@ -62,7 +62,6 @@ describe Chef::Provider::Group::Groupmod do
   
         it "logs a message and sets group's members to 'none', then removes existing group members" do
           Chef::Log.should_receive(:debug).with("group[wheel] setting group members to: none")
-          Chef::Log.should_receive(:debug).with("group[wheel] removing members lobster, rage, fist")
           @provider.should_receive(:shell_out!).with("group mod -n wheel_bak wheel")
           @provider.should_receive(:shell_out!).with("group add -g '123' -o wheel")
           @provider.should_receive(:shell_out!).with("group del wheel_bak")

data/spec/unit/provider/group/pw_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Provider::Group::Pw do
   describe "when creating a group" do
     it "should run pw groupadd with the return of set_options and set_members_option" do
       @new_resource.gid(23)
-      @provider.should_receive(:run_command).with({ :command => "pw groupadd wheel -g '23' -M root,aj" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "pw groupadd wheel -g '23'" }).and_return(true)
       @provider.create_group
     end
   end
@@ -58,7 +58,9 @@ describe Chef::Provider::Group::Pw do
   
     it "should run pw groupmod with the return of set_options" do
       @new_resource.gid(42)
-      @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -M root,aj" }).and_return(true)
+      @new_resource.members(["someone"])
+      @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -m someone" }).and_return(true)
+      @provider.should_receive(:run_command).with({ :command => "pw groupmod wheel -g '42' -d root,aj" }).and_return(true)
       @provider.manage_group
     end
 
@@ -78,14 +80,9 @@ describe Chef::Provider::Group::Pw do
         @new_resource.stub!(:members).and_return([])
         @current_resource.stub!(:members).and_return([])
       end
-    
-      it "should log an appropriate message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
-        @provider.set_members_option
-      end
-    
+
       it "should set no options" do
-        @provider.set_members_option.should eql("")
+        @provider.set_members_options.should eql([ ])
       end
     end
 
@@ -96,12 +93,12 @@ describe Chef::Provider::Group::Pw do
       end
     
       it "should log an appropriate message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] removing group members all, your, base")
-        @provider.set_members_option
+        Chef::Log.should_receive(:debug).with("group[wheel] removing group members: all,your,base")
+        @provider.set_members_options
       end
     
       it "should set the -d option with the members joined by ','" do
-        @provider.set_members_option.should eql(" -d all,your,base")
+        @provider.set_members_options.should eql([ " -d all,your,base" ])
       end
     end
   
@@ -112,12 +109,12 @@ describe Chef::Provider::Group::Pw do
       end
     
       it "should log an appropriate debug message" do
-        Chef::Log.should_receive(:debug).with("group[wheel] setting group members to all, your, base")
-        @provider.set_members_option
+        Chef::Log.should_receive(:debug).with("group[wheel] adding group members: all,your,base")
+        @provider.set_members_options
       end
     
       it "should set the -M option with the members joined by ','" do
-        @provider.set_members_option.should eql(" -M all,your,base")
+        @provider.set_members_options.should eql([ " -m all,your,base" ])
       end
     end
   end