rspec-puppet 2.6.11 → 2.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a2692f77f3f92e4102c513cfafdc76c448b244
-  data.tar.gz: adb38bf5c070207481b7c57de83f2fee7b467aad
+  metadata.gz: d8b38203076b16e77839a929ceecfc693389fa5c
+  data.tar.gz: ea68533700285fe1fc3177e96f1552007b1e098b
 SHA512:
-  metadata.gz: b7d43a327f6d8756fafcf5f5826a1e61d5f1e0fbe563114dd1f2008162581facc43e01b30176383471b5a773257e86c5b2380eb170b4ef40f11ad2d16b35a55a
-  data.tar.gz: 471744fbf1af0df7c91d62131fbd421276786e0a8be81e3f70fb885dc7d98963ce7888eb73645e154c4bf3c40cd7974419eb10d5608e8fd9c020f20193875a9a
+  metadata.gz: 20dfed8bed477dce75a21d4ba98c41f50e9ba779d44c3c8838eb77b95da69e6430cf56cf57766afc0a253ed0880d4c726e59b4e09d4db08005aa0c49a4efacb7
+  data.tar.gz: cbb9f00b6e90493b5934e5cb3acb3cb43ac8ed92e4d9c04e11012aea829beed0b19eedbd8795015d15cb51158016717d35f55a6a07aeb4e2dd9422e1e26810a8

data/CHANGELOG.md

@@ -2,6 +2,35 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.12]
+
+### Fixed
+
+ * Updated `Win32::TaskScheduler` stubs to match the latest release of
+   `win32-taskscheduler`.
+ * The `os` structured fact is now correctly treated as a Hash when determining
+   the platform that rspec-puppet pretends to be.
+ * The default resources that Puppet adds to the catalogue (`Class[main]`,
+   `Class[Settings]`, etc) are now filtered out of the catalogue when using the
+   `have_resource_count` matcher, rather than simply subtracted from the
+   resource count. This allows the `have_resource_count` matcher to be used on
+   subsects of the catalogue (`exported_resources` for example).
+ * When running on Windows, rspec-puppet will now convert Puppet configuration
+   settings from `/dev/null` to `NUL`, preventing Puppet from automatically
+   creating directories like `C:\dev` when running tests on Windows as an
+   Administrator.
+ * When overriding fact values, rspec-puppet will now assign the stub facts
+   a weight of 1000 to ensure that they override the generated fact values from
+   Facter 3.x.
+ * `Selinux.is_selinux_enabled` is now automatically stubbed to return 0 to
+   disable any SELinux related apply-time validation of resources.
+ * When testing against Puppet 3.x, rspec-puppet will now honour the
+   `RSpec.configuration.parser` value when determining the module name to set
+   up the fixture symlink.
+ * When testing for the absence of a parameter using `only_with(:parameter_name
+   => nil`), this will no longer incorrectly affect the expected parameter
+   count.
+
 ## [2.6.11]
 
 ### Fixed

data/lib/rspec-puppet.rb

@@ -32,17 +32,17 @@ end
 require 'rspec-puppet/monkey_patches'
 
 RSpec.configure do |c|
-  c.add_setting :environmentpath, :default => '/etc/puppetlabs/code/environments'
+  c.add_setting :environmentpath, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
   c.add_setting :module_path, :default => nil
   c.add_setting :manifest_dir, :default => nil
   c.add_setting :manifest, :default => nil
   c.add_setting :template_dir, :default => nil
   c.add_setting :config, :default => nil
-  c.add_setting :confdir, :default => '/etc/puppet'
+  c.add_setting :confdir, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
   c.add_setting :default_facts, :default => {}
   c.add_setting :default_node_params, :default => {}
   c.add_setting :default_trusted_facts, :default => {}
-  c.add_setting :hiera_config, :default => '/dev/null'
+  c.add_setting :hiera_config, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
   c.add_setting :parser, :default => 'current'
   c.add_setting :trusted_node_data, :default => false
   c.add_setting :ordering, :default => 'title-hash'
@@ -120,6 +120,7 @@ RSpec.configure do |c|
     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)
+      allow(Selinux).to receive(:is_selinux_enabled).and_return(0) if defined?(Selinux)
     end
   end
 

data/lib/rspec-puppet/adapters.rb

@@ -47,6 +47,7 @@ module RSpec::Puppet
           default_hash.merge!(Puppet::Test::TestHelper.send(:app_defaults_for_tests))
         end
         settings_hash = default_hash.merge(Hash[*settings])
+        settings_hash.inject(settings_hash) { |h, (k, v)| h[k] = (v == '/dev/null') ? 'c:/nul/' : v; h } if Gem.win_platform?
 
         if Puppet.settings.respond_to?(:initialize_app_defaults)
           Puppet.settings.initialize_app_defaults(settings_hash)

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

@@ -1,6 +1,12 @@
 module RSpec::Puppet
   module ManifestMatchers
     class CountGeneric
+      DEFAULT_RESOURCES = [
+        'Class[main]',
+        'Class[Settings]',
+        'Stage[main]',
+      ].freeze
+
       def initialize(type, count, *method)
         if type.nil?
           @type = method[0].to_s.gsub(/^have_(.+)_resource_count$/, '\1')
@@ -14,22 +20,20 @@ module RSpec::Puppet
       def matches?(catalogue)
         @catalogue = catalogue.call
 
-        if @type == "resource"
-          @actual_number = @catalogue.resources.count do |res|
-            !(['Class', 'Node'].include? res.type)
-          end
-
-          # Puppet automatically adds Stage[main]
-          @actual_number = @actual_number - 1
-        else
-          @actual_number = @catalogue.resources.count do |res|
-            res.type == @referenced_type
-          end
-
-          # Puppet automatically adds Class[main] and Class[Settings]
-          @actual_number = @actual_number - 2 if @type == "class"
+        resources = @catalogue.resources.reject do |res|
+          DEFAULT_RESOURCES.include?(res.ref)
         end
 
+        @actual_number = if @type == 'resource'
+                           resources.count do |res|
+                             !['Class', 'Node'].include?(res.type)
+                           end
+                         else
+                           resources.count do |res|
+                             res.type == @referenced_type
+                           end
+                         end
+
         @actual_number == @expected_number
       end
 

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

@@ -30,7 +30,7 @@ module RSpec::Puppet
 
       def only_with(*args, &block)
         params = args.shift
-        @expected_params_count = (@expected_params_count || 0) + params.size
+        @expected_params_count = (@expected_params_count || 0) + params.select { |_, v| !v.nil? }.size
         self.with(params, &block)
       end
 

data/lib/rspec-puppet/monkey_patches.rb

@@ -54,6 +54,7 @@ RSpec.configuration.reporter.register_listener(RSpec::Puppet::EventListener, :ex
 
 require 'rspec-puppet/monkey_patches/win32/taskscheduler'
 require 'rspec-puppet/monkey_patches/win32/registry'
+require 'rspec-puppet/monkey_patches/windows/taskschedulerconstants'
 
 module Puppet
   # Allow rspec-puppet to prevent Puppet::Type from automatically picking
@@ -177,6 +178,11 @@ module Puppet
       end
       module_function :actual_platform
 
+      def actually_windows?
+        actual_platform == :windows
+      end
+      module_function :actually_windows?
+
       def pretend_windows?
         pretend_platform == :windows
       end

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

@@ -1,33 +1,37 @@
 # Create our dummy Win32::TaskScheduler with the consts defined from
 # https://github.com/djberg96/win32-taskscheduler/blob/ole/lib/win32/taskscheduler.rb
+
+require 'rspec-puppet/monkey_patches/windows/taskschedulerconstants'
+
 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
+        include Windows::TaskSchedulerConstants
+
+        DAYS_IN_A_MONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
+        IDLE = IDLE_PRIORITY_CLASS
+        NORMAL = NORMAL_PRIORITY_CLASS
+        HIGH = HIGH_PRIORITY_CLASS
+        REALTIME = REALTIME_PRIORITY_CLASS
+        BELOW_NORMAL = BELOW_NORMAL_PRIORITY_CLASS
+        ABOVE_NORMAL = ABOVE_NORMAL_PRIORITY_CLASS
+
         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
+        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
         SUNDAY = TASK_SUNDAY
         MONDAY = TASK_MONDAY
         TUESDAY = TASK_TUESDAY
@@ -35,30 +39,6 @@ module RSpec
         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
@@ -72,19 +52,6 @@ module RSpec
         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
@@ -99,52 +66,44 @@ module RSpec
         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')
+        FIRST = TASK_FIRST
+        SECOND = TASK_SECOND
+        THIRD = TASK_THIRD
+        FOURTH = TASK_FOURTH
+        FIFTH = TASK_FIFTH
+        SIXTH = TASK_SIXTH
+        SEVENTH = TASK_SEVENTH
+        EIGHTH = TASK_EIGHTH
+        NINETH = TASK_NINETH
+        TENTH = TASK_TENTH
+        ELEVENTH = TASK_ELEVENTH
+        TWELFTH = TASK_TWELFTH
+        THIRTEENTH = TASK_THIRTEENTH
+        FOURTEENTH = TASK_FOURTEENTH
+        FIFTEENTH = TASK_FIFTEENTH
+        SIXTEENTH = TASK_SIXTEENTH
+        SEVENTEENTH = TASK_SEVENTEENTH
+        EIGHTEENTH = TASK_EIGHTEENTH
+        NINETEENTH = TASK_NINETEENTH
+        TWENTIETH = TASK_TWENTIETH
+        TWENTY_FIRST = TASK_TWENTY_FIRST
+        TWENTY_SECOND = TASK_TWENTY_SECOND
+        TWENTY_THIRD = TASK_TWENTY_THIRD
+        TWENTY_FOURTH = TASK_TWENTY_FOURTH
+        TWENTY_FIFTH = TASK_TWENTY_FIFTH
+        TWENTY_SIXTH = TASK_TWENTY_SIXTH
+        TWENTY_SEVENTH = TASK_TWENTY_SEVENTH
+        TWENTY_EIGHTH = TASK_TWENTY_EIGHTH
+        TWENTY_NINTH = TASK_TWENTY_NINTH
+        THIRTYETH = TASK_THIRTYETH
+        THIRTY_FIRST = TASK_THIRTY_FIRST
+        LAST = TASK_LAST
       end
     end
   end

data/lib/rspec-puppet/monkey_patches/windows/taskschedulerconstants.rb

@@ -0,0 +1,271 @@
+module RSpec
+  module Puppet
+    module Windows
+      module TaskSchedulerConstants
+	SYSTEM_USERS = ['NT AUTHORITY\SYSTEM', "SYSTEM", 'NT AUTHORITY\LOCALSERVICE', 'NT AUTHORITY\NETWORKSERVICE', 'BUILTIN\USERS', "USERS"].freeze
+
+	# Triggers
+
+	# Trigger is set to run the task a single time
+	TASK_TIME_TRIGGER_ONCE = 1
+
+	# Trigger is set to run the task on a daily interval
+	TASK_TIME_TRIGGER_DAILY = 2
+
+	# Trigger is set to run the task on specific days of a specific week & month
+	TASK_TIME_TRIGGER_WEEKLY = 3
+
+	# Trigger is set to run the task on specific day(s) of the month
+	TASK_TIME_TRIGGER_MONTHLYDATE = 4
+
+	# Trigger is set to run the task on specific day(s) of the month
+	TASK_TIME_TRIGGER_MONTHLYDOW = 5
+
+	# Trigger is set to run the task if the system remains idle for the amount
+	# of time specified by the idle wait time of the task
+	TASK_EVENT_TRIGGER_ON_IDLE = 6
+
+	TASK_TRIGGER_REGISTRATION = 7
+
+	# Trigger is set to run the task at system startup
+	TASK_EVENT_TRIGGER_AT_SYSTEMSTART = 8
+
+	# Trigger is set to run the task when a user logs on
+	TASK_EVENT_TRIGGER_AT_LOGON = 9
+
+	TASK_TRIGGER_SESSION_STATE_CHANGE = 11
+
+	# Daily Tasks
+
+	# The task will run on Sunday
+	TASK_SUNDAY = 0x1
+
+	# The task will run on Monday
+	TASK_MONDAY = 0x2
+
+	# The task will run on Tuesday
+	TASK_TUESDAY = 0x4
+
+	# The task will run on Wednesday
+	TASK_WEDNESDAY = 0x8
+
+	# The task will run on Thursday
+	TASK_THURSDAY = 0x10
+
+	# The task will run on Friday
+	TASK_FRIDAY = 0x20
+
+	# The task will run on Saturday
+	TASK_SATURDAY = 0x40
+
+	# Weekly tasks
+
+	# The task will run between the 1st and 7th day of the month
+	TASK_FIRST_WEEK = 0x01
+
+	# The task will run between the 8th and 14th day of the month
+	TASK_SECOND_WEEK = 0x02
+
+	# The task will run between the 15th and 21st day of the month
+	TASK_THIRD_WEEK = 0x04
+
+	# The task will run between the 22nd and 28th day of the month
+	TASK_FOURTH_WEEK = 0x08
+
+	# The task will run the last seven days of the month
+	TASK_LAST_WEEK = 0x10
+
+	# Monthly tasks
+
+	# The task will run in January
+	TASK_JANUARY = 0x1
+
+	# The task will run in February
+	TASK_FEBRUARY = 0x2
+
+	# The task will run in March
+	TASK_MARCH = 0x4
+
+	# The task will run in April
+	TASK_APRIL = 0x8
+
+	# The task will run in May
+	TASK_MAY = 0x10
+
+	# The task will run in June
+	TASK_JUNE = 0x20
+
+	# The task will run in July
+	TASK_JULY = 0x40
+
+	# The task will run in August
+	TASK_AUGUST = 0x80
+
+	# The task will run in September
+	TASK_SEPTEMBER = 0x100
+
+	# The task will run in October
+	TASK_OCTOBER = 0x200
+
+	# The task will run in November
+	TASK_NOVEMBER = 0x400
+
+	# The task will run in December
+	TASK_DECEMBER = 0x800
+
+	# Flags
+
+	# Used when converting AT service jobs into work items
+	TASK_FLAG_INTERACTIVE = 0x1
+
+	# The work item will be deleted when there are no more scheduled run times
+	TASK_FLAG_DELETE_WHEN_DONE = 0x2
+
+	# The work item is disabled. Useful for temporarily disabling a task
+	TASK_FLAG_DISABLED = 0x4
+
+	# The work item begins only if the computer is not in use at the scheduled
+	# start time
+	TASK_FLAG_START_ONLY_IF_IDLE = 0x10
+
+	# The work item terminates if the computer makes an idle to non-idle
+	# transition while the work item is running
+	TASK_FLAG_KILL_ON_IDLE_END = 0x20
+
+	# The work item does not start if the computer is running on battery power
+	TASK_FLAG_DONT_START_IF_ON_BATTERIES = 0x40
+
+	# The work item ends, and the associated application quits, if the computer
+	# switches to battery power
+	TASK_FLAG_KILL_IF_GOING_ON_BATTERIES = 0x80
+
+	# The work item starts only if the computer is in a docking station
+	TASK_FLAG_RUN_ONLY_IF_DOCKED = 0x100
+
+	# The work item created will be hidden
+	TASK_FLAG_HIDDEN = 0x200
+
+	# The work item runs only if there is a valid internet connection
+	TASK_FLAG_RUN_IF_CONNECTED_TO_INTERNET = 0x400
+
+	# The work item starts again if the computer makes a non-idle to idle
+	# transition
+	TASK_FLAG_RESTART_ON_IDLE_RESUME = 0x800
+
+	# The work item causes the system to be resumed, or awakened, if the
+	# system is running on batter power
+	TASK_FLAG_SYSTEM_REQUIRED = 0x1000
+
+	# The work item runs only if a specified account is logged on interactively
+	TASK_FLAG_RUN_ONLY_IF_LOGGED_ON = 0x2000
+
+	# Triggers
+
+	# The task will stop at some point in time
+	TASK_TRIGGER_FLAG_HAS_END_DATE = 0x1
+
+	# The task can be stopped at the end of the repetition period
+	TASK_TRIGGER_FLAG_KILL_AT_DURATION_END = 0x2
+
+	# The task trigger is disabled
+	TASK_TRIGGER_FLAG_DISABLED = 0x4
+
+	# Run Level Types
+	# Tasks will be run with the least privileges
+	TASK_RUNLEVEL_LUA      = 0
+	# Tasks will be run with the highest privileges
+	TASK_RUNLEVEL_HIGHEST  = 1
+
+	# Logon Types
+	# Used for non-NT credentials
+	TASK_LOGON_NONE                           = 0
+	# Use a password for logging on the user
+	TASK_LOGON_PASSWORD                       = 1
+	# The service will log the user on using Service For User
+	TASK_LOGON_S4U                            = 2
+	# Task will be run only in an existing interactive session
+	TASK_LOGON_INTERACTIVE_TOKEN              = 3
+	# Group activation. The groupId field specifies the group
+	TASK_LOGON_GROUP                          = 4
+	# When Local System, Local Service, or Network Service account is
+	# being used as a security context to run the task
+	TASK_LOGON_SERVICE_ACCOUNT                = 5
+	# Not in use; currently identical to TASK_LOGON_PASSWORD
+	TASK_LOGON_INTERACTIVE_TOKEN_OR_PASSWORD  = 6
+
+
+	TASK_MAX_RUN_TIMES = 1440
+	TASKS_TO_RETRIEVE  = 5
+
+	# Task creation
+
+	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
+
+	# Priority classes
+
+	REALTIME_PRIORITY_CLASS     = 0
+	HIGH_PRIORITY_CLASS         = 1
+	ABOVE_NORMAL_PRIORITY_CLASS = 2 # Or 3
+	NORMAL_PRIORITY_CLASS       = 4 # Or 5, 6
+	BELOW_NORMAL_PRIORITY_CLASS = 7 # Or 8
+	IDLE_PRIORITY_CLASS         = 9 # Or 10
+
+	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')
+
+	# Days of month
+
+	TASK_FIRST = 0x01
+	TASK_SECOND = 0x02
+	TASK_THIRD = 0x04
+	TASK_FOURTH = 0x08
+	TASK_FIFTH = 0x10
+	TASK_SIXTH = 0x20
+	TASK_SEVENTH = 0x40
+	TASK_EIGHTH = 0x80
+	TASK_NINETH = 0x100
+	TASK_TENTH = 0x200
+	TASK_ELEVENTH = 0x400
+	TASK_TWELFTH = 0x800
+	TASK_THIRTEENTH = 0x1000
+	TASK_FOURTEENTH = 0x2000
+	TASK_FIFTEENTH = 0x4000
+	TASK_SIXTEENTH = 0x8000
+	TASK_SEVENTEENTH = 0x10000
+	TASK_EIGHTEENTH = 0x20000
+	TASK_NINETEENTH = 0x40000
+	TASK_TWENTIETH = 0x80000
+	TASK_TWENTY_FIRST = 0x100000
+	TASK_TWENTY_SECOND = 0x200000
+	TASK_TWENTY_THIRD = 0x400000
+	TASK_TWENTY_FOURTH = 0x800000
+	TASK_TWENTY_FIFTH = 0x1000000
+	TASK_TWENTY_SIXTH = 0x2000000
+	TASK_TWENTY_SEVENTH = 0x4000000
+	TASK_TWENTY_EIGHTH = 0x8000000
+	TASK_TWENTY_NINTH = 0x10000000
+	TASK_THIRTYETH = 0x20000000
+	TASK_THIRTY_FIRST = 0x40000000
+	TASK_LAST = 0x80000000
+      end
+    end
+  end
+end
+
+begin
+  require 'win32/windows/constants'
+rescue LoadError
+  module Windows
+    TaskSchedulerConstants = RSpec::Puppet::Windows::TaskSchedulerConstants
+  end
+end

data/lib/rspec-puppet/setup.rb

@@ -1,7 +1,4 @@
 require 'puppet'
-if Puppet.version.to_f >= 4.0
-  require 'puppet/pops'
-end
 require 'fileutils'
 
 module RSpec::Puppet
@@ -87,7 +84,8 @@ END
     def self.get_module_name_from_file(file)
       # FIXME: see discussion at
       # https://github.com/rodjek/rspec-puppet/issues/290
-      if Puppet.version.to_f >= 4.0
+      if Puppet.version.to_f >= 4.0 || RSpec.configuration.parser == 'future'
+        require 'puppet/pops'
         p = Puppet::Pops::Parser::Lexer2.new
       else
         p = Puppet::Parser::Lexer.new

data/lib/rspec-puppet/support.rb

@@ -63,7 +63,7 @@ module RSpec::Puppet
         value.to_s.downcase == 'windows' ? :windows : :posix
       }
 
