rspec-puppet 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 685eff630cb1067919ce2264cfb87657480b75ff
-  data.tar.gz: 9139248ce97fee84aab8e4e963f8196ee5486e64
+  metadata.gz: 9e358d6951d64d0bd46d40657619cebac5c90af8
+  data.tar.gz: e2af0a6d7a995fe41b0d155f2dc1c20055911da8
 SHA512:
-  metadata.gz: cb91f5eea8e985d26590d6da1f74ec363d58ba762bf6e4b13542f71ee87de7977cf4887776aceaf17a2d80ded6c6ffd6e74812094f7a8689916ab25c4c1f0117
-  data.tar.gz: a112713996ca8b0bf03df1d85e57bf24f6f4e3c3a4c58e22bbad18e600a2aaa4f2cd6d5d216ca5d992263ea6883193fa8d394d951e220287d77cf459de3ec06d
+  metadata.gz: f0994991a27eddd126547940ae9a8b667dd7f08a7084b90f35c7a005cdb4b58974b580110908a7afa2a4034429964ee79181531b50cfa6028a016dcf9e8e27f2
+  data.tar.gz: 35ca0b9c0b1c1c60a2b736b05652c216322ee5ae1f47d2cb2c85080c93e9ba90e19f88d4f458424df8a9af37625050b16b3f13a02f7a4ecf9b31f1f586916e8c

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.6.9]
+
+### Fixed
+
+ * Initialise Hiera 3 before loading any monkey patches to ensure that the
+   correct code is loaded for the actual platform running the tests.
+
 ## [2.6.8]
 
 ### Fixed

data/lib/rspec-puppet/monkey_patches.rb

@@ -1,5 +1,12 @@
 require 'pathname'
 
+# Load this library before enabling the monkey-patches to avoid HI-581
+begin
+require 'hiera/util/win32'
+rescue LoadError
+  # ignore this on installs without hiera, e.g. puppet 3 gems
+end
+
 class RSpec::Puppet::EventListener
   def self.example_started(example)
     if rspec3?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.9
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -36,14 +36,6 @@ files:
 - bin/rspec-puppet-init
 - lib/rspec-puppet.rb
 - lib/rspec-puppet/adapters.rb
-- lib/rspec-puppet/adapters/base.rb
-- lib/rspec-puppet/adapters/puppet_27.rb
-- lib/rspec-puppet/adapters/puppet_30.rb
-- lib/rspec-puppet/adapters/puppet_32.rb
-- lib/rspec-puppet/adapters/puppet_33.rb
-- lib/rspec-puppet/adapters/puppet_34.rb
-- lib/rspec-puppet/adapters/puppet_35.rb
-- lib/rspec-puppet/adapters/puppet_4x.rb
 - lib/rspec-puppet/cache.rb
 - lib/rspec-puppet/consts.rb
 - lib/rspec-puppet/coverage.rb

data/lib/rspec-puppet/adapters/base.rb

@@ -1,108 +0,0 @@
-module RSpec::Puppet
-  module Adapters
-    class Base
-      # Set up all Puppet settings applicable for this Puppet version as
-      # application defaults.
-      #
-      # Puppet setting values can be taken from the global RSpec configuration, or from the currently
-      # executing RSpec context. When a setting is specified both in the global configuration and in
-      # the example group, the setting in the example group is preferred.
-      #
-      # @example Configuring a Puppet setting from a global RSpec configuration value
-      #   RSpec.configure do |config|
-      #     config.parser = "future"
-      #   end
-      #   # => Puppet[:parser] will be future
-      #
-      # @example Configuring a Puppet setting from within an RSpec example group
-      #   RSpec.describe 'my_module::my_class', :type => :class do
-      #     let(:module_path) { "/Users/luke/modules" }
-      #     #=> Puppet[:modulepath] will be "/Users/luke/modules"
-      #   end
-      #
-      # @example Configuring a Puppet setting with both a global RSpec configuration and local context
-      #   RSpec.configure do |config|
-      #     config.confdir = "/etc/puppet"
-      #   end
-      #   RSpec.describe 'my_module', :type => :class do
-      #     # Puppet[:confdir] will be "/etc/puppet"
-      #   end
-      #   RSpec.describe 'my_module::my_class', :type => :class do
-      #     let(:confdir) { "/etc/puppetlabs/puppet" }
-      #     # => Puppet[:confdir] will be "/etc/puppetlabs/puppet" in this example group
-      #   end
-      #   RSpec.describe 'my_module::my_define', :type => :define do
-      #     # Puppet[:confdir] will be "/etc/puppet" again
-      #   end
-      #
-      # @param example_group [RSpec::Core::ExampleGroup] The RSpec context to use for local settings
-      # @return [void]
-      def setup_puppet(example_group)
-        settings = settings_map.map do |puppet_setting, rspec_setting|
-          [puppet_setting, get_setting(example_group, rspec_setting)]
-        end.flatten
-        default_hash = {:confdir => '/dev/null', :vardir => '/dev/null' }
-        if defined?(Puppet::Test::TestHelper) && Puppet::Test::TestHelper.respond_to?(:app_defaults_for_tests, true)
-          default_hash.merge!(Puppet::Test::TestHelper.send(:app_defaults_for_tests))
-        end
-        settings_hash = default_hash.merge(Hash[*settings])
-
-        if Puppet.settings.respond_to?(:initialize_app_defaults)
-          Puppet.settings.initialize_app_defaults(settings_hash)
-
-          # Forcefully apply the environmentpath setting instead of relying on
-          # the application defaults as Puppet::Test::TestHelper automatically
-          # sets this value as well, overriding our application default
-          Puppet.settings[:environmentpath] = settings_hash[:environmentpath] if settings_hash.key?(:environmentpath)
-        else
-          # Set settings the old way for Puppet 2.x, because that's how
-          # they're defaulted in that version of Puppet::Test::TestHelper and
-          # we won't be able to override them otherwise.
-          settings_hash.each do |setting, value|
-            Puppet.settings[setting] = value
-          end
-        end
-
-        @environment_name = example_group.environment
-      end
-
-      def get_setting(example_group, rspec_setting)
-        if example_group.respond_to?(rspec_setting)
-          example_group.send(rspec_setting)
-        else
-          RSpec.configuration.send(rspec_setting)
-        end
-      end
-
-      def catalog(node, exported)
-        if exported
-          # Use the compiler directly to skip the filtering done by the indirector
-          Puppet::Parser::Compiler.compile(node).filter { |r| !r.exported? }
-        else
-          Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
-        end
-      end
-
-      def current_environment
-        Puppet::Node::Environment.new(@environment_name)
-      end
-
-      def settings_map
-        [
-          [:modulepath, :module_path],
-          [:config, :config],
-          [:confdir, :confdir],
-        ]
-      end
-
-      def modulepath
-        Puppet[:modulepath].split(File::PATH_SEPARATOR)
-      end
-
-      # @return [String, nil] The path to the Puppet manifest if it is present and set, nil otherwise.
-      def manifest
-        Puppet[:manifest]
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_27.rb

@@ -1,15 +0,0 @@
-require 'rspec-puppet/adapters/base'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet27 < Base
-      def settings_map
-        super.concat([
-          [:manifestdir, :manifest_dir],
-          [:manifest, :manifest],
-          [:templatedir, :template_dir],
-        ])
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_30.rb

@@ -1,16 +0,0 @@
-require 'rspec-puppet/adapters/base'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet30 < Base
-      def settings_map
-        super.concat([
-          [:manifestdir, :manifest_dir],
-          [:manifest, :manifest],
-          [:templatedir, :template_dir],
-          [:hiera_config, :hiera_config],
-        ])
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_32.rb

@@ -1,13 +0,0 @@
-require 'rspec-puppet/adapters/puppet_30'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet32 < Puppet30
-      def settings_map
-        super.concat([
-          [:parser, :parser],
-        ])
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_33.rb

@@ -1,14 +0,0 @@
-require 'rspec-puppet/adapters/puppet_32'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet33 < Puppet32
-      def settings_map
-        super.concat([
-          [:ordering, :ordering],
-          [:stringify_facts, :stringify_facts],
-        ])
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_34.rb

@@ -1,13 +0,0 @@
-require 'rspec-puppet/adapters/puppet_33'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet34 < Puppet33
-      def settings_map
-        super.concat([
-          [:trusted_node_data, :trusted_node_data],
-        ])
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_35.rb

@@ -1,13 +0,0 @@
-require 'rspec-puppet/adapters/puppet_34'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet35 < Puppet34
-      def settings_map
-        super.concat([
-          [:strict_variables, :strict_variables],
-        ])
-      end
-    end
-  end
-end

data/lib/rspec-puppet/adapters/puppet_4x.rb

@@ -1,82 +0,0 @@
-require 'rspec-puppet/adapters/base'
-
-module RSpec::Puppet
-  module Adapters
-    class Puppet4X < Base
-      def setup_puppet(example_group)
-        super
-
-        if rspec_modulepath = RSpec.configuration.module_path
-          modulepath = rspec_modulepath.split(File::PATH_SEPARATOR)
-        else
-          modulepath = Puppet[:environmentpath].split(File::PATH_SEPARATOR).map do |path|
-            File.join(path, 'fixtures', 'modules')
-          end
-        end
-
-        if rspec_manifest = RSpec.configuration.manifest
-          manifest = rspec_manifest
-        else
-          manifest_paths = Puppet[:environmentpath].split(File::PATH_SEPARATOR).map do |path|
-            File.join(path, 'fixtures', 'manifests')
-          end
-
-          manifest = manifest_paths.find do |path|
-            File.exist?(path)
-          end
-
-          manifest ||= Puppet::Node::Environment::NO_MANIFEST
-        end
-
-        env = Puppet::Node::Environment.create(@environment_name, modulepath, manifest)
-        loader = Puppet::Environments::Static.new(env)
-
-        Puppet.push_context(
-          {
-            :environments => loader,
-            :current_environment => env
-          },
-          "Setup rspec-puppet environments"
-        )
-      end
-
-      def settings_map
-        super.concat([
-          [:environmentpath, :environmentpath],
-          [:hiera_config, :hiera_config],
-          [:strict_variables, :strict_variables],
-          [:manifest, :manifest],
-        ])
-      end
-
-      def catalog(node, exported)
-        node.environment = current_environment
-        # Override $::environment to workaround PUP-5835, where Puppet otherwise
-        # stores a symbol for the parameter
-        node.parameters['environment'] = current_environment.name.to_s if node.parameters['environment'] != node.parameters['environment'].to_s
-        super
-      end
-
-      def current_environment
-        Puppet.lookup(:current_environment)
-      end
-
-      def modulepath
-        current_environment.modulepath
-      end
-
-      # Puppet 4.0 specially handles environments that don't have a manifest set, so we check for the no manifest value
-      # and return nil when it is set.
-      #
-      # @return [String, nil] The path to the Puppet manifest if it is present and set, nil otherwise.
-      def manifest
-        m = current_environment.manifest
-        if m == Puppet::Node::Environment::NO_MANIFEST
-          nil
-        else
-          m
-        end
-      end
-    end
-  end
-end