cucumber-puppet 0.0.3 → 0.0.4

data/VERSION.yml

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

data/bin/cucumber-puppet

@@ -1,28 +1,20 @@
 #!/usr/bin/env ruby
 
 unless ARGV[0]
-  puts "Usage: cucumber-puppet <feature> [<feature> <feature> ...]"
-  exit 1
+  puts "Usage: cucumber-puppet [options] <feature> [<feature> <feature> ...]"
+  exit 0
 end
 
-ARGV.each { |f|
-  unless File.exists?(f)
-    puts "No such file or directory: #{f}"
-    exit 1
-  end
-}
+command = ""
+command << "cucumber "
+command << "--strict "
 
 # XXX be more creative, finding this directory
 features_dir = "features"
-unless File.directory?(features_dir)
-  puts "Cannot find '#{features_dir}' directory."
-  exit 1
+if File.directory?(features_dir)
+  command << "--require #{features_dir} "
 end
 
-command = ""
-command << "cucumber "
-command << "--strict "
-command << "--require #{features_dir} "
 command << ARGV.join(' ')
 
 system(command) ? exit(0) : exit(1)

data/bin/cucumber-puppet-gen

@@ -27,6 +27,21 @@ module CucumberPuppetGenerators
     end
   end
 
+  class TestcaseGenerator < Templater::Generator
+    def source_root
+      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'testcase')
+    end
+
+    desc <<-DESC
+      Generate a test case for cucumber-puppet's test suite
+        cucumber-puppet-gen testcase
+    DESC
+
+    file('testcase.feature', 'testcase.feature', 'features/testcase.feature')
+    file('testcase.rb', 'testcase.rb', 'features/support/testcase.rb')
+    file('site.pp', 'site.pp')
+  end
+
   class WorldGenerator < Templater::Generator
     def source_root
       File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'world')
@@ -41,12 +56,20 @@ module CucumberPuppetGenerators
         cucumber-puppet-gen world
     DESC
 
+    first_argument :version, :required => false, :desc => "Puppet version"
+
+    template :version do |template|
+      template.source = "support/world.rb"
+      template.destination = "support/world.rb"
+    end
+
     directory('steps', 'steps')
-    directory('support', 'support')
+    file('support/hooks.rb', 'support/hooks.rb')
   end
 
   desc "Generators for cucumber-puppet"
   add :feature, FeatureGenerator
+  add :testcase, TestcaseGenerator
   add :world, WorldGenerator
 
 end

data/lib/cucumber-puppet/puppet.rb

@@ -39,7 +39,11 @@ class CucumberPuppet
 
     begin
       # Compile our catalog
-      @catalog = Puppet::Node::Catalog.find(node.name, :use_node => node)
+      begin
+        @catalog = Puppet::Resource::Catalog.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

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

@@ -0,0 +1,6 @@
+Then /^cron job "([^\"]*)" should be "([^\"]*)"$/ do  |name, state|
+  steps %Q{
+    Then there should be a resource "Cron[#{name}]"
+    And the state should be "#{state}"
+  }
+end

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

@@ -0,0 +1,5 @@
+Then /^exec "([^\"]*)" should be present$/ do |name|
+  steps %Q{
+    Then there should be a resource "Exec[#{name}]"
+  }
+end

data/lib/generators/world/support/world.rb

@@ -1,3 +1,13 @@
+<%=
+if version
+  "begin
+    gem 'puppet', '#{version}'
+  rescue Gem::LoadError => e
+    puts e
+    exit 1
+  end"
+end
+%>
 require 'cucumber-puppet/puppet'
 
 World do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nikolay Sturm
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +02:00
+date: 2010-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,8 @@ files:
 - lib/cucumber-puppet.rb
 - lib/cucumber-puppet/puppet.rb
 - lib/generators/feature/%feature_name%.feature
+- lib/generators/world/steps/cron.rb
+- lib/generators/world/steps/exec.rb
 - lib/generators/world/steps/file.rb
 - lib/generators/world/steps/package.rb
 - lib/generators/world/steps/puppet.rb