pdk 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581c9f97137a76ce3de4f61ea52e04558e588332
-  data.tar.gz: 60ff06765e3e2b9058082f1e99dae371ea38f6d6
+  metadata.gz: 849b417ba98de92f7d243560e9b2193dd898f9b8
+  data.tar.gz: badf3fc8fc3cf2698ad3ea37eb4eea53fda61859
 SHA512:
-  metadata.gz: 21bfb6eb5ec235fd9710be44cc31935a4130dc0ff3dc7117e3d025ea542446facbc2a01e77668453f8ccc8e677547925ce7aa5f639b5af3551f9f6e2f53ae0a7
-  data.tar.gz: 4be9a13156ce5173cbe69efbb122df2d458bb2b2bba713bd3712b8597e7732724d610981a5ab2c966fc4040ad8a918eea3d6a330df62f790c64765868cdade6c
+  metadata.gz: 8b58b9543ba8b4e556115694e23dc820d0aafd286d7719a36d103d7f1957a2d041f5eaf1e8a5f270e9103bc823926f2359258628c405b0239a4303492292ce66
+  data.tar.gz: c63a7b3f68b91e0a632fedf3c74d759bbfa3b137a9428a9bf28a231d2ded635794106841d4da65ef7802973029a45c313260c3ed33183f3cf9efd1cb70c58abf

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All changes to this repo will be documented in this file.
 See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.
 
 
+## [v1.3.1](https://github.com/puppetlabs/pdk/tree/v1.3.1) (2017-12-20)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.3.0...v1.3.1)
+
+**Fixed bugs:**
+
+- \(PDK-736\) Improve handling of old template-url and template-ref [\#397](https://github.com/puppetlabs/pdk/pull/397) ([scotje](https://github.com/scotje))
+
 ## [v1.3.0](https://github.com/puppetlabs/pdk/tree/v1.3.0) (2017-12-15)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.2.1...v1.3.0)
 
@@ -34,6 +41,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 **Merged pull requests:**
 
+- Release 1.3.0 [\#394](https://github.com/puppetlabs/pdk/pull/394) ([bmjen](https://github.com/bmjen))
 - \(PDK-729\) Remove Set usage in metadata [\#393](https://github.com/puppetlabs/pdk/pull/393) ([rodjek](https://github.com/rodjek))
 - \(maint\) Various UX fixes [\#391](https://github.com/puppetlabs/pdk/pull/391) ([bmjen](https://github.com/bmjen))
 - Minor updates to convert dialog [\#390](https://github.com/puppetlabs/pdk/pull/390) ([HelenCampbell](https://github.com/HelenCampbell))

data/lib/pdk/util.rb

@@ -173,11 +173,15 @@ module PDK
     module_function :targets_relative_to_pwd
 
     def default_template_url
-      if !PDK.answers['template-url'].nil?
-        PDK.answers['template-url']
-      else
-        puppetlabs_template_url
-      end
+      answer_file_url = PDK.answers['template-url']
+
+      return puppetlabs_template_url if answer_file_url.nil?
+
+      # Ignore answer file template-url if the value is the old or new default.
+      return puppetlabs_template_url if answer_file_url == 'https://github.com/puppetlabs/pdk-module-template'
+      return puppetlabs_template_url if answer_file_url == puppetlabs_template_url
+
+      answer_file_url
     end
     module_function :default_template_url
 
@@ -191,19 +195,18 @@ module PDK
     module_function :puppetlabs_template_url
 
     def default_template_ref
-      if !PDK.answers['template-ref'].nil?
-        PDK.answers['template-ref']
-      else
-        puppetlabs_template_ref
-      end
+      # TODO: This should respect a --template-ref option if we add that
+      return 'origin/master' if default_template_url != puppetlabs_template_url
+
+      puppetlabs_template_ref
     end
     module_function :default_template_ref
 
     def puppetlabs_template_ref
-      if PDK::Util.package_install? || PDK::Util.gem_install?
-        PDK::TEMPLATE_REF
-      else
+      if PDK::Util.development_mode?
         'origin/master'
+      else
+        PDK::TEMPLATE_REF
       end
     end
     module_function :puppetlabs_template_ref

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
   TEMPLATE_REF = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler