chef 10.14.2 → 10.14.4.rc.0

data/spec/unit/platform_spec.rb

@@ -154,19 +154,31 @@ describe Chef::Platform do
     node.platform_version("8.5")
     Chef::Platform.find_provider_for_node(node, kitty).should eql(Chef::Provider::Cat)
   end
-  
-  it "returns a provider object given a Chef::Resource object which has a valid run context" do
+ 
+  def setup_file_resource
     node = Chef::Node.new
     node.platform("mac_os_x")
     node.platform_version("9.2.2")
     run_context = Chef::RunContext.new(node, {}, @events)
-    file = Chef::Resource::File.new("whateva", run_context)
+    [ Chef::Resource::File.new("whateva", run_context), run_context ]
+  end
+
+  it "returns a provider object given a Chef::Resource object which has a valid run context and an action" do
+    file, run_context = setup_file_resource
     provider = Chef::Platform.provider_for_resource(file, :foo)
     provider.should be_an_instance_of(Chef::Provider::File)
     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)
+    provider.should be_an_instance_of(Chef::Provider::File)
+    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)

data/spec/unit/provider/deploy_spec.rb

@@ -43,20 +43,32 @@ describe Chef::Provider::Deploy do
     @provider.should respond_to(:action_rollback)
   end
 
-  it "creates deploy_to dir if it does not exist yet" do
-    FileUtils.should_receive(:mkdir_p).with(@resource.deploy_to)
-    FileUtils.should_receive(:mkdir_p).with(@resource.shared_path)
-    ::File.stub!(:directory?).and_return(false)
-    @provider.stub(:copy_cached_repo)
-    @provider.stub(:update_cached_repo)
-    @provider.stub(:symlink)
-    @provider.stub(:migrate)
-    @provider.deploy
-    @provider.converge
+  context "when the deploy_to dir does not exist yet" do
+    before do
+      FileUtils.should_receive(:mkdir_p).with(@resource.deploy_to).ordered
+      FileUtils.should_receive(:mkdir_p).with(@resource.shared_path).ordered
+      ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
+      ::File.stub!(:directory?).and_return(false)
+      @provider.stub(:symlink)
+      @provider.stub(:migrate)
+      @provider.stub(:copy_cached_repo)
+    end
+
+    it "creates deploy_to dir" do
+      @provider.stub(:update_cached_repo)
+      @provider.deploy
+    end
+
+    it "creates deploy_to dir before calling update_cached_repo (CHEF-3435)" do
+      @provider.send(:converge_actions).should_receive(:empty?).and_return(false)
+      @provider.should_receive(:update_cached_repo).ordered
+      @provider.deploy
+    end
   end
 
   it "does not create deploy_to dir if it exists" do
     ::File.stub!(:directory?).and_return(true)
+    ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
     FileUtils.should_not_receive(:mkdir_p).with(@resource.deploy_to)
     FileUtils.should_not_receive(:mkdir_p).with(@resource.shared_path)
     @provider.stub(:copy_cached_repo)
@@ -68,6 +80,7 @@ describe Chef::Provider::Deploy do
   end
 
   it "ensures the deploy_to dir ownership after the verfication that it exists" do
+    ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
     @provider.should_receive(:verify_directories_exist).ordered
     @provider.should_receive(:enforce_ownership).ordered
     @provider.stub(:copy_cached_repo)
@@ -281,11 +294,33 @@ describe Chef::Provider::Deploy do
   it "skips an eval callback if the file doesn't exist" do
     barbaz_callback = @expected_release_dir + "/deploy/barbaz.rb"
     ::File.should_receive(:exist?).with(barbaz_callback).and_return(false)
+    ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
     @provider.should_not_receive(:from_file)
     @provider.callback(:barbaz, nil)
     @provider.converge
   end
 
+  # CHEF-3449 #converge_by is called in #recipe_eval and must happen in sequence
+  # with the other calls to #converge_by to keep the train on the tracks
+  it "evaluates a callback file before the corresponding step" do
+    ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times.and_yield
+    @provider.should_receive(:verify_directories_exist)
+    @provider.should_receive(:update_cached_repo)
+    @provider.should_receive(:enforce_ownership)
+    @provider.should_receive(:copy_cached_repo)
+    @provider.should_receive(:install_gems)
+    @provider.should_receive(:enforce_ownership)
+    @provider.should_receive(:converge_by).ordered # before_migrate
+    @provider.should_receive(:migrate).ordered
+    @provider.should_receive(:converge_by).ordered # before_symlink
+    @provider.should_receive(:symlink).ordered
+    @provider.should_receive(:converge_by).ordered # before_restart
+    @provider.should_receive(:restart).ordered
+    @provider.should_receive(:converge_by).ordered # after_restart
+    @provider.should_receive(:cleanup!)
+    @provider.deploy
+  end
+
   it "gets a SCM provider as specified by its resource" do
     @provider.scm_provider.should be_an_instance_of(Chef::Provider::Git)
     @provider.scm_provider.new_resource.destination.should eql("/my/deploy/dir/shared/cached-copy")

data/spec/unit/provider/http_request_spec.rb

@@ -167,6 +167,12 @@ describe Chef::Provider::HttpRequest do
         @rest.should_receive(:run_request).with(:HEAD, @rest.create_url, @new_resource.headers, false, 10, false)
         @provider.run_action(:head)
       end
+
+      it "doesn't call converge_by if HEAD does not return modified" do
+        @rest.should_receive(:run_request).and_return(false)
+        @provider.should_not_receive(:converge_by)
+        @provider.run_action(:head)
+      end
     end
   end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 115
-  prerelease: 
+  hash: -3387315844
+  prerelease: 8
   segments: 
   - 10
   - 14
-  - 2
-  version: 10.14.2
+  - 4
+  - rc
+  - 0
+  version: 10.14.4.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-10 00:00:00 Z
+date: 2012-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -1290,6 +1292,7 @@ files:
 - spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
 - spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt
 - spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt
+- spec/data/cookbooks/angrybash/recipes/default.rb
 - spec/data/cookbooks/apache2/recipes/default.rb
 - spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
 - spec/data/cookbooks/java/files/default/java.response
@@ -1410,12 +1413,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: