cucumber-puppet 0.3.2 → 0.3.3

data/VERSION.yml

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

data/lib/cucumber-puppet/puppet.rb

@@ -64,7 +64,7 @@ class CucumberPuppet
     begin
       # Compile our catalog
       begin
-        @catalog = Puppet::Resource::Catalog.find(node.name, :use_node => node)
+        @catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
       rescue NameError
         @catalog = Puppet::Node::Catalog.find(node.name, :use_node => node)
       end
@@ -74,6 +74,8 @@ class CucumberPuppet
       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

data/lib/cucumber-puppet/steps.rb

@@ -12,7 +12,12 @@ Given /^I use storeconfigs$/ do
 end
 
 When /^I compile its catalog$/ do
-  compile_catalog(@node)
+  @compile_error = false
+  begin
+    compile_catalog(@node)
+  rescue
+    @compile_error = true
+  end
 end
 
 Then /^all resource dependencies should resolve$/ do

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

@@ -2,14 +2,51 @@ Given /^a node of class "([^\"]*)"$/ do |klass|
   @klass = klass
 end
 
+# And
+Given /^of class "([^\"]*)"$/ do |klass|
+  # we expect this to only be used in conjunction with other classes
+  fail unless @klass
+
+  if @klass.is_a? String
+    # FIXME: Arrays currently unsupported
+    @klass = {@klass => nil, klass => nil}
+  elsif @klass.is_a? Hash
+    @klass = @klass.merge({klass => nil})
+  end
+end
+
 Given /^a node of class "([^\"]*)" with parameters:$/ do |klass, params|
   parameters = {}
   params.hashes.each do |param|
-    parameters[param['name']] = param['value']
+    if param['value'] == "true"
+      parameters[param['name']] = true
+    elsif param['value'] == "false"
+      parameters[param['name']] = false
+    else
+      parameters[param['name']] = param['value']
+    end
   end
   @klass = { klass => parameters }
 end
 
+# And
+Given /^of class "([^\"]*)" with parameters:$/ do |klass, params|
+  # we expect this to only be used in conjunction with other classes
+  fail unless @klass
+
+  parameters = {}
+  params.hashes.each do |param|
+    parameters[param['name']] = param['value']
+  end
+
+  if @klass.is_a? String
+    # FIXME: Arrays currently unsupported
+    @klass = {@klass => nil, klass => parameters}
+  elsif @klass.is_a? Hash
+    @klass = @klass.merge({klass => parameters})
+  end
+end
+
 Given /^a node named "([^\"]*)"$/ do |name|
   @facts['hostname'] = name
 end
@@ -23,7 +60,16 @@ Given /^it is a virtual node$/ do
 end
 
 When /^I compile the catalog$/ do
-  compile_catalog
+  @compile_error = false
+  begin
+    compile_catalog
+  rescue
+    @compile_error = true
+  end
+end
+
+Then /^compilation should fail$/ do
+  fail "Compilation was expected to fail but did not." unless @compile_error == true
 end
 
 Then /^the [a-z]* should have "([^\"]*)" set to "(false|true)"$/ do |res, bool|
@@ -35,7 +81,27 @@ Then /^the [a-z]* should have "([^\"]*)" set to "(false|true)"$/ do |res, bool|
 end
 
 Then /^the [a-z]* should have an? "([^\"]*)" of "([^\"]*)"$/ do |property, value|
-  fail unless @resource[property] == value
+  value.gsub!('\n', "\n") # otherwise newlines don't get handled properly
+  if @resource[property].is_a?(Puppet::Resource)
+    prop = @resource[property].to_s
+  elsif @resource[property].kind_of?(Array)
+    if value =~ /, /
+      value = value.split(", ")
+    elsif value =~ /,/
+      value = value.split(",")
+    else
+      value = value.split
+    end
+
+    prop = @resource[property]
+  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
 end
 
 Then /^the [a-z]* should notify "([^\"]*)"$/ do |res|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-puppet
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Nikolay Sturm
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 +02:00
-default_executable: 
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -96,7 +95,6 @@ files:
 - lib/generators/world/steps/service.rb
 - lib/generators/world/support/hooks.rb
 - lib/generators/world/support/world.rb
-has_rdoc: true
 homepage: http://projects.puppetlabs.com/projects/cucumber-puppet
 licenses: []
 
@@ -126,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Puppet catalog testing with Cucumber