rspec-puppet 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375cf91b75c36ee1bc0bbade72608205a7b85fce94a49d0fcfafb02fa6f8eddc
-  data.tar.gz: 732ce59e27a5fd9d15052262d21b2de6df85b090fb56152aca88da4480133ac1
+  metadata.gz: 420f47c99ab3190a3e97c2b172e694694a5d997a56e70366bd168c8338c21fb9
+  data.tar.gz: 21f2d247e5169ba70e490d6b9c66fc8542a1c3c1cd99d1e5895a1322a9cfac1b
 SHA512:
-  metadata.gz: 3f1b0bb5c052df4ff70981384ad81bdc2e75ec1f23f9a890f101a933a4f7f50d569acef001524c7c3a9f37f0cfffd2eeaf0a26a7d67f8a3abd80b7147005e758
-  data.tar.gz: 65f0fbe718948c13b1866bb8d71c6b03fe741927ed86e97d6eeefb39526e98671e3ac5ae98e14e939654988fa8c272b3e72f66c5b61e9c6321fac11d5b66e276
+  metadata.gz: a5b2ef185120131a07fc6e063a7ee2d2cb191db8a765bb5cdda1fce92081547c4d0aea83b386faaf1d20e8051d51d84ba05facc5f9deb74f3aecdeea67798b86
+  data.tar.gz: 4714dac2b13e5a4eb44a8c965a61e08cc7e2ded172271ea61f85bfae22d43f51dde5d609f0a1d3515844fb5924b48ad8441fbb071eef267c0af6f886c0e21c9c

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.9.0]
+
+### Added
+ * Allow users to disable app_management for Puppet 4
+ * Added support for regexp arguments to Sensitive
+ * Handle all auto*, not just autorequire
+ * Set up loaders so that 4.x functions resolve properly
+
 ## [2.8.0]
 
 ### Breaking Changes
@@ -546,7 +554,36 @@ Thanks to Adrien Thebo, Alex Harvey, Brian, Dan Bode, Dominic Cleal, Javier Pala
 ## 1.0.1 and earlier
 For changelog of versions 1.0.1 and earlier, see http://rspec-puppet.com/changelog/
 
-[2.x]: https://github.com/rodjek/rspec-puppet/compare/v2.5.0...master
+[2.x]: https://github.com/rodjek/rspec-puppet/compare/v2.9.0...master
+[2.9.0]: https://github.com/rodjek/rspec-puppet/compare/v2.8.0...v2.9.0
+[2.8.0]: https://github.com/rodjek/rspec-puppet/compare/v2.7.10...v2.8.0
+[2.7.10]: https://github.com/rodjek/rspec-puppet/compare/v2.7.9...v2.7.10
+[2.7.9]: https://github.com/rodjek/rspec-puppet/compare/v2.7.8...v2.7.9
+[2.7.8]: https://github.com/rodjek/rspec-puppet/compare/v2.7.7...v2.7.8
+[2.7.7]: https://github.com/rodjek/rspec-puppet/compare/v2.7.6...v2.7.7
+[2.7.6]: https://github.com/rodjek/rspec-puppet/compare/v2.7.5...v2.7.6
+[2.7.5]: https://github.com/rodjek/rspec-puppet/compare/v2.7.4...v2.7.5
+[2.7.4]: https://github.com/rodjek/rspec-puppet/compare/v2.7.3...v2.7.4
+[2.7.3]: https://github.com/rodjek/rspec-puppet/compare/v2.7.2...v2.7.3
+[2.7.2]: https://github.com/rodjek/rspec-puppet/compare/v2.7.1...v2.7.2
+[2.7.1]: https://github.com/rodjek/rspec-puppet/compare/v2.7.0...v2.7.1
+[2.7.0]: https://github.com/rodjek/rspec-puppet/compare/v2.6.15...v2.7.0
+[2.6.15]: https://github.com/rodjek/rspec-puppet/compare/v2.6.14...v2.6.15
+[2.6.14]: https://github.com/rodjek/rspec-puppet/compare/v2.6.13...v2.6.14
+[2.6.13]: https://github.com/rodjek/rspec-puppet/compare/v2.6.12...v2.6.13
+[2.6.12]: https://github.com/rodjek/rspec-puppet/compare/v2.6.11...v2.6.12
+[2.6.11]: https://github.com/rodjek/rspec-puppet/compare/v2.6.10...v2.6.11
+[2.6.10]: https://github.com/rodjek/rspec-puppet/compare/v2.6.9...v2.6.10
+[2.6.9]: https://github.com/rodjek/rspec-puppet/compare/v2.6.8...v2.6.9
+[2.6.8]: https://github.com/rodjek/rspec-puppet/compare/v2.6.7...v2.6.8
+[2.6.7]: https://github.com/rodjek/rspec-puppet/compare/v2.6.6...v2.6.7
+[2.6.6]: https://github.com/rodjek/rspec-puppet/compare/v2.6.5...v2.6.6
+[2.6.5]: https://github.com/rodjek/rspec-puppet/compare/v2.6.4...v2.6.5
+[2.6.4]: https://github.com/rodjek/rspec-puppet/compare/v2.6.3...v2.6.4
+[2.6.3]: https://github.com/rodjek/rspec-puppet/compare/v2.6.2...v2.6.3
+[2.6.2]: https://github.com/rodjek/rspec-puppet/compare/v2.6.1...v2.6.2
+[2.6.1]: https://github.com/rodjek/rspec-puppet/compare/v2.6.0...v2.6.1
+[2.6.0]: https://github.com/rodjek/rspec-puppet/compare/2.5.0...v2.6.0
 [2.5.0]: https://github.com/rodjek/rspec-puppet/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/rodjek/rspec-puppet/compare/v2.3.2...v2.4.0
 [2.3.2]: https://github.com/rodjek/rspec-puppet/compare/v2.3.1...v2.3.2

data/lib/rspec-puppet/adapters.rb

@@ -139,7 +139,8 @@ module RSpec::Puppet
         Puppet.push_context(
           {
             :environments => loader,
-            :current_environment => env
+            :current_environment => env,
+            :loaders => (Puppet::Pops::Loaders.new(env) if Gem::Version.new(Puppet.version) >= Gem::Version.new('6.0.0')),
           },
           "Setup rspec-puppet environments"
         )

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

@@ -7,13 +7,15 @@ module RSpec::Puppet
         'Stage[main]',
       ].freeze
 
+      attr_reader :resource_type
+
       def initialize(type, count, *method)
         if type.nil?
           @type = method[0].to_s.gsub(/^have_(.+)_resource_count$/, '\1')
         else
           @type = type
         end
-        @referenced_type = referenced_type(@type)
+        @resource_type = referenced_type(@type)
         @expected_number = count.to_i
       end
 
@@ -30,7 +32,7 @@ module RSpec::Puppet
                            end
                          else
                            resources.count do |res|
-                             res.type == @referenced_type
+                             res.type == @resource_type
                            end
                          end
 
@@ -45,7 +47,7 @@ module RSpec::Puppet
           desc << "#{@expected_number == 1 ? "class" : "classes" }"
         else
           unless @type == "resource"
-            desc << "#{@referenced_type}"
+            desc << "#{@resource_type}"
           end
           desc << "#{@expected_number == 1 ? "resource" : "resources" }"
         end

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

@@ -307,14 +307,17 @@ module RSpec::Puppet
           end
         end
 
-        # Add autorequires if any
-        if type == :require and resource.resource_type.respond_to? :eachautorequire
-          resource.resource_type.eachautorequire do |t, b|
-            Array(resource.to_ral.instance_eval(&b)).each do |dep|
-              res = "#{t.to_s.capitalize}[#{dep}]"
-              if r = relationship_refs(res, type, visited)
-                results << res
-                results << r
+        # Add auto* (autorequire etc) if any
+        if [:before, :notify, :require, :subscribe].include?(type)
+          func = "eachauto#{type}".to_sym
+          if resource.resource_type.respond_to?(func)
+            resource.resource_type.send(func) do |t, b|
+              Array(resource.to_ral.instance_eval(&b)).each do |dep|
+                res = "#{t.to_s.capitalize}[#{dep}]"
+                if r = relationship_refs(res, type, visited)
+                  results << res
+                  results << r
+                end
               end
             end
           end

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

@@ -4,7 +4,7 @@ module RSpec::Puppet
 
     matcher :include_class do |expected_class|
       match do |catalogue|
-        RSpec.deprecate(:include_class, :replacement => :contain_class)
+        RSpec.deprecate('include_class()', :replacement => 'contain_class()')
         catalogue.call.classes.include?(expected_class)
       end
 

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

@@ -52,9 +52,6 @@ module RSpec::Puppet
         self
       end
 
-      #def with_autorequires(autorequires))
-      #end
-
       #
       # this is the method that drives all of the validation
       #

data/lib/rspec-puppet/sensitive.rb

@@ -29,7 +29,11 @@ module RSpec::Puppet
       # @param other [#unwrap, Object] value to compare to
       def == other
         if other.respond_to? :unwrap
-          return unwrap == other.unwrap
+          if unwrap.kind_of?(Regexp)
+            return unwrap =~ other.unwrap
+          else
+            return unwrap == other.unwrap
+          end
         else
           super
         end

data/lib/rspec-puppet/support.rb

@@ -392,7 +392,7 @@ module RSpec::Puppet
 
       # Enable app_management by default for Puppet versions that support it
       if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0 && Puppet.version.to_i < 5
-        Puppet[:app_management] = true
+        Puppet[:app_management] = ENV.include?('PUPPET_NOAPP_MANAGMENT') ? false : true
       end
 
       adapter.modulepath.map do |d|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests