puppetlabs_spec_helper 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ace8c695042d7598dca1a0f85cb349e2eda9721
-  data.tar.gz: e659c5eb0a21803c1151d910a40b466a9ddca763
+  metadata.gz: f488df4c706569eee6e7f47135359abbb222391b
+  data.tar.gz: bcc3ef4e868d31908422dec50ff9ab0bc7857269
 SHA512:
-  metadata.gz: 8cb50e96c99e20918f99a1ba69f946bd3f8d8dd01efa366f9dc61e2d1ece355a3681454f6ad82a60b517126d5a8559f519d1702514b8b7e854bd555dde9c139e
-  data.tar.gz: dba488e3be4b0e613dd93c3d3b8a0fc9f645a1b4a9d5edc172612286cb9fd8aa1c107e1fef941c5db3b22d4cef17f8e4ba92ad57572c4da0453b008dd20d6ae0
+  metadata.gz: c2622f2e64e0eab60e978d9dcf4087dc58cb4236dd091327744358c6253cf2a4ae94691b70bcf4beb2b7f84639659a4e861a77f1e29326a5b8ed2891bdbd77b2
+  data.tar.gz: 56c5b8c957e30886a3bd3b672d0a46e4ab5d0f71071282ef4da04c79e36087d85d575f2bee2150b0e6c217c5d958cc070b4b66e61d8519072c112e65450945f1

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.3.2]
+### Summary
+Cleanups and fixes around fixture handling.
+
+### Fixed
+- Do not error when no fixtures file is found or specified.
+- Clean up fixtures, even if tests fail. Especially on Windows this is important to not keep lingering symlinks around.
+- Fix creating of directory junctions (symlinks) on Windows for fixtures.
+
+
 ## [2.3.1]
 ### Summary
 Adds a `spec_list_json` rake task
@@ -375,7 +385,8 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.0...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.2...master
+[2.3.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.5...v2.2.0

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -114,7 +114,7 @@ def fixtures(category)
   end
 
   begin
-    fixtures = YAML.load_file(ENV['FIXTURES_YML'] || fixtures_yaml)["fixtures"]
+    fixtures = (YAML.load_file(ENV['FIXTURES_YML'] || fixtures_yaml) || { fixtures: {} })["fixtures"]
   rescue Errno::ENOENT
     fixtures = {}
   rescue Psych::SyntaxError => e
@@ -293,6 +293,7 @@ task :spec_prep do
     unless File.symlink?(link)
       logger.info("Creating symlink from #{link} to #{target}")
       if is_windows
+        target = File.join(File.dirname(link), target) unless Pathname.new(target).absolute?
         if Dir.respond_to?(:create_junction)
           Dir.create_junction(link, target)
         else
@@ -368,9 +369,12 @@ end
 
 desc "Run spec tests and clean the fixtures directory if successful"
 task :spec do
-  Rake::Task[:spec_prep].invoke
-  Rake::Task[:spec_standalone].invoke
-  Rake::Task[:spec_clean].invoke
+  begin
+    Rake::Task[:spec_prep].invoke
+    Rake::Task[:spec_standalone].invoke
+  ensure
+    Rake::Task[:spec_clean].invoke
+  end
 end
 
 desc "Parallel spec tests"
@@ -384,9 +388,10 @@ task :parallel_spec do
 
     Rake::Task[:spec_prep].invoke
     ParallelTests::CLI.new.run(args)
-    Rake::Task[:spec_clean].invoke
   rescue LoadError
     raise 'Add the parallel_tests gem to Gemfile to enable this task'
+  ensure
+    Rake::Task[:spec_clean].invoke
   end
 end
 

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 
   # 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.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.