puppetlabs_spec_helper 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24c3f7342e56650b8a82495db303beeceeba195
-  data.tar.gz: 9786d8e2bc84c4c61db486d19bbb133b7c4818f1
+  metadata.gz: 01f28b4872910d69e3d37d10e0a5e25193bd23b6
+  data.tar.gz: 9a2a2907b2bfc41da33c7fbd507a8dba3c361ca4
 SHA512:
-  metadata.gz: 4e08489fbba3e60258485c5a040cb992b56aaa8ec9c2cba58d23148d573ec7bf62e8ba4c27842cc2f9f8bc2c0b2398856c7a06de7f1703f8a8c9b9c870805ab4
-  data.tar.gz: 315eb5575a593aac681bec0af09ef2be4c23b84fdc4d04c9f90d094363d36dd139ac9c0e6dd13cfe67ee5f65400dbfb9954ba02735c4852a6f02417a2a01d9d0
+  metadata.gz: 5e4718a4d21f670b4d2c60bfb05becc6696e9e8ea3bfd4496cb1ae493ce449da24db54b0f2784026a27d4e67beb13b9e7441fb08e3303db910c2ad3f1acdc755
+  data.tar.gz: b8b98e85acfd1d6789b249409ebb6f799fe6631ac14192ce63f1660ae0f8f64f9d0cf05f11f95b73b6d65f9a289248069ebe3194a60a3d7fdd5e59b4aff7d22d

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.1.0]
+### Summary:
+Minor version bump for new CI_SPEC_OPTIONS variable and bug fix.
+
+### Added:
+- use CI_SPEC_OPTIONS to pass options to rspec
+
+### Fixed:
+- an issue where gettext:setup tasks were being loaded in the wrong order within a module and causing the POT file to be created in the Puppet gem, not the module.
+
 ## [2.0.2]
 ### Summary:
 Fixes an issue where the gettext rake tasks look in the spec\_helper and not the current module for the `locales/` directory.

data/README.md

@@ -167,17 +167,6 @@ and manifest ordering, you would:
 
     FUTURE_PARSER=yes STRICT_VARIABLES=yes ORDERING=manifest rake spec
 
-When executing tests in a matrix CI environment, tests can be split up to run
-a share of specs per CI node in parallel.  Set the ``CI_NODE_TOTAL`` environment
-variable to the total number of nodes, and the ``CI_NODE_INDEX`` to a number
-between 1 and the ``CI_NODE_TOTAL``.
-
-If using Travis CI, add new lines to the "env" section of .travis.yml per node,
-remembering to duplicate any existing environment variables:
-
-    env:
-      - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=1
-      - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=2
 
 Using Utility Classes
 =====================
@@ -305,6 +294,46 @@ Testing Parser Functions
 This whole section is superseded by improved support of accessing the scope in
 rspec-puppet.
 
+
+Modify rspec behavior
+================================
+
+#### Running Rspec with additional settings
+
+You can add command line options to rspec using the `CI_SPEC_OPTIONS` environment variable.  Any text in the `CI_SPEC_OPTIONS` environment variable is added as an rspec option.  For example:
+
+If you wanted to output JUnit test reports for a Jenkins CI server you could use;
+
+Bash
+``` bash
+export CI_SPEC_OPTIONS = "-r yarjuf -f JUnit -o result.xml"
+```
+
+PowerShell
+``` bash
+$ENV:CI_SPEC_OPTIONS = '-r yarjuf -f JUnit -o result.xml'
+```
+
+And then run
+```
+bundle exec rake spec
+```
+
+This would cause rspec to load the `yarjuf` gem and output the results in JUnit format to the file `result.xml`
+
+#### Running specs in parallel
+When executing tests in a matrix CI environment, tests can be split up to run
+a share of specs per CI node in parallel.  Set the ``CI_NODE_TOTAL`` environment
+variable to the total number of nodes, and the ``CI_NODE_INDEX`` to a number
+between 1 and the ``CI_NODE_TOTAL``.
+
+If using Travis CI, add new lines to the "env" section of .travis.yml per node,
+remembering to duplicate any existing environment variables:
+
+    env:
+      - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=1
+      - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=2
+
 Generating code coverage reports
 ================================
 

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -15,24 +15,13 @@ task :default => [:help]
 
 pattern = 'spec/{aliases,classes,defines,unit,functions,hosts,integration,type_aliases,types}/**/*_spec.rb'
 
-begin
-  spec = Gem::Specification.find_by_name 'gettext-setup'
-  load "#{spec.gem_dir}/lib/tasks/gettext.rake"
-  locales_dir = File.absolute_path('locales',  Dir.pwd )
-  # Initialization requires a valid locales directory
-  if File.exist? locales_dir
-    GettextSetup.initialize(locales_dir)
-  else
-    puts "No 'locales' directory found in #{ Dir.pwd }, skipping gettext initialization" if Rake.verbose == true
-  end
-rescue Gem::LoadError
-  puts "No gettext-setup gem found, skipping gettext initialization" if Rake.verbose == true
-end
 
 desc "Run spec tests on an existing fixtures directory"
 RSpec::Core::RakeTask.new(:spec_standalone) do |t|
   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
@@ -591,3 +580,19 @@ rescue LoadError
     fail "rubocop is not available in this installation"
   end
 end
+
+module_dir = Dir.pwd
+locales_dir = File.absolute_path('locales',  module_dir )
+# if the task is allowed to run when the module does not have a locales directory,
+# the task is run in the puppet gem instead and creates a POT there.
+puts "gettext-setup tasks will only be loaded if the locales/ directory is present" if Rake.verbose == true
+if File.exist? locales_dir
+  begin
+    spec = Gem::Specification.find_by_name 'gettext-setup'
+    load "#{spec.gem_dir}/lib/tasks/gettext.rake"
+    # Initialization requires a valid locales directory
+    GettextSetup.initialize(locales_dir)
+  rescue Gem::LoadError
+    puts "No gettext-setup gem found, skipping gettext initialization" if Rake.verbose == true
+  end
+end

data/lib/puppetlabs_spec_helper/version.rb

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