rspec-puppet 2.2.0 → 2.3.0

data/lib/rspec-puppet/support.rb

@@ -1,7 +1,8 @@
+require 'rspec-puppet/cache'
 module RSpec::Puppet
   module Support
 
-    @@cache = {}
+    @@cache = RSpec::Puppet::Cache.new
 
     def subject
       lambda { catalogue }
@@ -35,22 +36,25 @@ module RSpec::Puppet
     end
 
     def import_str
-      if File.exists?(File.join(Puppet[:modulepath], 'manifests', 'init.pp'))
-        path_to_manifest = File.join([
-          Puppet[:modulepath],
-          'manifests',
-          class_name.split('::')[1..-1]
-        ].flatten)
-        import_str = [
-          "import '#{Puppet[:modulepath]}/manifests/init.pp'",
-          "import '#{path_to_manifest}.pp'",
-          '',
-        ].join("\n")
-      elsif File.exists?(Puppet[:modulepath])
-        import_str = "import '#{Puppet[:manifest]}'\n"
-      else
-        import_str = ""
-      end
+      import_str = ""
+      Puppet[:modulepath].split(File::PATH_SEPARATOR).each { |d|
+        if File.exists?(File.join(d, 'manifests', 'init.pp'))
+          path_to_manifest = File.join([
+            d,
+            'manifests',
+            class_name.split('::')[1..-1]
+          ].flatten)
+          import_str = [
+            "import '#{d}/manifests/init.pp'",
+            "import '#{path_to_manifest}.pp'",
+            '',
+          ].join("\n")
+          break
+        elsif File.exists?(d)
+          import_str = "import '#{Puppet[:manifest]}'\n"
+          break
+        end
+      }
 
       import_str
     end
@@ -118,8 +122,13 @@ module RSpec::Puppet
 
     def param_str
       params.keys.map do |r|
-        param_val = escape_special_chars(params[r].inspect)
-        "#{r.to_s} => #{param_val}"
+        param_val = params[r]
+        param_val_str = if param_val == :undef
+                          'undef'  # verbatim undef keyword
+                        else
+                          escape_special_chars(param_val.inspect)
+                        end
+        "#{r.to_s} => #{param_val_str}"
       end.join(', ')
     end
 
@@ -170,7 +179,9 @@ module RSpec::Puppet
         end
       end
 
-      Dir["#{Puppet[:modulepath]}/*/lib"].entries.each do |lib|
+      Puppet[:modulepath].split(File::PATH_SEPARATOR).map do |d|
+        Dir["#{d}/*/lib"].entries
+      end.flatten.each do |lib|
         $LOAD_PATH << lib
       end
 
@@ -192,20 +203,17 @@ module RSpec::Puppet
 
       stub_facts! facts_val
 
-      node_obj = Puppet::Node.new(nodename)
+      node_facts = Puppet::Node::Facts.new(nodename, facts_val.dup)
 
-      node_obj.merge(facts_val)
+      node_obj = Puppet::Node.new(nodename, { :parameters => facts_val, :facts => node_facts })
 
       # trying to be compatible with 2.7 as well as 2.6
       if Puppet::Resource::Catalog.respond_to? :find
         Puppet::Resource::Catalog.find(node_obj.name, :use_node => node_obj)
       elsif Puppet.version.to_f >= 4.0
-        env = Puppet::Node::Environment.create(
-          environment,
-          [File.join(Puppet[:environmentpath],'fixtures','modules')],
-          File.join(Puppet[:environmentpath],'fixtures','manifests'))
+        env = build_4x_environment(environment)
         loader = Puppet::Environments::Static.new(env)
-        Puppet.override({:environments => loader}, 'fixtures') do
+        Puppet.override({:environments => loader}, 'Setup test environment') do
           node_obj.environment = env
           Puppet::Resource::Catalog.indirection.find(node_obj.name, :use_node => node_obj)
         end
@@ -219,13 +227,23 @@ module RSpec::Puppet
     end
 
     def build_catalog(*args)
-      @@cache[args] ||= self.build_catalog_without_cache(*args)
+      @@cache.get(*args) do |*args|
+        build_catalog_without_cache(*args)
+      end
     end
 
+    # Facter currently supports lower case facts.  Bug FACT-777 has been submitted to support case sensitive
+    # facts.
     def munge_facts(facts)
-      output = {}
-      facts.keys.each { |key| output[key.to_s] = facts[key] }
-      output
+      return facts.reduce({}) do | memo, (k, v)|
+        memo.tap { |m| m[k.to_s.downcase] = munge_facts(v) }
+      end if facts.is_a? Hash
+
+      return facts.reduce([]) do |memo, v|
+        memo << munge_facts(v); memo
+      end if facts.is_a? Array
+
+      facts
     end
 
     def escape_special_chars(string)
@@ -233,35 +251,6 @@ module RSpec::Puppet
       string
     end
 
-    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
-        # you might receive undefined method `function_*' errors
-        Puppet::Parser::Functions.autoloader.loadall
-        scope = Puppet::Parser::Scope.new(:compiler => compiler)
-      else
-        scope = Puppet::Parser::Scope.new(compiler)
-      end
-
-      scope.source = Puppet::Resource::Type.new(:node, node_name)
-      scope.parent = compiler.topscope
-      scope
-    end
-
-    def build_node(name, opts = {})
-      if Puppet.version.to_f >= 4.0
-        node_environment = Puppet::Node::Environment.create(
-          environment,
-          [File.join(Puppet[:environmentpath],'fixtures','modules')],
-          File.join(Puppet[:environmentpath],'fixtures','manifests'))
-      else
-        node_environment = Puppet::Node::Environment.new(environment)
-      end
-      opts.merge!({:environment => node_environment})
-      Puppet::Node.new(name, opts)
-    end
-
     def rspec_compatibility
       if RSpec::Version::STRING < '3'
         # RSpec 2 compatibility:
@@ -269,5 +258,11 @@ module RSpec::Puppet
         alias_method :failure_message_for_should_not, :failure_message_when_negated
       end
     end
+
+    def build_4x_environment(name)
+      modulepath = RSpec.configuration.module_path || File.join(Puppet[:environmentpath], 'fixtures', 'modules')
+      manifest = RSpec.configuration.manifest || File.join(Puppet[:environmentpath], 'fixtures', 'manifests')
+      Puppet::Node::Environment.create(name, [modulepath], manifest)
+    end
   end
 end

data/lib/rspec-puppet.rb

@@ -15,7 +15,7 @@ end
 
 RSpec.configure do |c|
   c.add_setting :environmentpath, :default => '/etc/puppetlabs/code/environments'
-  c.add_setting :module_path, :default => '/etc/puppet/modules'
+  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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-12-15 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
@@ -33,16 +33,16 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - README.md
-- bin/rspec-puppet-init
-- lib/rspec-puppet.rb
+- lib/rspec-puppet/cache.rb
 - lib/rspec-puppet/coverage.rb
 - lib/rspec-puppet/errors.rb
-- lib/rspec-puppet/example.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
 - lib/rspec-puppet/example/host_example_group.rb
-- lib/rspec-puppet/matchers.rb
+- lib/rspec-puppet/example/provider_example_group.rb
+- lib/rspec-puppet/example/type_example_group.rb
+- lib/rspec-puppet/example.rb
 - lib/rspec-puppet/matchers/compile.rb
 - lib/rspec-puppet/matchers/count_generic.rb
 - lib/rspec-puppet/matchers/create_generic.rb
@@ -50,8 +50,14 @@ files:
 - lib/rspec-puppet/matchers/include_class.rb
 - lib/rspec-puppet/matchers/parameter_matcher.rb
 - lib/rspec-puppet/matchers/run.rb
+- lib/rspec-puppet/matchers/type_matchers.rb
+- lib/rspec-puppet/matchers.rb
+- lib/rspec-puppet/rake_task.rb
 - lib/rspec-puppet/setup.rb
+- lib/rspec-puppet/spec_helper.rb
 - lib/rspec-puppet/support.rb
+- lib/rspec-puppet.rb
+- bin/rspec-puppet-init
 homepage: https://github.com/rodjek/rspec-puppet/
 licenses:
 - MIT
@@ -62,17 +68,17 @@ 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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your Puppet manifests