auxesis-cucumber-nagios 0.2.8 → 0.3.1

data/README.md

@@ -16,20 +16,20 @@ As Bradley Taylor [put it](http://bradley.is/post/82649218/testing-dash-metrics-
 Setting up a project
 ====================
 
-To set up a standalone cucumber-nagios project, run:
+To set up a standalone `cucumber-nagios` project, run:
 
     cucumber-nagios-gen project <project-name>
 
-This will spit out a bunch of files in the directory specified as <project-name>. 
+This will spit out a bunch of files in the directory specified as `<project-name>`. 
 
-Check the README within this directory for specific instructions for managing
+Check the `README` within this directory for specific instructions for managing
 the project. 
 
 
 Writing Features
 ================
 
-Within your project, I suggest you put your features under under features/$fqdn/$name.feature.
+Within your project, I suggest you put your features under under `features/$fqdn/$name.feature`.
 
 You'll want to have a read of the Cucumber documentation, however 
 your tests will look something like this:
@@ -45,10 +45,10 @@ your tests will look something like this:
         Then I should see "www.wikipedia.org"
 
 There's a collection of steps that will cover most of the things you'll be 
-testing for in features/steps/webrat_steps.rb. 
+testing for in `features/steps/webrat_steps.rb`. 
 
 You can write custom steps for testing specific output and behaviour, e.g.
-in features/smh.com.au/smh.feature: 
+in `features/smh.com.au/smh.feature`: 
 
     Feature: smh.com.au
       It should be up
@@ -60,7 +60,7 @@ in features/smh.com.au/smh.feature:
         And there should be a section named "Opinion"
 
 There aren't steps for "Then I should see site navigation", so you have to 
-write one yourself. :-) In features/smh.com.au/steps/smh_steps.rb: 
+write one yourself. :-) In `features/smh.com.au/steps/smh_steps.rb`: 
 
     Then /^I should see site navigation$/ do                                                                    
       doc = Nokogiri::HTML(response.body.to_s)                                                                  
@@ -70,7 +70,7 @@ write one yourself. :-) In features/smh.com.au/steps/smh_steps.rb:
 You can use Nokogiri for testing responses with XPath matchers and CSS 
 selectors. 
 
-I suggest you use bin/cucumber directly so you can get better feedback when 
+I suggest you use `bin/cucumber` directly so you can get better feedback when 
 writing your tests:
 
     bin/cucumber --require bin/common.rb \
@@ -81,17 +81,17 @@ writing your tests:
 Running
 =======
 
-Invoke the cucumber feature with the cucumber-nagios script: 
+Invoke the Cucumber feature with the `cucumber-nagios` script: 
 
     bin/cucumber-nagios features/smh.com.au/smh.feature
 
-cucumber-nagios can be run from anywhere: 
+`cucumber-nagios` can be run from anywhere: 
 
     /path/to/bin/cucumber-nagios /path/to/features/smh/smh.feature
 
 It should return a standard Nagios-formatted response string: 
 
-    Critical: 0, Warning: 0, 2 okay | passed=2, failed=0.0, total=2
+    Critical: 0, Warning: 0, 2 okay | passed=2, failed=0, total=2
 
 Steps that fail will show up in the "Critical" total, and steps that pass 
 show up in the "okay" total. 
@@ -106,11 +106,11 @@ Caveats
 You may want to think about keeping to one scenario to a file, otherwise 
 you'll get multiple lines of output for a test:
 
-    Critical: 1, Warning: 0, 2 okay | value=2.000000;;;;
-    Critical: 1, Warning: 0, 4 okay | value=4.000000;;;;
+    Critical: 1, Warning: 0, 2 okay | passed=2, failed=1, total=3
+    Critical: 1, Warning: 0, 4 okay | passed=4, failed=1, total=5
 
-I assume Nagios will only read the last line, so this might be an ok behaviour
-when you want to test for an aggregate of failures across a site.
+That said, Nagios should only read the last line, so this might be an ok 
+behaviour when you want to test for an aggregate of failures across a site.
 
 
 

data/lib/generators/project/bin/cucumber

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-# Add '.rb' to work around a bug in IronRuby's File#dirname
-$:.unshift(File.dirname(__FILE__ + '.rb') + '/../lib') unless $:.include?(File.dirname(__FILE__ + '.rb') + '/../lib')
+$: << File.dirname(__FILE__)
 
 begin 
   require 'common'

data/lib/generators/project/bin/cucumber-nagios

@@ -1,26 +1,27 @@
-#!/bin/sh
+#!/usr/bin/env ruby
 
-if [ "$#" != "1" ]; then
-	echo "Usage: $0 <feature>"
-	exit 99
-fi
+unless ARGV[0]
+  puts "Usage: #{__FILE__} <feature>"
+  exit 99
+end
 
-dirname=$(dirname $0)
-feature=$1
+__DIR__ = File.expand_path(File.dirname(__FILE__))
 
-if [ ! -e "$feature" ]; then
-	echo "Error: feature file doesn't exist!"
-	exit 98
-fi
+feature = ARGV[0]
+unless File.exists?(feature)
+  feature = File.join(__DIR__, '..', 'features', ARGV[0]) 
+end
 
-$dirname/cucumber --require $dirname/common.rb \
-				 					--require features/ \
-				 					--format Nagios::NagiosFormatter \
-				 					$feature
-retval=$?
+unless File.exist?(feature)
+  puts "Error: feature file doesn't exist!"
+  exit 98
+end
+
+command = "#{__DIR__}/cucumber"
+command += " --require #{__DIR__}/common.rb"
+command += " --require features/"
+command += " --format Nagios::NagiosFormatter"
+command += " #{feature}"
+
+system(command) ? exit(0) : exit(2)
 
-if [ "$retval" -eq "1" ]; then
-	exit 2
-else
-	exit $retval
-fi

data/lib/generators/project/bin/cucumber-nagios-gen

@@ -7,28 +7,35 @@ module CucumberNagiosGenerators
 
   extend Templater::Manifold
 
-  class ProjectGenerator < Templater::Generator
+  # feature generator
+  class FeatureGenerator < Templater::Generator
     def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'project')
+      File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'feature')
     end
 
-    def destination_root
-      # takes :name from first_argument
-      File.join(@destination_root, name)
-    end
+    desc <<-DESC
+      Generate a cucumber feature. Takes a two arguments:
+        bin/cucumber-nagios-gen feature <site-name> <feature-name>
+    DESC
 
-    desc "Generate a new self-contained cucumber-nagios project."
-    first_argument :name, :required => true, :desc => "Project name"
+    first_argument :site, :required => true, :desc => "Site name"
+    second_argument :feature, :required => true, :desc => "Feature name"
 
-    glob!
-    #file :rakefile, 'Rakefile'
+    template :feature do |template|
+      template.source = "%feature_name%.feature"
+      template.destination = "features/#{site}/#{feature}.feature"
+    end
+
+    template :step do |template|
+      template.source = "%feature_name%_steps.rb"
+      template.destination = "features/#{site}/steps/#{feature}_steps.rb"
+    end
 
   end
 
-  desc "Generate a cucumber-nagios project."
-  add :project, ProjectGenerator
+  desc "Generators for a cucumber-nagios project"
+  add :feature, FeatureGenerator
 
 end
 
-
 CucumberNagiosGenerators.run_cli Dir.pwd, 'cucumber-nagios-gen', '0.1', ARGV

data/lib/generators/project/features/steps/result_steps.rb

@@ -10,6 +10,10 @@ Then /^I should see an? (\w+) message$/ do |message_type|
   response.should have_xpath("//*[@class='#{message_type}']")
 end
 
+Then /^the (.*) ?request should succeed/ do |_|
+  response.should be_successful
+end
+
 Then /^the (.*) ?request should fail/ do |_|
   response.should_not be_successful
 end

data/lib/generators/project/lib/generators/feature/%feature_name%.feature

@@ -0,0 +1,7 @@
+Feature: <%= site %>
+  It should be up
+
+  Scenario: Visiting home page
+    When I go to http://<%= site %>
+    Then the request should succeed
+

data/lib/generators/project/lib/generators/feature/%feature_name%_steps.rb

@@ -0,0 +1 @@
+# steps go here!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auxesis-cucumber-nagios
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.3.1
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/generators/project/lib/generators/feature/%feature_name%.feature
+- lib/generators/project/lib/generators/feature/%feature_name%_steps.rb
 has_rdoc: false
 homepage: http://holmwood.id.au/~lindsay/2009/02/23/web-app-integration-testing-for-sysadmins-with-cucumber-nagios/
 post_install_message: