Template and remote file now supports a cookbook attribute, which lets you modify what cookbook you fetch the source from. Fixes CHEF-72

Author: adamhjk

chef/lib/chef/provider/file.rb

@@ -169,7 +169,8 @@ def backup(file=nil)
       end
 
       def generate_url(url, type, args=nil)
-        generate_cookbook_url(url, @new_resource.cookbook_name, type, @node, args)
+        cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
+        generate_cookbook_url(url, cookbook_name, type, @node, args)
       end
 
     end

chef/lib/chef/provider/remote_file.rb

@@ -107,8 +107,9 @@ def get_from_server(source, current_checksum)
 
       def get_from_local_cookbook(source)
         if Chef::Config[:solo]
+          cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
           filename = find_preferred_file(
-            @new_resource.cookbook_name.to_s,
+            cookbook_name,
             :remote_file,
             source,
             @node[:fqdn],

chef/lib/chef/provider/template.rb

@@ -36,12 +36,15 @@ class Template < Chef::Provider::File
       def action_create
         Chef::Log.debug(@node.run_state.inspect)
         raw_template_file = nil
-        cache_file_name = "cookbooks/#{@new_resource.cookbook_name}/templates/default/#{@new_resource.source}"
-        template_cache_name = "#{@new_resource.cookbook_name}_#{@new_resource.source}"
+        
+        cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
+        
+        cache_file_name = "cookbooks/#{cookbook_name}/templates/default/#{@new_resource.source}"
+        template_cache_name = "#{cookbook_name}_#{@new_resource.source}"
 
         if Chef::Config[:solo]
           filename = find_preferred_file(
-            @new_resource.cookbook_name.to_s,
+            cookbook_name,
             :template,
             @new_resource.source,
             @node[:fqdn],

chef/lib/chef/resource/remote_file.rb

@@ -27,6 +27,7 @@ def initialize(name, collection=nil, node=nil)
         @resource_name = :remote_file
         @action = "create"
         @source = nil
+        @cookbook = nil
       end
 
       def source(args=nil)
@@ -36,6 +37,14 @@ def source(args=nil)
           :kind_of => String
         )
       end
+      
+      def cookbook(args=nil)
+        set_or_return(
+          :cookbook,
+          args,
+          :kind_of => String
+        )
+      end
 
     end
   end

chef/lib/chef/resource/template.rb

@@ -27,6 +27,7 @@ def initialize(name, collection=nil, node=nil)
         @resource_name = :template
         @action = "create"
         @source = nil
+        @cookbook = nil
         @variables = Hash.new
       end
 
@@ -45,6 +46,14 @@ def variables(args=nil)
           :kind_of => [ Hash ]
         )
       end
+      
+      def cookbook(args=nil)
+        set_or_return(
+          :cookbook,
+          args,
+          :kind_of => [ String ]
+        )
+      end
 
     end
   end

chef/spec/unit/resource/remote_file_spec.rb

@@ -22,17 +22,32 @@
 
   before(:each) do
     @resource = Chef::Resource::RemoteFile.new("fakey_fakerton")
-  end  
+  end
 
-  it "should create a new Chef::Resource::RemoteFile" do
-    @resource.should be_a_kind_of(Chef::Resource)
-    @resource.should be_a_kind_of(Chef::Resource::File)
-    @resource.should be_a_kind_of(Chef::Resource::RemoteFile)
+  describe "initialize" do
+    it "should create a new Chef::Resource::RemoteFile" do
+      @resource.should be_a_kind_of(Chef::Resource)
+      @resource.should be_a_kind_of(Chef::Resource::File)
+      @resource.should be_a_kind_of(Chef::Resource::RemoteFile)
+    end
   end
 
-  it "should accept a string for the remote file source" do
-    @resource.source "something"
-    @resource.source.should eql("something")
+  describe "source" do
+    it "should accept a string for the remote file source" do
+      @resource.source "something"
+      @resource.source.should eql("something")
+    end
+  end
+  
+  describe "cookbook" do
+    it "should accept a string for the cookbook name" do
+      @resource.cookbook "something"
+      @resource.cookbook.should eql("something")
+    end
+    
+    it "should default to nil" do
+      @resource.cookbook.should == nil
+    end
   end
 
 end

chef/spec/unit/resource/template_spec.rb

@@ -24,20 +24,37 @@
     @resource = Chef::Resource::Template.new("fakey_fakerton")
   end  
 
-  it "should create a new Chef::Resource::Template" do
-    @resource.should be_a_kind_of(Chef::Resource)
-    @resource.should be_a_kind_of(Chef::Resource::File)
-    @resource.should be_a_kind_of(Chef::Resource::Template)
+  describe "initialize" do
+    it "should create a new Chef::Resource::Template" do
+      @resource.should be_a_kind_of(Chef::Resource)
+      @resource.should be_a_kind_of(Chef::Resource::File)
+      @resource.should be_a_kind_of(Chef::Resource::Template)
+    end
   end
 
-  it "should accept a string for the template source" do
-    @resource.source "something"
-    @resource.source.should eql("something")
+  describe "source" do
+    it "should accept a string for the template source" do
+      @resource.source "something"
+      @resource.source.should eql("something")
+    end
   end
 
-  it "should accept a hash for the variable list" do
-    @resource.variables({ :reluctance => :awkward })
-    @resource.variables.should == { :reluctance => :awkward }
+  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
   end
 
 end

example-repository/cookbooks/CHEF-72-define/definitions/define_remote_file.rb

@@ -0,0 +1,25 @@
+#
+# Cookbook Name:: CHEF-72-define
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :define_remote_file do  
+  remote_file "/tmp/chef-72-remote-#{params[:name]}.txt" do
+    source "chef-72.txt"
+    cookbook "CHEF-72-define"
+  end
+end

example-repository/cookbooks/CHEF-72-define/definitions/define_template.rb

@@ -0,0 +1,26 @@
+#
+# Cookbook Name:: CHEF-72-define
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :define_template, :sing => 'ahh' do  
+  template "/tmp/chef-72-#{params[:name]}.txt" do
+    source "chef-72.txt.erb"
+    variables({:sing => params[:sing]})
+    cookbook "CHEF-72-define"
+  end
+end 

example-repository/cookbooks/CHEF-72-define/files/default/chef-72.txt

@@ -0,0 +1 @@
+I want to give you some good, good love!