(maint) Update for PDK templates

This commit updates the module as per PDK-Templates commit 0b5b39b

diff --git a/.rubocop.yml b/.rubocop.yml
index ee74e8cbb291de546018ba3ea02860c589902f2a..33688a79ec1d068a47484b3bd878a725a7bf9f93 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -27,6 +27,7 @@ GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
   - spec/**/*
+  Enabled: false
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -89,6 +90,12 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+GetText/DecorateFunctionMessage:
+  Enabled: false
+GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: false
+GetText/DecorateStringFormattingUsingPercent:
+  Enabled: false
 Layout/EndOfLine:
   Enabled: false
 Layout/IndentHeredoc:

diff --git a/Gemfile b/Gemfile
index 97ba33d495b979dd0ccb95ee6c0d860cf853c3f3..a2edc2ff6ce44dc75c9b76ea16743a6ee64a8703 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -72,4 +72,4 @@ extra_gemfiles.each do |gemfile|
     eval(File.read(gemfile), binding)
   end
 end
-# vim: syntax=ruby
\ No newline at end of file
+# vim: syntax=ruby

diff --git a/Rakefile b/Rakefile
index 13b58c86ddcc8d51fff1e19c957deab7f9565fd6..c45dfc8c07e5a74f8fe4536a32a0f503d7084b21 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -16,8 +16,17 @@ end
 
 def changelog_project
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1]
-  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+
+  returnVal = nil
+  returnVal ||= begin
+    metadata_source = JSON.load(File.read('metadata.json'))['source']
+    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
+
+    metadata_source_match && metadata_source_match[1]
+  end
+
+  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
+
   puts "GitHubChangelogGenerator project:#{returnVal}"
   returnVal
 end

diff --git a/metadata.json b/metadata.json
index 19f0e8e23606686bb40eedc03329dde8a8c67e03..7b237eda2c7a2bcd3dd68124263b507d2eb1593b 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -42,6 +42,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
-  "template-ref": "1.12.0-0-g55d9ae2",
-  "pdk-version": "1.12.0"
+  "template-ref": "1.14.1-0-g0b5b39b",
+  "pdk-version": "1.14.0"
 }

diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index ea1e4808e3a67f50ea6d64d23a0eb8b3fd25437f..f777abfc9905202e7ccf5b5fcc76b9b4c59a39fb 100644 (file)
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -3,5 +3,6 @@
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
 ipaddress: "172.16.254.254"
+ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"