puppetlabs_spec_helper 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f28b4872910d69e3d37d10e0a5e25193bd23b6
-  data.tar.gz: 9a2a2907b2bfc41da33c7fbd507a8dba3c361ca4
+  metadata.gz: feee2f3cf5d61beaccc0515e95befc300307a526
+  data.tar.gz: 4931b17333960330bf64c0e6d9d54242d873be49
 SHA512:
-  metadata.gz: 5e4718a4d21f670b4d2c60bfb05becc6696e9e8ea3bfd4496cb1ae493ce449da24db54b0f2784026a27d4e67beb13b9e7441fb08e3303db910c2ad3f1acdc755
-  data.tar.gz: b8b98e85acfd1d6789b249409ebb6f799fe6631ac14192ce63f1660ae0f8f64f9d0cf05f11f95b73b6d65f9a289248069ebe3194a60a3d7fdd5e59b4aff7d22d
+  metadata.gz: 5ade464305fa7a9b1e237e0ecf379c23a2e27d38f963b7c7129432859c3b311f1a933a69a9624ba53e26cab68ec4d1461f888ddccd504a860889f450762fe94c
+  data.tar.gz: 63648ac51c6b670f3ad180b39ac6ce6fd7150b3457aa47faa555af86199ff806f5156354f7ec92c42a4f0997af2a8904b677ac939591b03791b472b34299fda6

data/CHANGELOG.md

@@ -2,6 +2,51 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.0]
+### Summary
+i18n rake task, and unbreak windows again.
+
+### Added
+- New rake task for i18n stuff.
+
+### Fixed
+- Fixture path calculation for windows
+- Log to stderr instead of stdout as per rspec's spec
+
+## [2.1.5]
+### Summary:
+Fix symlinks fixtures code.
+
+## [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.
+
+### 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.
+
+### Fixed:
+- Make `release_tasks` fall back to `spec` when missing the `parallel_tests` gem
+
+## [2.1.1]
+### Summary:
+Bugfix for an unstated dependency on parallel\_spec that was added in 2.0.0
+
+### Fixed:
+- Add dependency for parallel\_spec, since psh requires it anyway.
+
 ## [2.1.0]
 ### Summary:
 Minor version bump for new CI_SPEC_OPTIONS variable and bug fix.
@@ -316,7 +361,14 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.0.1...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.2.0...master
+[2.2.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.5...v2.2.0
+[2.1.5]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.4...v2.1.5
+[2.1.4]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.1.3...v2.1.4
+[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
 [2.0.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v1.2.2...v2.0.0
 [1.2.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v1.2.1...v1.2.2

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
@@ -94,7 +95,7 @@ def vagrant_ssh(set, node = nil)
 end
 
 def auto_symlink
-  { Dir.pwd.split('/').last.split('-').last => '#{source_dir}' }
+  { File.basename(Dir.pwd).split('-').last => '#{source_dir}' }
 end
 
 def fixtures(category)
@@ -192,7 +193,7 @@ def logger
      else
        level = Logger::INFO
     end
-    @logger = Logger.new(STDOUT)
+    @logger = Logger.new(STDERR)
     @logger.level = level
   end
   @logger
@@ -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
@@ -281,12 +283,18 @@ task :spec_prep do
   # wait for all the threads to finish
   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)
-    else
-      File::exists?(target) || FileUtils::ln_sf(source, target)
+  fixtures("symlinks").each do |target, link|
+    unless File.symlink?(link)
+      logger.info("Creating symlink from #{link} to #{target}")
+      if is_windows
+        if Dir.respond_to?(:create_junction)
+          Dir.create_junction(link, target)
+        else
+          system("call mklink /J \"#{link.gsub('/', '\\')}\" \"#{target.gsub('/', '\\')}\"")
+        end
+      else
+        FileUtils::ln_sf(target, link)
+      end
     end
   end
 
@@ -308,11 +316,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
 
@@ -371,7 +379,7 @@ task :parallel_spec do
     ParallelTests::CLI.new.run(args)
     Rake::Task[:spec_clean].invoke
   rescue LoadError
-    fail 'Add the parallel_tests gem to Gemfile to enable this task'
+    raise 'Add the parallel_tests gem to Gemfile to enable this task'
   end
 end
 
@@ -500,10 +508,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
@@ -515,20 +531,39 @@ desc "Runs all necessary checks on a module in preparation for a release"
 task :release_checks do
   Rake::Task[:lint].invoke
   Rake::Task[:validate].invoke
-  Rake::Task[:parallel_spec].invoke
+  begin
+    Rake::Task[:parallel_spec].invoke
+  rescue RuntimeError
+    Rake::Task[:spec].invoke
+  end
   Rake::Task["check:symlinks"].invoke
   Rake::Task["check:test_file"].invoke
   Rake::Task["check:dot_underscore"].invoke
   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
 
@@ -595,4 +630,11 @@ if File.exist? locales_dir
   rescue Gem::LoadError
     puts "No gettext-setup gem found, skipping gettext initialization" if Rake.verbose == true
   end
+  namespace :module do
+  desc "Runs all tasks to build a modules POT file for internationalization"
+    task :pot_gen do
+      Rake::Task["gettext:pot"].invoke()
+      Rake::Task["gettext:metadata_pot"].invoke("#{module_dir}/metadata.json")
+    end
+  end
 end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 
   # 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.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha