(PDK-715) Transition pdk to use pdk-templates as template repo

lib/pdk/module/templatedir.rb

@@ -22,7 +22,7 @@ class TemplateDir
       # the template available on disk.
       #
       # @example Using a git repository as a template
-      #   PDK::Module::TemplateDir.new('https://github.com/puppetlabs/pdk-module-template') do |t|
+      #   PDK::Module::TemplateDir.new('https://github.com/puppetlabs/pdk-templates') do |t|
       #     t.render do |filename, content|
       #       File.open(filename, 'w') do |file|
       #         file.write(content)
@@ -47,7 +47,7 @@ def initialize(path_or_url, module_metadata = {}, init = false)
           # @todo When switching this over to using rugged, cache the cloned
           # template repo in `%AppData%` or `$XDG_CACHE_DIR` and update before
           # use.
-          temp_dir = PDK::Util.make_tmpdir_name('pdk-module-template')
+          temp_dir = PDK::Util.make_tmpdir_name('pdk-templates')
           git_ref = PDK::Util.default_template_ref
 
           clone_result = PDK::Util::Git.git('clone', path_or_url, temp_dir)

lib/pdk/util.rb

@@ -183,9 +183,9 @@ def default_template_url
 
     def puppetlabs_template_url
       if package_install?
-        'file://' + File.join(package_cachedir, 'pdk-module-template.git')
+        'file://' + File.join(package_cachedir, 'pdk-templates.git')
       else
-        'https://github.com/puppetlabs/pdk-module-template'
+        'https://github.com/puppetlabs/pdk-templates'
       end
     end
     module_function :puppetlabs_template_url
@@ -203,7 +203,7 @@ def puppetlabs_template_ref
       if PDK::Util.package_install? || PDK::Util.gem_install?
         PDK::TEMPLATE_REF
       else
-        'origin/convert' # should be master
+        'origin/master'
       end
     end
     module_function :puppetlabs_template_ref

package-testing/tests/validate_a_new_module.rb

@@ -10,7 +10,7 @@
   step 'Create a module' do
     on(workstation, pdk_command(workstation, "new module #{module_name} --skip-interview")) do
       on(workstation, %(cat #{module_name}/metadata.json | egrep '"template-url":'), accept_all_exit_codes: true) do |template_result|
-        assert_match(%r{"file://.*pdk-module-template\.git",?$}, template_result.stdout.strip, "New module's metadata should refer to vendored pdk-module-template repo")
+        assert_match(%r{"file://.*pdk-templates\.git",?$}, template_result.stdout.strip, "New module's metadata should refer to vendored pdk-templates repo")
       end
     end
   end

pdk.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-which', '0.3.0'
   spec.add_runtime_dependency 'diff-lcs', '1.3'
 
-  # Used in the pdk-module-template
+  # Used in the pdk-templates
   spec.add_runtime_dependency 'deep_merge', '~> 1.1'
 end

spec/unit/pdk/generate/module_spec.rb

@@ -222,7 +222,7 @@
             end
 
             it 'uses the vendored template url' do
-              expect(PDK::Module::TemplateDir).to receive(:new).with('file:///tmp/package/cache/pdk-module-template.git', anything, anything).and_yield(test_template_dir)
+              expect(PDK::Module::TemplateDir).to receive(:new).with('file:///tmp/package/cache/pdk-templates.git', anything, anything).and_yield(test_template_dir)
               expect(PDK.answers).not_to receive(:update!).with(:'template-url' => anything)
 
               described_class.invoke(invoke_opts)

spec/unit/pdk/module/template_dir_spec.rb

@@ -31,7 +31,7 @@
   context 'with a valid template path' do
     it 'returns config hash with module metadata' do
       allow(File).to receive(:directory?).with(anything).and_return(true)
-      allow(PDK::Util).to receive(:make_tmpdir_name).with('pdk-module-template').and_return('/tmp/path')
+      allow(PDK::Util).to receive(:make_tmpdir_name).with('pdk-templates').and_return('/tmp/path')
       allow(PDK::CLI::Exec).to receive(:git).with('clone', path_or_url, '/tmp/path').and_return(exit_code: 0)
       allow(File).to receive(:file?).with(anything).and_return(File.join(path_or_url, 'config_defaults.yml')).and_return(true)
       allow(File).to receive(:read).with(File.join(path_or_url, 'config_defaults.yml')).and_return(config_defaults)
@@ -120,7 +120,7 @@
   describe '.render(template_files)' do
     before(:each) do
       allow(File).to receive(:directory?).with(anything).and_return(true)
-      allow(PDK::Util).to receive(:make_tmpdir_name).with('pdk-module-template').and_return('/tmp/path')
+      allow(PDK::Util).to receive(:make_tmpdir_name).with('pdk-templates').and_return('/tmp/path')
       allow(PDK::CLI::Exec).to receive(:git).with('clone', path_or_url, '/tmp/path').and_return(exit_code: 0)
     end
 
@@ -181,7 +181,7 @@
   describe '.config_for(dest_path)' do
     before(:each) do
       allow(File).to receive(:directory?).with(anything).and_return(true)
-      allow(PDK::Util).to receive(:make_tmpdir_name).with('pdk-module-template').and_return('/tmp/path')
+      allow(PDK::Util).to receive(:make_tmpdir_name).with('pdk-templates').and_return('/tmp/path')
       allow(PDK::CLI::Exec).to receive(:git).with('clone', path_or_url, '/tmp/path').and_return(exit_code: 0)
       allow(File).to receive(:file?).with(anything).and_return(File.join(path_or_url, 'config_defaults.yml')).and_return(true)
       allow(File).to receive(:read).with(File.join(path_or_url, 'config_defaults.yml')).and_return(config_defaults)

spec/unit/pdk/util_spec.rb

@@ -361,7 +361,7 @@
       end
 
       it 'returns the built-in TEMPLATE_REF' do
-        is_expected.to eq('origin/convert')
+        is_expected.to eq('origin/master')
       end
     end
   end