chef 11.6.2 → 11.8.0.rc.1

data/spec/unit/resource/apt_package_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,19 +19,19 @@
 require 'spec_helper'
 
 describe Chef::Resource::AptPackage, "initialize" do
-  
+
   before(:each) do
     @resource = Chef::Resource::AptPackage.new("foo")
   end
-  
+
   it "should return a Chef::Resource::AptPackage" do
     @resource.should be_a_kind_of(Chef::Resource::AptPackage)
   end
-  
+
   it "should set the resource_name to :apt_package" do
     @resource.resource_name.should eql(:apt_package)
   end
-  
+
   it "should set the provider to Chef::Provider::Package::Apt" do
     @resource.provider.should eql(Chef::Provider::Package::Apt)
   end

data/spec/unit/resource/bash_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.
@@ -22,17 +22,17 @@ describe Chef::Resource::Bash do
 
   before(:each) do
     @resource = Chef::Resource::Bash.new("fakey_fakerton")
-  end  
+  end
 
   it "should create a new Chef::Resource::Bash" do
     @resource.should be_a_kind_of(Chef::Resource)
     @resource.should be_a_kind_of(Chef::Resource::Bash)
   end
-  
+
   it "should have a resource name of :bash" do
     @resource.resource_name.should eql(:bash)
   end
-  
+
   it "should have an interpreter of bash" do
     @resource.interpreter.should eql("bash")
   end

data/spec/unit/resource/batch_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.
@@ -27,22 +27,22 @@ describe Chef::Resource::Batch do
     node.default["kernel"][:machine] = :x86_64.to_s
 
     run_context = Chef::RunContext.new(node, nil, nil)
-    
+
     @resource = Chef::Resource::Batch.new("batch_unit_test", run_context)
 
-  end  
+  end
 
   it "should create a new Chef::Resource::Batch" do
     @resource.should be_a_kind_of(Chef::Resource::Batch)
   end
-  
+
   context "windows script" do
     let(:resource_instance) { @resource }
     let(:resource_instance_name ) { @resource.command }
     let(:resource_name) { :batch }
     let(:interpreter_file_name) { 'cmd.exe' }
 
-    it_should_behave_like "a Windows script resource"  
+    it_should_behave_like "a Windows script resource"
   end
-  
+
 end

data/spec/unit/resource/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,25 +19,25 @@
 require 'spec_helper'
 
 describe Chef::Resource::Breakpoint do
-  
+
   before do
     @breakpoint = Chef::Resource::Breakpoint.new
   end
-  
+
   it "allows the action :break" do
     @breakpoint.allowed_actions.should include(:break)
   end
-  
+
   it "defaults to the break action" do
     @breakpoint.action.should == "break"
   end
-  
+
   it "names itself after the line number of the file where it's created" do
     @breakpoint.name.should match(/breakpoint_spec\.rb\:[\d]{2}\:in \`new\'$/)
   end
-  
+
   it "uses the breakpoint provider" do
     @breakpoint.provider.should == Chef::Provider::Breakpoint
   end
-  
+
 end

data/spec/unit/resource/chef_gem_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,19 +20,19 @@
 require 'spec_helper'
 
 describe Chef::Resource::ChefGem, "initialize" do
-  
+
   before(:each) do
     @resource = Chef::Resource::ChefGem.new("foo")
   end
-  
+
   it "should return a Chef::Resource::ChefGem" do
     @resource.should be_a_kind_of(Chef::Resource::ChefGem)
   end
-  
+
   it "should set the resource_name to :chef_gem" do
     @resource.resource_name.should eql(:chef_gem)
   end
-  
+
   it "should set the provider to Chef::Provider::Package::Rubygems" do
     @resource.provider.should eql(Chef::Provider::Package::Rubygems)
   end

data/spec/unit/resource/cookbook_file_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.
@@ -23,29 +23,29 @@ describe Chef::Resource::CookbookFile do
   before do
     @cookbook_file = Chef::Resource::CookbookFile.new('sourcecode_tarball.tgz')
   end
-  
+
   it "uses the name parameter for the source parameter" do
     @cookbook_file.name.should == 'sourcecode_tarball.tgz'
   end
-  
+
   it "has a source parameter" do
     @cookbook_file.name('config_file.conf')
     @cookbook_file.name.should == 'config_file.conf'
   end
-  
+
   it "defaults to a nil cookbook parameter (current cookbook will be used)" do
     @cookbook_file.cookbook.should be_nil
   end
-  
+
   it "has a cookbook parameter" do
     @cookbook_file.cookbook("munin")
     @cookbook_file.cookbook.should == 'munin'
   end
-  
+
   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?
@@ -63,21 +63,21 @@ describe Chef::Resource::CookbookFile do
       @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        
+      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"

data/spec/unit/resource/cron_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.
@@ -23,21 +23,21 @@ describe Chef::Resource::Cron do
 
   before(:each) do
     @resource = Chef::Resource::Cron.new("cronify")
-  end  
+  end
 
   it "should create a new Chef::Resource::Cron" do
     @resource.should be_a_kind_of(Chef::Resource)
     @resource.should be_a_kind_of(Chef::Resource::Cron)
   end
-  
+
   it "should have a name" do
     @resource.name.should eql("cronify")
   end
-  
+
   it "should have a default action of 'create'" do
     @resource.action.should eql(:create)
   end
-  
+
   it "should accept create or delete for action" do
     lambda { @resource.action :create }.should_not raise_error(ArgumentError)
     lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
@@ -63,7 +63,7 @@ describe Chef::Resource::Cron do
     @resource.hour "6"
     @resource.hour.should eql("6")
   end
-    
+
   it "should allow you to specify the day" do
     @resource.day "10"
     @resource.day.should eql("10")
@@ -110,7 +110,7 @@ describe Chef::Resource::Cron do
       @resource.send(x, "*").should eql("*")
     end
   end
-  
+
   it "should allow ranges for all time and date values" do
     [ "minute", "hour", "day", "month", "weekday" ].each do |x|
       @resource.send(x, "1-2,5").should eql("1-2,5")
@@ -130,31 +130,31 @@ describe Chef::Resource::Cron do
   it "should reject any minute over 59" do
     lambda { @resource.minute "60" }.should raise_error(RangeError)
   end
-  
+
   it "should reject any hour over 23" do
     lambda { @resource.hour "24" }.should raise_error(RangeError)
   end
-  
+
   it "should reject any day over 31" do
     lambda { @resource.day "32" }.should raise_error(RangeError)
   end
-  
+
   it "should reject any month over 12" do
     lambda { @resource.month "13" }.should raise_error(RangeError)
   end
-  
+
   it "should reject any weekday over 7" do
     lambda { @resource.weekday "8" }.should raise_error(RangeError)
   end
-  
+
   it "should convert integer schedule values to a string" do
     [ "minute", "hour", "day", "month", "weekday" ].each do |x|
       @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 
+    before do
       @resource.command("tackle")
       @resource.minute("1")
       @resource.hour("2")

data/spec/unit/resource/csh_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.
@@ -22,17 +22,17 @@ describe Chef::Resource::Csh do
 
   before(:each) do
     @resource = Chef::Resource::Csh.new("fakey_fakerton")
-  end  
+  end
 
   it "should create a new Chef::Resource::Csh" do
     @resource.should be_a_kind_of(Chef::Resource)
     @resource.should be_a_kind_of(Chef::Resource::Csh)
   end
-  
+
   it "should have a resource name of :csh" do
     @resource.resource_name.should eql(:csh)
   end
-  
+
   it "should have an interpreter of csh" do
     @resource.interpreter.should eql("csh")
   end

data/spec/unit/resource/deploy_revision_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::Resource::DeployRevision do
-  
+
   it "defaults to the revision deploy provider" do
     @resource = Chef::Resource::DeployRevision.new("deploy _this_!")
     @resource.provider.should == Chef::Provider::Deploy::Revision
@@ -29,11 +29,11 @@ describe Chef::Resource::DeployRevision do
     @resource = Chef::Resource::DeployRevision.new("deploy _this_!")
     @resource.resource_name.should == :deploy_revision
   end
-  
+
 end
 
 describe Chef::Resource::DeployBranch do
-  
+
   it "defaults to the revision deploy provider" do
     @resource = Chef::Resource::DeployBranch.new("deploy _this_!")
     @resource.provider.should == Chef::Provider::Deploy::Revision
@@ -43,5 +43,5 @@ describe Chef::Resource::DeployBranch do
     @resource = Chef::Resource::DeployBranch.new("deploy _this_!")
     @resource.resource_name.should == :deploy_branch
   end
-  
+
 end

data/spec/unit/resource/deploy_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::Resource::Deploy do
-  
+
   class << self
     def resource_has_a_string_attribute(attr_name)
       it "has a String attribute for #{attr_name.to_s}" do
@@ -28,7 +28,7 @@ describe Chef::Resource::Deploy do
         lambda {@resource.send(attr_name, 8675309)}.should raise_error(ArgumentError)
       end
     end
-    
+
     def resource_has_a_boolean_attribute(attr_name, opts={:defaults_to=>false})
       it "has a Boolean attribute for #{attr_name.to_s}" do
         @resource.send(attr_name).should eql(opts[:defaults_to])
@@ -36,7 +36,7 @@ describe Chef::Resource::Deploy do
         @resource.send(attr_name).should eql( !opts[:defaults_to] )
       end
     end
-    
+
     def resource_has_a_callback_attribute(attr_name)
       it "has a Callback attribute #{attr_name}" do
         callback_block = lambda { :noop }
@@ -49,11 +49,11 @@ describe Chef::Resource::Deploy do
       end
     end
   end
-  
+
   before do
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
   end
-  
+
   resource_has_a_string_attribute(:repo)
   resource_has_a_string_attribute(:deploy_to)
   resource_has_a_string_attribute(:role)
@@ -70,15 +70,15 @@ describe Chef::Resource::Deploy do
   resource_has_a_string_attribute(:svn_password)
   resource_has_a_string_attribute(:svn_arguments)
   resource_has_a_string_attribute(:svn_info_args)
-  
+
   resource_has_a_boolean_attribute(:migrate, :defaults_to=>false)
   resource_has_a_boolean_attribute(:enable_submodules, :defaults_to=>false)
   resource_has_a_boolean_attribute(:shallow_clone, :defaults_to=>false)
-  
+
   it "uses the first argument as the deploy directory" do
     @resource.deploy_to.should eql("/my/deploy/dir")
   end
-  
+
   # For git, any revision, branch, tag, whatever is resolved to a SHA1 ref.
   # For svn, the branch is included in the repo URL.
   # Therefore, revision and branch ARE NOT SEPARATE THINGS
@@ -86,19 +86,19 @@ describe Chef::Resource::Deploy do
     @resource.branch "stable"
     @resource.revision.should eql("stable")
   end
-  
+
   it "takes the SCM resource to use as a constant, and defaults to git" do
     @resource.scm_provider.should eql(Chef::Provider::Git)
     @resource.scm_provider Chef::Provider::Subversion
     @resource.scm_provider.should eql(Chef::Provider::Subversion)
   end
-  
+
   it "allows scm providers to be set via symbol" do
     @resource.scm_provider.should == Chef::Provider::Git
     @resource.scm_provider :subversion
     @resource.scm_provider.should == Chef::Provider::Subversion
   end
-  
+
   it "allows scm providers to be set via string" do
     @resource.scm_provider.should == Chef::Provider::Git
     @resource.scm_provider "subversion"
@@ -111,105 +111,105 @@ describe Chef::Resource::Deploy do
     @resource.svn_force_export.should be_true
     lambda {@resource.svn_force_export(10053)}.should raise_error(ArgumentError)
   end
-  
+
   it "takes arbitrary environment variables in a hash" do
     @resource.environment "RAILS_ENV" => "production"
     @resource.environment.should == {"RAILS_ENV" => "production"}
   end
-  
+
   it "takes string arguments to environment for backwards compat, setting RAILS_ENV, RACK_ENV, and MERB_ENV" do
     @resource.environment "production"
     @resource.environment.should == {"RAILS_ENV"=>"production", "RACK_ENV"=>"production","MERB_ENV"=>"production"}
   end
-  
+
   it "sets destination to $deploy_to/shared/$repository_cache" do
     @resource.destination.should eql("/my/deploy/dir/shared/cached-copy")
   end
-  
+
   it "sets shared_path to $deploy_to/shared" do
     @resource.shared_path.should eql("/my/deploy/dir/shared")
   end
-  
+
   it "sets current_path to $deploy_to/current" do
     @resource.current_path.should eql("/my/deploy/dir/current")
   end
-  
+
   it "gets the current_path correct even if the shared_path is set (regression test)" do
     @resource.shared_path
     @resource.current_path.should eql("/my/deploy/dir/current")
   end
-  
+
   it "gives #depth as 5 if shallow clone is true, nil otherwise" do
     @resource.depth.should be_nil
     @resource.shallow_clone true
     @resource.depth.should eql("5")
   end
-  
+
   it "aliases repo as repository" do
     @resource.repository "git@github.com/opcode/cookbooks.git"
     @resource.repo.should eql("git@github.com/opcode/cookbooks.git")
   end
-  
+
   it "aliases git_ssh_wrapper as ssh_wrapper" do
     @resource.ssh_wrapper "git_my_repo.sh"
     @resource.git_ssh_wrapper.should eql("git_my_repo.sh")
   end
-  
+
   it "has an Array attribute purge_before_symlink, default: log, tmp/pids, public/system" do
     @resource.purge_before_symlink.should == %w{ log tmp/pids public/system }
     @resource.purge_before_symlink %w{foo bar baz}
     @resource.purge_before_symlink.should == %w{foo bar baz}
   end
-  
+
   it "has an Array attribute create_dirs_before_symlink, default: tmp, public, config" do
     @resource.create_dirs_before_symlink.should == %w{tmp public config}
     @resource.create_dirs_before_symlink %w{foo bar baz}
     @resource.create_dirs_before_symlink.should == %w{foo bar baz}
   end
-  
+
   it 'has a Hash attribute symlinks, default: {"system" => "public/system", "pids" => "tmp/pids", "log" => "log"}' do
     default = { "system" => "public/system", "pids" => "tmp/pids", "log" => "log"}
     @resource.symlinks.should == default
     @resource.symlinks "foo" => "bar/baz"
     @resource.symlinks.should == {"foo" => "bar/baz"}
   end
-  
+
   it 'has a Hash attribute symlink_before_migrate, default "config/database.yml" => "config/database.yml"' do
     @resource.symlink_before_migrate.should == {"config/database.yml" => "config/database.yml"}
     @resource.symlink_before_migrate "wtf?" => "wtf is going on"
     @resource.symlink_before_migrate.should == {"wtf?" => "wtf is going on"}
   end
-  
+
   resource_has_a_callback_attribute :before_migrate
   resource_has_a_callback_attribute :before_symlink
   resource_has_a_callback_attribute :before_restart
   resource_has_a_callback_attribute :after_restart
-  
+
   it "aliases restart_command as restart" do
     @resource.restart "foobaz"
     @resource.restart_command.should == "foobaz"
   end
-  
+
   it "takes a block for the restart parameter" do
     restart_like_this = lambda {p :noop}
     @resource.restart(&restart_like_this)
     @resource.restart.should == restart_like_this
   end
-  
+
   it "defaults to using the Deploy::Timestamped provider" do
     @resource.provider.should == Chef::Provider::Deploy::Timestamped
   end
-  
+
   it "allows providers to be set with a full class name" do
     @resource.provider Chef::Provider::Deploy::Timestamped
     @resource.provider.should == Chef::Provider::Deploy::Timestamped
   end
-  
+
   it "allows deploy providers to be set via symbol" do
     @resource.provider :revision
     @resource.provider.should == Chef::Provider::Deploy::Revision
   end
-  
+
   it "allows deploy providers to be set via string" do
     @resource.provider "revision"
     @resource.provider.should == Chef::Provider::Deploy::Revision
@@ -229,9 +229,23 @@ describe Chef::Resource::Deploy do
     @resource.keep_releases.should == 1
   end
 
+  describe "when it has a timeout attribute" do
+    let(:ten_seconds) { 10 }
+    before { @resource.timeout(ten_seconds) }
+    it "stores this timeout" do
+      @resource.timeout.should == ten_seconds
+    end
+  end
+
+  describe "when it has no timeout attribute" do
+    it "should have no default timeout" do
+      @resource.timeout.should be_nil
+    end
+  end
+
   describe "when it has meta application root, revision, user, group,
             scm provider, repository cache, environment, simlinks and migrate" do
-    before do 
+    before do
       @resource.repository("http://uri.org")
       @resource.deploy_to("/")
       @resource.revision("1.2.3")
@@ -242,7 +256,7 @@ describe Chef::Resource::Deploy do
       @resource.environment({"SUDO" => "TRUE"})
       @resource.symlinks({"system" => "public/system"})
       @resource.migrate(false)
-      
+
     end
 
     it "describes its state" do
@@ -255,5 +269,5 @@ describe Chef::Resource::Deploy do
       @resource.identity.should == "http://uri.org"
     end
   end
-  
+
 end