puppetlabs_spec_helper 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0b2a921cc114d8a5ce52a27f063c8df99910a603
-  data.tar.gz: d0dfa70b4a9636b1835c52cb21fe526c20ab90cd
+SHA256:
+  metadata.gz: a9a1f7716029a379fd8c1d4af904e9093a40b37c4cf38407f82f5aa9e77b5d9a
+  data.tar.gz: e466f0292777e6cbda90f0fa1e0e9354d743667405146f2093fe8156b4f7dc81
 SHA512:
-  metadata.gz: 0e773f370727f0c26dcabf4bb09285280708aa09cba82a56fae35eeba7f2d2d2319c7e6b394220b4e44088d42c0c926344292d73a1a998e00767342f70bd5769
-  data.tar.gz: b3696a6a92f84f6506f37f0de8a0bd8194356d826b4e57ed9b5f44fe0eca9ec821f9696c7160d8fcb138ae33669164b5bdc5701696ff3ef05c85e03b2282c785
+  metadata.gz: 81a999915c16b01136577bd6535e03c7212e8307a12cbbd58edd44bbe6c3c83d765ea38540ecc5948fcdd7920f51f9132f74deb5114313c55c15d933365f6795
+  data.tar.gz: 6ee1c1b51b92f3f52b3cc52dd90c1c9b3f12c20f576432692cef3664860a38f300d44e3c96c8ea26d6ce028e6977e53974be2de1ed9019ccacfae21e8e66613c

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v2.11.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.11.0) (2018-09-26)
+[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.10.0...v2.11.0)
+
+**Implemented enhancements:**
+
+- \(MODULES-7856\) Allow optional repositories based on puppet version [\#258](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/258) ([joshcooper](https://github.com/joshcooper))
+
+**Fixed bugs:**
+
+- Fix example conversion from mocha to rspec mocks. [\#257](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/257) ([vStone](https://github.com/vStone))
+
 ## [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)
 
@@ -13,6 +24,7 @@ All significant changes to this repo will be summarized in this file.
 
 **Merged pull requests:**
 
+- \(maint\) - Release prep for 2.10.0 [\#256](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/256) ([tphoney](https://github.com/tphoney))
 - 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))
 

data/README.md

@@ -191,7 +191,7 @@ file named `.fixtures.yml` in the root of the project. You can specify a alterna
 You can use the `MODULE_WORKING_DIR` environment variable to specify a diffent location when installing module fixtures via the forge. By default the
 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.
+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.
@@ -215,6 +215,11 @@ When specifying the repo source of the fixture you have a few options as to whic
    ```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).
+
+   ```yaml
+   puppet_version: '>= 6.0.0'
+   ```
 
  **Note:** ref and branch can be used together to get a specific revision on a specific branch
 
@@ -263,6 +268,16 @@ fixtures:
       ref: "2.6.0"
 ```
 
+Only install the `yumrepo_core` module when testing against Puppet 6 or greater:
+
+```yaml
+fixtures:
+  repositories:
+    yumrepo_core:
+      repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core"
+      puppet_version: ">= 6.0.0"
+```
+
 Move manifests and siblings to root directory when they are inside a `code` directory:
 
 ```yaml
@@ -461,7 +476,7 @@ context.stubs(:some_method).with(arguments).returns('value')
 ```
 to this:
 ```
-allow(context).to receive(:some_method).with(arguments).and_returns('value')
+allow(context).to receive(:some_method).with(arguments).and_return('value')
 ```
 
 Translate all expectations:
@@ -470,7 +485,7 @@ context.expects(:some_method).with(arguments).returns('value')
 ```
 to this:
 ```
-expect(context).to receive(:some_method).with(arguments).and_returns('value')
+expect(context).to receive(:some_method).with(arguments).and_return('value')
 ```
 
 Rationale

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -84,6 +84,8 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
         # final option list
         opts = defaults.merge(opts)
 
+        next unless include_repo?(opts['puppet_version'])
+
         real_target = eval('"' + opts['target'] + '"')
         real_source = eval('"' + opts['repo'] + '"')
 
@@ -100,6 +102,18 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
     result
   end
 
+  def include_repo?(version_range)
+    if version_range && defined?(SemanticPuppet)
+      puppet_spec = Gem::Specification.find_by_name('puppet')
+      puppet_version = SemanticPuppet::Version.parse(puppet_spec.version.to_s)
+
+      constraint = SemanticPuppet::VersionRange.parse(version_range)
+      constraint.include?(puppet_version)
+    else
+      true
+    end
+  end
+
   def clone_repo(scm, remote, target, _subdir = nil, ref = nil, branch = nil, flags = nil)
     args = []
     case scm

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = '2.10.0'.freeze
+  VERSION = '2.11.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.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-26 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.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.