Merge branch 'CHEF-1057' of git://github.com/thommay/chef into thommay/CHEF-1057

Author: adamhjk

chef/lib/chef/provider/template.rb

@@ -42,7 +42,9 @@ def action_create
 cache_file_name="cookbooks/#{cookbook_name}/templates/default/#{@new_resource.source}"
 template_cache_name="#{cookbook_name}_#{@new_resource.source}"
 
-ifChef::Config[:solo]
+if@new_resource.local
+cache_file_name=@new_resource.source
+elsifChef::Config[:solo]
 cache_file_name=solo_cache_file_name
 else
 raw_template_file=fetch_template_via_rest(cache_file_name,template_cache_name)

chef/lib/chef/resource/template.rb

@@ -28,6 +28,7 @@ def initialize(name, collection=nil, node=nil)
 @action="create"
 @source="#{::File.basename(name)}.erb"
 @cookbook=nil
+@local=false
 @variables=Hash.new
 end
 
@@ -55,6 +56,14 @@ def cookbook(args=nil)
 )
 end
 
+deflocal(args=nil)
+set_or_return(
+:local,
+args,
+:kind_of=>[TrueClass,FalseClass]
+)
+end
+
 end
 end
 end

chef/spec/unit/resource/template_spec.rb

@@ -65,5 +65,16 @@
 @resource.cookbook.should == nil
 end
 end
+
+describe"local"do
+it"should accept a boolean for whether a template is local or remote"do
+@resource.local(true)
+@resource.local.should == true
+end
+
+it"should default to false"do
+@resource.local.should == false
+end
+end
 
 end