Merge pull request #846 from puppetlabs/pdksync_modules-8728

pdksync - Remove .project from .gitignore

diff --git a/.gitignore b/.gitignore
index 650022e58e7fcced551fb38f7bfdf73e65cb3e84..88cf7a6c6ef4373af088169cdf6082e7b9855fb3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc

diff --git a/.pdkignore b/.pdkignore
index b713b3b1f79b287fc7c489e7140f2a55dd89b5ba..2ec773abe21f5128134b4ae7b1218e9aeda2b8c8 100644 (file)
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,6 +22,8 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc
 /appveyor.yml
 /.fixtures.yml
 /Gemfile

diff --git a/.sync.yml b/.sync.yml
index efaa46761fb723202bde3a38a19f7c2ee272adcc..1e4bce19e30cb4e663d7590a36c94f0e25df594a 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,8 @@
 ---
+.gitignore:
+  required:
+    - ---.project
+
 .gitlab-ci.yml:
   unmanaged: true
 

diff --git a/Rakefile b/Rakefile
index cf0d5236395776072c01cb3ec8a81529bf21490b..98157db67960cb7d345f582af7164f525d3b4008 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,7 @@ end
 
 def changelog_future_release
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = JSON.load(File.read('metadata.json'))['version']
+  returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
   raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator future_release:#{returnVal}"
   returnVal

diff --git a/metadata.json b/metadata.json
index d529a87370ce89ab819d299da4b45f2196dc1155..04066db95b85c9f08867a46e922e94f84fa55720 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -40,7 +40,7 @@
       "version_requirement": ">= 4.8.0 < 7.0.0"
     }
   ],
-  "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "1.9.0-0-g7281db5",
-  "pdk-version": "1.9.0"
-}
+  "template-url": "https://github.com/puppetlabs/pdk-templates",
+  "template-ref": "heads/master-0-gfde5699",
+  "pdk-version": "1.8.0"
+}
\ No newline at end of file

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 149ff0337aeffe7198ab371816a123f3d7e0875f..1f8b6b4bcb859b551fddc87d454b9397e03691a9 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -23,7 +23,7 @@ default_fact_files.each do |f|
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f)))
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
   rescue => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end