chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/spec/unit/resource/remote_file_spec.rb

@@ -39,37 +39,35 @@ describe Chef::Resource::RemoteFile do
     Chef::Platform.find_provider(:noplatform, 'noversion', @resource).should == Chef::Provider::RemoteFile
   end
 
-  it "says its provider is CookbookFile when the source is a relative URI" do
-    @resource.source('seattle.txt')
-    @resource.provider.should == Chef::Provider::CookbookFile
-    Chef::Platform.find_provider(:noplatform, 'noversion', @resource).should == Chef::Provider::CookbookFile
-  end
-  
+
   describe "source" do
-    it "should accept a string for the remote file source" do
-      @resource.source "something"
-      @resource.source.should eql("something")
+    it "does not have a default value for 'source'" do
+      @resource.source.should eql([])
     end
 
-    it "should have a default based on the param name" do
-      @resource.source.should eql("fakey_fakerton")
+    it "should accept a URI for the remote file source" do
+      @resource.source "http://opscode.com/"
+      @resource.source.should eql([ "http://opscode.com/" ])
     end
 
-    it "should use only the basename of the file as the default" do
-      r = Chef::Resource::RemoteFile.new("/tmp/obit/fakey_fakerton")
-      r.source.should eql("fakey_fakerton")
+    it "should accept an array of URIs for the remote file source" do
+      @resource.source([ "http://opscode.com/", "http://puppetlabs.com/" ])
+      @resource.source.should eql([ "http://opscode.com/", "http://puppetlabs.com/" ])
     end
-  end
-  
-  describe "cookbook" do
-    it "should accept a string for the cookbook name" do
-      @resource.cookbook "something"
-      @resource.cookbook.should eql("something")
+
+    it "should accept an multiple URIs as arguments for the remote file source" do
+      @resource.source("http://opscode.com/", "http://puppetlabs.com/")
+      @resource.source.should eql([ "http://opscode.com/", "http://puppetlabs.com/" ])
     end
-    
-    it "should default to nil" do
-      @resource.cookbook.should == nil
+
+    it "does not accept a non-URI as the source" do
+      lambda { @resource.source("not-a-uri") }.should raise_error(Chef::Exceptions::InvalidRemoteFileURI)
     end
+
+    it "should raise an exception when source is an empty array" do
+      lambda { @resource.source([]) }.should raise_error(ArgumentError)
+    end
+
   end
 
   describe "checksum" do
@@ -82,7 +80,48 @@ describe Chef::Resource::RemoteFile do
       @resource.checksum.should == nil
     end
   end
-  
+
+  describe "ftp_active_mode" do
+    it "should accept a boolean for the ftp_active_mode object" do
+      @resource.ftp_active_mode true
+      @resource.ftp_active_mode.should be_true
+    end
+
+    it "should default to false" do
+      @resource.ftp_active_mode.should be_false
+    end
+  end
+
+  describe "conditional get options" do
+    it "defaults to using etags and last modified" do
+      @resource.use_etags.should be_true
+      @resource.use_last_modified.should be_true
+    end
+
+    it "enable or disables etag and last modified options as a group" do
+      @resource.use_conditional_get(false)
+      @resource.use_etags.should be_false
+      @resource.use_last_modified.should be_false
+
+      @resource.use_conditional_get(true)
+      @resource.use_etags.should be_true
+      @resource.use_last_modified.should be_true
+    end
+
+    it "disables etags indivdually" do
+      @resource.use_etags(false)
+      @resource.use_etags.should be_false
+      @resource.use_last_modified.should be_true
+    end
+
+    it "disables last modified individually" do
+      @resource.use_last_modified(false)
+      @resource.use_last_modified.should be_false
+      @resource.use_etags.should be_true
+    end
+
+  end
+
   describe "when it has group, mode, owner, source, and checksum" do
     before do 
       if Chef::Platform.windows?
@@ -121,5 +160,4 @@ describe Chef::Resource::RemoteFile do
       end
     end
   end
- 
 end

data/spec/unit/resource/route_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Resource::Route do
   end
   
   it "should have a default action of 'add'" do
-    @resource.action.should eql(:add)
+    @resource.action.should eql([:add])
   end
   
   it "should accept add or delete for action" do

data/spec/unit/resource/ruby_block_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Resource::RubyBlock do
 
   before(:each) do
     @resource = Chef::Resource::RubyBlock.new("fakey_fakerton")
-  end  
+  end
 
   it "should create a new Chef::Resource::RubyBlock" do
     @resource.should be_a_kind_of(Chef::Resource)
@@ -31,7 +31,7 @@ describe Chef::Resource::RubyBlock do
   end
 
   it "should have a default action of 'create'" do
-    @resource.action.should eql("create")
+    @resource.action.should eql("run")
   end
   
   it "should have a resource name of :ruby_block" do
@@ -44,6 +44,11 @@ describe Chef::Resource::RubyBlock do
     end.call.should eql("foo")
   end
 
+  it "allows the action to be 'create'" do
+    @resource.action :create
+    @resource.action.should == [:create]
+  end
+
   describe "when it has been initialized with block code" do
     before do 
       @resource.block_name("puts 'harrrr'")
@@ -53,5 +58,4 @@ describe Chef::Resource::RubyBlock do
       @resource.identity.should == "puts 'harrrr'"
     end
   end
-
 end

data/spec/unit/resource/script_spec.rb

@@ -20,50 +20,27 @@
 require 'spec_helper'
 
 describe Chef::Resource::Script do
+  let(:resource_instance_name) { "fakey_fakerton" }  
+  let(:script_resource) { Chef::Resource::Script.new(resource_instance_name) }
+  let(:resource_name) { :script }
 
-  before(:each) do
-    @resource = Chef::Resource::Script.new("fakey_fakerton")
-  end  
-
-  it "should create a new Chef::Resource::Script" do
-    @resource.should be_a_kind_of(Chef::Resource)
-    @resource.should be_a_kind_of(Chef::Resource::Script)
-  end
-  
-  it "should have a resource name of :script" do
-    @resource.resource_name.should eql(:script)
-  end
-  
-  it "should set command to the argument provided to new" do
-    @resource.command.should eql("fakey_fakerton")
-  end
-  
-  it "should accept a string for the code" do
-    @resource.code "hey jude"
-    @resource.code.should eql("hey jude")
-  end
-  
   it "should accept a string for the interpreter" do
-    @resource.interpreter "naaaaNaNaNaaNaaNaaNaa"
-    @resource.interpreter.should eql("naaaaNaNaNaaNaaNaaNaa")
-  end
-
-  it "should accept a string for the flags" do
-    @resource.flags "-f"
-    @resource.flags.should eql("-f")
+    script_resource.interpreter "naaaaNaNaNaaNaaNaaNaa"
+    script_resource.interpreter.should eql("naaaaNaNaNaaNaaNaaNaa")
   end
 
   describe "when it has interpreter and flags" do
     before do 
-      @resource.command("grep")
-      @resource.interpreter("gcc")
-      @resource.flags("-al")
+      script_resource.command("grep")
+      script_resource.interpreter("gcc")
+      script_resource.flags("-al")
     end
 
-    it "returns the command as its identity" do
-      @resource.identity.should == "grep"
+   it "returns the command as its identity" do
+      script_resource.identity.should == "grep"
     end
   end
-
-
+  
+  it_behaves_like "a script resource"
 end
+

data/spec/unit/resource/service_spec.rb

@@ -109,6 +109,17 @@ describe Chef::Resource::Service do
     }.should raise_error(ArgumentError)
   end
   
+  it "should accept a string for the service init command" do
+    @resource.init_command "/etc/init.d/chef"
+    @resource.init_command.should eql("/etc/init.d/chef")
+  end
+
+  it "should not accept a regexp for the service init command" do
+    lambda {
+      @resource.init_command /.*/
+    }.should raise_error(ArgumentError)
+  end
+
   %w{enabled running}.each do |attrib|
     it "should accept true for #{attrib}" do
       @resource.send(attrib, true) 

data/spec/unit/resource/template_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,7 +22,7 @@ describe Chef::Resource::Template do
 
   before(:each) do
     @resource = Chef::Resource::Template.new("fakey_fakerton")
-  end  
+  end
 
   describe "initialize" do
     it "should create a new Chef::Resource::Template" do
@@ -47,20 +47,20 @@ describe Chef::Resource::Template do
       r.source.should eql("fakey_fakerton.erb")
     end
   end
-  
+
   describe "variables" do
     it "should accept a hash for the variable list" do
       @resource.variables({ :reluctance => :awkward })
       @resource.variables.should == { :reluctance => :awkward }
     end
   end
-  
+
   describe "cookbook" do
     it "should accept a string for the cookbook name" do
       @resource.cookbook("foo")
       @resource.cookbook.should == "foo"
     end
-    
+
     it "should default to nil" do
       @resource.cookbook.should == nil
     end
@@ -76,7 +76,7 @@ describe Chef::Resource::Template do
       @resource.local.should == false
     end
   end
-  
+
   describe "when it has a path, owner, group, mode, and checksum" do
     before do
       @resource.path("/tmp/foo.txt")
@@ -104,5 +104,108 @@ describe Chef::Resource::Template do
     it "returns the file path as its identity" do
       @resource.identity.should == "/tmp/foo.txt"
     end
-  end 
+  end
+
+  describe "defining helper methods" do
+
+    module ExampleHelpers
+      def static_example
+        "static_example"
+      end
+    end
+
+    it "collects helper method bodies as blocks" do
+      @resource.helper(:example_1) { "example_1" }
+      @resource.helper(:example_2) { "example_2" }
+      @resource.inline_helper_blocks[:example_1].call.should == "example_1"
+      @resource.inline_helper_blocks[:example_2].call.should == "example_2"
+    end
+
+    it "compiles helper methods into a module" do
+      @resource.helper(:example_1) { "example_1" }
+      @resource.helper(:example_2) { "example_2" }
+      modules = @resource.helper_modules
+      modules.should have(1).module
+      o = Object.new
+      modules.each {|m| o.extend(m)}
+      o.example_1.should == "example_1"
+      o.example_2.should == "example_2"
+    end
+
+    it "compiles helper methods with arguments into a module" do
+      @resource.helper(:shout) { |quiet| quiet.upcase }
+      modules = @resource.helper_modules
+      o = Object.new
+      modules.each {|m| o.extend(m)}
+      o.shout("shout").should == "SHOUT"
+    end
+
+    it "raises an error when attempting to define a helper method without a method body" do
+      lambda { @resource.helper(:example) }.should raise_error(Chef::Exceptions::ValidationFailed)
+    end
+
+    it "raises an error when attempting to define a helper method with a non-Symbod method name" do
+      lambda { @resource.helper("example") { "fail" } }.should raise_error(Chef::Exceptions::ValidationFailed)
+    end
+
+    it "collects helper module bodies as blocks" do
+      @resource.helpers do
+        def example_1
+          "example_1"
+        end
+      end
+      module_body = @resource.inline_helper_modules.first
+      module_body.should be_a(Proc)
+    end
+
+    it "compiles helper module bodies into modules" do
+      @resource.helpers do
+        def example_1
+          "example_1"
+        end
+      end
+      modules = @resource.helper_modules
+      modules.should have(1).module
+      o = Object.new
+      modules.each {|m| o.extend(m)}
+      o.example_1.should == "example_1"
+    end
+
+    it "raises an error when no block or module name is given for helpers definition" do
+      lambda { @resource.helpers() }.should raise_error(Chef::Exceptions::ValidationFailed)
+    end
+
+    it "raises an error when a non-module is given for helpers definition" do
+      lambda { @resource.helpers("NotAModule") }.should raise_error(Chef::Exceptions::ValidationFailed)
+    end
+
+    it "raises an error when a module name and block are both given for helpers definition" do
+      lambda { @resource.helpers(ExampleHelpers) { module_code } }.should raise_error(Chef::Exceptions::ValidationFailed)
+    end
+
+    it "collects helper modules" do
+      @resource.helpers(ExampleHelpers)
+      @resource.helper_modules.should include(ExampleHelpers)
+    end
+
+    it "combines all helpers into a set of compiled modules" do
+      @resource.helpers(ExampleHelpers)
+      @resource.helpers do
+        def inline_module
+          "inline_module"
+        end
+      end
+      @resource.helper(:inline_method) { "inline_method" }
+      @resource.should have(3).helper_modules
+
+      o = Object.new
+      @resource.helper_modules.each {|m| o.extend(m)}
+      o.static_example.should == "static_example"
+      o.inline_module.should == "inline_module"
+      o.inline_method.should == "inline_method"
+    end
+
+
+  end
+
 end

data/spec/unit/resource/user_spec.rb

@@ -59,6 +59,13 @@ describe Chef::Resource::User, "initialize" do
       @resource.allowed_actions.detect { |a| a == action.to_sym }.should eql(action.to_sym)
     end
   end
+
+  it "should accept domain users (@ or \ separator) on non-windows" do
+    lambda { @resource.username "domain\@user" }.should_not raise_error(ArgumentError)
+    @resource.username.should == "domain\@user"
+    lambda { @resource.username "domain\\user" }.should_not raise_error(ArgumentError)
+    @resource.username.should  == "domain\\user"
+  end
 end
 
 %w{username comment home shell password}.each do |attrib|

data/spec/unit/resource_collection_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,49 +20,49 @@
 require 'spec_helper'
 
 describe Chef::ResourceCollection do
-  
+
   before(:each) do
     @rc = Chef::ResourceCollection.new()
     @resource = Chef::Resource::ZenMaster.new("makoto")
   end
-  
+
   describe "initialize" do
     it "should return a Chef::ResourceCollection" do
       @rc.should be_kind_of(Chef::ResourceCollection)
     end
   end
-  
+
   describe "[]" do
     it "should accept Chef::Resources through [index]" do
       lambda { @rc[0] = @resource }.should_not raise_error
       lambda { @rc[0] = "string" }.should raise_error
     end
-    
+
     it "should allow you to fetch Chef::Resources by position" do
       @rc[0] = @resource
       @rc[0].should eql(@resource)
     end
   end
-  
+
   describe "push" do
     it "should accept Chef::Resources through pushing" do
       lambda { @rc.push(@resource) }.should_not raise_error
       lambda { @rc.push("string") }.should raise_error
     end
   end
-  
+
   describe "<<" do
     it "should accept the << operator" do
       lambda { @rc << @resource }.should_not raise_error
     end
   end
-  
-  describe "insert" do 
+
+  describe "insert" do
     it "should accept only Chef::Resources" do
       lambda { @rc.insert(@resource) }.should_not raise_error
       lambda { @rc.insert("string") }.should raise_error
     end
-    
+
     it "should append resources to the end of the collection when not executing a run" do
       zmr = Chef::Resource::ZenMaster.new("there is no spoon")
       @rc.insert(@resource)
@@ -70,18 +70,18 @@ describe Chef::ResourceCollection do
       @rc[0].should eql(@resource)
       @rc[1].should eql(zmr)
     end
-    
+
     it "should insert resources to the middle of the collection if called while executing a run" do
       resource_to_inject = Chef::Resource::ZenMaster.new("there is no spoon")
       zmr = Chef::Resource::ZenMaster.new("morpheus")
       dummy = Chef::Resource::ZenMaster.new("keanu reeves")
       @rc.insert(zmr)
       @rc.insert(dummy)
-      
+
       @rc.execute_each_resource do |resource|
         @rc.insert(resource_to_inject) if resource == zmr
       end
-      
+
       @rc[0].should eql(zmr)
       @rc[1].should eql(resource_to_inject)
       @rc[2].should eql(dummy)
@@ -92,7 +92,7 @@ describe Chef::ResourceCollection do
     it "should allow you to iterate over every resource in the collection" do
       load_up_resources
       results = Array.new
-      lambda { 
+      lambda {
         @rc.each do |r|
           results << r.name
         end
@@ -109,15 +109,15 @@ describe Chef::ResourceCollection do
       end
     end
   end
-  
+
   describe "each_index" do
     it "should allow you to iterate over every resource by index" do
       load_up_resources
       results = Array.new
-      lambda { 
+      lambda {
         @rc.each_index do |i|
           results << @rc[i].name
-        end 
+        end
       }.should_not raise_error()
       results.each_index do |i|
         case i
@@ -131,7 +131,7 @@ describe Chef::ResourceCollection do
       end
     end
   end
-  
+
   describe "lookup" do
     it "should allow you to find resources by name via lookup" do
       zmr = Chef::Resource::ZenMaster.new("dog")
@@ -141,21 +141,21 @@ describe Chef::ResourceCollection do
       zmr = Chef::Resource::ZenMaster.new("cat")
       @rc[0] = zmr
       @rc.lookup(zmr).should eql(zmr)
-    
+
       zmr = Chef::Resource::ZenMaster.new("monkey")
       @rc.push(zmr)
       @rc.lookup(zmr).should eql(zmr)
     end
-  
+
     it "should raise an exception if you send something strange to lookup" do
       lambda { @rc.lookup(:symbol) }.should raise_error(ArgumentError)
     end
-  
+
     it "should raise an exception if it cannot find a resource with lookup" do
       lambda { @rc.lookup("zen_master[dog]") }.should raise_error(Chef::Exceptions::ResourceNotFound)
     end
   end
-  
+
   describe "resources" do
 
     it "should find a resource by symbol and name (:zen_master => monkey)" do
@@ -195,11 +195,11 @@ describe Chef::ResourceCollection do
       results.length.should eql(2)
       check_by_names(results, "monkey", "something")
     end
-  
+
     it "should raise an exception if you pass a bad name to resources" do
-      lambda { @rc.resources("michael jackson") }.should raise_error(ArgumentError)    
+      lambda { @rc.resources("michael jackson") }.should raise_error(ArgumentError)
     end
-  
+
     it "should raise an exception if you pass something other than a string or hash to resource" do
       lambda { @rc.resources([Array.new]) }.should raise_error(ArgumentError)
     end
@@ -209,7 +209,36 @@ describe Chef::ResourceCollection do
     end
 
   end
-  
+
+  describe "when validating a resource query object" do
+    it "accepts a string of the form 'resource_type[resource_name]'" do
+      @rc.validate_lookup_spec!("resource_type[resource_name]").should be_true
+    end
+
+    it "accepts a single-element :resource_type => 'resource_name' Hash" do
+      @rc.validate_lookup_spec!(:service => "apache2").should be_true
+    end
+
+
+    it "accepts a chef resource object" do
+      res = Chef::Resource.new("foo", nil)
+      @rc.validate_lookup_spec!(res).should be_true
+    end
+
+    it "rejects a malformed query string" do
+      lambda do
+        @rc.validate_lookup_spec!("resource_type[missing-end-bracket")
+      end.should raise_error(Chef::Exceptions::InvalidResourceSpecification)
+    end
+
+    it "rejects an argument that is not a String, Hash, or Chef::Resource" do
+      lambda do
+        @rc.validate_lookup_spec!(Object.new)
+      end.should raise_error(Chef::Exceptions::InvalidResourceSpecification)
+    end
+
+  end
+
   describe "to_json" do
     it "should serialize to json" do
       json = @rc.to_json
@@ -217,7 +246,7 @@ describe Chef::ResourceCollection do
       json.should =~ /instance_vars/
     end
   end
-  
+
   describe "self.from_json" do
     it "should deserialize itself from json" do
       @rc << @resource
@@ -227,13 +256,13 @@ describe Chef::ResourceCollection do
       s_rc[0].name.should eql(@resource.name)
     end
   end
-  
+
   describe "provides access to the raw resources array" do
     it "returns the resources via the all_resources method" do
       @rc.all_resources.should equal(@rc.instance_variable_get(:@resources))
     end
   end
-  
+
   describe "provides access to stepable iterator" do
     it "returns the iterator object" do
       @rc.instance_variable_set(:@iterator, :fooboar)
@@ -246,12 +275,12 @@ describe Chef::ResourceCollection do
       results.detect{ |res| res.name == res_name }.should_not eql(nil)
     end
   end
-  
+
   def load_up_resources
     %w{dog cat monkey}.each do |n|
        @rc << Chef::Resource::ZenMaster.new(n)
     end
     @rc << Chef::Resource::File.new("something")
   end
-    
+
 end