remove generated bin/cucumber-nagios and update tests

MANIFEST

@@ -47,5 +47,4 @@ lib/generators/project/.bzrignore
 lib/generators/project/.gitignore
 lib/generators/project/Gemfile
 lib/generators/project/README
-lib/generators/project/bin/cucumber-nagios
 man/cucumber-nagios.1.ronn

Rakefile

@@ -43,3 +43,4 @@ task :check_manifest => [:clean, 'MANIFEST', 'MANIFEST.tmp'] do
 end
 
 CLEAN << '*.gem'
+CLEAN << '.rake_tasks'

features/installing.feature

@@ -7,6 +7,7 @@ Feature: Installation
   Scenario: Installing the gem
     When I build the gem
     And I install the latest gem
-    Then I should have cucumber-nagios-gen on my path
+    Then I should have "cucumber-nagios-gen" on my path
+    And I should have "cucumber-nagios" on my path
     And I can generate a new project
 

features/steps/creating_steps.rb

@@ -1,7 +1,8 @@
 Given /^cucumber\-nagios is installed$/ do
   When 'I build the gem'
   And 'I install the latest gem'
-  Then 'I should have cucumber-nagios-gen on my path'
+  Then 'I should have "cucumber-nagios-gen" on my path'
+  And 'I should have "cucumber-nagios" on my path'
 end
 
 When /^I create a new project called "([^\"]*)"$/ do |project_name|

features/steps/installing_steps.rb

@@ -3,7 +3,7 @@
   rakefile     = project_root.join('Rakefile')
   File.exist?(rakefile).should be_true
 
-  silent_system("rake -f #{rakefile} build").should be_true
+  system("rake -f #{rakefile} build").should be_true
 end
 
 When /^I install the latest gem$/ do
@@ -15,8 +15,8 @@
   silent_system("gem install --local #{latest}").should be_true
 end
 
-Then /^I should have cucumber\-nagios\-gen on my path$/ do
-  silent_system("which cucumber-nagios-gen").should be_true
+Then /^I should have "([^"]*)" on my path$/ do |file|
+  silent_system("which #{file}").should be_true
 end
 
 Then /^I can generate a new project$/ do

features/steps/using_steps.rb

@@ -15,11 +15,11 @@
 end
 
 Then /^the "([^\"]*)" feature on "([^\"]*)" should exit cleanly$/ do |feature, site|
-  silent_system("cd /tmp/#{@project_name} ; bin/cucumber-nagios features/#{site}/#{feature}.feature").should be_true
+  silent_system("cd /tmp/#{@project_name} ; cucumber-nagios features/#{site}/#{feature}.feature").should be_true
 end
 
 Then /^the "([^\"]*)" feature on "([^\"]*)" should not exit cleanly$/ do |feature, site|
-  silent_system("cd /tmp/#{@project_name} ; bin/cucumber-nagios features/#{site}/#{feature}.feature").should be_false
+  silent_system("cd /tmp/#{@project_name} ; cucumber-nagios features/#{site}/#{feature}.feature").should be_false
 end
 
 When /^the "([^\"]*)" feature on "([^\"]*)" checks for something preposterous$/ do |feature, site|
@@ -35,7 +35,7 @@
 end
 
 Then /^the "([^"]*)" feature on "([^"]*)" should produce multiline output$/ do |feature, site|
-  command = "cd /tmp/#{@project_name} ; bin/cucumber-nagios features/#{site}/#{feature}.feature"
+  command = "cd /tmp/#{@project_name} ; cucumber-nagios features/#{site}/#{feature}.feature"
   @output = `#{command}`
   @output.split("\n").size.should > 1
 end

lib/generators/project/README

@@ -107,11 +107,11 @@ 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:
 
-    /path/to/bin/cucumber-nagios /path/to/features/smh/smh.feature
+    cucumber-nagios /path/to/features/smh/smh.feature
 
 It should return a standard Nagios-formatted response string: