Merge pull request #1002 from puppetlabs/pdksync_modules-8728

pdksync - Remove .project from .gitignore
puppetlabs · Mar 7, 2019 · b0dd4c1 · b0dd4c1
2 parents 760508d + 090184d
commit b0dd4c1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.vscode/
+.envrc
diff --git 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/.puppet-lint.rc b/.puppet-lint.rc
@@ -1 +0,0 @@
---relative

diff --git a/.sync.yml b/.sync.yml
@@ -1,4 +1,8 @@
 ---
+.gitignore:
+  required:
+    - ---.project
+
 .gitlab-ci.yml:
   unmanaged: true
 

diff --git 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
@@ -101,7 +101,7 @@
     }
   ],
   "description": "Standard Library for Puppet Modules",
-  "pdk-version": "1.9.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates/",
-  "template-ref": "1.9.0-0-g7281db5"
+  "pdk-version": "1.8.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates",
+  "template-ref": "heads/master-0-gfde5699"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -23,7 +23,7 @@
   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