rspec-puppet 0.1.4 → 0.1.5

data/lib/rspec-puppet.rb

@@ -1,9 +1,15 @@
 require 'puppet'
 require 'rspec'
+require 'fileutils'
+require 'tmpdir'
 require 'rspec-puppet/matchers'
 require 'rspec-puppet/example'
 require 'rspec-puppet/setup'
 
+if Integer(Puppet.version.split('.').first) >= 3
+  Puppet.initialize_settings
+end
+
 RSpec.configure do |c|
   c.add_setting :module_path, :default => '/etc/puppet/modules'
   c.add_setting :manifest_dir, :default => nil

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

@@ -8,6 +8,9 @@ module RSpec::Puppet
     end
 
     def catalogue
+      vardir = Dir.mktmpdir
+      Puppet[:vardir] = vardir
+      Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == File.expand_path("/dev/null")
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
       Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
@@ -49,7 +52,9 @@ module RSpec::Puppet
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 
-      build_catalog(nodename, facts_val, code)
+      catalogue = build_catalog(nodename, facts_val, code)
+      FileUtils.rm_rf(vardir) if File.directory?(vardir)
+      catalogue
     end
   end
 end

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

@@ -10,6 +10,9 @@ module RSpec::Puppet
     def catalogue
       define_name = self.class.top_level_description.downcase
 
+      vardir = Dir.mktmpdir
+      Puppet[:vardir] = vardir
+      Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == File.expand_path("/dev/null")
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
       Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
@@ -51,7 +54,9 @@ module RSpec::Puppet
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 
-      build_catalog(nodename, facts_val, code)
+      catalogue = build_catalog(nodename, facts_val, code)
+      FileUtils.rm_rf(vardir) if File.directory?(vardir)
+      catalogue
     end
   end
 end

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

@@ -1,13 +1,15 @@
+require 'puppetlabs_spec_helper/puppetlabs_spec/puppet_internals'
+
 module RSpec::Puppet
   module FunctionExampleGroup
     include RSpec::Puppet::FunctionMatchers
+    PuppetInternals = PuppetlabsSpec::PuppetInternals
 
     def subject
       function_name = self.class.top_level_description.downcase
 
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
       Puppet[:libdir] = Dir["#{Puppet[:modulepath]}/*/lib"].entries.join(File::PATH_SEPARATOR)
-      Puppet::Parser::Functions.autoloader.loadall
 
       # if we specify a pre_condition, we should ensure that we compile that code
       # into a catalog that is accessible from the scope where the function is called
@@ -23,20 +25,28 @@ module RSpec::Puppet
         # we need to get a compiler, b/c we can attach that to a scope
         @compiler = build_compiler(nodename, facts_val)
       else
-        @compiler = nil
+        @compiler = PuppetInternals.compiler
       end
 
-      scope = Puppet::Parser::Scope.new(:compiler => @compiler)
+      scope = PuppetInternals.scope(:compiler => @compiler)
 
-      scope.method "function_#{function_name}".to_sym
+      # Return the method instance for the function.  This can be used with
+      # method.call
+      method = PuppetInternals.function_method(function_name, :scope => scope)
     end
 
     def compiler
       @compiler
     end
+
     # get a compiler with an attached compiled catalog
     def build_compiler(node_name, fact_values)
-      compiler = Puppet::Parser::Compiler.new(Puppet::Node.new(node_name, :parameters => fact_values))
+      node_options = {
+        :name    => node_name,
+        :options => { :parameters => fact_values },
+      }
+      node = PuppetInternals.node(node_options)
+      compiler = PuppetInternals.compiler(:node => node)
       compiler.compile
       compiler
     end

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

@@ -8,6 +8,9 @@ module RSpec::Puppet
     end
 
     def catalogue
+      vardir = Dir.mktmpdir
+      Puppet[:vardir] = vardir
+      Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == File.expand_path("/dev/null")
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
       Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
@@ -24,7 +27,9 @@ module RSpec::Puppet
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 
-      build_catalog(nodename, facts_val, code)
+      catalogue = build_catalog(nodename, facts_val, code)
+      FileUtils.rm_rf(vardir) if File.directory?(vardir)
+      catalogue
     end
   end
 end

data/rspec-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.1.4'
+  s.version = '0.1.5'
   s.homepage = 'https://github.com/rodjek/rspec-puppet/'
   s.summary = 'RSpec tests for your Puppet manifests'
   s.description = 'RSpec tests for your Puppet manifests'

data/spec/functions/split_spec.rb

@@ -6,6 +6,12 @@ describe 'split' do
   it { should_not run.with_params('foo').and_raise_error(Puppet::DevError) }
 
   it 'something' do
-    expect { subject.call('foo') }.to raise_error(Puppet::ParseError)
+    if Integer(Puppet.version.split('.').first) >= 3
+      expected_error = ArgumentError
+    else
+      expected_error = Puppet::ParseError
+    end
+
+    expect { subject.call('foo') }.to raise_error(expected_error)
   end
 end

metadata

@@ -1,46 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-puppet
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.5
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-09 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec tests for your Puppet manifests
 email: tim@sharpe.id.au
-executables: 
+executables:
 - rspec-puppet-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/rspec-puppet-init
 - lib/rspec-puppet/example/class_example_group.rb
 - lib/rspec-puppet/example/define_example_group.rb
@@ -71,39 +64,28 @@ files:
 - spec/fixtures/modules/sysctl/manifests/init.pp
 - spec/functions/split_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/rodjek/rspec-puppet/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your Puppet manifests
 test_files: []
-