chef 10.14.4 → 10.16.0.rc.0

data/spec/unit/provider/file_spec.rb

@@ -29,6 +29,7 @@ describe Chef::Provider::File do
 
     @resource = Chef::Resource::File.new("seattle")
     @resource.path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates", "seattle.txt")))
+
     @provider = Chef::Provider::File.new(@resource, @run_context)
   end
 
@@ -52,6 +53,76 @@ describe Chef::Provider::File do
     @provider.current_resource.content.should eql(nil)
   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(3).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)
+
+    @provider.new_resource.group(1)
+    @provider.new_resource.owner(1)
+    @provider.new_resource.mode(0644)
+
+    # 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)
+
+    @provider.new_resource.group(nil)
+    @provider.new_resource.owner(nil)
+    @provider.new_resource.mode(nil)
+
+    # 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) 
+    # 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)
+
+    @provider.new_resource.group(nil)
+    @provider.new_resource.owner(nil)
+    @provider.new_resource.mode(nil)
+    
+    # test exectution 
+    @provider.update_new_file_state
+
+    # post-condition checks
+    @provider.new_resource.group.should == 0
+    @provider.new_resource.owner.should == 0
+    @provider.new_resource.mode.should == 0600
+end
+
   it "should load a mostly blank current resource if the file specified in new_resource doesn't exist/isn't readable" do
     resource = Chef::Resource::File.new("seattle")
     resource.path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates", "woot.txt")))
@@ -114,6 +185,7 @@ describe Chef::Provider::File do
 
   it "should create the file if it is missing, then set the attributes on action_create" do
     @provider.load_current_resource
+    @provider.stub!(:update_new_file_state)
     @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.access_controls.should_receive(:set_all)
     @provider.should_receive(:diff_current_from_content).and_return("")
@@ -130,6 +202,7 @@ describe Chef::Provider::File do
     @provider.new_resource.content "foobar"
     @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.should_receive(:diff_current_from_content).and_return("")
+    @provider.stub!(:update_new_file_state)
     File.should_receive(:open).with(@provider.new_resource.path, "w+").and_yield(io)
     @provider.access_controls.should_receive(:set_all)
     @provider.run_action(:create)
@@ -159,6 +232,7 @@ describe Chef::Provider::File do
     @provider.load_current_resource
     @provider.new_resource.stub!(:path).and_return(File.join(Dir.tmpdir, "monkeyfoo"))
     @provider.should_receive(:diff_current_from_content).and_return("")
+    @provider.stub!(:update_new_file_state)
     File.should_receive(:utime).once.and_return(1)
     File.stub!(:open).and_return(1)
     @provider.access_controls.should_receive(:set_all).once
@@ -267,6 +341,7 @@ describe Chef::Provider::File do
       @provider = Chef::Provider::File.new(@resource, @run_context)
       @provider.should_receive(:diff_current_from_content).and_return("")
       ::File.stub!(:exists?).with(@resource.path).and_return(false)
+      @provider.stub!(:update_new_file_state)
       io = StringIO.new
       File.should_receive(:open).with(@provider.new_resource.path, "w+").and_yield(io)
       #@provider.should_receive(:action_create).and_return(true)

data/spec/unit/provider/ifconfig_spec.rb

@@ -205,8 +205,8 @@ describe Chef::Provider::Ifconfig do
       @provider.stub!(:run_command)
       config_filename =  "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
       File.should_receive(:exist?).with(config_filename).and_return(true)
-      FileUtils.should_receive(:rm_f)#.with(config_filename, :verbose => false, :force => true)
-      
+      FileUtils.should_receive(:rm_f).with(config_filename, :verbose => false)
+
       @provider.run_action(:delete)
     end
   end

data/spec/unit/provider/package/pacman_spec.rb

@@ -103,6 +103,35 @@ PACMAN
       @provider.candidate_version.should eql("2.2.3-1")
     end
 
+    it "should use pacman.conf to determine valid repo names for package versions" do
+     @pacman_conf = <<-PACMAN_CONF
+[options]
+HoldPkg      = pacman glibc
+Architecture = auto
+
+[customrepo]
+Server = https://my.custom.repo
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+PACMAN_CONF
+
+      ::File.stub!(:exists?).with("/etc/pacman.conf").and_return(true)
+      ::File.stub!(:read).with("/etc/pacman.conf").and_return(@pacman_conf)
+      @stdout.stub!(:each).and_yield("customrepo/nano 1.2.3-4").
+                            and_yield("    My custom package")
+      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+
+      @provider.load_current_resource
+      @provider.candidate_version.should eql("1.2.3-4")
+    end
+
     it "should raise an exception if pacman fails" do
       @status.should_receive(:exitstatus).and_return(2)
       lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package)

data/spec/unit/provider/package_spec.rb

@@ -20,6 +20,10 @@ require 'spec_helper'
 
 describe Chef::Provider::Package do
   before do
+    #Terrible, but we need to implement a pseduo-filesystem for testing
+    #to not have this line. Only affects updating state fields.
+    Chef::Provider::CookbookFile.any_instance.stub(:update_new_file_state)
+
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)

data/spec/unit/provider/remote_directory_spec.rb

@@ -28,6 +28,10 @@ end
 describe Chef::Provider::RemoteDirectory do
   before do
     Chef::FileAccessControl.any_instance.stub(:set_all)
+    #Terrible, but we need to implement a pseduo-filesystem for testing
+    #to not have this line. Only affects updating state fields.
+    Chef::Provider::CookbookFile.any_instance.stub(:update_new_file_state)
+
     @resource = Chef::Resource::RemoteDirectory.new("/tmp/tafty")
     # in CHEF_SPEC_DATA/cookbooks/openldap/files/default/remotedir
     @resource.source "remotedir"
@@ -88,7 +92,7 @@ describe Chef::Provider::RemoteDirectory do
       @node[:platform] = :just_testing
       @node[:platform_version] = :just_testing
 
-      @destination_dir = Dir.tmpdir << "/remote_directory_test"
+      @destination_dir = Dir.mktmpdir << "/remote_directory_test"
       @resource.path(@destination_dir)
     end
 
@@ -186,6 +190,7 @@ describe Chef::Provider::RemoteDirectory do
         ::File.open(@destination_dir + '/remotesubdir/remote_subdir_file1.txt', 'a') {|f| f.puts "blah blah blah" }
         file1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt'))
         subdirfile1md5 = Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt'))
+        @provider.stub!(:update_new_file_state)
         @provider.run_action(:create)
         file1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remote_dir_file1.txt'))).should be_true
         subdirfile1md5.eql?(Digest::MD5.hexdigest(::File.read(@destination_dir + '/remotesubdir/remote_subdir_file1.txt'))).should be_true

data/spec/unit/provider/remote_file_spec.rb

@@ -119,6 +119,7 @@ describe Chef::Provider::RemoteFile, "action_create" do
         it "downloads the file" do
           @resource.checksum("this hash doesn't match")
           @rest.should_receive(:streaming_request).with("http://opscode.com/seattle.txt", {}).and_return(@tempfile)
+          @provider.stub!(:update_new_file_state)
           @provider.run_action(:create)
         end
 
@@ -126,6 +127,7 @@ describe Chef::Provider::RemoteFile, "action_create" do
           # i.e., the existing file is      "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa"
           @resource.checksum("fd012fd")
           @rest.should_receive(:streaming_request).with("http://opscode.com/seattle.txt", {}).and_return(@tempfile)
+          @provider.stub!(:update_new_file_state)
           @provider.run_action(:create)
         end
       end
@@ -199,10 +201,12 @@ describe Chef::Provider::RemoteFile, "action_create" do
 
       it "should copy the raw file to the new resource" do
         FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true)
+        @provider.stub!(:update_new_file_state)
         @provider.run_action(:create)
       end
 
       it "should set the new resource to updated" do
+        @provider.stub!(:update_new_file_state)
         @provider.run_action(:create)
         @resource.should be_updated
       end
@@ -254,16 +258,19 @@ describe Chef::Provider::RemoteFile, "action_create" do
         end
 
         it "should backup the original file" do
+          @provider.stub!(:update_new_file_state)
           @provider.should_receive(:backup).with(@resource.path).and_return(true)
           @provider.run_action(:create)
         end
 
         it "should copy the raw file to the new resource" do
+          @provider.stub!(:update_new_file_state)
           FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true)
           @provider.run_action(:create)
         end
 
         it "should set the new resource to updated" do
+          @provider.stub!(:update_new_file_state)
           @provider.run_action(:create)
           @resource.should be_updated
         end

data/spec/unit/resource/cookbook_file_spec.rb

@@ -1,7 +1,8 @@
 #
 # Author:: Daniel DeLeo (<dan@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2010 Opscode, Inc.
-# License:: Apache License, Version 2.0
+#p 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.
@@ -44,5 +45,45 @@ describe Chef::Resource::CookbookFile do
   it "sets the provider to Chef::Provider::CookbookFile" do
     @cookbook_file.provider.should == Chef::Provider::CookbookFile
   end
+  
+  describe "when it has a backup number, group, mode, owner, source, checksum, and cookbook on nix or path, rights, deny_rights, checksum on windows" do
+    before do
+       if Chef::Platform.windows?
+         @cookbook_file.path("C:/temp/origin/file.txt")
+         @cookbook_file.rights(:read, "Everyone")
+         @cookbook_file.deny_rights(:full_control, "Clumsy_Sam")
+       else
+         @cookbook_file.path("/tmp/origin/file.txt")
+         @cookbook_file.group("wheel")
+         @cookbook_file.mode("0664")
+         @cookbook_file.owner("root")
+         @cookbook_file.source("/tmp/foo.txt")
+         @cookbook_file.cookbook("/tmp/cookbooks/cooked.rb")
+       end
+      @cookbook_file.checksum("1" * 64)
+    end
 
+    
+    it "describes the state" do
+      state = @cookbook_file.state
+      if Chef::Platform.windows?
+        puts state
+        state[:rights].should == [{:permissions => :read, :principals => "Everyone"}]
+        state[:deny_rights].should == [{:permissions => :full_control, :principals => "Clumsy_Sam"}]
+      else        
+        state[:group].should == "wheel"
+        state[:mode].should == "0664"
+        state[:owner].should == "root"
+      end
+      state[:checksum].should == "1" * 64
+    end
+    
+    it "returns the path as its identity" do
+      if Chef::Platform.windows?
+        @cookbook_file.identity.should == "C:/temp/origin/file.txt"
+      else
+        @cookbook_file.identity.should == "/tmp/origin/file.txt"
+      end
+    end
+  end
 end

data/spec/unit/resource/cron_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -151,4 +152,30 @@ describe Chef::Resource::Cron do
       @resource.send(x, 5).should eql("5")
     end
   end
+  
+  describe "when it has a time (minute, hour, day, month, weeekend) and user" do
+    before do 
+      @resource.command("tackle")
+      @resource.minute("1")
+      @resource.hour("2")
+      @resource.day("3")
+      @resource.month("4")
+      @resource.weekday("5")
+      @resource.user("root")
+    end
+
+    it "describes the state" do
+      state = @resource.state
+      state[:minute].should == "1"
+      state[:hour].should == "2"
+      state[:day].should == "3"
+      state[:month].should == "4"
+      state[:weekday].should == "5"
+      state[:user].should == "root"
+    end
+
+    it "returns the command as its identity" do
+      @resource.identity.should == "tackle"
+    end
+  end
 end

data/spec/unit/resource/deploy_spec.rb

@@ -229,4 +229,31 @@ describe Chef::Resource::Deploy do
     @resource.keep_releases.should == 1
   end
 
+  describe "when it has meta application root, revision, user, group,
+            scm provider, repository cache, environment, simlinks and migrate" do
+    before do 
+      @resource.repository("http://uri.org")
+      @resource.deploy_to("/")
+      @resource.revision("1.2.3")
+      @resource.user("root")
+      @resource.group("pokemon")
+      @resource.scm_provider(Chef::Provider::Git)
+      @resource.repository_cache("cached-copy")
+      @resource.environment({"SUDO" => "TRUE"})
+      @resource.symlinks({"system" => "public/system"})
+      @resource.migrate(false)
+      
+    end
+
+    it "describes its state" do
+      state = @resource.state
+      state[:deploy_to].should == "/"
+      state[:revision].should == "1.2.3"
+    end
+
+    it "returns the repository URI as its identity" do
+      @resource.identity.should == "http://uri.org"
+    end
+  end
+  
 end

data/spec/unit/resource/directory_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -59,4 +60,23 @@ describe Chef::Resource::Directory do
     lambda { @resource.recursive "monkey" }.should raise_error(ArgumentError)
   end
 
+  describe "when it has group, mode, and owner" do
+    before do 
+      @resource.path("/tmp/foo/bar/")
+      @resource.group("wheel")
+      @resource.mode("0664")
+      @resource.owner("root")
+    end
+
+    it "describes its state" do
+      state = @resource.state
+      state[:group].should == "wheel"
+      state[:mode].should == "0664"
+      state[:owner].should == "root"
+    end
+
+    it "returns the directory path as its identity" do
+      @resource.identity.should == "/tmp/foo/bar/"
+    end
+  end
 end

data/spec/unit/resource/env_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Doug MacEachern (<dougm@vmware.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2010 VMware, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -63,4 +64,22 @@ describe Chef::Resource::Env do
     @resource.value "bar"
     @resource.value.should eql("bar")
   end
+
+  describe "when it has key name and value" do
+    before do 
+      @resource.key_name("charmander")
+      @resource.value("level7")
+      @resource.delim("hi")
+    end
+
+    it "describes its state" do
+      state = @resource.state
+      state[:value].should == "level7"
+    end
+
+    it "returns the key name as its identity" do
+      @resource.identity.should == "charmander"
+    end
+  end
+
 end

data/spec/unit/resource/erl_call_spec.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Joe Williams (<joe@joetify.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Joe Williams
 # License:: Apache License, Version 2.0
 #
@@ -66,4 +67,15 @@ describe Chef::Resource::ErlCall do
     @resource.node_name.should eql("chef@erlang")
   end
 
+  describe "when it has cookie and node_name" do
+    before do 
+      @resource.code("erl-call:function()")
+      @resource.cookie("cookie")
+      @resource.node_name("raster")
+    end
+
+    it "returns the code as its identity" do
+      @resource.identity.should == "erl-call:function()"
+    end
+  end
 end