-      ['operatingsystem', 'osfamily', 'os'].each do |os_fact|
+      ['operatingsystem', 'osfamily'].each do |os_fact|
         return from_value.call(test_facts[os_fact]) if test_facts.key?(os_fact)
       end
 
@@ -410,7 +410,7 @@ module RSpec::Puppet
     def stub_facts!(facts)
       Puppet.settings[:autosign] = false
       Facter.clear
-      facts.each { |k, v| Facter.add(k) { setcode { v } } }
+      facts.each { |k, v| Facter.add(k, :weight => 999) { setcode { v } } }
     end
 
     def build_catalog(*args)

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

@@ -51,7 +51,7 @@ task :release_test do
 
         Dir.chdir(module_dir) do
           print '  Installing dependencies... '
-          bundle_install_output, status = Open3.capture2e('bundle', 'install', '--path', 'vendor/gems')
+          bundle_install_output, status = Open3.capture2e('bundle', 'install', '--path', '../vendor/gems')
           if status.success?
             puts 'Done'
           else
@@ -90,7 +90,7 @@ task :release_test do
           puts 'Done'
 
           print '  Installing dependencies... '
-          _, status = Open3.capture2e('bundle', 'install', '--path', 'vendor/gems')
+          _, status = Open3.capture2e('bundle', 'install', '--path', '../vendor/gems')
           if status.success?
             puts 'Done'
           else
@@ -115,8 +115,8 @@ task :release_test do
           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)
+          baseline_results = JSON.parse(baseline_output.scan(json_regex).find { |r| r.include?('summary_line') })
+          head_results = JSON.parse(head_output.scan(json_regex).find { |r| r.include?('summary_line') })
           if head_results['summary_line'] == baseline_results['summary_line']
             puts "  PASS: #{head_results['summary_line']}"
           else
@@ -128,7 +128,7 @@ task :release_test do
   end
 end
 
-class GemfileRewrite < Parser::Rewriter
+class GemfileRewrite < Parser::TreeRewriter
   def on_send(node)
     _, method_name, *args = *node
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.11
+  version: 2.6.12
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,6 +62,7 @@ files:
 - 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/monkey_patches/windows/taskschedulerconstants.rb
 - lib/rspec-puppet/rake_task.rb
 - lib/rspec-puppet/raw_string.rb
 - lib/rspec-puppet/setup.rb
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests