(PDK-715) Use correct module template branch/ref

For gem installs, we need to make sure they use a compatible
module-template version, similar to what we do for package installs
in our build process. For development, we still want to use the
default git branch.

lib/pdk/module/templatedir.rb

@@ -48,7 +48,14 @@ def initialize(path_or_url, module_metadata = {}, init = false)
           # use.
           temp_dir = PDK::Util.make_tmpdir_name('pdk-module-template')
 
-          clone_result = PDK::Util::Git.git('clone', path_or_url, '--branch', 'convert', temp_dir)
+          clone_result = if PDK::Util.package_install?
+                           PDK::Util::Git.git('clone', path_or_url, temp_dir)
+                         elsif PDK::Util.gem_install?
+                           PDK::Util::Git.git('clone', path_or_url, '--branch', PDK::TEMPLATE_VERSION, temp_dir)
+                         else # TODO: Once we decide on a branching strategy for the pdk-module-template, this needs to be updated.
+                           PDK::Util::Git.git('clone', path_or_url, '--branch', 'convert', temp_dir)
+                         end
+
           unless clone_result[:exit_code].zero?
             PDK.logger.error clone_result[:stdout]
             PDK.logger.error clone_result[:stderr]
@@ -187,10 +194,7 @@ def validate_module_template!
 
         unless File.directory?(@moduleroot_init) # rubocop:disable Style/GuardClause
           # rubocop:disable Metrics/LineLength
-          raise ArgumentError, _("The template at '%{path}' does not contain a 'moduleroot_init/' directory, which indicates you are using an older style of template. Before continuing please use the --template_url flag when running the pdk new or convert commands to pass a new style template.") % { path: @path } unless @init
-
-          PDK.logger.warn(_("The template at '%{path}' doesn't seem to have a 'moduleroot_init' directory, this could indicate that you are using an older style of template.")) % { path: @path } # rubocop:disable Lint/Void
-          PDK.logger.warn(_('To pass in a new template you can use the --template_url flag when running the pdk new or convert commands.'))
+          raise ArgumentError, _("The template at '%{path}' does not contain a 'moduleroot_init/' directory, which indicates you are using an older style of template. Before continuing please use the --template-url flag when running the pdk new commands to pass a new style template.") % { path: @path }
           # rubocop:enable Metrics/LineLength
         end
       end

lib/pdk/util.rb

@@ -58,8 +58,13 @@ def package_install?
     end
     module_function :package_install?
 
+    def development_mode?
+      PDK::VERSION.end_with? 'pre'
+    end
+    module_function :development_mode?
+
     def gem_install?
-      !package_install?
+      !(package_install? || development_mode?)
     end
     module_function :gem_install?
 

lib/pdk/version.rb

@@ -1,3 +1,4 @@
 module PDK
   VERSION = '1.3.0.pre'.freeze
+  TEMPLATE_VERSION = '0.x'.freeze
 end

spec/unit/pdk/util_spec.rb

@@ -144,16 +144,48 @@
     end
   end
 
+  describe '.development_mode?' do
+    subject { described_class.development_mode? }
+
+    context 'when version ends with pre' do
+      before(:each) do
+        stub_const('PDK::VERSION', '1.0.0.pre')
+      end
+
+      it { is_expected.to be true }
+    end
+
+    context 'when version does not end with pre' do
+      before(:each) do
+        stub_const('PDK::VERSION', '1.0.0')
+      end
+
+      it { is_expected.to be false }
+    end
+  end
+
   describe '.gem_install?' do
     subject { described_class.gem_install? }
 
+    before(:each) do
+      allow(described_class).to receive(:development_mode?).and_return(false)
+    end
+
     context 'when there is no version file', version_file: false do
       it { is_expected.to be true }
     end
 
     context 'when a version file is present', version_file: true do
       it { is_expected.to be false }
     end
+
+    context 'when a version file is present and in development mode is true', version_file: false do
+      before(:each) do
+        allow(described_class).to receive(:development_mode?).and_return(true)
+      end
+
+      it { is_expected.to be false }
+    end
   end
 
   describe '.pdk_package_basedir' do