rspec-puppet 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4f7cd327bd2ebc223082a8f2ec4fa260a33099
-  data.tar.gz: 5f863681cfce560d3c821d097aa9b659b1911ff2
+  metadata.gz: 306b3d94980e5582b3fdd226c2616bb15a23984d
+  data.tar.gz: 689b36fdc52d0e49b1eb1a587e8682949839bbd4
 SHA512:
-  metadata.gz: d8ac24b9e683cb744bbe2102bf05c13c439594b4923b3aea580837b96795ee99973342ffab028e2feaaa9a0da1ccca6152ecbbc25c866f06d227c44b72e7840e
-  data.tar.gz: 933f349b6375c4e158afa6f87069c37b764989b315dbf0801c3f3e3b45a9519d441ae17ce6de30299500356730a36f15d19fe3e52dc60c3c38e92cf681d1aa84
+  metadata.gz: 65e3a47f0994979385b56d9739feed2644fea3eea0f86568bd37fd243ce5f00f210b1d3d05c78703823396b00d881d1a0fd54de72ea180bd69a591e0d6deb62a
+  data.tar.gz: acc9a1cb17456547bbe4f26965856af3d76d0a8ca33be63988ada284fd08592be597a54aa667a08d5b85bb33727c4454aacd752537796971a6f1496021a2fb4d

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.5]
+
+### Changed
+
+ * `derive_node_facts_from_nodename` setting added to disable the overriding of
+   `fqdn`, `hostname`, and `domain` facts with values derived from the node
+   name specified with `let(:node)`.
+
+### Fixed
+
+ * The `trusted_facts` hash now accepts symbol keys, matching the behaviour of
+   the `facts` hash.
+ * The modifications made to Puppet internals are now contained to rspec-puppet
+   examples, preventing them from bleeding out into other examples in the same
+   RSpec process (like Ruby unit tests).
+ * rspec-puppet no longer attempts to configure settings for Puppet 3.x
+   releases that they do not support.
+
 ## [2.6.4]
 
 ### Fixed

data/README.md

@@ -99,7 +99,7 @@ A hash of default trusted facts that should be used for all the tests
 #### trusted\_node\_data
 Type    | Default | Puppet Version(s)
 ------- | ------- | -----------------
-Boolean | `false` | 3.x, 4.x, 5.x
+Boolean | `false` | >=3.4, 4.x, 5.x
 
 Configures rspec-puppet to use the `$trusted` hash when compiling the
 catalogues.
@@ -143,14 +143,14 @@ The search path for environment directories.
 #### parser
 Type   | Default     | Puppet Version(s)
 ------ | ----------- | -----------------
-String | `"current"` | 3.x
+String | `"current"` | >= 3.2
 
 This switches between the 3.x (`current`) and 4.x (`future`) parsers.
 
 #### ordering
 Type   | Default        | Puppet Version(s)
 ------ | -------------- | -----------------
-String | `"title-hash"` | 3.x, 4.x, 5.x
+String | `"title-hash"` | >= 3.3, 4.x, 5.x
 
 How unrelated resources should be ordered when applying a catalogue.
  * `manifest` - Use the order in which the resources are declared in the
@@ -162,7 +162,7 @@ How unrelated resources should be ordered when applying a catalogue.
 #### strict\_variables
 Type    | Default | Puppet Version(s)
 ------- | ------- | -----------------
-Boolean | `false` | 3.x, 4.x, 5.x
+Boolean | `false` | >= 3.5, 4.x, 5.x
 
 Makes Puppet raise an error when it tries to reference a variable that hasn't
 been defined (not including variables that have been explicitly set to
@@ -171,7 +171,7 @@ been defined (not including variables that have been explicitly set to
 #### stringify\_facts
 Type    | Default | Puppet Version(s)
 ------- | ------- | -----------------
-Boolean | `true`  | 3.x, 4.x, 5.x
+Boolean | `true`  | >= 3.3, 4.x, 5.x
 
 Makes rspec-puppet coerce all the fact values into strings (matching the
 behaviour of older versions of Puppet).
@@ -194,6 +194,19 @@ Boolean | `true`  | 2.x, 3.x, 4.x, 5.x
 Configures rspec-puppet to automatically create a link from the root of your
 module to `spec/fixtures/<module name>` at the beginning of the test run.
 
+#### derive\_node\_facts\_from\_nodename
+Type    | Default | Puppet Version(s)
+------- | ------- | -----------------
+Boolean | `true`  | 2.x, 3.x, 4.x, 5.x
+
+If `true`, rspec-puppet will override the `fdqn`, `hostname`, and `domain`
+facts with values that it derives from the node name (specified with
+`let(:node)`.
+
+In some circumstances (e.g. where your nodename/certname is not the same as
+your FQDN), this behaviour is undesirable and can be disabled by changing this
+setting to `false`.
+
 ## Naming conventions
 
 For clarity and consistency, I recommend that you use the following directory
@@ -539,7 +552,7 @@ We can write the following testcase (in `spec/defines/sysctl_spec.rb`)
 ```ruby
 describe 'sysctl' do
   let(:title) { 'baz' }
-  let(:params) { { :value => 'foo' } }
+  let(:params) { { 'value' => 'foo' } }
 
   it { is_expected.to contain_exec('sysctl/reload').with_command("/sbin/sysctl -p /etc/sysctl.conf") }
 end
@@ -557,21 +570,21 @@ Parameters of a defined type, class or application can be passed defining `:para
 and passing it a hash as seen below.
 
 ```ruby
-let(:params) { {:ensure => 'present', ...} }
+let(:params) { {'ensure' => 'present', ...} }
 ```
 
 For passing Puppet's `undef` as a paremeter value, you can simply use `:undef` and it will
 be translated to `undef` when compiling. For example:
 
 ```ruby
-let(:params) { {:user => :undef, ...} }
+let(:params) { {'user' => :undef, ...} }
 ```
 
 For references to nodes or resources as seen when using `require` or `before` properties,
 or an `application` resource you can pass the string as an argument to the `ref` helper:
 
 ```ruby
-let(:params) { :require => ref('Package', 'sudoku') }
+let(:params) { 'require' => ref('Package', 'sudoku') }
 ```
 
 Which translates to:
@@ -583,7 +596,7 @@ mydefine { 'mytitle': require => Package['sudoku'] }
 Another example, for an application setup (when using `app_management`):
 
 ```ruby
-let(:params) { { :nodes => { ref('Node', 'dbnode') => ref('Myapp::Mycomponent', 'myapp') } } }
+let(:params) { { 'nodes' => { ref('Node', 'dbnode') => ref('Myapp::Mycomponent', 'myapp') } } }
 ```
 
 Will translate to:
@@ -616,7 +629,7 @@ By default, the test environment contains no facts for your manifest to use.
 You can set them with a hash
 
 ```ruby
-let(:facts) { {:operatingsystem => 'Debian', :kernel => 'Linux', ...} }
+let(:facts) { {'operatingsystem' => 'Debian', 'kernel' => 'Linux', ...} }
 ```
 
 Facts may be expressed as a value (shown in the previous example) or a structure.  Fact keys
@@ -624,7 +637,7 @@ may be expressed as either symbols or strings.  A key will be converted to a low
 string to align with the Facter standard
 
 ```ruby
-let(:facts) { {:os => { :family => 'RedHat', :release => { :major => '7', :minor => '1', :full => '7.1.1503' } } } }
+let(:facts) { {'os' => { 'family' => 'RedHat', 'release' => { 'major' => '7', 'minor' => '1', 'full' => '7.1.1503' } } } }
 ```
 
 You can also create a set of default facts provided to all specs in your spec_helper:
@@ -632,7 +645,7 @@ You can also create a set of default facts provided to all specs in your spec_he
 ``` ruby
 RSpec.configure do |c|
   c.default_facts = {
-    :operatingsystem => 'Ubuntu'
+    'operatingsystem' => 'Ubuntu'
   }
 end
 ```
@@ -646,7 +659,7 @@ You can create top-scope variables much in the same way as an ENC.
 
 
 ```ruby
-let(:node_params) { { :hostgroup => 'webservers', :rack => 'KK04', :status => 'maintenance' } }
+let(:node_params) { { 'hostgroup' => 'webservers', 'rack' => 'KK04', 'status' => 'maintenance' } }
 ```
 
 You can also create a set of default top-scope variables provided to all specs in your spec_helper:
@@ -654,9 +667,9 @@ You can also create a set of default top-scope variables provided to all specs i
 ``` ruby
 RSpec.configure do |c|
   c.default_node_params = {
-    :owner => 'itprod',
-    :site => 'ams4',
-    :status => 'live'
+    'owner'  => 'itprod',
+    'site'   => 'ams4',
+    'status' => 'live'
   }
 end
 ```
@@ -773,7 +786,7 @@ describe 'orch_app' do
   let(:title) { 'my_awesome_app' }
   let(:params) do
     {
-      :nodes => {
+      'nodes' => {
         ref('Node', node) => ref('Orch_app::Db', title),
       }
     }
@@ -965,7 +978,7 @@ user:
 
 ```ruby
   ntpserver = hiera.lookup('ntpserver', nil, nil)
-  let(:params) { :ntpserver => ntpserver }
+  let(:params) { 'ntpserver' => ntpserver }
 ```
 
 ### Enabling hiera lookups

data/lib/rspec-puppet.rb

@@ -8,6 +8,7 @@ require 'rspec-puppet/example'
 require 'rspec-puppet/setup'
 require 'rspec-puppet/coverage'
 require 'rspec-puppet/adapters'
+require 'rspec-puppet/consts'
 
 begin
   require 'puppet/test/test_helper'
@@ -18,6 +19,12 @@ RSpec.configure do |c|
   c.add_setting :enable_pathname_stubbing, :default => false
 end
 
+module RSpec::Puppet
+  def self.rspec_puppet_example?
+    RSpec::Puppet::EventListener.rspec_puppet_example?
+  end
+end
+
 require 'rspec-puppet/monkey_patches'
 
 RSpec.configure do |c|
@@ -37,8 +44,10 @@ RSpec.configure do |c|
   c.add_setting :ordering, :default => 'title-hash'
   c.add_setting :stringify_facts, :default => true
   c.add_setting :strict_variables, :default => false
-  c.add_setting :adapter
   c.add_setting :setup_fixtures, :default => true
+  c.add_setting :derive_node_facts_from_nodename, :default => true
+  c.add_setting :adapter
+  c.add_setting :platform, :default => Puppet::Util::Platform.actual_platform
 
   c.before(:all) do
     if RSpec.configuration.setup_fixtures?
@@ -85,7 +94,7 @@ RSpec.configure do |c|
   end
 
   c.before :each do
-    if self.class.ancestors.include? RSpec::Puppet::Support
+    if RSpec::Puppet.rspec_puppet_example?
       @adapter = RSpec::Puppet::Adapters.get
       @adapter.setup_puppet(self)
       c.adapter = adapter
@@ -93,6 +102,13 @@ RSpec.configure do |c|
   end
 
   c.before :each do |example|
-    stub_file_consts(example) if self.respond_to?(:stub_file_consts)
+    if RSpec::Puppet.rspec_puppet_example?
+      Puppet::Util::Platform.pretend_to_be RSpec.configuration.platform
+      stub_file_consts(example) if self.respond_to?(:stub_file_consts)
+    end
+  end
+
+  c.after(:each) do
+    RSpec::Puppet::Consts.restore_consts if RSpec::Puppet.rspec_puppet_example?
   end
 end

data/lib/rspec-puppet/adapters.rb

@@ -183,17 +183,45 @@ module RSpec::Puppet
       end
     end
 
-    class Adapter3X < Base
+    class Adapter30 < Base
       def settings_map
         super.concat([
           [:manifestdir, :manifest_dir],
           [:manifest, :manifest],
           [:templatedir, :template_dir],
           [:hiera_config, :hiera_config],
+        ])
+      end
+    end
+
+    class Adapter32 < Adapter30
+      def settings_map
+        super.concat([
           [:parser, :parser],
-          [:trusted_node_data, :trusted_node_data],
+        ])
+      end
+    end
+
+    class Adapter33 < Adapter32
+      def settings_map
+        super.concat([
           [:ordering, :ordering],
           [:stringify_facts, :stringify_facts],
+        ])
+      end
+    end
+
+    class Adapter34 < Adapter33
+      def settings_map
+        super.concat([
+          [:trusted_node_data, :trusted_node_data],
+        ])
+      end
+    end
+
+    class Adapter35 < Adapter34
+      def settings_map
+        super.concat([
           [:strict_variables, :strict_variables],
         ])
       end
@@ -212,7 +240,11 @@ module RSpec::Puppet
     def self.get
       [
         ['4.0', Adapter4X],
-        ['3.0', Adapter3X],
+        ['3.5', Adapter35],
+        ['3.4', Adapter34],
+        ['3.3', Adapter33],
+        ['3.2', Adapter32],
+        ['3.0', Adapter30],
         ['2.7', Adapter27]
       ].each do |(version, klass)|
         if Puppet::Util::Package.versioncmp(Puppet.version, version) >= 0

data/lib/rspec-puppet/consts.rb

@@ -0,0 +1,31 @@
+module RSpec::Puppet::Consts
+  STUBBED_CONSTS = {
+    :posix => {
+      'File::PATH_SEPARATOR' => ':',
+      'File::ALT_SEPARATOR' => nil,
+      'Pathname::SEPARATOR_PAT' => /#{Regexp.quote('/')}/,
+    },
+    :windows => {
+      'File::PATH_SEPARATOR' => ';',
+      'File::ALT_SEPARATOR' => "\\",
+      'Pathname::SEPARATOR_PAT' => /[#{Regexp.quote("\\")}#{Regexp.quote('/')}]/,
+    }
+  }
+
+  def self.stub_consts_for(platform)
+    STUBBED_CONSTS[platform].each do |const_name, const_value|
+      stub_const_wrapper(const_name, const_value)
+    end
+  end
+
+  def self.stub_const_wrapper(const, value)
+    klass_name, const_name = const.split('::', 2)
+    klass = Object.const_get(klass_name)
+    klass.send(:remove_const, const_name) if klass.const_defined?(const_name)
+    klass.const_set(const_name, value)
+  end
+
+  def self.restore_consts
+    stub_consts_for(RSpec.configuration.platform)
+  end
+end

data/lib/rspec-puppet/monkey_patches.rb

@@ -1,5 +1,29 @@
 require 'pathname'
 
+class RSpec::Puppet::EventListener
+  def self.example_started(example)
+    if rspec3?
+      @rspec_puppet_example = example.example.example_group.ancestors.include?(RSpec::Puppet::Support)
+    else
+      @rspec_puppet_example = example.example_group.ancestors.include?(RSpec::Puppet::Support)
+    end
+  end
+
+  def self.rspec_puppet_example?
+    @rspec_puppet_example || false
+  end
+
+  def self.rspec3?
+    if @rspec3.nil?
+      @rspec3 = defined?(RSpec::Core::Notifications)
+    end
+
+    @rspec3
+  end
+end
+
+RSpec.configuration.reporter.register_listener(RSpec::Puppet::EventListener, :example_started)
+
 module Puppet
   # Allow rspec-puppet to prevent Puppet::Type from automatically picking
   # a provider for a resource. We need to do this because in order to fully
@@ -11,32 +35,36 @@ module Puppet
     old_set_default = instance_method(:set_default)
 
     define_method(:set_default) do |attr|
-      old_posix = nil
-      old_microsoft_windows = nil
+      if RSpec::Puppet.rspec_puppet_example?
+        old_posix = nil
+        old_microsoft_windows = nil
+
+        if attr == :provider
+          old_posix = Puppet.features.posix?
+          old_microsoft_windows = Puppet.features.microsoft_windows?
+
+          if Puppet::Util::Platform.pretend_windows?
+            Puppet.features.add(:posix) { false }
+            Puppet.features.add(:microsoft_windows) { true }
+          else
+            Puppet.features.add(:posix) { true }
+            Puppet.features.add(:microsoft_windows) { false }
+          end
+        end
 
-      if attr == :provider
-        old_posix = Puppet.features.posix?
-        old_microsoft_windows = Puppet.features.microsoft_windows?
+        retval = old_set_default.bind(self).call(attr)
 
-        if Puppet::Util::Platform.pretend_windows?
-          Puppet.features.add(:posix) { false }
-          Puppet.features.add(:microsoft_windows) { true }
-        else
-          Puppet.features.add(:posix) { true }
-          Puppet.features.add(:microsoft_windows) { false }
+        unless old_posix.nil?
+          Puppet.features.add(:posix) { old_posix }
+        end
+        unless old_microsoft_windows.nil?
+          Puppet.features.add(:microsoft_windows) { old_microsoft_windows }
         end
-      end
-
-      retval = old_set_default.bind(self).call(attr)
 
-      unless old_posix.nil?
-        Puppet.features.add(:posix) { old_posix }
-      end
-      unless old_microsoft_windows.nil?
-        Puppet.features.add(:microsoft_windows) { old_microsoft_windows }
+        retval
+      else
+        old_set_default.bind(self).call(attr)
       end
-
-      retval
     end
 
     def self.suppress_provider?
@@ -52,37 +80,47 @@ module Puppet
     end
   end
 
-  # If Puppet::Node::Environment has a validate_dirs instance method (i.e.
-  # Puppet < 3.x), wrap the method to check if rspec-puppet is pretending to be
-  # running under windows. The original method uses Puppet::Util.absolute_path?
-  # (which in turn calls Puppet::Util::Platform.windows?) to validate the path
-  # to the manifests on disk during compilation, so we have to temporarily
-  # disable the pretending when running it.
-  class Node::Environment
-    if instance_methods.include?("validate_dirs")
-      old_validate_dirs = instance_method(:validate_dirs)
-
-      define_method(:validate_dirs) do |dirs|
+  module Parser::Files
+    alias :old_find_manifests_in_modules :find_manifests_in_modules
+    module_function :old_find_manifests_in_modules
+
+    def find_manifests_in_modules(pattern, environment)
+      if RSpec::Puppet.rspec_puppet_example?
         pretending = Puppet::Util::Platform.pretend_platform
 
-        if pretending
+        unless pretending.nil?
           Puppet::Util::Platform.pretend_to_be nil
+          RSpec::Puppet::Consts.stub_consts_for(RSpec.configuration.platform)
         end
 
-        output = old_validate_dirs.bind(self).call(dirs)
+        environment.send(:value_cache).clear if environment.respond_to?(:value_cache, true)
+        output = old_find_manifests_in_modules(pattern, environment)
 
-        Puppet::Util::Platform.pretend_to_be pretending
+        unless pretending.nil?
+          Puppet::Util::Platform.pretend_to_be pretending
+          RSpec::Puppet::Consts.stub_consts_for pretending
+        end
 
         output
+      else
+        old_find_manifests_in_modules(pattern, environment)
       end
     end
+    module_function :find_manifests_in_modules
   end
 
   module Util
     # Allow rspec-puppet to pretend to be different platforms.
     module Platform
+      alias :old_windows? :windows?
+      module_function :old_windows?
+
       def windows?
-        pretend_platform.nil? ? (actual_platform == :windows) : pretend_windows?
+        if RSpec::Puppet.rspec_puppet_example?
+          pretend_platform.nil? ? (actual_platform == :windows) : pretend_windows?
+        else
+          old_windows?
+        end
       end
       module_function :windows?
 
@@ -112,16 +150,32 @@ module Puppet
     end
   end
 
-  if defined?(Puppet::Confine)
+  begin
+    require 'puppet/confine/exists'
+
     class Confine::Exists < Puppet::Confine
-      def pass?(value)
-        true
+      old_pass = instance_method(:pass?)
+
+      define_method(:pass?) do |value|
+        if RSpec::Puppet.rspec_puppet_example?
+          true
+        else
+          old_pass.bind(self).call(value)
+        end
       end
     end
-  else
+  rescue LoadError
+    require 'puppet/provider/confine/exists'
+
     class Provider::Confine::Exists < Puppet::Provider::Confine
-      def pass?(value)
-        true
+      old_pass = instance_method(:pass?)
+
+      define_method(:pass?) do |value|
+        if RSpec::Puppet.rspec_puppet_example?
+          true
+        else
+          old_pass.bind(self).call(value)
+        end
       end
     end
   end
@@ -141,12 +195,16 @@ class Pathname
     old_chop_basename = instance_method(:chop_basename)
 
     define_method(:chop_basename) do |path|
-      if RSpec.configuration.enable_pathname_stubbing
-        base = rspec_puppet_basename(path)
-        if /\A#{SEPARATOR_PAT}?\z/o =~ base
-          return nil
+      if RSpec::Puppet.rspec_puppet_example?
+        if RSpec.configuration.enable_pathname_stubbing
+          base = rspec_puppet_basename(path)
+          if /\A#{SEPARATOR_PAT}?\z/o =~ base
+            return nil
+          else
+            return path[0, path.rindex(base)], base
+          end
         else
-          return path[0, path.rindex(base)], base
+          old_chop_basename.bind(self).call(path)
         end
       else
         old_chop_basename.bind(self).call(path)
@@ -157,12 +215,26 @@ end
 
 # Prevent the File type from munging paths (which uses File.expand_path to
 # normalise paths, which does very bad things to *nix paths on Windows.
-Puppet::Type.type(:file).paramclass(:path).munge { |value| value }
+file_path_munge = Puppet::Type.type(:file).paramclass(:path).instance_method(:unsafe_munge)
+Puppet::Type.type(:file).paramclass(:path).munge do |value|
+  if RSpec::Puppet.rspec_puppet_example?
+    value
+  else
+    file_path_munge.bind(self).call(value)
+  end
+end
 
 # Prevent the Exec type from validating the user. This parameter isn't
 # supported under Windows at all and only under *nix when the current user is
 # root.
-Puppet::Type.type(:exec).paramclass(:user).validate { |value| true }
+exec_user_validate = Puppet::Type.type(:exec).paramclass(:user).instance_method(:unsafe_validate)
+Puppet::Type.type(:exec).paramclass(:user).validate do |value|
+  if RSpec::Puppet.rspec_puppet_example?
+    true
+  else
+    exec_user_validate.bind(self).call(value)
+  end
+end
 
 # Prevent Puppet from requiring 'puppet/util/windows' if we're pretending to be
 # windows, otherwise it will require other libraries that probably won't be
@@ -170,7 +242,7 @@ Puppet::Type.type(:exec).paramclass(:user).validate { |value| true }
 module Kernel
   alias :old_require :require
   def require(path)
-    return if path == 'puppet/util/windows' && Puppet::Util::Platform.pretend_windows?
+    return if path == 'puppet/util/windows' && RSpec::Puppet.rspec_puppet_example? && Puppet::Util::Platform.pretend_windows?
     old_require(path)
   end
 end

data/lib/rspec-puppet/support.rb

@@ -4,7 +4,6 @@ require 'rspec-puppet/raw_string'
 
 module RSpec::Puppet
   module Support
-
     @@cache = RSpec::Puppet::Cache.new
 
     def subject
@@ -55,25 +54,14 @@ module RSpec::Puppet
 
       munged_facts = facts_hash(nodename(type))
 
-      if munged_facts['operatingsystem'] && munged_facts['operatingsystem'].to_s.downcase == 'windows'
-        stub_const_wrapper('File::PATH_SEPARATOR', ';')
-        stub_const_wrapper('File::ALT_SEPARATOR', "\\")
-        stub_const_wrapper('Pathname::SEPARATOR_PAT', /[#{Regexp.quote(File::ALT_SEPARATOR)}#{Regexp.quote(File::SEPARATOR)}]/)
-      else
-        stub_const_wrapper('File::PATH_SEPARATOR', ':')
-        stub_const_wrapper('File::ALT_SEPARATOR', nil)
-        stub_const_wrapper('Pathname::SEPARATOR_PAT', /#{Regexp.quote(File::SEPARATOR)}/)
-      end
-    end
-
-    def stub_const_wrapper(const, value)
-      if defined?(RSpec::Core::MockingAdapters::RSpec) && RSpec.configuration.mock_framework == RSpec::Core::MockingAdapters::RSpec
-        stub_const(const, value)
-      else
-        klass_name, const_name = const.split('::', 2)
-        klass = Object.const_get(klass_name)
-        klass.send(:remove_const, const_name) if klass.const_defined?(const_name)
-        klass.const_set(const_name, value)
+      ['operatingsystem', 'osfamily'].each do |os_fact|
+        if munged_facts.key?(os_fact)
+          if munged_facts[os_fact].to_s.downcase == 'windows'
+            RSpec::Puppet::Consts.stub_consts_for(:windows)
+          else
+            RSpec::Puppet::Consts.stub_consts_for(:posix)
+          end
+        end
       end
     end
 
@@ -239,7 +227,7 @@ module RSpec::Puppet
 
       # Merge node facts again on top of `let(:facts)` facts, but only if
       # a node name is given with `let(:node)`
-      if respond_to?(:node)
+      if respond_to?(:node) && RSpec.configuration.derive_node_facts_from_nodename
         result_facts.merge!(munge_facts(node_facts))
         (result_facts['networking'] ||= {}).merge!(networking_facts)
       end
@@ -269,10 +257,10 @@ module RSpec::Puppet
       extensions = {}
 
       if RSpec.configuration.default_trusted_facts.any?
-        extensions.merge!(RSpec.configuration.default_trusted_facts)
+        extensions.merge!(munge_facts(RSpec.configuration.default_trusted_facts))
       end
 
-      extensions.merge!(trusted_facts) if self.respond_to?(:trusted_facts)
+      extensions.merge!(munge_facts(trusted_facts)) if self.respond_to?(:trusted_facts)
       extensions
     end
 
@@ -367,16 +355,22 @@ module RSpec::Puppet
     end
 
     def stub_facts!(facts)
-      if facts['operatingsystem'] && facts['operatingsystem'].to_s.downcase == 'windows'
-        Puppet::Util::Platform.pretend_to_be :windows
-      else
-        Puppet::Util::Platform.pretend_to_be :posix
-      end
       Puppet.settings[:autosign] = false
       facts.each { |k, v| Facter.add(k) { setcode { v } } }
     end
 
     def build_catalog(*args)
+      build_facts = args[1]
+      ['operatingsystem', 'osfamily'].each do |os_fact|
+        if build_facts.key?(os_fact)
+          if build_facts[os_fact].to_s.downcase == 'windows'
+            Puppet::Util::Platform.pretend_to_be :windows
+          else
+            Puppet::Util::Platform.pretend_to_be :posix
+          end
+        end
+      end
+
       @@cache.get(*args) do |*args|
         build_catalog_without_cache(*args)
       end

data/lib/rspec-puppet/tasks/release_test.rb

@@ -0,0 +1,144 @@
+require 'rake'
+require 'open3'
+require 'json'
+require 'parser/current'
+
+task :release_test do
+  modules_to_test = [
+    'puppetlabs/puppetlabs-apt',
+    'puppetlabs/puppetlabs-tomcat',
+    'puppetlabs/puppetlabs-apache',
+    'puppetlabs/puppetlabs-mysql',
+    'puppetlabs/puppetlabs-ntp',
+    'puppetlabs/puppetlabs-acl',
+    'puppetlabs/puppetlabs-chocolatey',
+    'voxpupuli/puppet-archive',
+    'voxpupuli/puppet-collectd',
+    'garethr/garethr-docker',
+    'sensu/sensu-puppet',
+    'jenkinsci/puppet-jenkins',
+  ]
+
+  Bundler.with_clean_env do
+    FileUtils.mkdir_p('tmp')
+    Dir.chdir('tmp') do
+      modules_to_test.each do |module_name|
+        puts "Testing #{module_name}..."
+        module_dir = File.basename(module_name)
+
+        if File.directory?(module_dir)
+          Dir.chdir(module_dir) do
+            print '  Updating repository... '
+            _, status = Open3.capture2e('git', 'pull', '--rebase')
+            if status.success?
+              puts 'Done'
+            else
+              puts 'FAILED'
+              next
+            end
+          end
+        else
+          print '  Cloning repository... '
+          _, status = Open3.capture2e('git', 'clone', "https://github.com/#{module_name}")
+          if status.success?
+            puts 'Done'
+          else
+            puts 'FAILED'
+            next
+          end
+        end
+
+        Dir.chdir(module_dir) do
+          print '  Installing dependencies... '
+          bundle_install_output, status = Open3.capture2e('bundle', 'install', '--path', 'vendor/gems')
+          if status.success?
+            puts 'Done'
+          else
+            puts 'FAILED'
+            puts bundle_install_output
+            next
+          end
+
+          print '  Running baseline tests... '
+          baseline_output, _, status = Open3.capture3({'SPEC_OPTS' => '--format json'}, 'bundle', 'exec', 'rake', 'spec')
+          if status.success?
+            puts 'Done'
+          else
+            puts 'Done (tests failed)'
+          end
+
+          print '  Updating Gemfile to use rspec-puppet HEAD... '
+          buffer = Parser::Source::Buffer.new('Gemfile')
+          buffer.source = File.read('Gemfile')
+          parser = Parser::CurrentRuby.new
+          ast = parser.parse(buffer)
+
+          modified_gemfile = GemfileRewrite.new.rewrite(buffer, ast)
+
+          gem_root = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+          if modified_gemfile == buffer.source
+            File.open('Gemfile', 'a') do |f|
+              f.puts "gem 'rspec-puppet', :path => '#{gem_root}'"
+            end
+          else
+            File.open('Gemfile', 'w') do |f|
+              f.puts modified_gemfile
+            end
+          end
+
+          puts 'Done'
+
+          print '  Installing dependencies... '
+          _, status = Open3.capture2e('bundle', 'install', '--path', 'vendor/gems')
+          if status.success?
+            puts 'Done'
+          else
+            puts "FAILED"
+            next
+          end
+
+          print '  Running tests against rspec-puppet HEAD... '
+          head_output, _, status = Open3.capture3({'SPEC_OPTS' => '--format json'}, 'bundle', 'exec', 'rake', 'spec')
+          if status.success?
+            puts 'Done'
+          else
+            puts 'Done (tests failed)'
+          end
+
+          print '  Restoring Gemfile... '
+          _, status = Open3.capture2e('git', 'checkout', '--', 'Gemfile')
+          if status.success?
+            puts 'Done'
+          else
+            puts 'FAILED'
+          end
+
+          json_regex = %r{\{(?:[^{}]|(?:\g<0>))*\}}x
+          baseline_results = JSON.parse(baseline_output.scan(json_regex).last)
+          head_results = JSON.parse(head_output.scan(json_regex).last)
+          if head_results['summary_line'] == baseline_results['summary_line']
+            puts "  PASS: #{head_results['summary_line']}"
+          else
+            puts "!!FAILED: baseline:(#{baseline_results['summary_line']}) head:(#{head_results['summary_line']})"
+          end
+        end
+      end
+    end
+  end
+end
+
+class GemfileRewrite < Parser::Rewriter
+  def on_send(node)
+    _, method_name, *args = *node
+
+    if method_name == :gem
+      gem_name = args.first
+      if gem_name.type == :str && gem_name.children.first == 'rspec-puppet'
+        gem_root = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+        replace(node.location.expression, "gem 'rspec-puppet', :path => '#{gem_root}'")
+      end
+    end
+
+    super
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,6 +37,7 @@ files:
 - lib/rspec-puppet.rb
 - lib/rspec-puppet/adapters.rb
 - lib/rspec-puppet/cache.rb
+- lib/rspec-puppet/consts.rb
 - lib/rspec-puppet/coverage.rb
 - lib/rspec-puppet/errors.rb
 - lib/rspec-puppet/example.rb
@@ -64,6 +65,7 @@ files:
 - lib/rspec-puppet/setup.rb
 - lib/rspec-puppet/spec_helper.rb
 - lib/rspec-puppet/support.rb
+- lib/rspec-puppet/tasks/release_test.rb
 homepage: https://github.com/rodjek/rspec-puppet/
 licenses:
 - MIT