puppetlabs_spec_helper 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d87d6131bfee20ef40887c452db37042acdab37d
-  data.tar.gz: a327772c292504414a79d4fd3784ff82348cad4a
+  metadata.gz: 560988fc4b9b6843571dd84cb9950ed4e7183b13
+  data.tar.gz: c0a9ecd1c637521bcbb2376e0db81805ed9c908c
 SHA512:
-  metadata.gz: 6abed6f18fb005b07a38e19c0646716216058d88f425ea1659fd8453ac46bb17cb3135059f4f9deb2f7542609e8348e19121df1d74dc395bfaa94c9a9ec69fd8
-  data.tar.gz: c656294475da31a64af15631968a513438291e4f1d1b0e8e3e85d60cb65029ffcfdf63a793d1f2a0982c02706b6f887ed7a0c69d1f30da9d0d7d04d4acdcfb8d
+  metadata.gz: 12dd845bdcfafb01e7e81d6c4d603abc1b235d175711883cdc0e73fd59cb53f6901bfe45e9b52d65333e704f7bf47a29e4d729a881f4eb91ddd5115d7739f081
+  data.tar.gz: 23fa34f17299df694322d9f8402fa95e4f39d7b7eb10c513022431145f709e64167fb190287afd39f96f744dd67529c24db7afe3cd4fc5a4cf294ea0f6c3fe55

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.8.0]
+### Summary
+This feature release adds a new rake task `parallel_spec_standalone` which is a parallel version of `spec_standalone`
+
+### Added
+- `parallel_spec_standalone` rake task
+- `spec_clean_symlinks` rake task to just clean symlink fixtures, not all fixtures
+- Leave downloaded fixtures on test failure to speed up test runs.
+- Update already-existing fixtures instead of doing nothing to them.
+
 ## [2.7.0]
 ### Summary
 Feature release to begin moving away from mocha as a testing (specifically, mocking) framework for modules.
@@ -442,7 +452,8 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.7.0...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...master
+[2.8.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.2...v2.7.0
 [2.6.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.1...v2.6.2
 [2.6.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.5.1...v2.6.1

data/README.md

@@ -466,7 +466,7 @@ The following links may give you some insight into why...
 mock_with
 =========
 
-There are two major mocking frameworks in modules test suites today: [mocha](https://rubygems.org/gems/mocha) and [rspec-mocks](https://rubygems.org/gems/rspec-mocks). It is recommended to choose rspec-mocks explicitely by specifying `mock_with` either in your `spec_helper.rb` like so:
+There are two major mocking frameworks in modules test suites today: [mocha](https://rubygems.org/gems/mocha) and [rspec-mocks](https://rubygems.org/gems/rspec-mocks). We recommend that you choose rspec-mocks explicitly by specifying `mock_with`, either in your `spec_helper.rb` like so:
 
 ```
 RSpec.configure do |c|
@@ -475,7 +475,7 @@ end
 require 'puppetlabs_spec_helper/module_spec_helper'
 ```
 
-or by using the PDK's [`mock_with` option in `.sync.yml`](https://github.com/puppetlabs/pdk-templates#specspec_helperrb) and `pdk update`.
+or by using Puppet Development Kit's [`mock_with` option in `.sync.yml`](https://github.com/puppetlabs/pdk-templates#specspec_helperrb) and `pdk update`.
 
 You can also continue to use mocha by explicitly specifying `:mocha`, following the [mocha documentation](http://gofreerange.com/mocha/docs/).
 

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -60,13 +60,25 @@ task :spec do |t, args|
   begin
     Rake::Task[:spec_prep].invoke
     Rake::Task[:spec_standalone].invoke(*args.extras)
+    Rake::Task[:spec_clean].invoke
   ensure
+    Rake::Task[:spec_clean_symlinks].invoke
+  end
+end
+
+desc "Run spec tests in parallel and clean the fixtures directory if successful"
+task :parallel_spec do |t, args|
+  begin
+    Rake::Task[:spec_prep].invoke
+    Rake::Task[:parallel_spec_standalone].invoke(*args.extras)
     Rake::Task[:spec_clean].invoke
+  ensure
+    Rake::Task[:spec_clean_symlinks].invoke
   end
 end
 
 desc "Parallel spec tests"
-task :parallel_spec do
+task :parallel_spec_standalone do |t, args|
   raise 'Add the parallel_tests gem to Gemfile to enable this task' unless parallel_tests_loaded
   if Rake::FileList[pattern].to_a.empty?
     warn "No files for parallel_spec to run against"
@@ -76,10 +88,7 @@ task :parallel_spec do
       args.push('--').concat(ENV['CI_SPEC_OPTIONS'].strip.split(' ')).push('--') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
       args.concat(Rake::FileList[pattern].to_a)
 
-      Rake::Task[:spec_prep].invoke
       ParallelTests::CLI.new.run(args)
-    ensure
-      Rake::Task[:spec_clean].invoke
     end
   end
 end

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -117,6 +117,20 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     result
   end
 
+  def update_repo(scm, target)
+    args = case scm
+           when 'hg'
+             ['pull']
+           when 'git'
+             ['fetch']
+           else
+             fail "Unfortunately #{scm} is not supported yet"
+           end
+    Dir.chdir(target) do
+      system("#{scm} #{args.flatten.join(' ')}")
+    end
+  end
+
   def revision(scm, target, ref)
     args = []
     case scm
@@ -239,7 +253,11 @@ task :spec_prep do
       logger.debug "New Thread started for #{remote}"
       # start up a new thread and store it in the opts hash
       opts[:thread] = Thread.new do
-        clone_repo(scm, remote, target, subdir, ref, branch, flags)
+        if File.directory?(target)
+          update_repo(scm, target)
+        else
+          clone_repo(scm, remote, target, subdir, ref, branch, flags)
+        end
         revision(scm, target, ref) if ref
         remove_subdirectory(target, subdir) if subdir
       end
@@ -283,7 +301,8 @@ task :spec_prep do
       ref = " --version #{opts['ref']}" if not opts['ref'].nil?
       flags = " #{opts['flags']}" if opts['flags']
     end
-    next if File::exists?(target)
+
+    next if File.directory?(target)
 
     working_dir = module_working_directory
     target_dir = File.expand_path('spec/fixtures/modules')
@@ -317,12 +336,17 @@ task :spec_clean do
 
   FileUtils::rm_rf(module_working_directory)
 
-  fixtures("symlinks").each do |source, opts|
-    target = opts["target"]
-    FileUtils::rm_f(target)
-  end
+  Rake::Task[:spec_clean_symlinks].invoke
 
   if File.zero?("spec/fixtures/manifests/site.pp")
     FileUtils::rm_f("spec/fixtures/manifests/site.pp")
   end
 end
+
+desc "Clean up any fixture symlinks"
+task :spec_clean_symlinks do
+  fixtures("symlinks").each do |source, opts|
+    target = opts["target"]
+    FileUtils::rm_f(target)
+  end
+end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.7.0"
+  VERSION = "2.8.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.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.