fizzgig 0.1.1 → 0.2.0

data/.gitignore

@@ -1,4 +1,4 @@
 Gemfile.lock
 
 .ruby-version
-fizzgig-0.1.0.gem
+fizzgig-*.gem

data/README.asciidoc

@@ -5,24 +5,13 @@ Fizzgig is a library to help write fast unit tests.
 
 [source,ruby]
 -------------------------------------------
-describe 'ganglia::cronjob' do
-  include Fizzgig::CatalogMatchers
-
-  it 'should create ganglia script and cron job' do
-    catalog = Fizzgig.instantiate <<END
-      ganglia::cronjob {'tiger':
-        content => 'tiger content',
-      }
-END
-    catalog.should contain_file('/etc/ganglia/scripts/tiger')
-      .with_content('tiger content')
-      .with_mode('0755')
-
-    catalog.should contain_cron('ganglia-tiger')
-      .with_command('/etc/ganglia/scripts/tiger')
-      .with_minute('*')
-      .with_user('root')
-  end
+describe 'nginx::site' do
+  subject { Fizzgig.instantiate %q[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').
+         with_ensure('link').
+         with_target('/etc/nginx/sites-available/www.foo.com') }
 end
 -------------------------------------------
 

data/TODO.org

@@ -44,7 +44,7 @@ Can we isolate the compiler from the settings?
 
 Answer seems to be yes -- use puppetlabs_spec_helper or directly
 Puppet::Test::TestHelper to tear down Puppet.settings after each test.
-** TODO Ensure that modulepath can take multiple directories
+** DONE Ensure that modulepath can take multiple directories
    - in govuk/puppet, we had trouble having multiple directories on
      the module path, so we ended up doing this:
 
@@ -69,13 +69,17 @@ Puppet::Test::TestHelper to tear down Puppet.settings after each test.
 That's not so cool :(
 
 ** DONE Rename
+** DONE functions with multiple arguments
 ** TODO implementation-independent dependency assertions
 ** TODO Test standalone puppet modules
 ** TODO better test output for files with large content
 ** TODO Test puppet types (ie from lib/puppet/parser/types)
 ** TODO Test templates in isolation
+maybe testing functions more generally?
 ** TODO Test custom facts
 ** TODO Virtual/exported resources
+@dcarley's trick of using a precondition with a collector might be
+helpful here
 ** TODO Parameterized classes
 ** TODO Preconditions (do I actually want this?)
 ** TODO nodes

data/fizzgig.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'fizzgig'
-  s.version = '0.1.1'
+  s.version = '0.2.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/function_stubs.rb

@@ -3,11 +3,11 @@ module Fizzgig::FunctionStubs
   def self.has_stub?(fname,args)
     stubs = LSpace[:function_stubs] || {}
     stubs.has_key?(fname.to_sym) &&
-      stubs[fname.to_sym].has_key?(args[0])
+      stubs[fname.to_sym].has_key?(args)
   end
 
   def self.get_stub(fname,args)
-    LSpace[:function_stubs][fname.to_sym][args[0]]
+    LSpace[:function_stubs][fname.to_sym][args]
   end
 end
 

data/spec/example_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'fizzgig'
+
+describe 'nginx::site' do
+  subject { Fizzgig.instantiate %q[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').
+         with_ensure('link').
+         with_target('/etc/nginx/sites-available/www.foo.com') }
+end

data/spec/extra_modules/webapp/manifests/init.pp

@@ -0,0 +1,8 @@
+class webapp {
+  nginx::site {'webapp':
+  }
+  file {'/etc/nginx/nginx.conf':
+    ensure  => present,
+    content => "fee fie foe fum",
+  }
+}

data/spec/fizzgig/function_stubs_spec.rb

@@ -0,0 +1,39 @@
+require_relative '../spec_helper'
+require 'fizzgig/function_stubs'
+
+describe Fizzgig::FunctionStubs do
+  describe '.has_stub?' do
+    subject { LSpace.with(:function_stubs => stubs) { Fizzgig::FunctionStubs.has_stub?(fname, args) } }
+
+    context 'single arg fn' do
+      let(:stubs) { { :myfn => {['foo'] => 'bar'}} }
+      let(:fname) {:myfn}
+      let(:args)  {['foo']}
+      it {should be_true}
+    end
+
+    context 'multi arg fn' do
+      let(:stubs) { { :myfn => {['foo','bar'] => 'giraffe'}} }
+      let(:fname) {:myfn}
+      let(:args)  {['foo','bar']}
+      it {should be_true}
+    end
+  end
+
+  describe '.get_stub' do
+    subject { LSpace.with(:function_stubs => stubs) { Fizzgig::FunctionStubs.get_stub(fname, args) } }
+    context 'single arg fn' do
+      let(:stubs) { { :myfn => {['foo'] => 'bar'}} }
+      let(:fname) {:myfn}
+      let(:args)  {['foo']}
+      it {should == 'bar'}
+    end
+
+    context 'multi arg fn' do
+      let(:stubs) { { :myfn => {['foo','bar'] => 'giraffe'}} }
+      let(:fname) {:myfn}
+      let(:args)  {['foo','bar']}
+      it {should == 'giraffe'}
+    end
+  end
+end

data/spec/fizzgig_spec.rb

@@ -11,12 +11,19 @@ describe Fizzgig do
       let(:classname) {'webapp'}
 
       it { should contain_nginx__site('webapp') }
+      it 'should check multiple matchers for a single parameter' do
+        should contain_file('/etc/nginx/nginx.conf').
+          with_content(/fee fie foe fum/)
+        should_not contain_file('/etc/nginx/nginx.conf').
+          with_content(/pattern not present in file/).
+          with_content(/fee fie foe fum/)
+      end
     end
 
     describe 'functions::class_test' do
       let(:classname) {'functions::class_test'}
       context 'with extlookup stubbed out' do
-        let(:stubs) { {:extlookup => {'ssh-key-barry' => 'the key of S'}} }
+        let(:stubs) { {:extlookup => {['ssh-key-barry'] => 'the key of S'}} }
         it { should contain_ssh_authorized_key('barry').with_key('the key of S') }
       end
 
@@ -32,12 +39,21 @@ describe Fizzgig do
       let(:classname) {'functions::recursive_extlookup_test'}
       let(:stubs) {
         {:extlookup =>
-          { 'ssh-key-barry' => 'rsa-key-barry',
-            'rsa-key-barry' => 'the key of S'}}
+          { ['ssh-key-barry'] => 'rsa-key-barry',
+            ['rsa-key-barry'] => 'the key of S'}}
       }
       it { should contain_ssh_authorized_key('barry').with_key('the key of S') }
     end
 
+    describe 'functions::function_with_multiple_arguments' do
+      let(:classname) {'functions::function_with_multiple_arguments'}
+      let(:stubs) {
+        {:hiera =>
+          {['hiera_key','default value'] => 'correct result'}}
+      }
+      it { should contain_file('/tmp/multiarg_fn_test').with_content('correct result') }
+    end
+
     describe 'facts::class_test' do
       let(:classname) {'facts::class_test'}
       let(:facts) {
@@ -70,21 +86,6 @@ describe Fizzgig do
       end
     end
 
-    describe 'nginx::site' do
-      context 'basic functionality' do
-        let(:code) { %q[nginx::site {'foo': content => 'dontcare'}] }
-        it { should contain_file('/etc/nginx/sites-enabled/foo').
-          with_ensure('present').
-          with_mode('0440')
-        }
-        it { should_not contain_file('/etc/nginx/sites-enabled/foo').
-          with_ensure(/text not present/). # test that this doesn't get ignored
-          with_ensure(/present/)
-        }
-        it { should contain_user('www-data') }
-      end
-    end
-
     describe 'nginx::simple_server' do
       context 'basic functionality' do
         let(:code) { %q[nginx::simple_server {'foo':}] }
@@ -95,7 +96,7 @@ describe Fizzgig do
     end
 
     context 'functions::define_test with function stubs' do
-      let(:stubs) { {:extlookup => {'ssh-key-barry' => 'the key of S'}} }
+      let(:stubs) { {:extlookup => {['ssh-key-barry'] => 'the key of S'}} }
       let(:code) { %[functions::define_test{'foo': }] }
       it { should contain_ssh_authorized_key('barry').with_key('the key of S') }
     end

data/spec/modules/functions/manifests/function_with_multiple_arguments.pp

@@ -0,0 +1,5 @@
+class functions::function_with_multiple_arguments {
+  file {'/tmp/multiarg_fn_test':
+    content => hiera('hiera_key','default value');
+  }
+}

data/spec/modules/nginx/manifests/site.pp

@@ -1,9 +1,10 @@
-define nginx::site ($content) {
-  file {"/etc/nginx/sites-enabled/$title":
+define nginx::site () {
+  file {"/etc/nginx/sites-available/$title":
     ensure  => present,
-    mode    => 0440,
     content => template('nginx/vhost.erb'),
   }
-  user {'www-data':
+  file {"/etc/nginx/sites-enabled/$title":
+    ensure  => link,
+    target  => "/etc/nginx/sites-available/${title}",
   }
 }

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'fizzgig'
 HERE = File.expand_path(File.dirname(__FILE__))
 
 RSpec.configure do |c|
-  c.modulepath  = File.join(HERE, 'modules')
+  c.modulepath  = "#{File.join(HERE, 'modules')}:#{File.join(HERE, 'extra_modules')}"
 
   c.include Fizzgig::CatalogMatchers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fizzgig
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -75,18 +75,21 @@ files:
 - lib/fizzgig.rb
 - lib/fizzgig/function_stubs.rb
 - lib/fizzgig/matchers.rb
+- spec/example_spec.rb
+- spec/extra_modules/webapp/manifests/init.pp
+- spec/fizzgig/function_stubs_spec.rb
 - spec/fizzgig_spec.rb
 - spec/modules/facts/manifests/class_test.pp
 - spec/modules/facts/manifests/define_test.pp
 - spec/modules/facts/templates/template-test.erb
 - spec/modules/functions/manifests/class_test.pp
 - spec/modules/functions/manifests/define_test.pp
+- spec/modules/functions/manifests/function_with_multiple_arguments.pp
 - spec/modules/functions/manifests/recursive_extlookup_test.pp
 - spec/modules/nginx/manifests/simple_server.pp
 - spec/modules/nginx/manifests/site.pp
 - spec/modules/nginx/templates/vhost.erb
 - spec/modules/params_test/manifests/init.pp
-- spec/modules/webapp/manifests/init.pp
 - spec/spec_helper.rb
 homepage: https://github.com/philandstuff/fizzgig
 licenses: []
@@ -113,16 +116,19 @@ signing_key:
 specification_version: 3
 summary: Tools for writing fast unit tests for Puppet
 test_files:
+- spec/example_spec.rb
+- spec/extra_modules/webapp/manifests/init.pp
+- spec/fizzgig/function_stubs_spec.rb
 - spec/fizzgig_spec.rb
 - spec/modules/facts/manifests/class_test.pp
 - spec/modules/facts/manifests/define_test.pp
 - spec/modules/facts/templates/template-test.erb
 - spec/modules/functions/manifests/class_test.pp
 - spec/modules/functions/manifests/define_test.pp
+- spec/modules/functions/manifests/function_with_multiple_arguments.pp
 - spec/modules/functions/manifests/recursive_extlookup_test.pp
 - spec/modules/nginx/manifests/simple_server.pp
 - spec/modules/nginx/manifests/site.pp
 - spec/modules/nginx/templates/vhost.erb
 - spec/modules/params_test/manifests/init.pp
-- spec/modules/webapp/manifests/init.pp
 - spec/spec_helper.rb

data/spec/modules/webapp/manifests/init.pp

@@ -1,4 +0,0 @@
-class webapp {
-  nginx::site {'webapp':
-  }
-}