template.rb in chef-11.0.0.beta.0

- old
+ new

@@ -15,20 +15,22 @@
 # 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.
 #
 
+require 'chef/provider/template_finder'
 require 'chef/provider/file'
 require 'chef/mixin/template'
 require 'chef/mixin/checksum'
 require 'chef/file_access_control'
 
 class Chef
   class Provider
 
     class Template < Chef::Provider::File
 
+      include Chef::Mixin::EnforceOwnershipAndPermissions
       include Chef::Mixin::Checksum
       include Chef::Mixin::Template
 
       def load_current_resource
         @current_resource = Chef::Resource::Template.new(@new_resource.name)
@@ -36,58 +38,54 @@
       end
 
       def define_resource_requirements
         super
 
-        requirements.assert(:create, :create_if_missing) do |a|
-          a.assertion { ::File::exist?(template_location) }
+        requirements.assert(:create, :create_if_missing) do |a| 
+          a.assertion { ::File::exist?(template_location) } 
           a.failure_message "Template source #{template_location} could not be found."
           a.whyrun "Template source #{template_location} does not exist. Assuming it would have been created."
           a.block_action!
         end
       end
 
       def action_create
         render_with_context(template_location) do |rendered_template|
           rendered(rendered_template)
-          update = ::File.exist?(@new_resource.path)
-          if update && content_matches?
+          if file_already_exists? && content_matches?
             Chef::Log.debug("#{@new_resource} content has not changed.")
             set_all_access_controls
+            update_new_file_state(@new_resource.path)
           else
             description = []
-            action_message = update ? "update #{@current_resource} from #{short_cksum(@current_resource.checksum)} to #{short_cksum(@new_resource.checksum)}" :
+            action_message = if file_already_exists?
+              "update #{@current_resource} from #{short_cksum(@current_resource.checksum)} to #{short_cksum(@new_resource.checksum)}"
+            else
               "create #{@new_resource}"
+            end
             description << action_message
             description << diff_current(rendered_template.path)
             converge_by(description) do
               backup
               FileUtils.cp(rendered_template.path, @new_resource.path)
               Chef::Log.info("#{@new_resource} updated content")
               access_controls.set_all!
-              stat = ::File.stat(@new_resource.path)
-
-              # template depends on the checksum not changing, and updates it
-              # itself later in the code, so we cannot set it here, as we do with
-              # all other < File child provider classes
-              @new_resource.owner(stat.uid)
-              @new_resource.mode(stat.mode & 07777)
-              @new_resource.group(stat.gid)
+              update_new_file_state(@new_resource.path)
             end
           end
         end
       end
 
+      def template_finder
+        @template_finder ||= begin
+          TemplateFinder.new(run_context, cookbook_name, node)
+        end
+      end
 
       def template_location
         @template_file_cache_location ||= begin
-          if @new_resource.local
-            @new_resource.source
-          else
-            cookbook = run_context.cookbook_collection[resource_cookbook]
-            cookbook.preferred_filename_on_disk_location(node, :templates, @new_resource.source)
-          end
+          template_finder.find(@new_resource.source, :local => @new_resource.local, :cookbook => @new_resource.cookbook)
         end
       end
 
       def resource_cookbook
         @new_resource.cookbook || @new_resource.cookbook_name
@@ -103,20 +101,19 @@
         @current_resource.checksum == @new_resource.checksum
       end
 
       private
 
+      def file_already_exists?
+        ::File.exist?(@new_resource.path)
+      end
+
       def render_with_context(template_location, &block)
         context = {}
         context.merge!(@new_resource.variables)
         context[:node] = node
+        context[:template_finder] = template_finder
         render_template(IO.read(template_location), context, &block)
-      end
-
-      def managing_content?
-        return true if @new_resource.checksum
-        return true if !@new_resource.source.nil? && @action != :create_if_missing
-        false
       end
 
     end
   end
 end