cucumber-puppet 0.1.0 → 0.1.1

data/VERSION.yml

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

data/lib/cucumber-puppet/puppet.rb

@@ -6,6 +6,9 @@ require 'puppet/network/client'
 class CucumberPuppet
   # Returns a new CucumberPuppet object.
   def initialize
+    # resources' alias metaparameter
+    @aliases = {}
+
     @confdir = "/etc/puppet"
     @manifest = @confdir + "/manifests/site.pp"
 
@@ -70,11 +73,21 @@ class CucumberPuppet
       end
       exit 1
     end
+
+    # XXX could not find this in puppet
+    catalog_resources.each do |resource|
+      next unless resource[:alias]
+      resource[:alias].each do |a|
+        # "foo" -> "Package[foo]"
+        @aliases["#{resource.type}[#{a}]"] = resource
+      end
+    end
   end
 
-  # Returns an Object with the given title from catalog.
+  # Returns an Object with the given title from catalog, taking aliases
+  # into account.
   def resource(title)
-    @catalog.resource(title)
+    @catalog.resource(title) || @aliases[title]
   end
 
   # Returns an Array with the catalog's Puppet::Resource objects.
@@ -82,12 +95,12 @@ class CucumberPuppet
     # This method exists to supply a common interface to the puppet catalog
     # for different versions of puppet.
     @catalog.resources.map do |r|
-      if r.is_a?(Puppet::Resource)
-        # puppet 2.6 and newer
-        r
-      elsif r.is_a?(String)
+      if r.is_a?(String)
         # puppet 0.25 and older
         resource(r)
+      elsif r.is_a?(Puppet::Resource)
+        # puppet 2.6 and newer
+        r
       else
         raise "Unknown resource object #{r.class}"
       end

data/man/cucumber-puppet-gen.1

@@ -1,10 +1,10 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.\" generated with Ronn/v0.5
+.\" http://github.com/rtomayko/ronn/
 .
 .TH "CUCUMBER\-PUPPET\-GEN" "1" "September 2010" "" ""
 .
 .SH "NAME"
-\fBcucumber\-puppet\-gen\fR \- Generator script for cucumber\-puppet
+\fBcucumber\-puppet\-gen\fR \-\- Generator script for cucumber\-puppet
 .
 .SH "SYNOPSIS"
 \fBcucumber\-puppet\-gen\fR feature MODULE FEATURE
@@ -13,15 +13,19 @@
 \fBcucumber\-puppet\-gen\fR world
 .
 .SH "DESCRIPTION"
-\fBcucumber\-puppet\-gen\fR generates feature files and initializes a Puppet tree for use with \fBcucumber\-puppet\fR\.
+\fBcucumber\-puppet\-gen\fR generates feature files and initializes a Puppet tree
+for use with \fBcucumber\-puppet\fR.
 .
 .TP
 \fBcucumber\-puppet\-gen\fR feature MODULE FEATURE
-Generate a feature file from template for feature FEATURE and module MODULE\. Depending on the current working directory, the feature is either placed in \fBfeatures/modules/MODULE/FEATURE\.feature\fR or, if called from the \fBmodules/\fR subdirectory tree, \fBmodules/MODULE/features/FEATURE\.feature\fR\.
+Generate a feature file from template for feature FEATURE and module
+MODULE. Depending on the current working directory, the feature is either
+placed in \fBfeatures/modules/MODULE/FEATURE.feature\fR or, if called from the \fBmodules/\fR subdirectory tree, \fBmodules/MODULE/features/FEATURE.feature\fR.
 .
 .TP
 \fBcucumber\-puppet\-gen\fR world
-Initialize Puppet tree for use with \fBcucumber\-puppet\fR, to be run from the Puppet tree\'s root\.
+Initialize Puppet tree for use with \fBcucumber\-puppet\fR, to be run from the
+Puppet tree's root.
 .
 .SH "EXAMPLES"
 Initialize the Puppet tree:
@@ -38,10 +42,10 @@ $ cucumber\-puppet\-gen world
 .IP "" 0
 .
 .P
-Generated files are to be found in \fBfeatures/steps/\fR and \fBfeatures/support/\fR\.
+Generated files are to be found in \fBfeatures/steps/\fR and \fBfeatures/support/\fR.
 .
 .P
-Create a feature file for module \fIfoo\fR\'s \fIbar\fR feature:
+Create a feature file for module \fIfoo\fR's \fIbar\fR feature:
 .
 .IP "" 4
 .
@@ -69,10 +73,12 @@ $ cucumber\-puppet\-gen feature foo bar
 .IP "" 0
 .
 .SH "REPORTING BUGS"
-Please report any bugs at http://projects\.puppetlabs\.com/projects/cucumber\-puppet/issues/new or send an email to \fIcucumber\-puppet@erisiandiscord\.de\fR\.
+Please report any bugs at
+http://projects.puppetlabs.com/projects/cucumber\-puppet/issues/new
+or send an email to \fIcucumber-puppet@erisiandiscord.de\fR.
 .
 .SH "COPYRIGHT"
-\fBcucumber\-puppet\fR is Copyright (c) 2010 Nikolay Sturm \fIsturm@nistu\.de\fR
+\fBcucumber\-puppet\fR is Copyright (c) 2010 Nikolay Sturm \fIsturm@nistu.de\fR
 .
 .SH "SEE ALSO"
 cucumber\-puppet(1)

data/man/cucumber-puppet.1

@@ -1,96 +1,107 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.\" generated with Ronn/v0.5
+.\" http://github.com/rtomayko/ronn/
 .
 .TH "CUCUMBER\-PUPPET" "1" "September 2010" "" ""
 .
 .SH "NAME"
-\fBcucumber\-puppet\fR \- Puppet catalog testing with Cucumber
+\fBcucumber\-puppet\fR \-\- Puppet catalog testing with Cucumber
 .
 .SH "SYNOPSIS"
-\fBcucumber\-puppet\fR [ OPTIONS ] FILE | DIR \.\.\.
+\fBcucumber\-puppet\fR [ OPTIONS ] FILE | DIR ...
 .
 .SH "DESCRIPTION"
-\fBcucumber\-puppet\fR is a tool for behavioral testing of Puppet catalogs\. It provides the glue necessary to access Puppet\'s data structures from Cucumber\'s step definitions\.
+\fBcucumber\-puppet\fR is a tool for behavioral testing of Puppet catalogs. It
+provides the glue necessary to access Puppet's data structures from Cucumber's
+step definitions.
 .
 .P
-\fBcucumber\-puppet\fR takes a list of feature files or directories, containing feature files, as argument\. These will then be run through \fBcucumber\fR\. It needs to be started from somewhere inside the Puppet directory tree\.
+\fBcucumber\-puppet\fR takes a list of feature files or directories, containing
+feature files, as argument. These will then be run through \fBcucumber\fR. It needs
+to be started from somewhere inside the Puppet directory tree.
 .
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-Show help message\.
+Show help message.
 .
 .TP
 \fB\-\-version\fR
-Show version number\.
+Show version number.
 .
 .P
-The following options are passed on to \fBcucumber\fR\. See \fBcucumber \-\-help\fR for further details\.
+The following options are passed on to \fBcucumber\fR. See \fBcucumber \-\-help\fR for
+further details.
 .
 .TP
 \fB\-b\fR, \fB\-\-backtrace\fR
-Show full backtrace for all errors\.
+Show full backtrace for all errors.
 .
 .TP
 \fB\-e\fR, \fB\-\-exclude\fR \fIPATTERN\fR
-Don\'t run feature files or require ruby files matching \fIPATTERN\fR\.
+Don't run feature files or require ruby files matching \fIPATTERN\fR.
 .
 .TP
 \fB\-f\fR, \fB\-\-format\fR \fIFORMAT\fR
-How to format features (Default: pretty)\.
+How to format features (Default: pretty).
 .
 .TP
 \fB\-n\fR, \fB\-\-name\fR \fINAME\fR
-Only run matching feature elements\.
+Only run matching feature elements.
 .
 .TP
 \fB\-o\fR, \fB\-\-out\fR \fIFILE\fR|\fIDIR\fR
-Write output to \fIFILE\fR|\fIDIR\fR\.
+Write output to \fIFILE\fR|\fIDIR\fR.
 .
 .TP
 \fB\-t\fR, \fB\-\-tags\fR \fITAG\-EXPRESSION\fR
-Only run features/scenarios matching \fITAG\-EXPRESSION\fR\.
+Only run features/scenarios matching \fITAG\-EXPRESSION\fR.
 .
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-Show files and features loaded\.
+Show files and features loaded.
 .
 .TP
 \fB\-x\fR, \fB\-\-expand\fR
-Expand Scenario Outline Tables in output\.
+Expand Scenario Outline Tables in output.
 .
 .SH "FILES"
-\fBcucumber\-puppet\fR assumes a certain directory structure to magically find necessary support files\. Relative to the Puppet directory\'s root, the structure looks like this:
+\fBcucumber\-puppet\fR assumes a certain directory structure to magically find
+necessary support files. Relative to the Puppet directory's root, the structure
+looks like this:
 .
 .TP
 \fBfeatures/\fR
-The generic place to store Cucumber files\.
+The generic place to store Cucumber files.
 .
 .TP
 \fBfeatures/modules/foo/\fR
-Feature files for module \fIfoo\fR go here\.
+Feature files for module \fIfoo\fR go here.
 .
 .TP
-\fBfeatures/modules/foo/bar\.feature\fR
-File containing scenarios for the \fIbar\fR feature\.
+\fBfeatures/modules/foo/bar.feature\fR
+File containing scenarios for the \fIbar\fR feature.
 .
 .TP
 \fBfeatures/steps/\fR
-Step definitions go here\. To distinguish local extensions, it is suggested putting these into files named \fBmodule_foo\.rb\fR or \fBdefine_bar\.rb\fR\. Although names don\'t really matter to cucumber, as long as files have the proper suffix\.
+Step definitions go here. To distinguish local extensions, it is suggested
+putting these into files named \fBmodule_foo.rb\fR or \fBdefine_bar.rb\fR. Although
+names don't really matter to cucumber, as long as files have the proper
+suffix.
 .
 .TP
 \fBfeatures/support/\fR
-Cucumber support files go here\.
+Cucumber support files go here.
 .
 .P
-\fBcucumber\-puppet\fR also supports bundling features with modules\. In this case it looks for features, step definitions and support files in \fBmodules/foo/features/\fR like so:
+\fBcucumber\-puppet\fR also supports bundling features with modules. In this case it
+looks for features, step definitions and support files in \fBmodules/foo/features/\fR like so:
 .
 .TP
-\fBmodules/foo/features/bar\.feature\fR
-Bundled feature file\.
+\fBmodules/foo/features/bar.feature\fR
+Bundled feature file.
 .
 .TP
-\fBmodules/foo/features/steps/bar\.rb\fR
-Bundled step definition file\.
+\fBmodules/foo/features/steps/bar.rb\fR
+Bundled step definition file.
 .
 .SH "EXAMPLES"
 To run all features found in a directory:
@@ -112,26 +123,32 @@ To run a single feature:
 .
 .nf
 
-$ cucumber\-puppet features/modules/foo/bar\.feature
+$ cucumber\-puppet features/modules/foo/bar.feature
 .
 .fi
 .
 .IP "" 0
 .
 .SH "REPORTING BUGS"
-Please report any bugs at http://projects\.puppetlabs\.com/projects/cucumber\-puppet/issues/new or send an email to \fIcucumber\-puppet@erisiandiscord\.de\fR\.
+Please report any bugs at
+http://projects.puppetlabs.com/projects/cucumber\-puppet/issues/new
+or send an email to \fIcucumber-puppet@erisiandiscord.de\fR.
 .
 .SH "COPYRIGHT"
-\fBcucumber\-puppet\fR is Copyright (c) 2010 Nikolay Sturm \fIsturm@nistu\.de\fR
+\fBcucumber\-puppet\fR is Copyright (c) 2010 Nikolay Sturm \fIsturm@nistu.de\fR
 .
 .SH "SEE ALSO"
 cucumber\-puppet\-gen(1)
 .
 .P
-Behavior Driven Development: http://behaviour\-driven\.org/ http://en\.wikipedia\.org/wiki/Behavior_driven_development
+Behavior Driven Development:
+  http://behaviour\-driven.org/
+  http://en.wikipedia.org/wiki/Behavior_driven_development
 .
 .P
-Cucumber: http://cukes\.info/
+Cucumber:
+  http://cukes.info/
 .
 .P
-Puppet: http://www\.puppetlabs\.com/puppet/introduction/
+Puppet:
+  http://www.puppetlabs.com/puppet/introduction/

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-puppet
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nikolay Sturm
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +02:00
+date: 2010-11-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 6
@@ -38,11 +35,9 @@ dependencies:
   name: gem-man
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
@@ -54,11 +49,9 @@ dependencies:
   name: templater
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -87,15 +80,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
 has_rdoc: true
 homepage: http://projects.puppetlabs.com/projects/cucumber-puppet
 licenses: []
@@ -106,27 +99,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Puppet catalog testing with Cucumber