rspec-puppet 2.6.15 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '088bd4fad95b9e94e69fe9f830ca94f3a6dbec39'
-  data.tar.gz: 01a0b23cb2688dca2e476ee1bd649e1a5e704423
+  metadata.gz: fe98cc153715d0f4a7ea74302e22db11b27f256b
+  data.tar.gz: 0ff2d613a201b5b50779674bc126904555203c66
 SHA512:
-  metadata.gz: 29984636946f45bca01b6d4e3226ae8e5bc1d072ffc67a93cc179fec4d55e0386cc207626978f35317adf1696a612059921038235ce40cc617e9a227314e36be
-  data.tar.gz: '018cc4710b3a32ffd647d3434c16c693f1fe3b9e552aee9b113740d1c5755b42496375d9dad72c41332e9e0d5c21f652a332c77009d4136fe1987158c4306290'
+  metadata.gz: 24db31229795fcfd326243a0b2fc20a17c78b6ee772f28092f9afd917534a3dd307d688c3934ef590c857027944c6fc9432baea652c7c4ecfbd40e563eb89dd1
+  data.tar.gz: 50fa9b5882460e10e4148c4b78372b3f366178738fe5fa92dfee522e8b4811a5378156623e0f6d13e030c912f9a5560d6f4051e0cd7aa7a249c59600a55fe20f

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.7.0]
+
+### Changed
+ * Official Puppet 6 support added.
+ * When testing resource parameter values, the values received from Puppet are
+   now reencoded before testing to ensure that the line endings (if present)
+   match the platform being tested.
+ * `vendormoduledir` and `basemodulepath` settings (introduced in Puppet 6) are
+   now configurable in rspec-puppet.
+
 ## [2.6.15]
 
 ### Fixed

data/lib/rspec-puppet.rb

@@ -52,6 +52,8 @@ RSpec.configure do |c|
   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.add_setting :vendormoduledir, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
+  c.add_setting :basemodulepath, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
 
   c.instance_eval do
     def trusted_server_facts

data/lib/rspec-puppet/adapters.rb

@@ -192,7 +192,14 @@ module RSpec::Puppet
       end
     end
 
-    class Adapter6X < Adapter40; end
+    class Adapter6X < Adapter40
+      def settings_map
+        super.concat([
+          [:basemodulepath, :basemodulepath],
+          [:vendormoduledir, :vendormoduledir],
+        ])
+      end
+    end
 
     class Adapter30 < Base
       def settings_map

data/lib/rspec-puppet/consts.rb

@@ -12,10 +12,25 @@ module RSpec::Puppet::Consts
     }
   }
 
+  FEATURES = {
+    :posix   => {
+      :posix             => true,
+      :microsoft_windows => false,
+    },
+    :windows => {
+      :posix             => false,
+      :microsoft_windows => true,
+    },
+  }
+
   def self.stub_consts_for(platform)
     STUBBED_CONSTS[platform].each do |const_name, const_value|
       stub_const_wrapper(const_name, const_value)
     end
+    Puppet::Util::Platform.pretend_to_be(platform)
+    FEATURES[platform].each do |feature_name, feature_value|
+      Puppet.features.add(feature_name) { feature_value }
+    end
   end
 
   def self.stub_const_wrapper(const, value)
@@ -28,4 +43,15 @@ module RSpec::Puppet::Consts
   def self.restore_consts
     stub_consts_for(RSpec.configuration.platform)
   end
+
+  def self.without_stubs
+    if Puppet::Util::Platform.pretending?
+      pretend_platform = Puppet::Util::Platform.pretend_platform
+      restore_consts
+    end
+
+    yield
+  ensure
+    stub_consts_for(pretend_platform) if pretend_platform
+  end
 end

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

@@ -138,7 +138,6 @@ module RSpec::Puppet
       end
 
       def cycles_found?
-        Puppet::Type.suppress_provider
         cat = @catalogue.to_ral.relationship_graph
         cat.write_graph(:resources)
         if cat.respond_to? :find_cycles_in_graph
@@ -146,7 +145,6 @@ module RSpec::Puppet
         else
           find_cycles_legacy(cat)
         end
-        Puppet::Type.unsuppress_provider
 
         !@cycles.empty?
       end

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

@@ -294,7 +294,6 @@ module RSpec::Puppet
           end
         end
 
-        Puppet::Type.suppress_provider
         # Add autorequires if any
         if type == :require and resource.resource_type.respond_to? :eachautorequire
           resource.resource_type.eachautorequire do |t, b|
@@ -307,7 +306,6 @@ module RSpec::Puppet
             end
           end
         end
-        Puppet::Type.unsuppress_provider
 
         results.flatten
       end

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

@@ -78,7 +78,7 @@ module RSpec::Puppet
       end
 
       def check_regexp(expected, actual)
-        !!(actual.to_s.match expected) == @should_match
+        !!(munge_line_endings(actual.to_s).match expected) == @should_match
       end
 
       # Ensure that two hashes have the same number of keys, and that for each
@@ -119,7 +119,17 @@ module RSpec::Puppet
       end
 
       def check_string(expected, actual)
-        (expected.to_s == actual.to_s) == @should_match
+        (expected.to_s == munge_line_endings(actual.to_s)) == @should_match
+      end
+
+      def munge_line_endings(value)
+        return value unless value.respond_to?(:encode)
+
+        if Puppet::Util::Platform.windows?
+          value.encode(:crlf_newline => true)
+        else
+          value.encode(:universal_newline => true)
+        end
       end
     end
   end

data/lib/rspec-puppet/monkey_patches.rb

@@ -98,18 +98,6 @@ module Puppet
         old_set_default.bind(self).call(attr)
       end
     end
-
-    def self.suppress_provider?
-      @suppress_provider ||= false
-    end
-
-    def self.suppress_provider
-      @suppress_provider = true
-    end
-
-    def self.unsuppress_provider
-      @suppress_provider = false
-    end
   end
 
   module Parser::Files
@@ -159,6 +147,22 @@ module Puppet
       module_function :get_env
     end
 
+    if respond_to?(:path_to_uri)
+      alias :old_path_to_uri :path_to_uri
+      module_function :old_path_to_uri
+
+      def path_to_uri(*args)
+        if RSpec::Puppet.rspec_puppet_example?
+          RSpec::Puppet::Consts.without_stubs do
+            old_path_to_uri(*args)
+          end
+        else
+          old_path_to_uri(*args)
+        end
+      end
+      module_function :path_to_uri
+    end
+
     # Allow rspec-puppet to pretend to be different platforms.
     module Platform
       alias :old_windows? :windows?
@@ -166,7 +170,7 @@ module Puppet
 
       def windows?
         if RSpec::Puppet.rspec_puppet_example?
-          pretend_platform.nil? ? (actual_platform == :windows) : pretend_windows?
+          !pretending? ? (actual_platform == :windows) : pretend_windows?
         else
           old_windows?
         end
@@ -201,6 +205,27 @@ module Puppet
         @pretend_platform ||= nil
       end
       module_function :pretend_platform
+
+      def pretending?
+        !pretend_platform.nil?
+      end
+      module_function :pretending?
+    end
+
+    class Autoload
+      if singleton_class.respond_to?(:load_file)
+        singleton_class.send(:alias_method, :old_load_file, :load_file)
+
+        def self.load_file(*args)
+          if RSpec::Puppet.rspec_puppet_example?
+            RSpec::Puppet::Consts.without_stubs do
+              old_load_file(*args)
+            end
+          else
+            old_load_file(*args)
+          end
+        end
+      end
     end
   end
 

data/lib/rspec-puppet/support.rb

@@ -408,7 +408,7 @@ module RSpec::Puppet
     end
 
     def stub_facts!(facts)
-      Puppet.settings[:autosign] = false
+      Puppet.settings[:autosign] = false if Puppet.settings.include? :autosign
       Facter.clear
       facts.each { |k, v| Facter.add(k, :weight => 999) { setcode { v } } }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.15
+  version: 2.7.0
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec