rspec-puppet 2.7.9 → 2.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca4beef2e1c4c55e6e0e79b0fd9d03fb05a1462166632aa64c6df9b37ca93e51
-  data.tar.gz: 7b4c5948d175bbfad4f46fcf89ac1ec8427dbc1457cf3f767dc656427a30b6ce
+  metadata.gz: 38af21b6f0c4e9fcfeb90c063d299c725fd80d63e6d74b44d0a6e6f937f6d955
+  data.tar.gz: 977523988ad9525e31c461040c33894e1cbd79c9180252f9521f8b8172ac111b
 SHA512:
-  metadata.gz: 3a24ffc5d27c563a0bfe01be6f6881119955ad7a46afe330ffa9a787102186b41ba1af6d26df8984202746aefa5fca432860074e874073aba9a2fe69e87099d7
-  data.tar.gz: 19e34976f263b427406002ffa5ba26711814d49558c1bc2f396fd03415ce0ec7fe018052d4e90db5e295127561d1e8a1c30371fc32d856a14a0d34c81a29b1a4
+  metadata.gz: e8145ad0c55a4c52f7032f67ea2f73dc7fb72f162c32214e8b3e5aa5bd69efe1bd0ded6c2e36cff165e2e8f51734e0f94017c74f07ad0ce3b1bbeca90463ad34
+  data.tar.gz: 149c839eb092309b0e3bb1be2c0887aed4dc0ebe8fb9ea2b4b5b562a797df8b39800486e24e181dc7d44abdddbe94bc9938978e0d5862e35fa73581203475545

data/CHANGELOG.md

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

data/lib/rspec-puppet/cache.rb

@@ -11,17 +11,12 @@ 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 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
+      if !@cache.has_key? key
+        @cache[key] = (blk || @default_proc).call(*args)
+        @lra << key
         expire!
-        @cache[args] = (blk || @default_proc).call(*args)
-        @lra << args
       end
 
       @cache[key]
@@ -30,8 +25,8 @@ module RSpec::Puppet
     private
 
     def expire!
-      # delete one entry (the oldest) when there is no room in cache
-      @cache.delete(@lra.shift) if @cache.size == MAX_ENTRIES
+      expired = @lra.slice!(0, @lra.size - MAX_ENTRIES)
+      expired.each { |key| @cache.delete(key) } if expired
     end
   end
 end

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

@@ -89,11 +89,6 @@ 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,7 +21,10 @@ module RSpec::Puppet
       #
       # @return [true, false]
       def matches?(resource)
-        actual = resource[@parameter]
+
+        @resource = resource
+
+        actual   = @resource[@parameter]
         expected = @value
 
         # Puppet flattens an array with a single value into just the value and
@@ -62,8 +65,6 @@ 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

@@ -302,24 +302,6 @@ 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/support.rb

@@ -1,7 +1,6 @@
 require 'rspec-puppet/cache'
 require 'rspec-puppet/adapters'
 require 'rspec-puppet/raw_string'
-require 'rspec-puppet/sensitive'
 
 module RSpec::Puppet
   module Support
@@ -441,7 +440,8 @@ module RSpec::Puppet
     end
 
     def escape_special_chars(string)
-      string.gsub(/\$/, "\\$")
+      string.gsub!(/\$/, "\\$")
+      string
     end
 
     def rspec_compatibility
@@ -462,14 +462,6 @@ 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.9
+  version: 2.7.10
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,7 +66,6 @@ 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

data/lib/rspec-puppet/sensitive.rb

@@ -1,47 +0,0 @@
-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