puppetlabs_spec_helper 0.10.1 → 0.10.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODcwMTc1NWRkNjVhYWFjYWYyNmJlZTlhNjJkMmJkODIxNmViYjY0OA==
+    YmU1NDkwYzEzMzYxY2Q5NGJiMzEwY2FhMjU2MmM5YjU1NzA3YWNmYw==
   data.tar.gz: !binary |-
-    Nzc0ZTdhNDQyN2I5MjYyMzY2YjllMTNiOTFhN2I4YWIzMGEzMGU5NQ==
+    NzZmZTRiYWY2OTAxODZkM2E1ODRhMjkxMDNmYmVkYWIxYWMyY2NhNA==
 SHA512:
   metadata.gz: !binary |-
-    YzkwNWQ1MzBkZmIyYjdmZjc5NGI3OTlmZTE2MDMxMDU4ZWNiZjc0NDNhMmU4
-    MDQ4NDJiZDllMWNlY2E5YTkzOGJhMmY2OGZhMzFlMzkxNzA4NTEwMGE2NDdm
-    OTk5YjdiZTZhMjlmN2NlZjdkZjVkOWYwOGNkMDQ4ODFiNTZiMWQ=
+    YTlmMDA3MTY5ZDBhYjEwMjgzZWFmMDliNzM5NmZhZDhhYTc5ZTIyYjYzM2Ni
+    OWZhNjM3M2JhYjhiMjJjYzUyZjZiZTEyNTU3YmE1OTMxZThiYTcyMjczODdm
+    NDRiNTQ0MWU2ZDlmMjM4M2JkMmZjOTJmMzI2YzY0Njg1NzgzNGM=
   data.tar.gz: !binary |-
-    YTgyNDY5NzIyZTJhMDVlZDA1YTdhZjljMWJiMDc5NzQzYzU5NzFhMzVkZDQz
-    YWRmZTJmZTk3ZTZmMWFiNTIxNThiZDAwNWQ0ZGI5YWRmMWFkMDk3MDAxMmNm
-    NjdiMWRlNzQxMDgwNjJhODM0OTUwYThlMTMxZTE1ZWNhMzZjMTA=
+    Y2E3N2U3ZDYxODgzMmM5MmM1NWUzNTZjZWZkN2VhYThmMTk3MzdkNjUxYTJj
+    ZDgwNGI0ZTQ5NTA0ZTc3YjJiZTBkYWFiNDczMzRjZDUyZjU4Y2Y4MzU4ODM5
+    OTYwY2MzNDY3N2EyNWNkZmY2ODBjMTA4ZmUwODUwNTk4NDFlOWI=

data/{CHANGELOG → CHANGELOG.md}

@@ -1,127 +1,138 @@
-2015-03-17 - Release 0.10.1
-Summary:
+# Change log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.10.2] - 2015-04-14
+### Summary:
+A bugfix for puppet 4 coming out, which manages modulepath and environments differently.
+
+### Fixed:
+- Use puppet 4 environmentpath and environment creation on puppet 4
+
+## [0.10.1] - 2015-03-17
+### Summary:
 A bugfix for the previous release when using references.
 
-Bugfixes:
+### Fixed:
 - Only shallow clone if not using a reference
 
-2015-03-16 - Release 0.10.0
-Summary:
+## [0.10.0] - 2015-03-16
+### Summary:
 This release adds shallow fixtures clones to speed up the spec_prep step for
 rspec-puppet
 
-Features:
+### Added:
 - Shallow clone fixtures
 
-Bugfixes:
+### Fixed:
 - Don't lint in vendor/ (spec/fixtures/ and pkg/ are alread ignored)
 - Don't syntax check in spec/fixtures/, pkg/, or vendor/
 
-2015-02-24 - Release 0.9.1
-Summary:
+## [0.9.1] - 2015-02-24
+### Summary:
 This release removes the hard dependency on metadata-json-lint, as it requires
 a dev toolchain to install the 'json' gem.
 
-Bugfixes:
+### Fixed:
 - Only warn when metadata-json-lint isn't installed instead of requiring it
 
-2015-02-24 - Release 0.9.0
-Summary:
+## [0.9.0] - 2015-02-24
+### Summary:
 This release adds fixes for rspec-puppet 2.0 and json linting for metadata.json
 
-Features:
+### Added:
 - Add json linting for metadata.json (adds dep on metadata-json-lint gem)
 - Document using references in fixtures
 
-Bugfixes:
-- FUTURE_PARSER=yes working with rspec-puppet 2.0
+### Fixed:
+- `FUTURE_PARSER=yes` working with rspec-puppet 2.0
 - Symlinks breaking on windows
 - rspec as a runtime dependency conflicting with rspec-puppet
 - root stub for testing execs
 
-2014-10-01 - Release 0.8.2
-Summary:
+## [0.8.2] - 2014-10-01
+### Summary:
 This release fixes the lint task on the latest puppet-lint
 
-Bugfixes:
+### Fixed:
 - Fix the lint task require code
 
-2014-08-25 - Release 0.8.1
-Summary:
+## [0.8.1] - 2014-08-25
+### Summary:
 This release corrects compatibility with the recently-released puppet-lint
 1.0.0
 
-Bugfixes:
+### Fixed:
 - Turn on relative autoloader lint checking for backwards-compatibility
 - Turn off param class inheritance check (deprecated style)
-- Fix ignore paths to ignore pkg/*
+- Fix ignore paths to ignore `pkg/*`
 
-2014-07-29 - Release 0.8.0
-Summary:
+## [0.8.0] - 2014-07-29
+### Summary:
 This release uses the new puppet-syntax gem to perform manifest validation
 better than before! Shiny.
 
-Features:
+### Added:
 - Use puppet-syntax gem for manifest validation rake task
 
-Bugfixes:
+### Fixed:
 - Fix compatibility with rspec 3
 
-2014-07-17 - Release 0.7.0
-Summary:
+## [0.7.0] - 2014-07-17
+### Summary:
 This feature release adds the ability to test structured facts, manifest
 ordering, and trusted node facts, and check out branches with fixtures.
 
-Features:
+### Added:
 - Add `STRINGIFY_FACTS=no` for structured facts
 - Add `TRUSTED_NODE_DATA=yes` for trusted node data
 - Add `ORDERING=<order>` for manifest ordering
 - Add `:branch` support for fixtures on a branch.
 
-Bugfixes:
+### Fixed:
 - Fix puppet-lint to ignore spec/fixtures/
 
-2014-07-02 - Release 0.6.0
-Summary:
+## [0.6.0] - 2014-07-02
+### Summary:
 This feature release adds the `validate` rake task and the ability to test
 strict variables and the future parser with rspec-puppet.
 
-Features:
+### Added:
 - Add `validate` rake task.
 - Add `STRICT_VARIABLES=yes` to module_spec_helper
 - Add `FUTURE_PARSER=yes` to module_spec_helper
 
-Bugfixes:
+### Fixed:
 - Avoid conflict with Object.clone
 - Install forge fixtures without conflicting with already-installed modules
 
-2014-06-19 - Release 0.5.2
-Summary:
+## [0.5.2] - 2014-06-19
+### Summary:
 This release removes the previously non-existant puppet runtime dependency to
 better match rspec-puppet and puppet-lint and allow system puppet packages to
 be used instead of gems.
 
-Bugfixes:
+### Fixed:
 - Remove puppet dependency from gemspec
 
-2014-06-09 - Release 0.5.1
-Summary:
+## [0.5.1] - 2014-06-09
+### Summary:
 This release re-adds mocha mocking, which was mistakenly removed in 0.5.0
 
-Bugfixes:
+### Fixed:
 - Re-enable mocha mocking as default.
 
-2014-06-06 - Release 0.5.0
-Summary:
+## [0.5.0] - 2014-06-06
+### Summary:
 This is the first feature release in over a year. The biggest feature is fixtures supporting the forge, and not just github, plus rake tasks for syntax checking and beaker.
 
-Features:
+### Added:
 - Install modules from the forge, not just git
 - Beaker rake tasks added
 - Syntax task added
 - Rake spec runs tests in `integration/` directory
 
-Bugfixes:
+### Fixed:
 - Fix the gemspec so that this may be used with bundler
 - Fix removal of symlinks
 - Fix removal of site.pp only when empty
@@ -129,42 +140,68 @@ Bugfixes:
 - Remove extra mocha dependency
 - Remove rspec pinning (oops)
 
-2014-06-06 - Release 0.4.2
-
-Summary:
+## 0.4.2 - 2014-06-06 [YANKED]
+### Summary:
 This release corrects the pinning of rspec for modules which are not rspec 3
 compatible yet.
 
-Bugfixes:
+### Fixed:
 * Pin to 2.x range for rspec 2
 * Fix aborting rake task when packaging gem
 * Fix puppet issue tracker url
 * Fix issue with running `git reset` in the incorrect dir
 
-2013-02-08 Puppet Labs <info@puppetlabs.com> - 0.4.1
+## [0.4.1] - 2013-02-08
+### Fixed
  * (#18165) Mark tests pending on broken puppet versions
  * (#18165) Initialize TestHelper as soon as possible
  * Maint: Change formatting and handle windows path separator
 
-2012-12-14 Puppet Labs <info@puppetlabs.com> - 0.4.0
- * Rake should fail if git can't clone repository
+## [0.4.0] - 2012-12-14
+### Added
  * Add readme for fixtures
- * Fix Mocha deprecations
  * add opts logic to rake spec_clean
  * add backwards-compatible support for arbitrary git refs in .fixtures.yml
+
+### Fixed
+ * Rake should fail if git can't clone repository
+ * Fix Mocha deprecations
  * Only remove the site.pp if it is empty
  * (#15464) Make contributing easy via bundle Gemfile
  * (#15464) Add gemspec from 0.3.0 published gem
 
-2012-08-14 Puppet Labs <info@puppetlabs.com> - 0.3.0
+## [0.3.0] - 2012-08-14
+### Added
  * Add PuppetInternals compatibility module for
    scope, node, compiler, and functions
  * Add rspec-puppet convention directories to rake tasks
 
-2012-07-05 Puppet Labs <info@puppetlabs.com> - 0.2.0
+## [0.2.0] - 2012-07-05
+### Fixed
  * Fix integration with mocha-0.12.0
  * Fix coverage rake task
  * Fix an issue creating the fixtures directory
 
-2012-06-08 Puppet Labs <info@puppetlabs.com> - 0.1.0
+## 0.1.0 - 2012-06-08
+### Added
  * Initial release
+
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.1...master
+[0.10.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.1...0.10.2
+[0.10.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.10.0...0.10.1
+[0.10.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.9.1...0.10.0
+[0.9.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.9.0...0.9.1
+[0.9.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.8.2...0.9.0
+[0.8.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.8.1...0.8.2
+[0.8.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.8.0...0.8.1
+[0.8.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.7.0...0.8.0
+[0.7.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.6.0...0.7.0
+[0.6.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.5.2...0.6.0
+[0.5.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.5.1...0.5.2
+[0.5.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.5.0...0.5.1
+[0.5.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.4.1...0.5.0
+[0.4.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.4.0...0.4.1
+[0.4.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.3.0...0.4.0
+[0.3.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.2.0...0.3.0
+[0.2.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.1.0...0.2.0
+[0.1.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/0.0.0...0.1.0

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -11,7 +11,8 @@ def verify_contents(subject, title, expected_lines)
   (content.split("\n") & expected_lines).should == expected_lines
 end
 
-fixture_path = File.expand_path(File.join(Dir.pwd, 'spec/fixtures'))
+spec_path = File.expand_path(File.join(Dir.pwd, 'spec'))
+fixture_path = File.join(spec_path, 'fixtures')
 
 env_module_path = ENV['MODULEPATH']
 module_path = File.join(fixture_path, 'modules')
@@ -19,6 +20,7 @@ module_path = File.join(fixture_path, 'modules')
 module_path = [module_path, env_module_path].join(File::PATH_SEPARATOR) if env_module_path
 
 RSpec.configure do |c|
+  c.environmentpath = spec_path if Puppet.version.to_f >= 4.0
   c.module_path = module_path
   c.manifest_dir = File.join(fixture_path, 'manifests')
   c.parser = 'future' if ENV['FUTURE_PARSER'] == 'yes'

data/lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb

@@ -47,7 +47,11 @@ module PuppetlabsSpec
     def node(parts = {})
       node_name = parts[:name] || 'testinghost'
       options = parts[:options] || {}
-      node_environment = Puppet::Node::Environment.new(parts[:environment] || 'test')
+      if Puppet.version.to_f >= 4.0
+        node_environment = Puppet::Node::Environment.create(parts[:environment] || 'test', [])
+      else
+        node_environment = Puppet::Node::Environment.new(parts[:environment] || 'test')
+      end
       options.merge!({:environment => node_environment})
       Puppet::Node.new(node_name, options)
     end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '0.10.1'
+    STRING = '0.10.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,7 +90,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .noexec.yaml
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.markdown