rspec-puppet 3.0.0 → 4.0.1

data/lib/rspec-puppet/sensitive.rb

@@ -1,53 +1,43 @@
 # frozen_string_literal: true
 
 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
+  # 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 the wrapped value
+    def unwrap
+      @value
+    end
 
-      # @return true
-      def sensitive?
-        true
-      end
+    # @return true
+    def sensitive?
+      true
+    end
 
-      # @return inspect of the wrapped value, inside Sensitive()
-      def inspect
-        "Sensitive(#{@value.inspect})"
-      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.
+    # 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
-          if unwrap.is_a?(Regexp)
-            unwrap =~ other.unwrap
-          else
-            unwrap == other.unwrap
-          end
+    # @param other [#unwrap, Object] value to compare to
+    def ==(other)
+      if other.respond_to? :unwrap
+        if unwrap.is_a?(Regexp)
+          unwrap =~ other.unwrap
         else
-          super
+          unwrap == other.unwrap
         end
+      else
+        super
       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/setup.rb

@@ -91,14 +91,8 @@ module RSpec::Puppet
     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 || RSpec.configuration.parser == 'future'
-        require 'puppet/pops'
-        p = Puppet::Pops::Parser::Lexer2.new
-      else
-        p = Puppet::Parser::Lexer.new
-      end
+      require 'puppet/pops'
+      p = Puppet::Pops::Parser::Lexer2.new
       module_name = nil
       p.string = File.read(file)
       tokens = p.fullscan

data/lib/rspec-puppet/spec_helper.rb

@@ -2,11 +2,8 @@
 
 require 'rspec-puppet'
 
-fixture_path = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures')
-
 RSpec.configure do |c|
   c.module_path     = File.join(fixture_path, 'modules')
-  c.manifest_dir    = File.join(fixture_path, 'manifests')
   c.manifest        = File.join(fixture_path, 'manifests', 'site.pp')
   c.environmentpath = File.join(Dir.pwd, 'spec')
 end

data/lib/rspec-puppet/support.rb

@@ -21,11 +21,7 @@ module RSpec::Puppet
     end
 
     def build_code(type, manifest_opts)
-      if (Puppet.version.to_f >= 4.0) || (Puppet[:parser] == 'future')
-        [site_pp_str, pre_cond, test_manifest(type, manifest_opts), post_cond].compact.join("\n")
-      else
-        [import_str, pre_cond, test_manifest(type, manifest_opts), post_cond].compact.join("\n")
-      end
+      [site_pp_str, pre_cond, test_manifest(type, manifest_opts), post_cond].compact.join("\n")
     end
 
     def guess_type_from_path(path)
@@ -44,8 +40,6 @@ module RSpec::Puppet
         :type_alias
       when %r{spec/provider}
         :provider
-      when %r{spec/applications}
-        :application
       else
         :unknown
       end
@@ -90,7 +84,6 @@ module RSpec::Puppet
         hiera_data_value = respond_to?(:hiera_data) ? hiera_data : nil
 
         rspec_config_values = %i[
-          trusted_server_facts
           disable_module_hiera
           use_fixture_spec_hiera
           fixture_hiera_configs
@@ -128,30 +121,6 @@ module RSpec::Puppet
       end
     end
 
-    def import_str
-      import_str = ''
-      adapter.modulepath.each do |d|
-        if File.exist?(File.join(d, 'manifests', 'init.pp'))
-          path_to_manifest = File.join([
-            d,
-            'manifests',
-            class_name.split('::')[1..]
-          ].flatten)
-          import_str = [
-            "import '#{d}/manifests/init.pp'",
-            "import '#{path_to_manifest}.pp'",
-            ''
-          ].join("\n")
-          break
-        elsif File.exist?(d)
-          import_str = "import '#{adapter.manifest}'\n"
-          break
-        end
-      end
-
-      import_str
-    end
-
     def site_pp_str
       return '' unless (path = adapter.manifest)
 
@@ -177,11 +146,6 @@ module RSpec::Puppet
         else
           "class { '#{class_name}': #{param_str(opts[:params])} }"
         end
-      when :application
-        raise ArgumentError, 'You need to provide params for an application' unless opts.key?(:params)
-
-        "site { #{class_name} { #{sanitise_resource_title(title)}: #{param_str(opts[:params])} } }"
-
       when :define
         title_str = if title.is_a?(Array)
                       '[' + title.map { |r| sanitise_resource_title(r) }.join(', ') + ']'
@@ -207,7 +171,7 @@ module RSpec::Puppet
     def nodename(type)
       return node if respond_to?(:node)
 
-      if %i[class define function application].include? type
+      if %i[class define function].include? type
         Puppet[:certname]
       else
         class_name
@@ -248,10 +212,18 @@ module RSpec::Puppet
         'hostname' => node.split('.').first,
         'fqdn' => node,
         'domain' => node.split('.', 2).last,
-        'clientcert' => node,
-        'ipaddress6' => 'FE80:0000:0000:0000:AAAA:AAAA:AAAA'
+        'clientcert' => node
       }
 
+      # Puppet 6.9.0 started setting a `serverip6` server fact which is set
+      # using the value of the `ipaddress6` fact. If the fact set(s) provided
+      # by FacterDB don't have an `ipaddress6` fact set, then the normal Facter
+      # fact will be resolved, which can result in Ruby trying to load Windows
+      # only gems on Linux. This is only a problem if facter is used.
+      if RSpec.configuration.facter_implementation.to_sym == :facter
+        node_facts['ipaddress6'] = 'FE80:0000:0000:0000:AAAA:AAAA:AAAA'
+      end
+
       networking_facts = {
         'hostname' => node_facts['hostname'],
         'fqdn' => node_facts['fqdn'],
@@ -301,8 +273,6 @@ module RSpec::Puppet
     end
 
     def trusted_facts_hash(_node_name)
-      return {} unless Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0
-
       extensions = {}
 
       if RSpec.configuration.default_trusted_facts.any?
@@ -314,8 +284,6 @@ module RSpec::Puppet
     end
 
     def trusted_external_data_hash
-      return {} unless Puppet::Util::Package.versioncmp(Puppet.version, '6.14.0') >= 0
-
       external_data = {}
 
       if RSpec.configuration.default_trusted_external_data.any?
@@ -335,7 +303,7 @@ module RSpec::Puppet
       # And then add the server name and IP
       { 'servername' => 'fqdn',
         'serverip' => 'ipaddress' }.each do |var, fact|
-        if (value = FacterImpl.value(fact))
+        if (value = Puppet.runtime[:facter].value(fact))
           server_facts[var] = value
         else
           warn "Could not retrieve fact #{fact}"
@@ -343,8 +311,8 @@ module RSpec::Puppet
       end
 
       if server_facts['servername'].nil?
-        host = FacterImpl.value(:hostname)
-        server_facts['servername'] = if (domain = FacterImpl.value(:domain))
+        host = Puppet.runtime[:facter].value(:hostname)
+        server_facts['servername'] = if (domain = Puppet.runtime[:facter].value(:domain))
                                        [host, domain].join('.')
                                      else
                                        host
@@ -388,11 +356,6 @@ module RSpec::Puppet
       vardir = Dir.mktmpdir
       Puppet[:vardir] = vardir
 
-      # 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] = !ENV.include?('PUPPET_NOAPP_MANAGMENT')
-      end
-
       adapter.modulepath.map do |d|
         Dir["#{d}/*/lib"].entries
       end.flatten.each do |lib|
@@ -404,7 +367,7 @@ module RSpec::Puppet
 
     def with_vardir
       vardir = setup_puppet
-      return yield(vardir) if block_given?
+      yield(vardir) if block_given?
     ensure
       FileUtils.rm_rf(vardir) if vardir && File.directory?(vardir)
     end
@@ -456,25 +419,23 @@ module RSpec::Puppet
       node_obj = Puppet::Node.new(nodename, { parameters: node_params, facts: node_facts })
 
       trusted_info = ['remote', nodename, trusted_facts_val]
-      trusted_info.push(trusted_external_data) if Puppet::Util::Package.versioncmp(Puppet.version, '6.14.0') >= 0
-      if Puppet::Util::Package.versioncmp(Puppet.version, '4.3.0') >= 0
-        Puppet.push_context(
-          {
-            trusted_information: Puppet::Context::TrustedInformation.new(*trusted_info)
-          },
-          'Context for spec trusted hash'
-        )
+      trusted_info.push(trusted_external_data)
+      Puppet.push_context(
+        {
+          trusted_information: Puppet::Context::TrustedInformation.new(*trusted_info)
+        },
+        'Context for spec trusted hash'
+      )
 
-        node_obj.add_server_facts(server_facts_hash) if RSpec.configuration.trusted_server_facts
-      end
+      node_obj.add_server_facts(server_facts_hash)
 
       adapter.catalog(node_obj, exported)
     end
 
     def stub_facts!(facts)
       Puppet.settings[:autosign] = false if Puppet.settings.include? :autosign
-      FacterImpl.clear
-      facts.each { |k, v| FacterImpl.add(k, weight: 999) { setcode { v } } }
+      Puppet.runtime[:facter].clear
+      facts.each { |k, v| Puppet.runtime[:facter].add(k, weight: 999) { setcode { v } } }
     end
 
     def build_catalog(*args)
@@ -504,15 +465,7 @@ module RSpec::Puppet
     end
 
     def escape_special_chars(string)
-      string.gsub(/\$/, '\\$')
-    end
-
-    def rspec_compatibility
-      return unless RSpec::Version::STRING < '3'
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
+      string.gsub('$', '\\$')
     end
 
     def fixture_spec_hiera_conf(mod)

data/lib/rspec-puppet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSpecPuppet
-  VERSION = '3.0.0'
+  VERSION = '4.0.1'
 end

data/lib/rspec-puppet.rb

@@ -36,9 +36,7 @@ require 'rspec-puppet/monkey_patches'
 RSpec.configure do |c|
   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: Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
   c.add_setting :default_facts, default: {}
@@ -47,9 +45,6 @@ RSpec.configure do |c|
   c.add_setting :default_trusted_external_data, default: {}
   c.add_setting :facter_implementation, default: :facter
   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'
   c.add_setting :stringify_facts, default: true
   c.add_setting :strict_variables, default: false
   c.add_setting :setup_fixtures, default: true
@@ -63,17 +58,6 @@ RSpec.configure do |c|
   c.add_setting :use_fixture_spec_hiera, default: false
   c.add_setting :fallback_to_default_hiera, default: true
 
-  c.instance_eval do
-    def trusted_server_facts
-      @trusted_server_facts.nil? ? false : @trusted_server_facts
-    end
-
-    def trusted_server_facts=(value)
-      @trusted_server_facts = value
-      adapter&.setup_puppet(RSpec::Puppet.current_example)
-    end
-  end
-
   c.before(:all) do
     RSpec::Puppet::Setup.safe_setup_directories(nil, false) if RSpec.configuration.setup_fixtures?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -10,23 +10,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: RSpec tests for your Puppet manifests
+        version: '3.0'
+description: "    RSpec tests for your Puppet manifests.\n"
 email:
 - tim@sharpe.id.au
 - modules-team@puppet.com
@@ -45,7 +45,6 @@ files:
 - lib/rspec-puppet/coverage.rb
 - lib/rspec-puppet/errors.rb
 - lib/rspec-puppet/example.rb
-- lib/rspec-puppet/example/application_example_group.rb
 - lib/rspec-puppet/example/class_example_group.rb
 - lib/rspec-puppet/example/define_example_group.rb
 - lib/rspec-puppet/example/function_example_group.rb

data/lib/rspec-puppet/example/application_example_group.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module RSpec::Puppet
-  # This module provides support for the application type
-  module ApplicationExampleGroup
-    include RSpec::Puppet::ManifestMatchers
-    include RSpec::Puppet::Support
-
-    def catalogue
-      @catalogue ||= load_catalogue(:application)
-    end
-
-    def exported_resources
-      -> { load_catalogue(:application, true) }
-    end
-
-    def rspec_puppet_cleanup
-      @catalogue = nil
-    end
-  end
-end