rspec-puppet 2.7.8 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd000960b92cf4b8a24b042dd07d4d91bd333b98f83a554e6b7bb8cf776deb40
-  data.tar.gz: ab87e51803b7ec899ca1389041f00b39a8766b76a141a673e3058c3ed22bc677
+  metadata.gz: ca4beef2e1c4c55e6e0e79b0fd9d03fb05a1462166632aa64c6df9b37ca93e51
+  data.tar.gz: 7b4c5948d175bbfad4f46fcf89ac1ec8427dbc1457cf3f767dc656427a30b6ce
 SHA512:
-  metadata.gz: f1730e3df44bebb5b49f9cd9c83ae1aac317398568002e9777d25c4a34105be371e5f9683ccb07cdd36fb6891aaee1a045837e9a9e5be034e8bbb4b5acf83cc6
-  data.tar.gz: 29056e119989fdaf2e16eea9bb7208caf5b551431098194ed9f4f42697ef512d1ef47594fb3c9d3f1a2f2aa7af655be8ca76a3de45720bf824a719ba17a860d1
+  metadata.gz: 3a24ffc5d27c563a0bfe01be6f6881119955ad7a46afe330ffa9a787102186b41ba1af6d26df8984202746aefa5fca432860074e874073aba9a2fe69e87099d7
+  data.tar.gz: 19e34976f263b427406002ffa5ba26711814d49558c1bc2f396fd03415ce0ec7fe018052d4e90db5e295127561d1e8a1c30371fc32d856a14a0d34c81a29b1a4

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.7.9]
+### Fixed
+ * Fix issues with removal of `default_env` method in Puppet 6.17.0.
+
 ## [2.7.8]
 
 ### Fixed

data/lib/rspec-puppet/cache.rb

@@ -11,12 +11,17 @@ module RSpec::Puppet
     end
 
     def get(*args, &blk)
-      # decouple the hash key from whatever the blk might do to it
       key = Marshal.load(Marshal.dump(args))
-      if !@cache.has_key? key
-        @cache[key] = (blk || @default_proc).call(*args)
-        @lra << key
+      if @cache.has_key?(key)
+        # Cache hit
+        # move that entry last to make it "most recenty used"
+        @lra.insert(-1, @lra.delete_at(@lra.index(args)))
+      else
+        # Cache miss
+        # Ensure room by evicting least recently used if no space left
         expire!
+        @cache[args] = (blk || @default_proc).call(*args)
+        @lra << args
       end
 
       @cache[key]
@@ -25,8 +30,8 @@ module RSpec::Puppet
     private
 
     def expire!
-      expired = @lra.slice!(0, @lra.size - MAX_ENTRIES)
-      expired.each { |key| @cache.delete(key) } if expired
+      # delete one entry (the oldest) when there is no room in cache
+      @cache.delete(@lra.shift) if @cache.size == MAX_ENTRIES
     end
   end
 end

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

@@ -89,6 +89,11 @@ module RSpec::Puppet
         else
           RSpec::Puppet::Coverage.cover!(resource)
           rsrc_hsh = resource.to_hash
+          if resource.respond_to?(:sensitive_parameters)
+            resource.sensitive_parameters.each do |s_param|
+              rsrc_hsh[s_param] = ::Puppet::Pops::Types::PSensitiveType::Sensitive.new(rsrc_hsh[s_param])
+            end
+          end
 
           if resource.builtin_type?
             namevar = resource.resource_type.key_attributes.first.to_s

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

@@ -21,10 +21,7 @@ module RSpec::Puppet
       #
       # @return [true, false]
       def matches?(resource)
-
-        @resource = resource
-
-        actual   = @resource[@parameter]
+        actual = resource[@parameter]
         expected = @value
 
         # Puppet flattens an array with a single value into just the value and
@@ -65,6 +62,8 @@ module RSpec::Puppet
           check_hash(expected, actual)
         when Array
           check_array(expected, actual)
+        when RSpec::Puppet::Sensitive
+          expected == actual
         else
           check_string(expected, actual)
         end

data/lib/rspec-puppet/monkey_patches.rb

@@ -132,6 +132,16 @@ module Puppet
   end
 
   module Util
+    # Fix for removal of default_env function
+    # Bug: https://github.com/rodjek/rspec-puppet/issues/796
+    # Upstream: https://github.com/puppetlabs/puppet/commit/94df3c1a3992d89b2d7d5db8a70373c135bdd86b
+    if !respond_to?(:default_env)
+      def default_env()
+        DEFAULT_ENV
+      end
+      module_function :default_env
+    end
+
     if respond_to?(:get_env)
       alias :old_get_env :get_env
       module_function :old_get_env
@@ -292,6 +302,24 @@ class Pathname
   end
 end
 
+# Puppet loads init.pp, then foo.pp, to find class "mod::foo".  If
+# class "mod" has been mocked using pre_condition when testing
+# "mod::foo", this causes duplicate declaration for "mod".
+# This monkey patch only loads "init.pp" if "foo.pp" does not exist.
+class Puppet::Module
+  if [:match_manifests, 'match_manifests'].any? { |r| instance_methods.include?(r) }
+    old_match_manifests = instance_method(:match_manifests)
+
+    define_method(:match_manifests) do |rest|
+      result = old_match_manifests.bind(self).call(rest)
+      if result.length > 1 && File.basename(result[0]) == 'init.pp'
+        result.shift
+      end
+      result
+    end
+  end
+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.
 file_path_munge = Puppet::Type.type(:file).paramclass(:path).instance_method(:unsafe_munge)

data/lib/rspec-puppet/sensitive.rb

@@ -0,0 +1,47 @@
+module RSpec::Puppet
+  if defined?(::Puppet::Pops::Types::PSensitiveType::Sensitive)
+    # A wrapper representing Sensitive data type, eg. in class params.
+    class Sensitive < ::Puppet::Pops::Types::PSensitiveType::Sensitive
+      # Create a new Sensitive object
+      # @param [Object] value to wrap
+      def initialize(value)
+        @value = value
+      end
+
+      # @return the wrapped value
+      def unwrap
+        @value
+      end
+
+      # @return true
+      def sensitive?
+        true
+      end
+
+      # @return inspect of the wrapped value, inside Sensitive()
+      def inspect
+        "Sensitive(#{@value.inspect})"
+      end
+
+      # Check for equality with another value.
+      # If compared to Puppet Sensitive type, it compares the wrapped values.
+
+      # @param other [#unwrap, Object] value to compare to
+      def == other
+        if other.respond_to? :unwrap
+          return unwrap == other.unwrap
+        else
+          super
+        end
+      end
+    end
+  else
+    #:nocov:
+    class Sensitive
+      def initialize(value)
+        raise 'The use of the Sensitive data type is not supported by this Puppet version'
+      end
+    end
+    #:nocov:
+  end
+end

data/lib/rspec-puppet/support.rb

@@ -1,6 +1,7 @@
 require 'rspec-puppet/cache'
 require 'rspec-puppet/adapters'
 require 'rspec-puppet/raw_string'
+require 'rspec-puppet/sensitive'
 
 module RSpec::Puppet
   module Support
@@ -440,8 +441,7 @@ module RSpec::Puppet
     end
 
     def escape_special_chars(string)
-      string.gsub!(/\$/, "\\$")
-      string
+      string.gsub(/\$/, "\\$")
     end
 
     def rspec_compatibility
@@ -462,6 +462,14 @@ module RSpec::Puppet
       return RSpec::Puppet::RawString.new("#{type}['#{title}']")
     end
 
+    # Helper to return value wrapped in Sensitive type.
+    #
+    # @param [Object] value to wrap
+    # @return [RSpec::Puppet::Sensitive] a new Sensitive wrapper with the new value
+    def sensitive(value)
+      return RSpec::Puppet::Sensitive.new(value)
+    end
+
     # @!attribute [r] adapter
     #   @api private
     #   @return [Class < RSpec::Puppet::Adapters::Base]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.9
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,7 @@ files:
 - lib/rspec-puppet/monkey_patches/windows/taskschedulerconstants.rb
 - lib/rspec-puppet/rake_task.rb
 - lib/rspec-puppet/raw_string.rb
+- lib/rspec-puppet/sensitive.rb
 - lib/rspec-puppet/setup.rb
 - lib/rspec-puppet/spec_helper.rb
 - lib/rspec-puppet/support.rb