lib/pdk/module/templatedir.rb in pdk-1.11.1 vs lib/pdk/module/templatedir.rb in pdk-1.12.0

@@ -158,17 +158,19 @@
       #
       # @api public
       def object_template_for(object_type)
         object_path = File.join(@object_dir, "#{object_type}.erb")
         type_path = File.join(@object_dir, "#{object_type}_type.erb")
+        device_path = File.join(@object_dir, "#{object_type}_device.erb")
         spec_path = File.join(@object_dir, "#{object_type}_spec.erb")
         type_spec_path = File.join(@object_dir, "#{object_type}_type_spec.erb")
 
         if File.file?(object_path) && File.readable?(object_path)
           result = { object: object_path }
           result[:type] = type_path if File.file?(type_path) && File.readable?(type_path)
           result[:spec] = spec_path if File.file?(spec_path) && File.readable?(spec_path)
+          result[:device] = device_path if File.file?(device_path) && File.readable?(device_path)
           result[:type_spec] = type_spec_path if File.file?(type_spec_path) && File.readable?(type_spec_path)
           result
         else
           nil
         end
@@ -348,13 +350,13 @@
             reset_result = PDK::Util::Git.git('reset', '--hard', full_ref)
             return if reset_result[:exit_code].zero?
 
             PDK.logger.error reset_result[:stdout]
             PDK.logger.error reset_result[:stderr]
-            raise PDK::CLI::FatalError, _("Unable to set HEAD of git repository at '%{repo}' to ref:'%{ref}'.") % { repo: path, ref: ref }
+            raise PDK::CLI::FatalError, _("Unable to checkout '%{ref}' of git repository at '%{path}'.") % { ref: ref, path: path }
           end
         else
-          PDK.logger.warn _("Uncommitted changes found when attempting to set HEAD of git repository at '%{repo}' to ref '%{ref}'; skipping git reset.") % { repo: path, ref: ref }
+          PDK.logger.warn _("Uncommitted changes found when attempting to checkout '%{ref}' of git repository at '%{path}'; skipping git reset.") % { ref: ref, path: path }
         end
       end
 
       def cache_template_ref(path, ref = nil)
         @template_ref ||= PDK::Util::Git.describe(File.join(path, '.git'), ref)