rspec-puppet 0.1.3 → 0.1.4

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

@@ -34,12 +34,12 @@ module RSpec::Puppet
       end
 
       if !self.respond_to?(:params) || params == {}
-        Puppet[:code] = import_str + "include #{klass_name}"
+        code = import_str + "include #{klass_name}"
       else
-        Puppet[:code] = import_str + 'class' + " { \"" + klass_name + "\": " + params.keys.map { |r| "#{r.to_s} => #{params[r].inspect}"
+        code = import_str + 'class' + " { \"" + klass_name + "\": " + params.keys.map { |r| "#{r.to_s} => #{params[r].inspect}"
       }.join(',' ) + " }"
       end
-      Puppet[:code] = pre_cond + "\n" + Puppet[:code]
+      code = pre_cond + "\n" + code
 
       nodename = self.respond_to?(:node) ? node : Puppet[:certname]
       facts_val = {
@@ -49,7 +49,7 @@ module RSpec::Puppet
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 
-      build_catalog(nodename, facts_val)
+      build_catalog(nodename, facts_val, code)
     end
   end
 end

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

@@ -41,7 +41,7 @@ module RSpec::Puppet
         pre_cond = ""
       end
 
-      Puppet[:code] = pre_cond + "\n" + import_str + define_name + " { \"" + title + "\": " + param_str + " }"
+      code = pre_cond + "\n" + import_str + define_name + " { \"" + title + "\": " + param_str + " }"
 
       nodename = self.respond_to?(:node) ? node : Puppet[:certname]
       facts_val = {
@@ -51,7 +51,7 @@ module RSpec::Puppet
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 
-      build_catalog(nodename, facts_val)
+      build_catalog(nodename, facts_val, code)
     end
   end
 end

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

@@ -9,9 +9,36 @@ module RSpec::Puppet
       Puppet[:libdir] = Dir["#{Puppet[:modulepath]}/*/lib"].entries.join(File::PATH_SEPARATOR)
       Puppet::Parser::Functions.autoloader.loadall
 
-      scope = Puppet::Parser::Scope.new
+      # 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)
+        # we need to get a compiler, b/c we can attach that to a scope
+        @compiler = build_compiler(nodename, facts_val)
+      else
+        @compiler = nil
+      end
+
+      scope = Puppet::Parser::Scope.new(:compiler => @compiler)
 
       scope.method "function_#{function_name}".to_sym
     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))
+      compiler.compile
+      compiler
+    end
   end
 end

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

@@ -13,7 +13,7 @@ module RSpec::Puppet
       Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
       Puppet[:templatedir] = self.respond_to?(:template_dir) ? template_dir : RSpec.configuration.template_dir
       Puppet[:config] = self.respond_to?(:config) ? config : RSpec.configuration.config
-      Puppet[:code] = ""
+      code = ""
 
       nodename = self.class.top_level_description.downcase
 
@@ -24,7 +24,7 @@ module RSpec::Puppet
       }
       facts_val.merge!(munge_facts(facts)) if self.respond_to?(:facts)
 
-      build_catalog(nodename, facts_val)
+      build_catalog(nodename, facts_val, code)
     end
   end
 end

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

@@ -51,7 +51,7 @@ module RSpec::Puppet
                   (@errors ||= []) << "#{name.to_s} matching `#{value.inspect}` but its value of `#{rsrc_hsh[name.to_sym].inspect}` does not"
                 end
               elsif value.kind_of?(Array) then
-                unless rsrc_hsh[name.to_sym].join == value.join
+                unless Array(rsrc_hsh[name.to_sym]).flatten.join == value.flatten.join
                   ret = false
                   (@errors ||= []) << "#{name.to_s} set to `#{value.inspect}` but it is set to `#{rsrc_hsh[name.to_sym].inspect}` in the catalogue"
                 end

data/lib/rspec-puppet/support.rb

@@ -1,6 +1,12 @@
 module RSpec::Puppet
   module Support
-    def build_catalog nodename, facts_val
+
+    @@cache = {}
+
+    protected
+    def build_catalog_without_cache(nodename, facts_val, code)
+      Puppet[:code] = code
+
       node_obj = Puppet::Node.new(nodename)
 
       node_obj.merge(facts_val)
@@ -13,6 +19,11 @@ module RSpec::Puppet
       end
     end
 
+    public
+    def build_catalog *args
+      @@cache[args] ||= self.build_catalog_without_cache(*args)
+    end
+
     def munge_facts(facts)
       output = {}
       facts.keys.each { |key| output[key.to_s] = facts[key] }

data/rspec-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rspec-puppet'
-  s.version = '0.1.3'
+  s.version = '0.1.4'
   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/classes/sysctl_common_spec.rb

@@ -8,7 +8,7 @@ describe 'sysctl::common' do
     it 'should fail if the parameter is not contained in the resource' do
       expect do
         subject.should contain_exec('sysctl/reload').with('foo' => 'bar')
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
     it 'should pass if the parameters are contained in the resource' do
       subject.should contain_exec('sysctl/reload').with(
@@ -27,7 +27,7 @@ describe 'sysctl::common' do
     it 'should fail if any of the parameter names are contained in the resource' do
       expect do
         subject.should contain_exec('sysctl/reload').without(['foo', 'returns'])
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
   end
 end

data/spec/functions/split_spec.rb

@@ -6,6 +6,6 @@ describe 'split' do
   it { should_not run.with_params('foo').and_raise_error(Puppet::DevError) }
 
   it 'something' do
-    expect { subject.call('foo') }.should raise_error(Puppet::ParseError)
+    expect { subject.call('foo') }.to raise_error(Puppet::ParseError)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-07 00:00:00 -07:00
+date: 2012-08-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency