chef 10.34.6 → 11.0.0.beta.0

data/spec/unit/platform_spec.rb

@@ -35,8 +35,7 @@ describe "Chef::Platform supports" do
     :solaris,
     :mswin,
     :mingw32,
-    :windows,
-    :gcel
+    :windows
   ].each do |platform|
     it "#{platform}" do
       Chef::Platform.platforms.should have_key(platform)
@@ -130,8 +129,8 @@ describe Chef::Platform do
     kitty = Chef::Resource::Cat.new("loulou")    
     node = Chef::Node.new
     node.name("Intel")
-    node.platform("mac_os_x")
-    node.platform_version("9.2.2")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "9.2.2"
     Chef::Platform.find_provider_for_node(node, kitty).should eql("nice")
   end
 
@@ -140,8 +139,8 @@ describe Chef::Platform do
     kitty.stub!(:provider).and_return(Chef::Provider::File)
     node = Chef::Node.new
     node.name("Intel")
-    node.platform("mac_os_x")
-    node.platform_version("9.2.2")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "9.2.2"
     Chef::Platform.find_provider_for_node(node, kitty).should eql(Chef::Provider::File)
   end
 
@@ -151,15 +150,15 @@ describe Chef::Platform do
     Chef::Platform.platforms[:default].delete(:cat)
     node = Chef::Node.new
     node.name("Intel")
-    node.platform("mac_os")
-    node.platform_version("8.5")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    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.platform("mac_os_x")
-    node.platform_version("9.2.2")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "9.2.2"
     run_context = Chef::RunContext.new(node, {}, @events)
     [ Chef::Resource::File.new("whateva", run_context), run_context ]
   end

data/spec/unit/provider/breakpoint_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.
@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 describe Chef::Provider::Breakpoint do
-  
+
   before do
     @resource = Chef::Resource::Breakpoint.new
     @node = Chef::Node.new
@@ -29,13 +29,13 @@ describe Chef::Provider::Breakpoint do
     @run_context.stub!(:resource_collection).and_return(@collection)
     @provider = Chef::Provider::Breakpoint.new(@resource, @run_context)
   end
-  
+
   it "responds to load_current_resource" do
     @provider.should respond_to(:load_current_resource)
   end
-  
+
   it "gets the iterator from @collection and pauses it" do
-    Shef.stub!(:running?).and_return(true)
+    Shell.stub!(:running?).and_return(true)
     @iterator = mock("stepable_iterator")
     @collection.stub!(:iterator).and_return(@iterator)
     @iterator.should_receive(:pause)
@@ -43,8 +43,8 @@ describe Chef::Provider::Breakpoint do
     @resource.should be_updated
   end
 
-  it "doesn't pause the iterator if Shef isn't running" do
-    Shef.stub!(:running?).and_return(false)
+  it "doesn't pause the iterator if chef-shell isn't running" do
+    Shell.stub!(:running?).and_return(false)
     @iterator = mock("stepable_iterator")
     @collection.stub!(:iterator).and_return(@iterator)
     @iterator.should_not_receive(:pause)

data/spec/unit/provider/cookbook_file_spec.rb

@@ -28,7 +28,9 @@ describe Chef::Provider::CookbookFile do
 
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.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)
     @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
 
     @new_resource = Chef::Resource::CookbookFile.new('apache2_module_conf_generate.pl', @run_context)
@@ -83,7 +85,7 @@ EXPECTED
       @provider.current_resource = @current_resource
     end
 
-    after { ::File.exist?(@install_to) && FileUtils.rm(@install_to) }
+    after { ::File.exist?(File.dirname(@install_to)) && FileUtils.rm_rf(@install_to) }
 
     it "loads the current file state" do
       @provider.load_current_resource
@@ -95,12 +97,6 @@ EXPECTED
       @provider.file_cache_location.should == expected
     end
 
-    it "stages the cookbook to a temporary file" do
-      @new_resource.path(@install_to)
-      @provider.should_receive(:deploy_tempfile)
-      @provider.run_action(:create)
-    end
-
     it "installs the file from the cookbook cache" do
       @new_resource.path(@install_to)
       @provider.should_receive(:backup_new_resource)

data/spec/unit/provider/directory_spec.rb

@@ -36,80 +36,112 @@ describe Chef::Provider::Directory do
     @directory = Chef::Provider::Directory.new(@new_resource, @run_context)
   end
 
-  context "load_current_resource_attrs", :unix_only do
-    it "should load the current resource based on the new resource" do
-      File.stub!(:exist?).and_return(true)
+
+  describe "scanning file security metadata on windows" do
+    before do
+    end
+
+    it "describes the directory's access rights" do
+      pending
+    end
+  end
+
+  describe "scanning file security metadata on unix" do
+    before do
+      Chef::Platform.stub!(:windows?).and_return(false)
+    end
+    let(:mock_stat) do
       cstats = mock("stats")
       cstats.stub!(:uid).and_return(500)
       cstats.stub!(:gid).and_return(500)
       cstats.stub!(:mode).and_return(0755)
-      File.should_receive(:stat).twice.and_return(cstats)
-      @directory.load_current_resource
-      @directory.current_resource.path.should eql(@new_resource.path)
-      @directory.current_resource.owner.should eql(500)
-      @directory.current_resource.group.should eql(500)
-      @directory.current_resource.mode.should == 00755
-    end
-  
-    it "should create a new directory on create, setting updated to true" do
-      @new_resource.path "/tmp/foo"
-  
-      File.should_receive(:exist?).exactly(3).and_return(false)
-      Dir.should_receive(:mkdir).with(@new_resource.path).once.and_return(true)
-  
-      @directory.should_receive(:set_all_access_controls)
-      @directory.stub!(:update_new_file_state)
-      @directory.run_action(:create)
-      @directory.new_resource.should be_updated
+      cstats
     end
-  
-    it "should raise an exception if the parent directory does not exist and recursive is false" do 
-      @new_resource.path "/tmp/some/dir"
-      @new_resource.recursive false
-      lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist) 
-    end
-  
-    it "should create a new directory when parent directory does not exist if recursive is true and permissions are correct" do
-      @new_resource.path "/path/to/dir"
-      @new_resource.recursive true
-      File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
-      File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
-  
-      File.should_receive(:exist?).with('/path/to').ordered.and_return(false)
-      File.should_receive(:exist?).with('/path').ordered.and_return(true)
-      File.should_receive(:writable?).with('/path').ordered.and_return(true)
-      File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
-   
-      FileUtils.should_receive(:mkdir_p).with(@new_resource.path).and_return(true) 
-      @directory.should_receive(:set_all_access_controls)
-      @directory.stub!(:update_new_file_state)
-      @directory.run_action(:create)
-      @new_resource.should be_updated
+
+    it "describes the access mode as a String of octal integers" do
+      File.stub!(:exist?).and_return(true)
+      File.should_receive(:stat).and_return(mock_stat)
+      @directory.load_current_resource
+      @directory.current_resource.mode.should == "0755"
     end
-   
-    # it "should raise an error when creating a directory recursively and permissions do not allow creation" do
-      
-    # end
-  
-    it "should raise an error when creating a directory when parent directory is a file" do
-      File.should_receive(:directory?).and_return(false)
-      Dir.should_not_receive(:mkdir).with(@new_resource.path)
-      lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
-      @directory.new_resource.should_not be_updated
+
+    context "when user and group are specified with UID/GID" do
+      it "describes the current owner and group as UID and GID" do
+        File.stub!(:exist?).and_return(true)
+        File.should_receive(:stat).and_return(mock_stat)
+        @directory.load_current_resource
+        @directory.current_resource.path.should eql(@new_resource.path)
+        @directory.current_resource.owner.should eql(500)
+        @directory.current_resource.group.should eql(500)
+      end
     end
-    
-    it "should not create the directory if it already exists" do
-      stub_file_cstats
-      @new_resource.path "/tmp/foo"
-      File.should_receive(:exist?).exactly(3).and_return(true)
-      Dir.should_not_receive(:mkdir).with(@new_resource.path)
-      @directory.should_receive(:set_all_access_controls)
-      @directory.run_action(:create)
+
+    context "when user/group are specified with user/group names" do
     end
   end
 
-  context "load_current_resource_attrs", :windows_only do
-    pending "CHEF-3557: Fix implicit resource change collection on Windows"
+  # Unix only for now. While file security attribute reporting for windows is
+  # disabled, unix and windows differ in the number of exist? calls that are
+  # made by the provider.
+  it "should create a new directory on create, setting updated to true", :unix_only do
+    @new_resource.path "/tmp/foo"
+
+    File.should_receive(:exist?).exactly(2).and_return(false)
+    File.should_receive(:directory?).with("/tmp").and_return(true)
+    Dir.should_receive(:mkdir).with(@new_resource.path).once.and_return(true)
+
+    @directory.should_receive(:set_all_access_controls)
+    @directory.stub!(:update_new_file_state)
+    @directory.run_action(:create)
+    @directory.new_resource.should be_updated
+  end
+
+  it "should raise an exception if the parent directory does not exist and recursive is false" do 
+    @new_resource.path "/tmp/some/dir"
+    @new_resource.recursive false
+    lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist) 
+  end
+
+  # Unix only for now. While file security attribute reporting for windows is
+  # disabled, unix and windows differ in the number of exist? calls that are
+  # made by the provider.
+  it "should create a new directory when parent directory does not exist if recursive is true and permissions are correct", :unix_only do
+    @new_resource.path "/path/to/dir"
+    @new_resource.recursive true
+    File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
+
+    File.should_receive(:exist?).with('/path/to').ordered.and_return(false)
+    File.should_receive(:exist?).with('/path').ordered.and_return(true)
+    File.should_receive(:writable?).with('/path').ordered.and_return(true)
+    File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
+
+    FileUtils.should_receive(:mkdir_p).with(@new_resource.path).and_return(true) 
+    @directory.should_receive(:set_all_access_controls)
+    @directory.stub!(:update_new_file_state)
+    @directory.run_action(:create)
+    @new_resource.should be_updated
+  end
+
+
+  it "should raise an error when creating a directory when parent directory is a file" do
+    File.should_receive(:directory?).and_return(false)
+    Dir.should_not_receive(:mkdir).with(@new_resource.path)
+    lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
+    @directory.new_resource.should_not be_updated
+  end
+
+  # Unix only for now. While file security attribute reporting for windows is
+  # disabled, unix and windows differ in the number of exist? calls that are
+  # made by the provider.
+  it "should not create the directory if it already exists", :unix_only do
+    stub_file_cstats
+    @new_resource.path "/tmp/foo"
+    File.should_receive(:directory?).twice.and_return(true)
+    File.should_receive(:writable?).with("/tmp").and_return(true)
+    File.should_receive(:exist?).exactly(3).and_return(true)
+    Dir.should_not_receive(:mkdir).with(@new_resource.path)
+    @directory.should_receive(:set_all_access_controls)
+    @directory.run_action(:create)
   end
 
   it "should delete the directory if it exists, and is writable with action_delete" do

data/spec/unit/provider/env_spec.rb

@@ -81,7 +81,7 @@ describe Chef::Provider::Env do
       @provider.action_create
     end
 
-    it "should set the new_resources updated flag when it creates the key" do
+    it "should set the the new_resources updated flag when it creates the key" do
       @provider.action_create
       @new_resource.should be_updated
     end
@@ -99,7 +99,7 @@ describe Chef::Provider::Env do
       @provider.action_create
     end
 
-    it "should set the new_resources updated flag when it updates an existing value" do
+    it "should set the the new_resources updated flag when it updates an existing value" do
       @provider.key_exists = true
       @provider.stub!(:compare_value).and_return(true)
       @provider.stub!(:modify_env).and_return(true)

data/spec/unit/provider/file_spec.rb

@@ -53,25 +53,33 @@ describe Chef::Provider::File do
     @provider.current_resource.content.should eql(nil)
   end
 
-  context "load_current_resource_attrs", :unix_only do
+  describe "examining file security metadata on Unix" do
+    before do
+      Chef::Platform.stub!(:windows?).and_return(false)
+    end
     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(2).with(@resource.path).and_return(stat_struct)
+      ::File.should_receive(:stat).exactly(1).times.with(@resource.path).and_return(stat_struct)
 
       # test execution
+
+      Etc.should_receive(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
+      Etc.should_receive(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+
+      # 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
+      @provider.current_resource.mode.should == "0600"
+      @provider.current_resource.owner.should == "root"
+      @provider.current_resource.group.should == "wheel"
     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(2).with(@resource.path).and_return(stat_struct)
+      ::File.should_receive(:stat).exactly(1).times.with(@resource.path).and_return(stat_struct)
 
       @provider.new_resource.group(1)
       @provider.new_resource.owner(1)
@@ -86,47 +94,45 @@ describe Chef::Provider::File do
       @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(2).with(@resource.path).and_return(stat_struct)
+    context "when the new_resource does not specify the desired access control" do
+      it "records access control information in the new resource after modifying the file" do
+        # test setup
+        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).once.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)
+        Etc.should_receive(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+        Etc.should_receive(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
 
-      # test execution
-      @provider.load_current_resource
+        @provider.new_resource.group(nil)
+        @provider.new_resource.owner(nil)
+        @provider.new_resource.mode(nil)
 
-      # 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
+        # test exectution
+        @provider.update_new_file_state
 
-    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)
-      # 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(:directory?).once.with(@provider.new_resource.path).and_return(false)
+        # post-condition checks
+        @provider.new_resource.group.should == "wheel"
+        @provider.new_resource.owner.should == "root"
+        @provider.new_resource.mode.should == "0600"
+      end
+    end
+  end
 
-      @provider.new_resource.group(nil)
-      @provider.new_resource.owner(nil)
-      @provider.new_resource.mode(nil)
+  describe "when reporting security metadata on windows" do
 
-      # test exectution
-      @provider.update_new_file_state
+    it "records the file owner" do
+      pending
+    end
 
-      # post-condition checks
-      @provider.new_resource.group.should == 0
-      @provider.new_resource.owner.should == 0
-      @provider.new_resource.mode.should == 0600
+    it "records rights for each user in the ACL" do
+      pending
     end
-  end
 
-  context "load_current_resource_attrs", :windows_only do
-    pending "CHEF-3557: Fix implicit resource change collection on Windows"
+    it "records deny_rights for each user in the ACL" do
+      pending
+    end
   end
 
   it "should load a mostly blank current resource if the file specified in new_resource doesn't exist/isn't readable" do
@@ -174,6 +180,8 @@ describe Chef::Provider::File do
     @provider.new_resource.content "foobar"
     @provider.should_receive(:diff_current_from_content).and_return("")
     @provider.should_receive(:backup)
+    # checksum check
+    File.should_receive(:open).with(@provider.new_resource.path, "rb").and_yield(io)
     File.should_receive(:open).with(@provider.new_resource.path, "w").and_yield(io)
     @provider.set_content
     io.string.should == "foobar"
@@ -182,7 +190,8 @@ describe Chef::Provider::File do
   it "should not set the content of the file if it already matches the requested content" do
     @provider.load_current_resource
     @provider.new_resource.content IO.read(@resource.path)
-    File.stub!(:open).and_return(1)
+    # Checksum check:
+    File.should_receive(:open).with(@resource.path, "rb").and_yield(StringIO.new(@resource.content))
     File.should_not_receive(:open).with(@provider.new_resource.path, "w")
     lambda { @provider.set_content }.should_not raise_error
     @resource.should_not be_updated_by_last_action