Merge?

Gemfile.lock

@@ -9,12 +9,12 @@ GIT
 PATH
   remote: .
   specs:
-    cucumber-nagios (0.9.0)
+    cucumber-nagios (0.9.1)
       amqp (= 0.6.7)
       aruba (>= 0.3.3)
       bundler (~> 1.0.10)
       cucumber (>= 0.10.0)
-      cuken (>= 0.1.0)
+      cuken (>= 0.1.1)
       mechanize (= 1.0.0)
       net-ssh (~> 2.1.0)
       rspec (>= 2.5.0)
@@ -27,34 +27,34 @@ GEM
   specs:
     amqp (0.6.7)
       eventmachine (>= 0.12.4)
-    aruba (0.3.3)
-      childprocess (~> 0.1.7)
-      cucumber (~> 0.10)
-      rspec (~> 2.5)
+    aruba (0.3.6)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
     builder (3.0.0)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    cucumber (0.10.0)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     cuken (0.1.1)
       aruba (~> 0.3.3)
       ssh-forever
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
     extlib (0.9.15)
-    ffi (0.6.3)
+    ffi (1.0.7)
       rake (>= 0.8.7)
-    gherkin (2.3.4)
-      json (~> 1.4.6)
+    gherkin (2.3.6)
+      json (>= 1.4.6)
     highline (1.6.1)
-    json (1.4.6)
+    json (1.5.1)
     mechanize (1.0.0)
       nokogiri (>= 1.2.1)
-    net-ssh (2.1.3)
+    net-ssh (2.1.4)
     nokogiri (1.4.4)
     open4 (1.0.1)
     rack (1.2.2)
@@ -83,6 +83,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba (>= 0.3.6)
   cucumber-nagios!
   rake (>= 0.8.3)
   ssh-forever (>= 0.4.0)!

README.md

@@ -21,7 +21,7 @@ Quickstart
  4. `cd bunch-o-tests`
  5. `bundle install`
  6. `cucumber-nagios-gen feature ebay.com.au bidding`
- 7. `bin/cucumber-nagios features/ebay.com.au/bidding.feature`
+ 7. `cucumber-nagios features/ebay.com.au/bidding.feature`
 
 Installing
 ==========
@@ -30,8 +30,9 @@ Install the gem with:
 
     gem install cucumber-nagios
 
-This will add the `cucumber-nagios-gen` command to your path, and make the
-shipped cucumber-nagios steps available to other projects using Cucumber.
+This will add the `cucumber-nagios-gen` and `cucumber-nagios` commands to your
+path, and make the shipped cucumber-nagios steps available to other projects
+using Cucumber.
 
 *Windows users* - you need to download and install the
 [Ruby Installer](http://rubyinstaller.org/downloads/) and the
@@ -165,7 +166,7 @@ Running
 
 Invoke the Cucumber feature with the `cucumber-nagios` script:
 
-    bin/cucumber-nagios features/smh.com.au/smh.feature
+    cucumber-nagios features/smh.com.au/smh.feature
 
 `cucumber-nagios` can be run from anywhere:
 

bin/cucumber-nagios-gen

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 require 'templater'

cucumber-nagios.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency     "amqp", "= 0.6.7"
   s.add_runtime_dependency     "bundler", "~> 1.0.10"
   s.add_development_dependency "rake", ">= 0.8.3"
+  s.add_development_dependency "aruba", ">= 0.3.6"
 end

features/support/env.rb

@@ -13,6 +13,7 @@
 
 require 'cucumber/nagios/steps'
 require 'webrat_logging_patches'
+require 'aruba/cucumber'
 
 World do
   Webrat::Session.new(Webrat::MechanizeAdapter.new)