cucumber-puppet 0.0.6 → 0.1.0

data/VERSION.yml

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

data/bin/cucumber-puppet-gen

@@ -32,6 +32,21 @@ module CucumberPuppetGenerators
     end
   end
 
+  class PolicyGenerator < Templater::Generator
+    include CucumberPuppet::Helper
+
+    def source_root
+      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'policy')
+    end
+
+    desc <<-DESC
+      Generate a catalog policy
+        cucumber-puppet-gen policy
+    DESC
+
+    directory('catalog', 'catalog', 'features/catalog')
+  end
+
   class TestcaseGenerator < Templater::Generator
     extend CucumberPuppet::Helper
 
@@ -74,6 +89,7 @@ module CucumberPuppetGenerators
 
   desc "Generators for cucumber-puppet"
   add :feature, FeatureGenerator
+  add :policy, PolicyGenerator
   add :testcase, TestcaseGenerator
   add :world, WorldGenerator
 

data/lib/cucumber-puppet/puppet.rb

@@ -7,7 +7,7 @@ class CucumberPuppet
   # Returns a new CucumberPuppet object.
   def initialize
     @confdir = "/etc/puppet"
-    @manifest = @confdir + "/manifest/site.pp"
+    @manifest = @confdir + "/manifests/site.pp"
 
     # default facts
     @facts = {
@@ -41,9 +41,11 @@ class CucumberPuppet
   #   @manifest defaults to @confdir + '/manifests/site.pp'
   #
   def compile_catalog( node = nil )
-    Puppet[:confdir] = @confdir
-    Puppet[:manifest] = @manifest
+    Puppet.settings.handlearg("--confdir", @confdir)
     Puppet.parse_config
+    # reset confdir in case it got overwritten
+    Puppet.settings.handlearg("--confdir", @confdir)
+    Puppet.settings.handlearg("--manifest", @manifest)
 
     unless node.is_a?(Puppet::Node)
       node = Puppet::Node.new(@facts['hostname'], :classes => @klass)
@@ -71,12 +73,24 @@ class CucumberPuppet
   end
 
   # Returns an Object with the given title from catalog.
-  def get_resource(title)
-    @catalog.resource(title)
-  end
-  # XXX add deprecation warning for resource()
   def resource(title)
-    get_resource(title)
+    @catalog.resource(title)
   end
 
+  # Returns an Array with the catalog's Puppet::Resource objects.
+  def catalog_resources
+    # 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)
+        # puppet 0.25 and older
+        resource(r)
+      else
+        raise "Unknown resource object #{r.class}"
+      end
+    end
+  end
 end

data/lib/cucumber-puppet/steps.rb

@@ -0,0 +1,41 @@
+Given /^a node specified by "([^\"]*)"$/ do |file|
+  # file: yaml node file
+  fail("Cannot find node facts #{file}.") unless File.exist?(file)
+  @node = YAML.load_file(file)
+  fail("Invalid node file #{file}, this should come from " +
+    "/var/lib/puppet/yaml/node.") unless @node.is_a?(Puppet::Node)
+end
+
+Given /^I use storeconfigs$/ do
+  # XXX workaround storeconfig warnings
+  Puppet::Util::Log.level = :err
+end
+
+When /^I compile its catalog$/ do
+  compile_catalog(@node)
+end
+
+Then /^all resource dependencies should resolve$/ do
+  steps %Q{
+    Then all "before" should resolve
+    And all "notify" should resolve
+    And all "require" should resolve
+    And all "subscribe" should resolve
+  }
+end
+
+Then /^all "(before|notify|require|subscribe)" should resolve$/ do |parameter|
+  catalog_resources.each do |resource|
+    dependency = [ resource[parameter] ].flatten.compact
+
+    dependency.each do |dep|
+      fail("#{resource} cannot #{parameter} #{dep}, not in catalog.") \
+        unless resource(dep.to_s)
+    end
+  end
+end
+
+Then /^compilation should succeed$/ do
+  fail("Catalog compilation failed.") unless
+    @catalog.is_a?(Puppet::Resource::Catalog)
+end

data/lib/generators/policy/catalog/policy.feature

@@ -0,0 +1,14 @@
+Feature: General policy for all catalogs
+  In order to ensure applicability of a host's catalog
+  As a manifest developer
+  I want all catalogs to obey some general rules
+
+  Scenario Outline: Compile and verify catalog
+    Given a node specified by "features/yaml/<hostname>.example.com.yaml"
+    When I compile its catalog
+    Then compilation should succeed
+    And all resource dependencies should resolve
+
+    Examples:
+      | hostname  |
+      | localhost |

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

@@ -1,6 +1,7 @@
 Before do
   # local configuration
-  @confdir = File.dirname(__FILE__) + "/../../"
+  # @confdir = File.join(File.dirname(__FILE__), '..', '..')
+  # @manifest = File.join(@confdir, 'manifests', 'site.pp')
   # adjust facts like this
   @facts['architecture'] = "i386"
 end

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

@@ -9,6 +9,7 @@ if version
 end
 %>
 require 'cucumber-puppet/puppet'
+require 'cucumber-puppet/steps'
 
 World do
   CucumberPuppet.new

data/man/cucumber-puppet-gen.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CUCUMBER\-PUPPET\-GEN" "1" "August 2010" "" ""
+.TH "CUCUMBER\-PUPPET\-GEN" "1" "September 2010" "" ""
 .
 .SH "NAME"
 \fBcucumber\-puppet\-gen\fR \- Generator script for cucumber\-puppet
@@ -69,7 +69,7 @@ $ cucumber\-puppet\-gen feature foo bar
 .IP "" 0
 .
 .SH "REPORTING BUGS"
-Report bugs to \fIcucumber\-puppet@erisiandiscord\.de\fR or go to http://github\.com/nistude/cucumber\-puppet/issues
+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

data/man/cucumber-puppet.1

@@ -1,16 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CUCUMBER\-PUPPET" "1" "August 2010" "" ""
+.TH "CUCUMBER\-PUPPET" "1" "September 2010" "" ""
 .
 .SH "NAME"
-\fBcucumber\-puppet\fR \- Puppet manifest testing with Cucumber
+\fBcucumber\-puppet\fR \- Puppet catalog testing with Cucumber
 .
 .SH "SYNOPSIS"
 \fBcucumber\-puppet\fR [ OPTIONS ] FILE | DIR \.\.\.
 .
 .SH "DESCRIPTION"
-\fBcucumber\-puppet\fR is a tool for behavioral testing of Puppet manifests\. 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\.
@@ -119,7 +119,7 @@ $ cucumber\-puppet features/modules/foo/bar\.feature
 .IP "" 0
 .
 .SH "REPORTING BUGS"
-Report bugs to \fIcucumber\-puppet@erisiandiscord\.de\fR or go to http://github\.com/nistude/cucumber\-puppet/issues
+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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-puppet
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Nikolay Sturm
@@ -9,40 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
         version: 0.6.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gem-man
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: templater
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
-description: cucumber-puppet is a tool for behavioral testing of Puppet manifests
+  type: :runtime
+  version_requirements: *id003
+description: cucumber-puppet is a tool for behavioral testing of Puppet catalogs
 email: cucumber-puppet@erisiandiscord.de
 executables: 
 - cucumber-puppet
@@ -57,13 +80,14 @@ files:
 - lib/cucumber-puppet.rb
 - lib/cucumber-puppet/helper.rb
 - lib/cucumber-puppet/puppet.rb
+- lib/cucumber-puppet/steps.rb
 - lib/cucumber-puppet/rake/task.rb
 - lib/generators/feature/%feature_name%.feature
+- lib/generators/policy/catalog/policy.feature
 - man/cucumber-puppet.1
 - man/cucumber-puppet-gen.1
 - VERSION.yml
 - lib/generators/world/steps/package.rb
-- lib/generators/world/steps/catalog_specs.rb
 - lib/generators/world/steps/exec.rb
 - lib/generators/world/steps/user.rb
 - lib/generators/world/steps/file.rb
@@ -73,7 +97,7 @@ files:
 - lib/generators/world/support/hooks.rb
 - lib/generators/world/support/world.rb
 has_rdoc: true
-homepage: http://github.com/nistude/cucumber-puppet/
+homepage: http://projects.puppetlabs.com/projects/cucumber-puppet
 licenses: []
 
 post_install_message: 
@@ -82,23 +106,29 @@ 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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Puppet manifest testing with Cucumber
+summary: Puppet catalog testing with Cucumber
 test_files: []
 

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

@@ -1,67 +0,0 @@
-Given /^a node specified by "([^\"]*)"$/ do |file|
-  # file: yaml node file, usually from /var/lib/puppet/yaml/node
-  fail("Cannot find node facts #{file}.") unless File.exist?(file)
-  @node = YAML.load_file(file)
-  file("Invalid node file #{file}, this should come from " +
-    "/var/lib/puppet/yaml/node.") unless @node.is_a?(Puppet::Node)
-end
-
-When /^I compile its catalog$/ do
-  compile_catalog(@node)
-end
-
-Then /^all "([^\"]*)" should resolve$/ do |parameter|
-  # paramter: before, notify, require, or subscribe
-  @catalog.resources.each do |name|
-    resource = get_resource(name)
-
-    dependency = resource[parameter]
-    next unless dependency
-    if dependency.is_a?(Array)
-      dependency.each do |dep|
-        fail("#{resource} cannot #{parameter} #{dep}, not in catalog.") \
-          unless get_resource(dep.to_s)
-      end
-    elsif dependency.is_a?(Puppet::Resource::Reference)
-      fail("#{resource} cannot #{parameter} #{dependency}, not in catalog.") \
-        unless get_resource(dependency.to_s)
-    else
-      fail("#{resource} #{parameter} #{dependency} of unknown class.")
-    end
-  end
-end
-
-Then /^all file sources should exist in git repository$/ do
-  @catalog.resources.each do |name|
-    next unless name.match(/^File/)
-    file = get_resource(name)
-
-    next unless file['source']
-    source = file['source']
-
-    filepath = source.gsub(%r{^puppet:///([^/]*)/(.*)$}, 'modules/\1/files/\2')
-    fail("#{name}: source #{filepath} not in git repository.") unless
-      system("git cat-file -e :#{filepath} > /dev/null 2>&1")
-  end
-end
-
-Then /^all file templates should exist in git repository$/ do
-  Dir.glob('modules/*/templates/**.erb').each do |template|
-    fail("#{template} not in git.") unless
-      system("git cat-file -e :#{template} > /dev/null 2>&1")
-  end
-end
-
-Then /^all resource dependencies should resolve$/ do
-  steps %Q{
-    Then all "before" should resolve
-    And all "notify" should resolve
-    And all "require" should resolve
-    And all "subscribe" should resolve
-  }
-end
-
-Then /^compilation should succeed$/ do
-  fail("Catalog compilation failed.") unless
-    @catalog.is_a?(Puppet::Resource::Catalog)
-end