fizzgig 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.0
+
+  * Changed API for #instantiate to take ruby Hash of params rather
+    than String containing puppet code
+
 # 0.2.1
 
   * Added support for evaluating nodes using Fizzgig.node(hostname)

data/TODO.org

@@ -73,6 +73,7 @@ That's not so cool :(
 ** DONE nodes
 See govuk_nodes_spec_optional for examples of this.
 the rspec-puppet equivalent is :type => :host
+** DONE implement defined types from ruby hashes
 ** TODO implementation-independent dependency assertions
 ** TODO Test standalone puppet modules
 ** TODO better test output for files with large content

data/fizzgig.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'fizzgig'
-  s.version = '0.2.1'
+  s.version = '0.3.0'
   s.homepage = 'https://github.com/philandstuff/fizzgig'
   s.summary = 'Tools for writing fast unit tests for Puppet'
   s.description = 'Tools for writing fast unit tests for Puppet'

data/lib/fizzgig.rb

@@ -3,13 +3,32 @@ require 'fizzgig/matchers'
 require 'fizzgig/function_stubs'
 require 'lspace'
 
+class Puppet::Resource::TypeCollection
+  alias_method :find_or_load_real, :find_or_load
+  def find_or_laod(namespaces, name, type)
+    $stderr.puts "Resourcing #{name} #{type} in #{namespaces}"
+    find_or_load_real(namespaces,name,type)
+  end
+end
+
 module Fizzgig
-  def self.instantiate(code,options = {})
+  def self.instantiate(type,title,params={},options = {})
     LSpace.with(:function_stubs => options[:stubs]) do
       setup_puppet
       compiler = make_compiler(options[:facts])
-      resources = compile(code,compiler)
-      resources[0].evaluate
+      scope = compiler.newscope(nil)
+      scope.source = Puppet::Resource::Type.new(:node,'localhost')
+      # we need to force loading the type; normally this would be
+      # handled by Puppet::Parser::AST::Resource calling
+      # scope.resolve_type_and_titles
+      scope.find_defined_resource_type(type)
+
+      resource = Puppet::Parser::Resource.new(
+                     type,
+                     title,
+                     :scope => scope,
+                     :parameters => munge_params(params))
+      resource.evaluate
       compiler.catalog
     end
   end
@@ -33,6 +52,10 @@ module Fizzgig
     end
   end
 
+  def self.munge_params(params)
+    params.collect {|k,v| Puppet::Parser::Resource::Param.new(:name => k, :value => v)}
+  end
+
   def self.make_compiler(facts,hostname='localhost')
     node = Puppet::Node.new(hostname)
     node.merge(facts) if facts

data/spec/example_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'fizzgig'
 
 describe 'nginx::site' do
-  subject { Fizzgig.instantiate %q[nginx::site{'www.foo.com':}] }
+  subject { Fizzgig.instantiate 'nginx::site','www.foo.com' }
   it { should contain_file('/etc/nginx/sites-available/www.foo.com').
          with_content(/server_name\s+www.foo.com;/) }
   it { should contain_file('/etc/nginx/sites-enabled/www.foo.com').

data/spec/fizzgig_spec.rb

@@ -69,26 +69,30 @@ describe Fizzgig do
   end
 
   describe '#instantiate' do
-    subject { Fizzgig.instantiate(code, :stubs => stubs, :facts => facts) }
+    subject { Fizzgig.instantiate(type, title, params, :stubs => stubs, :facts => facts) }
     let(:stubs) { {} }
     let(:facts) { {} }
+    let(:params) { {} }
 
     describe 'params' do
+      let(:type) {'params_test'}
+      let(:title) { 'foo' }
       context 'when specifying one parameter' do
-        let(:code) { %q[params_test {'foo': param => 'bar'}] }
+        let(:params) { {:param => 'bar'} }
         it { should contain_file('foo-param').with_source('bar') }
         it { should contain_notify('foo-default').with_message('default_val') }
       end
       context 'when specifying both paramaters' do
-        let(:code) { %q[params_test {'foo': param => 'bar', param_with_default => 'baz'}] }
+        let(:params) { {:param => 'bar', :param_with_default => 'baz'} }
         it { should contain_file('foo-param').with_source('bar') }
         it { should contain_notify('foo-default').with_message('baz') }
       end
     end
 
     describe 'nginx::simple_server' do
+      let(:type) {'nginx::simple_server'}
+      let(:title)    {'foo'}
       context 'basic functionality' do
-        let(:code) { %q[nginx::simple_server {'foo':}] }
         it { should contain_nginx__site('foo').
           with_content(/server_name foo;/)
         }
@@ -97,13 +101,14 @@ describe Fizzgig do
 
     context 'functions::define_test with function stubs' do
       let(:stubs) { {:extlookup => {['ssh-key-barry'] => 'the key of S'}} }
-      let(:code) { %[functions::define_test{'foo': }] }
+      let(:type) {'functions::define_test'}
+      let(:title) {'foo'}
       it { should contain_ssh_authorized_key('barry').with_key('the key of S') }
     end
 
     describe 'facts::define_test' do
-      let(:classname) {'facts::define_test'}
-      let(:code) {%q[facts::define_test{'test':}]}
+      let(:type) {'facts::define_test'}
+      let(:title) {'test'}
       let(:facts) {
         { 'unqualified_fact' => 'no qualifications',
           'qualified_fact'   => 'cse ungraded in metalwork'}
@@ -114,9 +119,20 @@ describe Fizzgig do
   end
 
   describe '#node' do
-    subject { Fizzgig.node('foo.com') }
-    it {
-#      require 'pp'; pp subject
-      should contain_nginx__site('foo.com') }
+    subject { Fizzgig.node(hostname, :facts => facts) }
+    let(:facts) { {} }
+    context 'simple node' do
+      let(:hostname) {'foo.com'}
+      it { should contain_nginx__site('foo.com') }
+    end
+    context 'default node' do
+      let(:hostname) {'foo.invalid'}
+      it { should contain_notify('oops, default') }
+    end
+    context 'node with facts specified' do
+      let(:hostname) {'fact.com'}
+      let(:facts) { { 'fact_site' => 'facts.org' } }
+      it { should contain_nginx__site('facts.org') }
+    end
   end
 end

data/spec/manifests/site.pp

@@ -1,6 +1,9 @@
 node 'foo.com' {
   nginx::site {'foo.com':}
 }
+node 'fact.com' {
+  nginx::site {$::fact_site: }
+}
 node 'default' {
   notify{'oops, default':}
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fizzgig
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet