cucumber-puppet 0.3.3 → 0.3.4

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :build:
-:patch: 3
+:patch: 4
 :minor: 3
 :major: 0

data/bin/cucumber-puppet-gen

@@ -65,6 +65,19 @@ module CucumberPuppetGenerators
     file('site.pp', 'site.pp', "#{destdir}/site.pp")
   end
 
+  class TestsuiteGenerator < Templater::Generator
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'testsuite')
+    end
+
+    desc <<-DESC
+      Generate a test suite for puppet features
+        cucumber-puppet-gen testsuite
+    DESC
+
+    glob!
+  end
+
   class WorldGenerator < Templater::Generator
     def source_root
       File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'world')
@@ -91,6 +104,7 @@ module CucumberPuppetGenerators
   add :feature, FeatureGenerator
   add :policy, PolicyGenerator
   add :testcase, TestcaseGenerator
+  add :testsuite, TestsuiteGenerator
   add :world, WorldGenerator
 
 end

data/lib/cucumber-puppet/puppet.rb

@@ -61,25 +61,11 @@ class CucumberPuppet
       node.merge(@facts)
     end
 
+    # Compile our catalog
     begin
-      # Compile our catalog
-      begin
-        @catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
-      rescue NameError
-        @catalog = Puppet::Node::Catalog.find(node.name, :use_node => node)
-      end
-    rescue => detail
-      if Puppet[:trace]
-        puts detail.backtrace
-      end
-      if detail.is_a?(XMLRPC::FaultException)
-        $stderr.puts detail.message
-      elsif detail.is_a?(Puppet::Error)
-        raise Puppet::Error, detail.message
-      else
-        $stderr.puts detail
-      end
-      exit 1
+      @catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
+    rescue NameError
+      @catalog = Puppet::Node::Catalog.find(node.name, :use_node => node)
     end
 
     # XXX could not find this in puppet

data/lib/cucumber-puppet/steps.rb

@@ -12,10 +12,15 @@ Given /^I use storeconfigs$/ do
 end
 
 When /^I compile its catalog$/ do
+  compile_catalog(@node)
+end
+
+When /^I try to compile its catalog$/ do
   @compile_error = false
   begin
     compile_catalog(@node)
-  rescue
+  rescue => e
+    @compile_error_msg = e
     @compile_error = true
   end
 end
@@ -41,6 +46,6 @@ Then /^all "(before|notify|require|subscribe)" should resolve$/ do |parameter|
 end
 
 Then /^compilation should succeed$/ do
-  fail("Catalog compilation failed.") unless
+  fail("Catalog compilation failed: #{@compile_error_msg}") unless
     @catalog.is_a?(Puppet::Resource::Catalog)
 end

data/lib/generators/world/steps/puppet.rb

@@ -60,12 +60,11 @@ Given /^it is a virtual node$/ do
 end
 
 When /^I compile the catalog$/ do
-  @compile_error = false
-  begin
-    compile_catalog
-  rescue
-    @compile_error = true
-  end
+  steps %Q{ When I compile its catalog }
+end
+
+When /^I try to compile the catalog$/ do
+  steps %Q{ When I try to compile its catalog }
 end
 
 Then /^compilation should fail$/ do
@@ -93,15 +92,17 @@ Then /^the [a-z]* should have an? "([^\"]*)" of "([^\"]*)"$/ do |property, value
       value = value.split
     end
 
-    prop = @resource[property]
+    prop = []
+    @resource[property].each do |p|
+      prop << p.to_s
+    end
   elsif @resource[property].is_a?(String)
     prop = @resource[property]
   else
     fail "Class #{@resource[property].class} not supported. Please modify steps to accomodate."
   end
 
-  fail "Resource #{@resource} had #{property}='#{@resource[property] ? @resource[property] : "<empty>"}', not '#{value}'" \
-    unless prop == value
+  fail "Resource #{@resource} had #{property}='#{prop ? prop.to_s : "<empty>"}', not '#{value}'" unless prop == value
 end
 
 Then /^the [a-z]* should notify "([^\"]*)"$/ do |res|
@@ -121,9 +122,9 @@ Then /^the [a-z]* should require "([^\"]*)"$/ do |res|
         break
       end
     end
-    fail unless found
+    fail("#{@resource} should require #{res}") unless found
   else
-    fail unless req.to_s == res
+    fail("#{@resource} should require #{res}") unless req.to_s == res
   end
   steps %Q{
     Then the catalog should contain "#{res}"
@@ -131,7 +132,7 @@ Then /^the [a-z]* should require "([^\"]*)"$/ do |res|
 end
 
 Then /^the catalog should contain "([^\"]*)"$/ do |res|
-  fail unless resource(res)
+  fail("#{res} not in catalog") unless resource(res)
 end
 
 Then /^the state should be "([^\"]*)"$/ do |state|
@@ -140,5 +141,10 @@ end
 
 Then /^there should be a resource "([^\"]*)"$/ do |res|
   @resource = resource(res)
-  fail unless @resource
+  fail("#{res} not in catalog") unless @resource
+end
+
+Then /^there should be no resource "([^\"]*)"$/ do |res|
+  @resource = resource(res)
+  fail("#{@resource} in catalog although it shouldn't be") if @resource
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-puppet
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Nikolay Sturm
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -25,12 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 6
-        - 4
-        version: 0.6.4
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,29 +39,84 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: templater
+  name: puppet
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: templater
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: facter
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 5
+        - 9
+        version: 1.5.9
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ronn
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: cucumber-puppet is a tool for behavioral testing of Puppet catalogs
 email: cucumber-puppet@erisiandiscord.de
 executables: 
@@ -86,15 +139,15 @@ files:
 - man/cucumber-puppet.1
 - man/cucumber-puppet-gen.1
 - VERSION.yml
-- lib/generators/world/steps/package.rb
-- lib/generators/world/steps/exec.rb
+- lib/generators/world/support/world.rb
+- lib/generators/world/support/hooks.rb
 - lib/generators/world/steps/user.rb
-- lib/generators/world/steps/file.rb
-- lib/generators/world/steps/cron.rb
 - lib/generators/world/steps/puppet.rb
+- lib/generators/world/steps/cron.rb
 - lib/generators/world/steps/service.rb
-- lib/generators/world/support/hooks.rb
-- lib/generators/world/support/world.rb
+- lib/generators/world/steps/package.rb
+- lib/generators/world/steps/exec.rb
+- lib/generators/world/steps/file.rb
 homepage: http://projects.puppetlabs.com/projects/cucumber-puppet
 licenses: []