puppetlabs_spec_helper 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e45684c9216162f69c0dd3afd5d8dff52c4cd5b7
-  data.tar.gz: 2f37f0da9a4cac0d58df5612dc966a1f6a112c2d
+  metadata.gz: 2af2de3c35e1218a908641c49faafa015ef5a31d
+  data.tar.gz: 66433a97c6001f9d162256c20b747d7d16f122b1
 SHA512:
-  metadata.gz: de629171b63520b5245ac177521fe9f7cd37298d30957a1c9740916f74f572f8c18e15724471ea5bd63d6b4117dc31d059b9118ca00d7551dc98b1203410a49b
-  data.tar.gz: 34db93d7c4df67c8011672c04e76290f68aa20d1fd1eff673f83a8215fb66da534b345d95ecc3d4c6fdf352f669e4c491b8def5a1b14dbc21bd5d7526537d3e6
+  metadata.gz: d7b08134e2037452e20e37e4a8d805b0194d9b1204e9eec1a6463c2f00091578043f66f7de1d001c01ba203e32e23639d1e0cd1b9e354109f426e6556e07f74b
+  data.tar.gz: f15b5756ad0aef32714b9c52d46a7ca4fb4b42642880655c8c7713595368744b949b587d7aacbaedfb8beee7ec7ef32b5eecc04850033d63983f91d540235aad

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.5.0]
+### Summary
+Adds a feature to pass test file targets from 'rake spec' to 'rspec', also fixes a parsing issue with test\_tiers.
+
+### Added
+- Allows passing test file targets through to 'rspec' from 'rake spec'.
+
+### Fixed
+- Trim whitespace from test\_tiers before parsing.
+
 ## [2.4.0]
 ### Summary
 Fix mercurial stuff, allow fixtures other than spec/fixtures/modules/, and allow running specific tags for beaker tests.
@@ -398,7 +408,8 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.4.0...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.5.0...master
+[2.5.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.2...v2.4.0
 [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

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -25,23 +25,26 @@ task :default => [:help]
 
 pattern = 'spec/{aliases,classes,defines,unit,functions,hosts,integration,type_aliases,types}/**/*_spec.rb'
 
-
-desc "Run spec tests on an existing fixtures directory"
-RSpec::Core::RakeTask.new(:spec_standalone) do |t|
+RSpec::Core::RakeTask.new(:spec_standalone) do |t, args|
   t.rspec_opts = ['--color']
-
   t.rspec_opts << ENV['CI_SPEC_OPTIONS'] unless ENV['CI_SPEC_OPTIONS'].nil?
-
   if ENV['CI_NODE_TOTAL'] && ENV['CI_NODE_INDEX']
     ci_total = ENV['CI_NODE_TOTAL'].to_i
     ci_index = ENV['CI_NODE_INDEX'].to_i
     raise "CI_NODE_INDEX must be between 1-#{ci_total}" unless ci_index >= 1 && ci_index <= ci_total
-
     files = Rake::FileList[pattern].to_a
     per_node = (files.size / ci_total.to_f).ceil
-    t.pattern = files.each_slice(per_node).to_a[ci_index - 1] || files.first
+    t.pattern = if args.extras.nil? || args.extras.empty?
+                  files.each_slice(per_node).to_a[ci_index - 1] || files.first
+                else
+                  args.extras.join(",")
+                end
   else
-    t.pattern = pattern
+    if args.extras.nil? || args.extras.empty?
+      t.pattern = pattern
+    else
+      t.pattern = args.extras.join(",")
+    end
   end
 end
 
@@ -61,8 +64,9 @@ RSpec::Core::RakeTask.new(:beaker) do |t|
     test_tiers = ENV['TEST_TIERS'].split(',')
     raise 'TEST_TIERS env variable must have at least 1 tier specified. low, medium or high (comma separated).' if test_tiers.count == 0
     test_tiers.each do |tier|
-      raise "#{tier} not a valid test tier." unless %w(low medium high).include?(tier)
-      tiers += "tier_#{tier},"
+      tier_to_add = tier.strip
+      raise "#{tier_to_add} not a valid test tier." unless %w(low medium high).include?(tier_to_add)
+      tiers += "tier_#{tier_to_add},"
     end
     tiers = tiers.chomp(',')
     t.rspec_opts.push(tiers)
@@ -400,10 +404,10 @@ task :spec_clean do
 end
 
 desc "Run spec tests and clean the fixtures directory if successful"
-task :spec do
+task :spec do |t, args|
   begin
     Rake::Task[:spec_prep].invoke
-    Rake::Task[:spec_standalone].invoke
+    Rake::Task[:spec_standalone].invoke(*args.extras)
   ensure
     Rake::Task[:spec_clean].invoke
   end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.4.0"
+  VERSION = "2.5.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.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha