puppetlabs_spec_helper 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b21969553f83495baee878153ceb6d7dc828dded4cd8ed35792b18b23ccaa804
-  data.tar.gz: 5a2b080d487936959a2e0435682874dee0a1be4e01e908a302a293aa7418b772
+SHA1:
+  metadata.gz: 0b2a921cc114d8a5ce52a27f063c8df99910a603
+  data.tar.gz: d0dfa70b4a9636b1835c52cb21fe526c20ab90cd
 SHA512:
-  metadata.gz: 3241f6e747d967037543ae2bf8244c099c97a237a938ea8e4fcde077f49fc60b6ab6322eec0a38dd5513869b91765b77cb774d97db00517221f86a3534a67f78
-  data.tar.gz: 10dcfe69b3c546e1bd0d45298e95f555998ec9809ad804e0e46dc8366b5d24487bd9f3fd07f5f7c2d97a957d671aa223ffb256f9e30c636828b11181e2cc4a8a
+  metadata.gz: 0e773f370727f0c26dcabf4bb09285280708aa09cba82a56fae35eeba7f2d2d2319c7e6b394220b4e44088d42c0c926344292d73a1a998e00767342f70bd5769
+  data.tar.gz: b3696a6a92f84f6506f37f0de8a0bd8194356d826b4e57ed9b5f44fe0eca9ec821f9696c7160d8fcb138ae33669164b5bdc5701696ff3ef05c85e03b2282c785

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v2.10.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.10.0) (2018-08-30)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.9.1...v2.10.0)
+
+**Implemented enhancements:**
+
+- \(feat\) add puppet lint fix task [\#255](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/255) ([tphoney](https://github.com/tphoney))
+- add support to override the allowed test tiers [\#253](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/253) ([b4ldr](https://github.com/b4ldr))
+
+**Merged pull requests:**
+
+- Update documentation for older Puppet versions [\#254](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/254) ([op-ct](https://github.com/op-ct))
+- update README [\#252](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/252) ([b4ldr](https://github.com/b4ldr))
+
 ## [v2.9.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.9.1) (2018-06-20)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.9.0...v2.9.1)
 
@@ -11,6 +24,10 @@ All significant changes to this repo will be summarized in this file.
 - \(PDK-1031\) Remove thread-unsafe Dir.chdir usage [\#249](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/249) ([rodjek](https://github.com/rodjek))
 - \(PDK-1033\) Use `--unshallow` when fetching a ref [\#247](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/247) ([DavidS](https://github.com/DavidS))
 
+**Merged pull requests:**
+
+- \(maint\) - Release prep for 2.9.1 [\#251](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/251) ([pmcmaw](https://github.com/pmcmaw))
+
 ## [v2.9.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.9.0) (2018-06-18)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...v2.9.0)
 

data/README.md

@@ -141,9 +141,6 @@ A number of the Puppet parser features, controlled via configuration during a
 normal puppet run, can be controlled by exporting specific environment
 variables for the spec run. These are:
 
-* ``FUTURE_PARSER`` - set to "yes" to enable the [future parser](http://docs.puppetlabs.com/puppet/latest/reference/experiments_future.html),
-  the equivalent of setting [parser=future](http://docs.puppetlabs.com/references/latest/configuration.html#parser)
-  in puppet.conf.
 * ``STRICT_VARIABLES`` - set to "yes" to enable set to strict variable checking when using Puppet versions between 3.5 and 4.0;
   set to "no" to disable strict variable checking on Puppet versions 4.0, and later.
   See [strict_variables](http://docs.puppetlabs.com/references/latest/configuration.html#strictvariables)
@@ -152,14 +149,18 @@ variables for the spec run. These are:
   to set the order of unrelated resources when applying a catalog. Leave unset for the default
   behavior, currently "random". This is equivalent to setting [ordering](http://docs.puppetlabs.com/references/latest/configuration.html#ordering)
   in puppet.conf.
-* ``STRINGIFY_FACTS`` - set to "no" to enable [structured facts](http://docs.puppetlabs.com/facter/2.0/fact_overview.html#writing-structured-facts),
-  otherwise leave unset to retain the current default behavior. This is equivalent to setting
-  [stringify_facts=false](http://docs.puppetlabs.com/references/latest/configuration.html#stringifyfacts)
-  in puppet.conf.
-* ``TRUSTED_NODE_DATA`` - set to "yes" to enable [the $facts hash and trusted node data](http://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html),
-  which enabled ``$facts`` and ``$trusted`` hashes. This is equivalent to setting
-  [trusted_node_data=true](http://docs.puppetlabs.com/references/latest/configuration.html#trustednodedata)
-  in puppet.conf.
+* The following options only affect Puppet 3.x:
+  * ``FUTURE_PARSER`` _(Puppet 3.x, starting with 3.2)_ - set to "yes" to enable the [future parser](https://docs.puppet.com/puppet/3/experiments_future.html),
+    the equivalent of setting [parser=future](https://puppet.com/docs/puppet/3.8/configuration.html#parser)
+    in puppet.conf.
+  * ``TRUSTED_NODE_DATA``  _(Puppet 3.x, starting with 3.4)_ - set to "yes" to enable [the $facts hash and trusted node data](https://puppet.com/docs/puppet/3.8/lang_facts_and_builtin_vars.html#trusted-facts),
+    which enabled ``$facts`` and ``$trusted`` hashes. This is equivalent to setting
+    [trusted_node_data=true](https://puppet.com/docs/puppet/3.8/configuration.html#trustednodedata)
+    in puppet.conf.    
+  * ``STRINGIFY_FACTS``  _(Puppet 3.x, starting with 3.5)_  - set to "no" to enable [structured facts](http://docs.puppetlabs.com/facter/2.0/fact_overview.html#writing-structured-facts),
+    otherwise leave unset to retain the current default behavior. This is equivalent to setting
+    [stringify_facts=false](https://puppet.com/docs/puppet/3.8/configuration.html#stringifyfacts)
+    in puppet.conf.
 
 As an example, to run spec tests with the future parser, strict variable checking,
 and manifest ordering, you would:
@@ -346,12 +347,16 @@ remembering to duplicate any existing environment variables:
       - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=2
 
 #### Running tests tagged with test tiers
-To run tests tagged with risk levels set the ``TEST_TIERS`` environment variable to a comma-separated list of
-the appropriate tiers.
+To run tests tagged with risk levels set the ``TEST_TIERS`` environment variable to a comma-separated list of the appropriate tiers.
 
 For example: to run tests marked ``tier_high => true`` and ``tier_medium => true`` in the same test run set the
 environment variable``TEST_TIERS=high,medium``
 
+By default ``TEST_TIERS`` only accepts low, medium and high as valid tiers.  If you would like to use your own keywords to set the environment variable ``TEST_TIERS_ALLOWED``.
+
+For example: to use the keywords dev, rnd, staging and production you can set 
+``TEST_TIERS_ALLOWED=dev,rnd,staging,production``. Then you would be able to run tests marked ``tier_dev => true``, ``tier_production => true`` with ``TEST_TIERS=dev,production``
+
 Note, if the ``TEST_TIERS`` environment variable is set to empty string or nil, all tiers will be executed.
 
 

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -131,10 +131,36 @@ PuppetLint::RakeTask.new(:lint) do |config|
     140chars
     class_inherits_from_params_class
     class_parameter_defaults
+    disable_autoloader_layout
     documentation
     single_quote_string_with_variables
   ]
   config.ignore_paths = [
+    '.vendor/**/*.pp',
+    'bundle/**/*.pp',
+    'pkg/**/*.pp',
+    'spec/**/*.pp',
+    'tests/**/*.pp',
+    'types/**/*.pp',
+    'vendor/**/*.pp',
+  ]
+end
+
+desc 'Run puppet-lint and fix issues automatically'
+PuppetLint::RakeTask.new(:lint_fix) do |config|
+  config.fail_on_warnings = true
+  config.fix = true
+  config.disable_checks = %w[
+    80chars
+    140chars
+    class_inherits_from_params_class
+    class_parameter_defaults
+    disable_autoloader_layout
+    documentation
+    single_quote_string_with_variables
+  ]
+  config.ignore_paths = [
+    '.vendor/**/*.pp',
     'bundle/**/*.pp',
     'pkg/**/*.pp',
     'spec/**/*.pp',

data/lib/puppetlabs_spec_helper/tasks/beaker.rb

@@ -64,10 +64,11 @@ class SetupBeaker
     # TEST_TIERS env variable is a comma separated list of tiers to run. e.g. low, medium, high
     if ENV['TEST_TIERS']
       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_allowed = ENV.fetch('TEST_TIERS_ALLOWED', 'low,medium,high').split(',')
+      raise 'TEST_TIERS env variable must have at least 1 tier specified. Either low, medium or high or one of the tiers listed in TEST_TIERS_ALLOWED (comma separated).' if test_tiers.count == 0
       test_tiers.each do |tier|
         tier_to_add = tier.strip.downcase
-        raise "#{tier_to_add} not a valid test tier." unless %w[low medium high].include?(tier_to_add)
+        raise "#{tier_to_add} not a valid test tier." unless test_tiers_allowed.include?(tier_to_add)
         tiers = "--tag tier_#{tier_to_add}"
         t.rspec_opts.push(tiers)
       end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = '2.9.1'.freeze
+  VERSION = '2.10.0'.freeze
 
   # 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.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.