rspec-puppet 2.6.9 → 2.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e358d6951d64d0bd46d40657619cebac5c90af8
-  data.tar.gz: e2af0a6d7a995fe41b0d155f2dc1c20055911da8
+  metadata.gz: 79d6d3a697c31a222aeeed78ed607388ea642626
+  data.tar.gz: 22bcbe25913fcc858d11f4d5842525fd5f891dd9
 SHA512:
-  metadata.gz: f0994991a27eddd126547940ae9a8b667dd7f08a7084b90f35c7a005cdb4b58974b580110908a7afa2a4034429964ee79181531b50cfa6028a016dcf9e8e27f2
-  data.tar.gz: 35ca0b9c0b1c1c60a2b736b05652c216322ee5ae1f47d2cb2c85080c93e9ba90e19f88d4f458424df8a9af37625050b16b3f13a02f7a4ecf9b31f1f586916e8c
+  metadata.gz: e4eb8e8725a5373c0b4fb965b0ac0804ec6003696f5e202cabf88240412b5fe35613a5613544ce22b3c31ce6a055b8463206d7b6c0cb13be427d1c4d812e68fb
+  data.tar.gz: da2762a48d9cf1096c84eb01faf1595709a3bffb8cbb3b95128feb7f2c8e9a1527d8bfa8892cc1798f7342cb1f0c86145b3c5df2b522c9cdb3d3bced10f17104

data/CHANGELOG.md

@@ -2,6 +2,53 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.10]
+
+### Fixed
+
+ * Replaced deprecated `File.exists?` calls in `rspec-puppet-init` with
+   `File.exist?`, which behaves much more reliably in respect to symlinks.
+ * Stubbed out `Puppet::Util::Windows::Security.supports_acl?` when compiling
+   the catalogue as this check only make sense when applying the resources to
+   a host and prevents testing Windows File resources on non-Windows hosts.
+ * The cached default provider for native types is now reset before compiling
+   a new catalogue.
+ * Resource titles that contain single quotes are now rendered correctly,
+   allowing them to be tested.
+ * When pretending to be a different platform, the methods in
+   `Puppet::Util::Platform` are now stubbed after the catalogue has been
+   compiled, allowing path related logic in custom facts to behave as expected.
+ * A mock version of `Win32::TaskScheduler` has been added to rspec-puppet.
+   This will be loaded when running rspec-puppet on a non-Windows host in order
+   to allow testing of catalogues containing Scheduled\_task resources.
+ * Stubbed out the `manages_symlinks` feature on
+   `Puppet::Type::File::ProviderWindows` as this can only be evaluated at apply
+   time and prevents testing Windows File resources that manage symlinks on
+   non-Windows hosts.
+ * Fixed unhandled exception when testing resource parameters where the
+   expected value is an Array or a Hash and the actual value is a different
+   data type.
+ * A mock version of `Win32::Registry` has been added to rspec-puppet. This
+   will be loaded when running rspec-puppet on a non-Windows host in order to
+   allow testing of catalogues that contain Exec resources that use the
+   `powershell` provider from the `puppetlabs/puppetlabs-powershell` module.
+ * Fixed a case where the order in which tests are run can cause a resource
+   that is being tested to be falsely reported as untested in the coverage
+   report.
+
+### Changed
+
+ * The tests for the `compile` matcher have been updated to support the new
+   error message format introduced in Puppet 5.3.4.
+ * The builtin `$server_facts` hash is now populated on versions of Puppet that
+   support it (Puppet >= 4.3). This is not currently enabled by default, but
+   can be enabled by setting `RSpec.configuration.trusted_server_facts` to
+   `true`.
+ * `$facts['os']['family']` and `$facts['os']['name']` are now checked when
+   determining if rspec-puppet needs to pretend to be running on a different
+   platform (previously only `$facts['operatingsystem']` and
+   `$facts['osfamily']` were used).
+
 ## [2.6.9]
 
 ### Fixed

data/README.md

@@ -105,6 +105,14 @@ Boolean | `false` | >=3.4, 4.x, 5.x
 Configures rspec-puppet to use the `$trusted` hash when compiling the
 catalogues.
 
+#### trusted\_server\_facts
+Type    | Default | Puppet Version(s)
+------- | ------- | -----------------
+Boolean | `false` | >=4.3, 5.x
+
+Configures rspec-puppet to use the `$server_facts` hash when compiling the
+catalogues.
+
 #### confdir
 Type   | Default         | Puppet Version(s)
 ------ | --------------- | ------------------
@@ -1047,6 +1055,7 @@ be excluded from the coverage report.
 * [puppetlabs_spec_helper](https://github.com/puppetlabs/puppetlabs_spec_helper): shared spec helpers to setup puppet
 * [rspec-puppet-augeas](https://github.com/domcleal/rspec-puppet-augeas): RSpec tests for Augeas resources inside Puppet manifests
 * [jimdo-rspec-puppet-helpers](https://github.com/Jimdo/jimdo-rspec-puppet-helpers): Tests the contents of a file with a source
+* [puppet-catalog_rspec](https://github.com/enterprisemodules/puppet-catalog_rspec): Ease development of specs by dumping the Puppet catalog as RSpec code
 
 * Fact providers
   * [rspec-puppet-facts](https://github.com/mcanevet/rspec-puppet-facts): Simplify your unit tests by looping on every supported Operating System and populating facts.

data/lib/rspec-puppet.rb

@@ -23,6 +23,10 @@ module RSpec::Puppet
   def self.rspec_puppet_example?
     RSpec::Puppet::EventListener.rspec_puppet_example?
   end
+
+  def self.current_example
+    RSpec::Puppet::EventListener.current_example
+  end
 end
 
 require 'rspec-puppet/monkey_patches'
@@ -49,6 +53,17 @@ RSpec.configure do |c|
   c.add_setting :adapter
   c.add_setting :platform, :default => Puppet::Util::Platform.actual_platform
 
+  c.instance_eval do
+    def trusted_server_facts
+      @trusted_server_facts.nil? ? false : @trusted_server_facts
+    end
+
+    def trusted_server_facts=(value)
+      @trusted_server_facts = value
+      adapter.setup_puppet(RSpec::Puppet.current_example) unless adapter.nil?
+    end
+  end
+
   c.before(:all) do
     if RSpec.configuration.setup_fixtures?
       RSpec::Puppet::Setup.safe_setup_directories(nil, false)

data/lib/rspec-puppet/adapters.rb

@@ -150,6 +150,7 @@ module RSpec::Puppet
           [:hiera_config, :hiera_config],
           [:strict_variables, :strict_variables],
           [:manifest, :manifest],
+          [:trusted_server_facts, :trusted_server_facts]
         ])
       end
 

data/lib/rspec-puppet/coverage.rb

@@ -119,6 +119,8 @@ module RSpec::Puppet
     def results
       report = {}
 
+      @collection.delete_if { |name, _| filtered?(name) }
+
       report[:total] = @collection.size
       report[:touched] = @collection.count { |_, resource| resource.touched? }
       report[:untouched] = report[:total] - report[:touched]

data/lib/rspec-puppet/matchers/parameter_matcher.rb

@@ -87,6 +87,11 @@ module RSpec::Puppet
       def check_hash(expected, actual)
         op = @should_match ? :"==" : :"!="
 
+        unless actual.class.send(op, expected.class)
+          @errors << MatchError.new(@parameter, expected, actual, !@should_match)
+          return false
+        end
+
         unless expected.keys.size.send(op, actual.keys.size)
           return false
         end
@@ -99,6 +104,11 @@ module RSpec::Puppet
       def check_array(expected, actual)
         op = @should_match ? :"==" : :"!="
 
+        unless actual.class.send(op, expected.class)
+          @errors << MatchError.new(@parameter, expected, actual, !@should_match)
+          return false
+        end
+
         unless expected.size.send(op, actual.size)
           return false
         end

data/lib/rspec-puppet/monkey_patches.rb

@@ -11,8 +11,13 @@ class RSpec::Puppet::EventListener
   def self.example_started(example)
     if rspec3?
       @rspec_puppet_example = example.example.example_group.ancestors.include?(RSpec::Puppet::Support)
+      @current_example = example.example
+      if !@current_example.respond_to?(:environment) && @current_example.respond_to?(:example_group_instance)
+        @current_example = @current_example.example_group_instance
+      end
     else
       @rspec_puppet_example = example.example_group.ancestors.include?(RSpec::Puppet::Support)
+      @current_example = example
     end
   end
 
@@ -39,10 +44,17 @@ class RSpec::Puppet::EventListener
 
     @rspec3
   end
+
+  def self.current_example
+    @current_example
+  end
 end
 
 RSpec.configuration.reporter.register_listener(RSpec::Puppet::EventListener, :example_started, :example_pending, :example_passed, :example_failed)
 
+require 'rspec-puppet/monkey_patches/win32/taskscheduler'
+require 'rspec-puppet/monkey_patches/win32/registry'
+
 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
@@ -272,13 +284,38 @@ Puppet::Type.type(:exec).paramclass(:user).validate do |value|
   end
 end
 
+# Stub out Puppet::Util::Windows::Security.supports_acl? if it has been
+# defined. This check only makes sense when applying the catalogue to a host
+# and so can be safely stubbed out for unit testing.
+Puppet::Type.type(:file).provide(:windows).class_eval do
+  old_supports_acl = instance_method(:supports_acl?) if respond_to?(:supports_acl?)
+
+  def supports_acl?(path)
+    if RSpec::Puppet.rspec_puppet_example?
+      true
+    else
+      old_supports_acl.bind(self).call(value)
+    end
+  end
+
+  old_manages_symlinks = instance_method(:manages_symlinks?) if respond_to?(:manages_symlinks?)
+
+  def manages_symlinks?
+    if RSpec::Puppet.rspec_puppet_example?
+      true
+    else
+      old_manages_symlinks.bind(self).call(value)
+    end
+  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
 # available on non-windows hosts.
 module Kernel
   alias :old_require :require
   def require(path)
-    return if path == 'puppet/util/windows' && RSpec::Puppet.rspec_puppet_example? && Puppet::Util::Platform.pretend_windows?
+    return if (['puppet/util/windows', 'win32/registry'].include?(path)) && RSpec::Puppet.rspec_puppet_example? && Puppet::Util::Platform.pretend_windows?
     old_require(path)
   end
 end

data/lib/rspec-puppet/monkey_patches/win32/registry.rb

@@ -0,0 +1,79 @@
+module RSpec
+  module Puppet
+    module Win32
+      class Registry
+        module Constants
+          HKEY_CLASSES_ROOT = 0x80000000
+          HKEY_CURRENT_USER = 0x80000001
+          HKEY_LOCAL_MACHINE = 0x80000002
+          HKEY_USERS = 0x80000003
+          HKEY_PERFORMANCE_DATA = 0x80000004
+          HKEY_PERFORMANCE_TEXT = 0x80000050
+          HKEY_PERFORMANCE_NLSTEXT = 0x80000060
+          HKEY_CURRENT_CONFIG = 0x80000005
+          HKEY_DYN_DATA = 0x80000006
+
+          REG_NONE = 0
+          REG_SZ = 1
+          REG_EXPAND_SZ = 2
+          REG_BINARY = 3
+          REG_DWORD = 4
+          REG_DWORD_LITTLE_ENDIAN = 4
+          REG_DWORD_BIG_ENDIAN = 5
+          REG_LINK = 6
+          REG_MULTI_SZ = 7
+          REG_RESOURCE_LIST = 8
+          REG_FULL_RESOURCE_DESCRIPTOR = 9
+          REG_RESOURCE_REQUIREMENTS_LIST = 10
+          REG_QWORD = 11
+          REG_QWORD_LITTLE_ENDIAN = 11
+
+          STANDARD_RIGHTS_READ = 0x00020000
+          STANDARD_RIGHTS_WRITE = 0x00020000
+          KEY_QUERY_VALUE = 0x0001
+          KEY_SET_VALUE = 0x0002
+          KEY_CREATE_SUB_KEY = 0x0004
+          KEY_ENUMERATE_SUB_KEYS = 0x0008
+          KEY_NOTIFY = 0x0010
+          KEY_CREATE_LINK = 0x0020
+          KEY_READ = STANDARD_RIGHTS_READ |
+          KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
+          KEY_WRITE = STANDARD_RIGHTS_WRITE |
+          KEY_SET_VALUE | KEY_CREATE_SUB_KEY
+          KEY_EXECUTE = KEY_READ
+          KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+
+          REG_OPTION_RESERVED = 0x0000
+          REG_OPTION_NON_VOLATILE = 0x0000
+          REG_OPTION_VOLATILE = 0x0001
+          REG_OPTION_CREATE_LINK = 0x0002
+          REG_OPTION_BACKUP_RESTORE = 0x0004
+          REG_OPTION_OPEN_LINK = 0x0008
+          REG_LEGAL_OPTION = REG_OPTION_RESERVED |
+          REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
+          REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
+
+          REG_CREATED_NEW_KEY = 1
+          REG_OPENED_EXISTING_KEY = 2
+
+          REG_WHOLE_HIVE_VOLATILE = 0x0001
+          REG_REFRESH_HIVE = 0x0002
+          REG_NO_LAZY_FLUSH = 0x0004
+          REG_FORCE_RESTORE = 0x0008
+
+          MAX_KEY_LENGTH = 514
+          MAX_VALUE_LENGTH = 32768
+        end
+        include Constants
+      end
+    end
+  end
+end
+
+begin
+  require 'win32/registry'
+rescue LoadError
+  module Win32
+    Registry = RSpec::Puppet::Win32::Registry
+  end
+end

data/lib/rspec-puppet/monkey_patches/win32/taskscheduler.rb

@@ -0,0 +1,159 @@
+# Create our dummy Win32::TaskScheduler with the consts defined from
+# https://github.com/djberg96/win32-taskscheduler/blob/ole/lib/win32/taskscheduler.rb
+module RSpec
+  module Puppet
+    module Win32
+      class TaskScheduler
+        TASK_TIME_TRIGGER_ONCE = 0
+        TASK_TIME_TRIGGER_DAILY = 1
+        TASK_TIME_TRIGGER_WEEKLY = 2
+        TASK_TIME_TRIGGER_MONTHLYDATE = 3
+        TASK_TIME_TRIGGER_MONTHLYDOW = 4
+        TASK_EVENT_TRIGGER_ON_IDLE = 5
+        TASK_EVENT_TRIGGER_AT_SYSTEMSTART = 6
+        TASK_EVENT_TRIGGER_AT_LOGON = 7
+        ONCE = TASK_TIME_TRIGGER_ONCE
+        DAILY = TASK_TIME_TRIGGER_DAILY
+        WEEKLY = TASK_TIME_TRIGGER_WEEKLY
+        MONTHLYDATE = TASK_TIME_TRIGGER_MONTHLYDATE
+        MONTHLYDOW = TASK_TIME_TRIGGER_MONTHLYDOW
+        ON_IDLE = TASK_EVENT_TRIGGER_ON_IDLE
+        AT_SYSTEMSTART = TASK_EVENT_TRIGGER_AT_SYSTEMSTART
+        AT_LOGON = TASK_EVENT_TRIGGER_AT_LOGON
+
+        TASK_SUNDAY = 0x1
+        TASK_MONDAY = 0x2
+        TASK_TUESDAY = 0x4
+        TASK_WEDNESDAY = 0x8
+        TASK_THURSDAY = 0x10
+        TASK_FRIDAY = 0x20
+        TASK_SATURDAY = 0x40
+        SUNDAY = TASK_SUNDAY
+        MONDAY = TASK_MONDAY
+        TUESDAY = TASK_TUESDAY
+        WEDNESDAY = TASK_WEDNESDAY
+        THURSDAY = TASK_THURSDAY
+        FRIDAY = TASK_FRIDAY
+        SATURDAY = TASK_SATURDAY
+
+        TASK_FIRST_WEEK = 1
+        TASK_SECOND_WEEK = 2
+        TASK_THIRD_WEEK = 3
+        TASK_FOURTH_WEEK = 4
+        TASK_LAST_WEEK = 5
+        FIRST_WEEK = TASK_FIRST_WEEK
+        SECOND_WEEK = TASK_SECOND_WEEK
+        THIRD_WEEK = TASK_THIRD_WEEK
+        FOURTH_WEEK = TASK_FOURTH_WEEK
+        LAST_WEEK = TASK_LAST_WEEK
+
+        TASK_JANUARY = 0x1
+        TASK_FEBRUARY = 0x2
+        TASK_MARCH = 0x4
+        TASK_APRIL = 0x8
+        TASK_MAY = 0x10
+        TASK_JUNE = 0x20
+        TASK_JULY = 0x40
+        TASK_AUGUST = 0x80
+        TASK_SEPTEMBER = 0x100
+        TASK_OCTOBER = 0x200
+        TASK_NOVEMBER = 0x400
+        TASK_DECEMBER = 0x800
+        JANUARY = TASK_JANUARY
+        FEBRUARY = TASK_FEBRUARY
+        MARCH = TASK_MARCH
+        APRIL = TASK_APRIL
+        MAY = TASK_MAY
+        JUNE = TASK_JUNE
+        JULY = TASK_JULY
+        AUGUST = TASK_AUGUST
+        SEPTEMBER = TASK_SEPTEMBER
+        OCTOBER = TASK_OCTOBER
+        NOVEMBER = TASK_NOVEMBER
+        DECEMBER = TASK_DECEMBER
+
+        TASK_FLAG_INTERACTIVE = 0x1
+        TASK_FLAG_DELETE_WHEN_DONE = 0x2
+        TASK_FLAG_DISABLED = 0x4
+        TASK_FLAG_START_ONLY_IF_IDLE = 0x10
+        TASK_FLAG_KILL_ON_IDLE_END = 0x20
+        TASK_FLAG_DONT_START_IF_ON_BATTERIES = 0x40
+        TASK_FLAG_KILL_IF_GOING_ON_BATTERIES = 0x80
+        TASK_FLAG_RUN_ONLY_IF_DOCKED = 0x100
+        TASK_FLAG_HIDDEN = 0x200
+        TASK_FLAG_RUN_IF_CONNECTED_TO_INTERNET = 0x400
+        TASK_FLAG_RESTART_ON_IDLE_RESUME = 0x800
+        TASK_FLAG_SYSTEM_REQUIRED = 0x1000
+        TASK_FLAG_RUN_ONLY_IF_LOGGED_ON = 0x2000
+        INTERACTIVE = TASK_FLAG_INTERACTIVE
+        DELETE_WHEN_DONE = TASK_FLAG_DELETE_WHEN_DONE
+        DISABLED = TASK_FLAG_DISABLED
+        START_ONLY_IF_IDLE = TASK_FLAG_START_ONLY_IF_IDLE
+        KILL_ON_IDLE_END = TASK_FLAG_KILL_ON_IDLE_END
+        DONT_START_IF_ON_BATTERIES = TASK_FLAG_DONT_START_IF_ON_BATTERIES
+        KILL_IF_GOING_ON_BATTERIES = TASK_FLAG_KILL_IF_GOING_ON_BATTERIES
+        RUN_ONLY_IF_DOCKED = TASK_FLAG_RUN_ONLY_IF_DOCKED
+        HIDDEN = TASK_FLAG_HIDDEN
+        RUN_IF_CONNECTED_TO_INTERNET = TASK_FLAG_RUN_IF_CONNECTED_TO_INTERNET
+        RESTART_ON_IDLE_RESUME = TASK_FLAG_RESTART_ON_IDLE_RESUME
+        SYSTEM_REQUIRED = TASK_FLAG_SYSTEM_REQUIRED
+        RUN_ONLY_IF_LOGGED_ON = TASK_FLAG_RUN_ONLY_IF_LOGGED_ON
+
+        TASK_TRIGGER_FLAG_HAS_END_DATE = 0x1
+        TASK_TRIGGER_FLAG_KILL_AT_DURATION_END = 0x2
+        TASK_TRIGGER_FLAG_DISABLED = 0x4
+        FLAG_HAS_END_DATE = TASK_TRIGGER_FLAG_HAS_END_DATE
+        FLAG_KILL_AT_DURATION_END = TASK_TRIGGER_FLAG_KILL_AT_DURATION_END
+        FLAG_DISABLED = TASK_TRIGGER_FLAG_DISABLED
+
+        TASK_MAX_RUN_TIMES = 1440
+        TASKS_TO_RETRIEVE = 5
+        MAX_RUN_TIMES = TASK_MAX_RUN_TIMES
+
+        TASK_VALIDATE_ONLY = 0x1
+        TASK_CREATE = 0x2
+        TASK_UPDATE = 0x4
+        TASK_CREATE_OR_UPDATE = 0x6
+        TASK_DISABLE = 0x8
+        TASK_DONT_ADD_PRINCIPAL_ACE = 0x10
+        TASK_IGNORE_REGISTRATION_TRIGGERS = 0x20
+
+        TASK_LOGON_NONE = 0
+        TASK_LOGON_PASSWORD = 1
+        TASK_LOGON_S4U = 2
+        TASK_LOGON_INTERACTIVE_TOKEN = 3
+        TASK_LOGON_GROUP = 4
+        TASK_LOGON_SERVICE_ACCOUNT = 5
+        TASK_LOGON_INTERACTIVE_TOKEN_OR_PASSWORD = 6
+
+        REALTIME_PRIORITY_CLASS = 0
+        HIGH_PRIORITY_CLASS = 1
+        ABOVE_NORMAL_PRIORITY_CLASS = 2
+        NORMAL_PRIORITY_CLASS = 4
+        BELOW_NORMAL_PRIORITY_CLASS = 7
+        IDLE_PRIORITY_CLASS = 9
+        REALTIME = REALTIME_PRIORITY_CLASS
+        HIGH = HIGH_PRIORITY_CLASS
+        ABOVE_NORMAL = ABOVE_NORMAL_PRIORITY_CLASS
+        NORMAL = NORMAL_PRIORITY_CLASS
+        BELOW_NORMAL = BELOW_NORMAL_PRIORITY_CLASS
+        IDLE = IDLE_PRIORITY_CLASS
+
+        CLSCTX_INPROC_SERVER  = 0x1
+        CLSID_CTask =  [0x148BD520,0xA2AB,0x11CE,0xB1,0x1F,0x00,0xAA,0x00,0x53,0x05,0x03].pack('LSSC8')
+        CLSID_CTaskScheduler =  [0x148BD52A,0xA2AB,0x11CE,0xB1,0x1F,0x00,0xAA,0x00,0x53,0x05,0x03].pack('LSSC8')
+        IID_ITaskScheduler = [0x148BD527,0xA2AB,0x11CE,0xB1,0x1F,0x00,0xAA,0x00,0x53,0x05,0x03].pack('LSSC8')
+        IID_ITask = [0x148BD524,0xA2AB,0x11CE,0xB1,0x1F,0x00,0xAA,0x00,0x53,0x05,0x03].pack('LSSC8')
+        IID_IPersistFile = [0x0000010b,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46].pack('LSSC8')
+      end
+    end
+  end
+end
+
+begin
+  require 'win32/taskscheduler'
+rescue LoadError
+  module Win32
+    TaskScheduler = RSpec::Puppet::Win32::TaskScheduler
+  end
+end

data/lib/rspec-puppet/setup.rb

@@ -109,7 +109,7 @@ END
     end
 
     def self.safe_mkdir(dir, verbose=true)
-      if File.exists? dir
+      if File.exist? dir
         unless File.directory? dir
           $stderr.puts "!! #{dir} already exists and is not a directory"
         end
@@ -124,7 +124,7 @@ END
     end
 
     def self.safe_touch(file)
-      if File.exists? file
+      if File.exist? file
         unless File.file? file
           $stderr.puts "!! #{file} already exists and is not a regular file"
         end
@@ -135,7 +135,7 @@ END
     end
 
     def self.safe_create_file(filename, content)
-      if File.exists? filename
+      if File.exist? filename
         old_content = File.read(filename)
         if old_content != content
           $stderr.puts "!! #{filename} already exists and differs from template"
@@ -154,7 +154,7 @@ END
     end
 
     def self.safe_make_link(source, target, verbose=true)
-      if File.exists?(target)
+      if File.exist?(target)
         unless File.symlink?(target) && File.readlink(target) == File.expand_path(source)
           $stderr.puts "!! #{target} already exists and is not a symlink"
         end

data/lib/rspec-puppet/support.rb

@@ -54,17 +54,29 @@ module RSpec::Puppet
 
       munged_facts = facts_hash(nodename(type))
 
-      ['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
+      pretend_platform = find_pretend_platform(munged_facts)
+      RSpec::Puppet::Consts.stub_consts_for(pretend_platform) unless pretend_platform.nil?
+    end
+
+    def find_pretend_platform(test_facts)
+      from_value = lambda { |value|
+        value.to_s.downcase == 'windows' ? :windows : :posix
+      }
+
+      ['operatingsystem', 'osfamily', 'os'].each do |os_fact|
+        return from_value.call(test_facts[os_fact]) if test_facts.key?(os_fact)
+      end
+
+      if test_facts.key?('os') && test_facts['os'].is_a?(Hash)
+        ['name', 'family'].each do |os_hash_key|
+          return from_value.call(test_facts['os'][os_hash_key]) if test_facts['os'].key?(os_hash_key)
         end
       end
+
+      nil
     end
 
+
     def load_catalogue(type, exported = false, manifest_opts = {})
       with_vardir do
         node_name = nodename(type)
@@ -72,8 +84,10 @@ module RSpec::Puppet
         hiera_config_value = self.respond_to?(:hiera_config) ? hiera_config : nil
         hiera_data_value = self.respond_to?(:hiera_data) ? hiera_data : nil
 
-        catalogue = build_catalog(node_name, facts_hash(node_name), trusted_facts_hash(node_name), hiera_config_value,
-                                  build_code(type, manifest_opts), exported, node_params_hash, hiera_data_value)
+        build_facts = facts_hash(node_name)
+        catalogue = build_catalog(node_name, build_facts, trusted_facts_hash(node_name), hiera_config_value,
+                                  build_code(type, manifest_opts), exported, node_params_hash, hiera_data_value,
+                                  RSpec.configuration.trusted_server_facts)
 
         test_module = type == :host ? nil : class_name.split('::').first
         if type == :define
@@ -83,6 +97,9 @@ module RSpec::Puppet
         end
         RSpec::Puppet::Coverage.add_from_catalog(catalogue, test_module)
 
+        pretend_platform = find_pretend_platform(build_facts)
+        Puppet::Util::Platform.pretend_to_be(pretend_platform) unless pretend_platform.nil?
+
         catalogue
       end
     end
@@ -132,15 +149,15 @@ module RSpec::Puppet
         end
       elsif type == :application
         if opts.has_key?(:params)
-          "site { #{class_name} { '#{title}': #{param_str(opts[:params])} } }"
+          "site { #{class_name} { #{sanitise_resource_title(title)}: #{param_str(opts[:params])} } }"
         else
           raise ArgumentError, "You need to provide params for an application"
         end
       elsif type == :define
         title_str = if title.is_a?(Array)
-                      '[' + title.map { |r| "'#{r}'" }.join(', ') + ']'
+                      '[' + title.map { |r| sanitise_resource_title(r) }.join(', ') + ']'
                     else
-                      "'#{title}'"
+                      sanitise_resource_title(title)
                     end
         if opts.has_key?(:params)
           "#{class_name} { #{title_str}: #{param_str(opts[:params])} }"
@@ -154,6 +171,10 @@ module RSpec::Puppet
       end
     end
 
+    def sanitise_resource_title(title)
+      title.include?("'") ? title.inspect : "'#{title}'"
+    end
+
     def nodename(type)
       return node if self.respond_to?(:node)
       if [:class, :define, :function, :application].include? type
@@ -264,6 +285,34 @@ module RSpec::Puppet
       extensions
     end
 
+    def server_facts_hash
+      server_facts = {}
+
+      # Add our server version to the fact list
+      server_facts["serverversion"] = Puppet.version.to_s
+
+      # And then add the server name and IP
+      {"servername" => "fqdn",
+        "serverip" => "ipaddress"
+      }.each do |var, fact|
+        if value = Facter.value(fact)
+          server_facts[var] = value
+        else
+          warn "Could not retrieve fact #{fact}"
+        end
+      end
+
+      if server_facts["servername"].nil?
+        host = Facter.value(:hostname)
+        if domain = Facter.value(:domain)
+          server_facts["servername"] = [host, domain].join(".")
+        else
+          server_facts["servername"] = host
+        end
+      end
+      server_facts
+    end
+
     def str_from_value(value)
       case value
       when Hash
@@ -337,6 +386,8 @@ module RSpec::Puppet
 
       stub_facts! facts_val
 
+      Puppet::Type.eachtype { |type| type.defaultprovider = nil }
+
       node_facts = Puppet::Node::Facts.new(nodename, facts_val.dup)
       node_params = facts_val.merge(node_params)
 
@@ -351,26 +402,20 @@ module RSpec::Puppet
         )
       end
 
+      if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0
+        node_obj.add_server_facts(server_facts_hash)
+      end
+
       adapter.catalog(node_obj, exported)
     end
 
     def stub_facts!(facts)
       Puppet.settings[:autosign] = false
+      Facter.clear
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.6.10
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,6 +60,8 @@ files:
 - lib/rspec-puppet/matchers/run.rb
 - lib/rspec-puppet/matchers/type_matchers.rb
 - lib/rspec-puppet/monkey_patches.rb
+- lib/rspec-puppet/monkey_patches/win32/registry.rb
+- lib/rspec-puppet/monkey_patches/win32/taskscheduler.rb
 - lib/rspec-puppet/rake_task.rb
 - lib/rspec-puppet/raw_string.rb
 - lib/rspec-puppet/setup.rb
@@ -86,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests