puppetlabs_spec_helper 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e15925ec0c92c16f71d8eed1c8f8a82de0cf68
-  data.tar.gz: 020f9dafb26284722be445b19dbe512927b9bc7e
+  metadata.gz: a4e32792b5b1b9ff5cb3e4549b2e34f8c067358e
+  data.tar.gz: bde81e497fccf351baa4c2b7304346ae134f71c7
 SHA512:
-  metadata.gz: 16ea5bdac9799b1961f024ff305779bf9969f1cf359110a9cda299bcced3bb4dcfa24e12d3b7378bfd22fa11e1125d3f1b860d242a3ed7152b2fbfa5fd628e9c
-  data.tar.gz: 4e45b05701149bf0894b4e79caeed2ee1bec7070b8222766034af7c243ae53032bd151b09d179a8bf05be4643f2cf7f082751a6794475ca357c8362edd067a78
+  metadata.gz: d61b5e9fb3e9d439f72be5cd436a8c1b2b154696b81647e9a8d133640560e46e0f33be60c046b50715e3e1c8eaa3c691ee416408aa119067f5da1917e8c562ef
+  data.tar.gz: 31c88292d17c418fb89bc02f6a80ed5acfabd2384c578f7a8e978e23f27084154e52f465770e73976d2ddbea8386227a7d0b1abdf18f01be452cd9fa957200e7

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.3]
+### Summary:
+This release fixes puppet module install into paths with spaces, and fix conflicting build names for CI jobs.
+
+### Fixed:
+- Properly exscape paths for puppet module install
+- Add "r" to the beginning of `rake compute_dev_version`
+
 ## [2.1.2]
 ### Summary:
 The `release_tasks` now falls back to `spec` if the `parallel_spec` test fails due to the `parallel_tests` gem being absent.
@@ -330,8 +338,9 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.2...master
-[2.1.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.1...v2.1.2
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.3...master
+[2.1.3]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.2...v2.1.3
+[2.1.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.0.1...v2.1.0
 [2.0.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.0.0...v2.0.1

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -308,11 +308,11 @@ task :spec_prep do
     command = "puppet module install" + ref + flags + \
       " --ignore-dependencies" \
       " --force" \
-      " --module_working_dir #{working_dir}" \
-      " --target-dir #{target_dir} #{remote}"
+      " --module_working_dir \"#{working_dir}\"" \
+      " --target-dir \"#{target_dir}\" \"#{remote}\""
 
     unless system(command)
-      fail "Failed to install module #{remote} to #{target}"
+      fail "Failed to install module #{remote} to #{target_dir}"
     end
   end
 
@@ -500,10 +500,18 @@ task :compute_dev_version do
   end
 
   sha = `git rev-parse HEAD`[0..7]
+  branch = `git rev-parse --abbrev-ref HEAD`
 
   # If we're in a CI environment include our build number
+  # If the branch is a release branch we append an 'r' into the new_version,
+  # this is due to the release branch buildID conflicting with master branch when trying to push to the staging forge.
+  # More info can be found at https://tickets.puppetlabs.com/browse/FM-6170
   if build = ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER']
-    new_version = sprintf('%s-%04d-%s', version, build, sha)
+    if branch.eql? "release"
+      new_version = sprintf('%s-%s%04d-%s', version, "r", build, sha)
+    else 
+      new_version = sprintf('%s-%04d-%s', version, build, sha)
+    end
   else
     new_version = "#{version}-#{sha}"
   end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 
   # compat for pre-1.2.0 users; deprecated
   module Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha