rspec-puppet 0.1.5 → 0.1.6

data/lib/rspec-puppet.rb

@@ -6,10 +6,6 @@ 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

@@ -31,7 +31,11 @@ module RSpec::Puppet
       end
 
       if self.respond_to? :pre_condition
-        pre_cond = pre_condition
+        if pre_condition.kind_of?(Array)
+          pre_cond = pre_condition.join("\n")
+        else
+          pre_cond = pre_condition
+        end
       else
         pre_cond = ''
       end

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

@@ -39,7 +39,11 @@ module RSpec::Puppet
       end
 
       if self.respond_to? :pre_condition
-        pre_cond = pre_condition
+        if pre_condition.kind_of?(Array)
+          pre_cond = pre_condition.join("\n")
+        else
+          pre_cond = pre_condition
+        end
       else
         pre_cond = ""
       end

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

@@ -11,17 +11,23 @@ module RSpec::Puppet
       Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
       Puppet[:libdir] = Dir["#{Puppet[:modulepath]}/*/lib"].entries.join(File::PATH_SEPARATOR)
 
+      nodename = self.respond_to?(:node) ? node : Puppet[:certname]
+      facts_val = {
+        'hostname' => nodename.split('.').first,
+        'fqdn' => nodename,
+        'domain' => nodename.split('.').last,
+      }
+      facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
+      facts_val.each { |k, v| Facter.add(k) { setcode { v } } }
+
       # 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
       if self.respond_to? :pre_condition
-        Puppet[:code] = pre_condition
-        nodename = self.respond_to?(:node) ? node : Puppet[:certname]
-        facts_val = {
-          'hostname' => nodename.split('.').first,
-          'fqdn' => nodename,
-          'domain' => nodename.split('.').last,
-        }
-        facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
+        if pre_condition.kind_of?(Array)
+          Puppet[:code] = pre_condition.join("\n")
+        else
+          Puppet[:code] = pre_condition
+        end
         # we need to get a compiler, b/c we can attach that to a scope
         @compiler = build_compiler(nodename, facts_val)
       else

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

@@ -47,7 +47,7 @@ module RSpec::Puppet
       end
 
       failure_message_for_should do |func_obj|
-        func_name = func_obj.name.gsub(/^function_/, '')
+        func_name = func_obj.name.to_s.gsub(/^function_/, '')
         func_params = @params.inspect[1..-2]
 
         if @expected_return

data/lib/rspec-puppet/support.rb

@@ -5,8 +5,14 @@ module RSpec::Puppet
 
     protected
     def build_catalog_without_cache(nodename, facts_val, code)
+      if Integer(Puppet.version.split('.').first) >= 3
+        Puppet.initialize_settings
+      end
+
       Puppet[:code] = code
 
+      facts_val.each { |k, v| Facter.add(k) { setcode { v } } }
+
       node_obj = Puppet::Node.new(nodename)
 
       node_obj.merge(facts_val)

data/rspec-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.1.5'
+  s.version = '0.1.6'
   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/defines/sysctl_before_spec.rb

@@ -13,7 +13,9 @@ end
   
 describe 'sysctl::before' do
   let(:title) { 'test define' }
-  let(:pre_condition) { 'class {"sysctl::common":}' }
+  let(:pre_condition) {
+    [ '# we need sysctl common',
+      'class {"sysctl::common":}' ] }
   let(:params) { { :value => "title" } }
 
   it { should create_resource("sysctl::before", 'test define')\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec