puppetlabs_spec_helper 2.13.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e8e6e26b94e0e75ff8666f4717b44b5fc86a3b
-  data.tar.gz: 746dbb92c29158633c4de0f425670560d8f1f2e7
+  metadata.gz: 59b0ff166435a08f815102cf64ffcb10cb12b6b5
+  data.tar.gz: ba04fab64d289eeab37ed149350856b76c96b9c0
 SHA512:
-  metadata.gz: b9aa9308506dede8697180e61dd7e00d240247a9ff3b6a6345a9033cac781ea994f13a72453a54911091bfc4955158ce65949840bfcd71836be3422aba2cde1e
-  data.tar.gz: 51e2a367e8ccf3658eb72866b4377892ab58a5b342fbd6dba266692b59e4295db7f51821a555e61207d1eb04a272a333cbe8b6cc75caf7139f485437208451a0
+  metadata.gz: 9c29a0df65465b365928261453e1fff1e7fa9ff4882905994ba24809ba254f0cbdc614d437787afea2b5cd08ae975fd131c558f6ca47910f7c487dec2e0610a2
+  data.tar.gz: 7a3704b6f0aeaa197c33d7d20928233317d5663c15d2b351cc55df6741d264eb37c26d4bf2f471b73d7cca4a338ed1f8f11cd3afe3fc51896d3de63b1bcb88fe

data/.rspec

@@ -1,3 +1,2 @@
 --format documentation
---color
 --order rand

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v2.14.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.14.0) (2019-03-22)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.13.1...v2.14.0)
+
+**Implemented enhancements:**
+
+- \(feat\) dont load the beaker if litmus is there [\#281](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/281) ([tphoney](https://github.com/tphoney))
+- \(maint\) load rake tasks from optional libraries [\#279](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/279) ([DavidS](https://github.com/DavidS))
+- Document how to set default values for fixture loading [\#277](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/277) ([Felixoid](https://github.com/Felixoid))
+
+**Merged pull requests:**
+
+- Remove `--color` from everywhere, use RSpec default detection instead [\#280](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/280) ([DavidS](https://github.com/DavidS))
+
 ## [v2.13.1](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.13.1) (2019-01-15)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.13.0...v2.13.1)
 
@@ -10,6 +23,10 @@ All significant changes to this repo will be summarized in this file.
 
 - Revert "\(MODULES-8242\) - Fix CI\_SPEC\_OPTIONS failing" [\#275](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/275) ([rodjek](https://github.com/rodjek))
 
+**Merged pull requests:**
+
+- Release Prep 2.13.1 [\#276](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/276) ([bmjen](https://github.com/bmjen))
+
 ## [v2.13.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.13.0) (2019-01-11)
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.12.0...v2.13.0)
 

data/README.md

@@ -193,35 +193,38 @@ working directory is `<module directory>/spec/fixtures/work-dir`.
 
 When specifying the repo source of the fixture you have a few options as to which revision of the codebase you wish to use, and optionally, the puppet versions where the fixture is needed.
 
- * repo - the url to the repo
- * scm - options include git or hg. This is an optional step as the helper code will figure out which scm is used.
+ * `repo` - the url to the repo
+ * `scm` - options include git or hg. This is an optional step as the helper code will figure out which scm is used.
 
    ```yaml
    scm: git
    scm: hg
    ```
 
- * target - the directory name to clone the repo into ie. `target: mymodule`  defaults to the repo name  (Optional)
- * subdir - directory to be removed from the cloned repo. Its contents will be moved to the root directory (Optional)
- * ref - used to specify the tag name like version hash of commit (Optional)
+ * `target` - the directory name to clone the repo into ie. `target: mymodule`  defaults to the repo name  (Optional)
+ * `subdir` - directory to be removed from the cloned repo. Its contents will be moved to the root directory (Optional)
+ * `ref` - used to specify the tag name like version hash of commit (Optional)
 
    ```yaml
    ref: 1.0.0
    ref: 880fca52c
    ```
- * branch - used to specify the branch name you want to use ie. `branch: development`
- * flags - additional flags passed to the module installer (both puppet and scm)
+ * `branch` - used to specify the branch name you want to use ie. `branch: development`
+ * `flags` - additional flags passed to the module installer (both puppet and scm)
 
    ```yaml
    flags: --verbose
    ```
- * puppet_version - versions of puppet for which the fixture should be installed. Ruby version constraints are supported. Only works when the `semantic_puppet` gem is available (shipped with puppet 4.0 and up, by default).
+ * `puppet_version` - versions of puppet for which the fixture should be installed. Ruby version constraints are supported. Only works when the `semantic_puppet` gem is available (shipped with puppet 4.0 and up, by default).
 
    ```yaml
    puppet_version: '>= 6.0.0'
    ```
 
- **Note:** ref and branch can be used together to get a specific revision on a specific branch
+ **Notes:**
+
+ * `ref` and `branch` can be used together to get a specific revision on a specific branch
+ * Top level `defaults` option could be used to set global options
 
 Fixtures Examples
 -----------------
@@ -257,7 +260,7 @@ fixtures:
       target: "spec/fixtures/control_repos"
 ```
 
-Specify that the git tag `2.4.2` of `stdlib' should be checked out:
+Specify that the git tag `2.4.2` of `stdlib` should be checked out:
 
 ```yaml
 fixtures:
@@ -315,6 +318,23 @@ fixtures:
         flags: "--verbose"
 ```
 
+Use `defaults` to define global parameters:
+
+```yaml
+defaults:
+  forge_modules:
+    flags: "--module_repository https://my_repo.com"
+fixtures:
+  forge_modules:
+    stdlib:
+      repo: "puppetlabs/stdlib"
+      ref: "2.6.0"
+    repositories:
+      firewall:
+        repo: "git://github.com/puppetlabs/puppetlabs-firewall"
+        ref: "2.6.0"
+```
+
 Testing Parser Functions
 ========================
 

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -4,11 +4,13 @@ require 'rspec/core/rake_task'
 require 'tmpdir'
 require 'pathname'
 require 'puppetlabs_spec_helper/version'
-require 'puppetlabs_spec_helper/tasks/beaker'
 require 'puppetlabs_spec_helper/tasks/fixtures'
 require 'puppetlabs_spec_helper/tasks/check_symlinks'
 require 'English'
 
+# dont load beaker if litmus is present
+require 'puppetlabs_spec_helper/tasks/beaker' unless Bundler.rubygems.find_name('puppet_litmus').any?
+
 # optional gems
 begin
   require 'metadata-json-lint/rake_task'
@@ -16,6 +18,24 @@ rescue LoadError
   # ignore
 end
 
+begin
+  require 'puppet_blacksmith/rake_tasks'
+rescue LoadError
+  # ignore
+end
+
+begin
+  require 'github_changelog_generator/task'
+rescue LoadError
+  # ignore
+end
+
+begin
+  require 'puppet-strings/tasks'
+rescue LoadError
+  # ignore
+end
+
 parallel_tests_loaded = false
 begin
   require 'parallel_tests'
@@ -29,7 +49,7 @@ task default: [:help]
 pattern = 'spec/{aliases,classes,defines,functions,hosts,integration,plans,tasks,type_aliases,types,unit}/**/*_spec.rb'
 
 RSpec::Core::RakeTask.new(:spec_standalone) do |t, args|
-  t.rspec_opts = ['--color']
+  t.rspec_opts = []
   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

data/lib/puppetlabs_spec_helper/tasks/beaker.rb

@@ -59,7 +59,7 @@ end
 
 class SetupBeaker
   def self.setup_beaker(t)
-    t.rspec_opts = ['--color']
+    t.rspec_opts = []
     t.pattern = 'spec/acceptance'
     # TEST_TIERS env variable is a comma separated list of tiers to run. e.g. low, medium, high
     if ENV['TEST_TIERS']

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = '2.13.1'.freeze
+  VERSION = '2.14.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.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.