rspec-puppet 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306b3d94980e5582b3fdd226c2616bb15a23984d
-  data.tar.gz: 689b36fdc52d0e49b1eb1a587e8682949839bbd4
+  metadata.gz: 9090f6434c25d6afd4341586dab7f2c04a281cce
+  data.tar.gz: 29c6eedd09c990f1cf2b7bc9c398b224e2931f6a
 SHA512:
-  metadata.gz: 65e3a47f0994979385b56d9739feed2644fea3eea0f86568bd37fd243ce5f00f210b1d3d05c78703823396b00d881d1a0fd54de72ea180bd69a591e0d6deb62a
-  data.tar.gz: acc9a1cb17456547bbe4f26965856af3d76d0a8ca33be63988ada284fd08592be597a54aa667a08d5b85bb33727c4454aacd752537796971a6f1496021a2fb4d
+  metadata.gz: 3d9f9db94e36ac66d643943e50fbd5fda038c7be688a764e7090109cf5ad7759c54f31471e24f323dac15c6f7141b65e7b0a522d20daa05b54934ead96f712e1
+  data.tar.gz: 5763b8a546bb6af4ef4198ff7d136c63328483b95b6ecf9f3a35e1f64261a707ee7e0f6009c3f35e23b6a5b5fc4b637c93fbc800c52b5930c5d6b8a6ce72ffae

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.6]
+
+### Fixed
+
+ * Fixed an issue caused by `Puppet::Util.get_env` when pretending to be a
+   Windows host.
+
 ## [2.6.5]
 
 ### Changed

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

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

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

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

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

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

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

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

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

data/lib/rspec-puppet/monkey_patches.rb

@@ -110,6 +110,21 @@ module Puppet
   end
 
   module Util
+    if respond_to?(:get_env)
+      alias :old_get_env :get_env
+      module_function :old_get_env
+
+      def get_env(name, mode = default_env)
+        if RSpec::Puppet.rspec_puppet_example?
+          # use the actual platform, not the pretended
+         old_get_env(name, Platform.actual_platform)
+        else
+         old_get_env(name, mode)
+        end
+      end
+      module_function :get_env
+    end
+
     # Allow rspec-puppet to pretend to be different platforms.
     module Platform
       alias :old_windows? :windows?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -36,6 +36,14 @@ 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