rspec-puppet 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGRlMzY5NDE4OWNiN2Y2MTViMzE3YTA4N2MwMDJkN2FiNjljMjg1Mw==
-  data.tar.gz: !binary |-
-    MWExYmViYmQ5Y2RiN2E4ZjU2ZWRjODc1MTg4NmExN2VkYzI1ZmQxZg==
+SHA1:
+  metadata.gz: 99267b05af6dbb02ad504453ec338ea2617e1768
+  data.tar.gz: ffb1e195adc74932acdbc6581eae52317018dc08
 SHA512:
-  metadata.gz: !binary |-
-    YzIzNjc1NzRmOTlmODU2Yjc5MGVhYTAxZTkzZjc2Mjc3Zjc5MmVhNzg2MWE1
-    ZDJkNDNiM2U3YWNjYTlmMTY4ZDZmYTc1NDE1MzNlZDVkNThiOWI4NDU3M2Q2
-    ZjJkZmMxMTJkMGU1NWYzZTUzMDRlZDY2MmFiODg0ODg2YWFiYzU=
-  data.tar.gz: !binary |-
-    MDNkNTU4MGYyNWYzZDUwYWRjM2I5MWZiMDgxYzE5NTE5YjJmYTY1NzVhYTYw
-    MzE0YmQxNDk2NzgzNDI1MGY3YmJmNWZjZmZlZmQwZTI2YjkyZWI1OGE3ZWY5
-    ZjI3Zjc3ZmQwZDI4N2Q1MDRkY2NhNDJjNmYxZmZhNzI4OGRkZjM=
+  metadata.gz: f1036132529e546b54f1e475c69f437402c994328795cf8d2828a619cd2e7cb2e1d7a6e51fc01dd95860e4623f650bac6983f3eaf432d8c664ea223370ba2ec3
+  data.tar.gz: 9d0e5709f38c09486749c1cd4bea517aa2757988e2bb55f430b241ed029d88bb2afa939392924378bf7f15924625d13a051fddef342b04052642241971cbb5bc

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.0]
+### Added
+- Settings for ordering, strict_variables, stringify_facts, and trusted_node_data
+- Expose the scope in function example groups
+
+### Fixed
+- rspec-puppet-init now works with Puppet 4
+- Several fixes and enhancements for the `run` matcher
+- Recompile the catalog when the hiera config changes
+
 ## [2.1.0] - 2015-04-21
 ### Added
 - Puppet 4 support

data/lib/rspec-puppet.rb

@@ -24,6 +24,10 @@ RSpec.configure do |c|
   c.add_setting :default_facts, :default => {}
   c.add_setting :hiera_config, :default => '/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
 
   if defined?(Puppet::Test::TestHelper)
     begin

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

@@ -9,8 +9,6 @@ module RSpec::Puppet
 
       vardir = setup_puppet
 
-      node_name = nodename(:function)
-
       if Puppet.version.to_f >= 4.0
         env = Puppet::Node::Environment.create(environment, [File.join(Puppet[:environmentpath],'fixtures','modules')], File.join(Puppet[:environmentpath],'fixtures','manifests'))
         loader = Puppet::Pops::Loaders.new(env)
@@ -18,8 +16,6 @@ module RSpec::Puppet
         return func if func
       end
 
-      function_scope = scope(compiler, node_name)
-
       # Return the method instance for the function.  This can be used with
       # method.call
       if env
@@ -28,7 +24,11 @@ module RSpec::Puppet
         return nil unless Puppet::Parser::Functions.function(function_name)
       end
       FileUtils.rm_rf(vardir) if File.directory?(vardir)
-      function_scope.method("function_#{function_name}".intern)
+      scope.method("function_#{function_name}".intern)
+    end
+
+    def scope
+      @scope ||= build_scope(compiler, nodename(:function))
     end
 
     def catalogue

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

@@ -17,42 +17,41 @@ module RSpec::Puppet
           end
         end
 
-        unless @expected_error.nil?
-          result = false
-          begin
-            @func.call
-          rescue Exception => e
-            @actual_error = e.class
-            @actual_error_message = e.to_s
-            if e.is_a?(@expected_error)
-              case @expected_error_message
-              when nil
-                result = true
-              when Regexp
-                result = @expected_error_message =~ e.message
-              else
-                result = @expected_error_message == e.message
-              end
+        begin
+          @actual_return = @func.call
+          @has_returned = true
+        rescue Exception => e
+          @actual_error = e
+        end
+
+        if @has_expected_error
+          if @has_returned
+            return false
+          elsif @actual_error.is_a?(@expected_error)
+            case @expected_error_message
+            when nil
+              return true
+            when Regexp
+              return @actual_error.message =~ @expected_error_message
+            else
+              return @actual_error.message == @expected_error_message
             end
+          else # error did not match
+            return false
           end
-          result
-        else
-          unless @expected_return.nil?
-            @actual_return = @func.call
+        elsif @has_expected_return
+          if !@has_returned
+            return false
+          else
             case @expected_return
             when Regexp
-              @actual_return =~ @expected_return
+              return @actual_return =~ @expected_return
             else
-              @actual_return == @expected_return
+              return @actual_return == @expected_return
             end
-          else
-            begin
-              @func.call
-            rescue
-              false
-            end
-            true
           end
+        else
+          return @has_returned
         end
       end
 
@@ -65,6 +64,7 @@ module RSpec::Puppet
       end
 
       def and_return(value)
+        @has_expected_return = true
         @expected_return = value
         if value.is_a? Regexp
           @desc = "match #{value.inspect}"
@@ -75,6 +75,7 @@ module RSpec::Puppet
       end
 
       def and_raise_error(error_or_message, message=nil)
+        @has_expected_error = true
         case error_or_message
         when String, Regexp
           @expected_error, @expected_error_message = Exception, error_or_message
@@ -102,7 +103,11 @@ module RSpec::Puppet
       end
 
       def description
-        "run #{func_name}(#{func_params}) and #{@desc}"
+        if @desc
+          "run #{func_name}(#{func_params}) and #{@desc}"
+        else
+          "run #{func_name}(#{func_params}) without error"
+        end
       end
 
       private
@@ -118,34 +123,41 @@ module RSpec::Puppet
         @func_args
       end
 
+      def failure_message_actual(type)
+        if type != :should
+          ''
+        elsif @actual_error
+          if @has_expected_return
+            " instead of raising #{@actual_error.class.inspect}(#{@actual_error})"
+          else
+            " instead of #{@actual_error.class.inspect}(#{@actual_error})"
+          end
+        else # function has returned
+          if @has_expected_error
+            " instead of returning #{@actual_return.inspect}"
+          else
+            " instead of #{@actual_return.inspect}"
+          end
+        end
+      end
+
       def failure_message_generic(type, func_obj)
         message = "expected #{func_name}(#{func_params}) to "
         message << "not " if type == :should_not
 
-        if @expected_return
+        if @has_expected_return
           message << "have returned #{@expected_return.inspect}"
-          if type == :should
-            message << " instead of #{@actual_return.inspect}"
-          end
-        elsif @expected_error
-          message << "have raised #{@expected_error.inspect}"
-          if @expected_error_message
-            message << " matching #{@expected_error_message.inspect}"
-          end
-          if type == :should
-            if @actual_error
-              message << " instead of raising #{@actual_error.inspect}"
-              if @expected_error_message
-                message << "(#{@actual_error_message})"
-              end
-            elsif @actual_return
-              message << " instead of returning #{@actual_return.inspect}"
+        else
+          if @has_expected_error
+            message << "have raised #{@expected_error.inspect}"
+            if @expected_error_message
+              message << " matching #{@expected_error_message.inspect}"
             end
+          else
+            message << "have run successfully"
           end
-        else
-          message << "have run successfully"
         end
-        message
+        message << failure_message_actual(type)
       end
     end
   end

data/lib/rspec-puppet/setup.rb

@@ -55,7 +55,11 @@ module RSpec::Puppet
     end
 
     def self.get_module_name_from_file(file)
-      p = Puppet::Parser::Lexer.new
+      if Puppet.version.to_f >= 4.0
+        p = Puppet::Pops::Parser::Lexer2.new
+      else
+        p = Puppet::Parser::Lexer.new
+      end
       module_name = nil
       p.string = File.read(file)
       tokens = p.fullscan
@@ -117,6 +121,7 @@ fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
 RSpec.configure do |c|
   c.module_path = File.join(fixture_path, 'modules')
   c.manifest_dir = File.join(fixture_path, 'manifests')
+  c.environmentpath = File.join(Dir.pwd, 'spec')
 end
 EOF
     safe_create_file('spec/spec_helper.rb', content)
@@ -140,7 +145,8 @@ require 'rspec/core/rake_task'
 
 desc "Run all RSpec code examples"
 RSpec::Core::RakeTask.new(:rspec) do |t|
-  t.rspec_opts = File.read("spec/spec.opts").chomp || ""
+  File.exist?('spec/spec.opts') ? opts = File.read("spec/spec.opts").chomp : opts = ""
+  t.rspec_opts = opts
 end
 
 SPEC_SUITES = (Dir.entries('spec') - ['.', '..','fixtures']).select {|e| File.directory? "spec/#{e}" }
@@ -149,7 +155,8 @@ namespace :rspec do
     desc "Run #{suite} RSpec code examples"
     RSpec::Core::RakeTask.new(suite) do |t|
       t.pattern = "spec/#{suite}/**/*_spec.rb"
-      t.rspec_opts = File.read("spec/spec.opts").chomp || ""
+      File.exist?('spec/spec.opts') ? opts = File.read("spec/spec.opts").chomp : opts = ""
+      t.rspec_opts = opts
     end
   end
 end

data/lib/rspec-puppet/support.rb

@@ -22,7 +22,9 @@ module RSpec::Puppet
 
       node_name = nodename(type)
 
-      catalogue = build_catalog(node_name, facts_hash(node_name), code)
+      hiera_config_value = self.respond_to?(:hiera_config) ? hiera_config : nil
+
+      catalogue = build_catalog(node_name, facts_hash(node_name), hiera_config_value, code)
 
       test_module = class_name.split('::').first
       RSpec::Puppet::Coverage.add_filter(type.to_s, self.class.description)
@@ -127,12 +129,14 @@ module RSpec::Puppet
 
       if Puppet.version.to_f >= 4.0
         settings = [
+          [:modulepath, :module_path],
           [:environmentpath, :environmentpath],
           [:config, :config],
           [:confdir, :confdir],
           [:hiera_config, :hiera_config],
+          [:strict_variables, :strict_variables],
         ]
-      else
+      elsif Puppet.version.to_f >= 3.0
         settings = [
           [:modulepath, :module_path],
           [:manifestdir, :manifest_dir],
@@ -142,6 +146,19 @@ module RSpec::Puppet
           [:confdir, :confdir],
           [:hiera_config, :hiera_config],
           [:parser, :parser],
+          [:trusted_node_data, :trusted_node_data],
+          [:ordering, :ordering],
+          [:stringify_facts, :stringify_facts],
+          [:strict_variables, :strict_variables],
+        ]
+      else
+        settings = [
+          [:modulepath, :module_path],
+          [:manifestdir, :manifest_dir],
+          [:manifest, :manifest],
+          [:templatedir, :template_dir],
+          [:config, :config],
+          [:confdir, :confdir],
         ]
       end
       settings.each do |a,b|
@@ -153,12 +170,24 @@ module RSpec::Puppet
         end
       end
 
-      # This line is wrong. libdir should never be more than a single path
-      Puppet[:libdir] = Dir["#{Puppet[:modulepath]}/*/lib"].entries.join(File::PATH_SEPARATOR)
+      Dir["#{Puppet[:modulepath]}/*/lib"].entries.each do |lib|
+        $LOAD_PATH << lib
+      end
+
       vardir
     end
 
-    def build_catalog_without_cache(nodename, facts_val, code)
+    def build_catalog_without_cache(nodename, facts_val, hiera_config_val, code)
+
+      # If we're going to rebuild the catalog, we should clear the cached instance
+      # of Hiera that Puppet is using.  This opens the possibility of the catalog
+      # now being rebuilt against a differently configured Hiera (i.e. :hiera_config
+      # set differently in one example group vs. another).
+      # It would be nice if Puppet offered a public API for invalidating their
+      # cached instance of Hiera, but que sera sera.  We will go directly against
+      # the implementation out of absolute necessity.
+      HieraPuppet.instance_variable_set('@hiera', nil) if defined? HieraPuppet
+
       Puppet[:code] = code
 
       stub_facts! facts_val
@@ -204,7 +233,7 @@ module RSpec::Puppet
       string
     end
 
-    def scope(compiler, node_name)
+    def build_scope(compiler, node_name)
       if Puppet.version =~ /^2\.[67]/
         # loadall should only be necessary prior to 3.x
         # Please note, loadall needs to happen first when creating a scope, otherwise

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '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
@@ -62,19 +62,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests
 test_files: []
-has_rdoc: