puppetlabs_spec_helper 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e32792b5b1b9ff5cb3e4549b2e34f8c067358e
-  data.tar.gz: bde81e497fccf351baa4c2b7304346ae134f71c7
+  metadata.gz: 1889098dbf439ae7274e2b27fb3953d82a8c53a8
+  data.tar.gz: dd27b2e161f3c4a7c77ba38e044f4a1a322bb3fd
 SHA512:
-  metadata.gz: d61b5e9fb3e9d439f72be5cd436a8c1b2b154696b81647e9a8d133640560e46e0f33be60c046b50715e3e1c8eaa3c691ee416408aa119067f5da1917e8c562ef
-  data.tar.gz: 31c88292d17c418fb89bc02f6a80ed5acfabd2384c578f7a8e978e23f27084154e52f465770e73976d2ddbea8386227a7d0b1abdf18f01be452cd9fa957200e7
+  metadata.gz: b6ae9d52ec46f3b3cf480b03a12491e79fe771b3f61b846da7b3fabd8a9a772783c61ec0c6c24552d68108be344958c37191af91f3081c79caa9317af9eae629
+  data.tar.gz: 78c2779abc91960af397c0129249c4ea8e8724dfe60214e98014f1f0e0f0d5063c8039600bf2bb0bf37a3e1278b869aa11b0bcaa5b6da08064560fe19acc240a

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.4]
+### Summary:
+Better Windows support.
+
+### Fixed:
+- Create directory junctions instead of symlinks on windows (#192)
+- Replace check:symlinks with platform independent alternative (#193)
+
 ## [2.1.3]
 ### Summary:
 This release fixes puppet module install into paths with spaces, and fix conflicting build names for CI jobs.

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -3,6 +3,7 @@ require 'rake'
 require 'rspec/core/rake_task'
 require 'tmpdir'
 require 'yaml'
+require 'pathname'
 
 # optional gems
 begin
@@ -240,11 +241,12 @@ task :spec_prep do
   # Ruby only sets File::ALT_SEPARATOR on Windows and Rubys standard library
   # uses this to check for Windows
   is_windows = !!File::ALT_SEPARATOR
-  puppet_symlink_available = false
-  begin
-    require 'puppet'
-    puppet_symlink_available = Puppet::FileSystem.respond_to?(:symlink)
-  rescue
+  if is_windows
+    begin
+      require 'win32/dir'
+    rescue LoadError
+      $stderr.puts "win32-dir gem not installed, falling back to executing mklink directly"
+    end
   end
 
   # git has a race condition creating that directory, that would lead to aborted clone operations
@@ -282,11 +284,16 @@ task :spec_prep do
   repositories.each {|remote, opts| opts[:thread].join }
 
   fixtures("symlinks").each do |source, target|
-    if is_windows
-      fail "Cannot symlink on Windows unless using at least Puppet 3.5" if !puppet_symlink_available
-      Puppet::FileSystem::exist?(target) || Puppet::FileSystem::symlink(source, target)
+    unless File.symlink(target)
+      if is_windows
+        if Dir.respond_to?(:create_junction)
+          Dir.create_junction(target, source)
+        else
+          system("call mklink /J \"#{target.gsub('/', '\\')}\" \"#{source.gsub('/', '\\')}\"")
+        end
+      end
     else
-      File::exists?(target) || FileUtils::ln_sf(source, target)
+      FileUtils::ln_sf(source, target)
     end
   end
 
@@ -534,13 +541,28 @@ task :release_checks do
   Rake::Task["check:git_ignore"].invoke
 end
 
+def check_directory_for_symlinks(dir='.')
+  dir = Pathname.new(dir) unless dir.is_a?(Pathname)
+  results = []
+
+  dir.each_child(true) do |child|
+    if child.symlink?
+      results << child
+    elsif child.directory? && child.basename.to_s != '.git'
+      results.concat(check_directory_for_symlinks(child))
+    end
+  end
+
+  results
+end
+
 namespace :check do
   desc "Fails if symlinks are present in directory"
   task :symlinks do
-    symlink = `find . -path ./.git -prune -o -type l -ls`
-    unless symlink == ""
-      puts symlink
-      fail "A symlink exists within this directory"
+    symlinks = check_directory_for_symlinks
+    unless symlinks.empty?
+      symlinks.each { |r| puts "Symlink found: #{r.to_s} => #{r.readlink}" }
+      fail "Symlink(s) exist within this directory"
     end
   end
 

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 
   # 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.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-07 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.