cuken 0.1.13 → 0.1.15

data/cuken.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cuken}
-  s.version = "0.1.13"
+  s.name = "cuken"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hedgehog"]
-  s.date = %q{2011-05-03}
-  s.description = %q{Reusable Cucumber steps and API for post-convergence system integration descriptions}
-  s.email = %q{hedgehogshiatus@gmail.com}
+  s.date = "2011-10-17"
+  s.description = "Reusable Cucumber steps and API for post-convergence system integration descriptions"
+  s.email = "hedgehogshiatus@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
     ".relish",
     ".rspec",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
     "examples/chef/features/support/env.rb",
     "features/.nav",
     "features/about.md",
+    "features/avagrant_steps/vagrant_steps.feature",
     "features/chef_examples/cookbooks_cookbook.feature",
     "features/chef_examples/cookbooks_metadata.feature",
     "features/chef_examples/cookbooks_remote_repo.feature",
@@ -49,6 +51,12 @@ Gem::Specification.new do |s|
     "features/chef_steps/node_steps.feature",
     "features/chef_steps/role_steps.feature",
     "features/command_examples/commands.feature",
+    "features/command_examples/exit_statuses.feature",
+    "features/command_examples/file_system_commands.feature",
+    "features/command_examples/flushing.feature",
+    "features/command_examples/interactive.feature",
+    "features/command_examples/no_clobber.feature",
+    "features/command_examples/output.feature",
     "features/command_steps/command_steps.feature",
     "features/cuken.feature",
     "features/data/Rakefile",
@@ -398,12 +406,17 @@ Gem::Specification.new do |s|
     "features/file_examples/files.feature",
     "features/file_steps/file_steps.feature",
     "features/generic_steps/generic_steps.feature",
+    "features/git_examples/git_clone.feature",
     "features/ssh_examples/ssh.feature",
     "features/ssh_steps/ssh_steps.feature",
     "features/step_definitions/cuken_steps.rb",
     "features/support/env.rb",
     "lib/cuken.rb",
     "lib/cuken/all.rb",
+    "lib/cuken/api/aruba.rb",
+    "lib/cuken/api/aruba/api.rb",
+    "lib/cuken/api/aruba/hooks.rb",
+    "lib/cuken/api/aruba/process.rb",
     "lib/cuken/api/chef.rb",
     "lib/cuken/api/chef/common.rb",
     "lib/cuken/api/chef/cookbook.rb",
@@ -413,7 +426,15 @@ Gem::Specification.new do |s|
     "lib/cuken/api/cmd.rb",
     "lib/cuken/api/common.rb",
     "lib/cuken/api/file.rb",
+    "lib/cuken/api/git.rb",
+    "lib/cuken/api/git/clone.rb",
+    "lib/cuken/api/git/common.rb",
+    "lib/cuken/api/git/remote.rb",
+    "lib/cuken/api/git/repository.rb",
     "lib/cuken/api/rvm.rb",
+    "lib/cuken/api/rvm/common.rb",
+    "lib/cuken/api/rvm/gemsets.rb",
+    "lib/cuken/api/rvm/wip.rb",
     "lib/cuken/api/ssh-forever.rb",
     "lib/cuken/api/ssh.rb",
     "lib/cuken/api/ssh/password.rb",
@@ -426,6 +447,9 @@ Gem::Specification.new do |s|
     "lib/cuken/cucumber/chef.rb",
     "lib/cuken/cucumber/chef/common.rb",
     "lib/cuken/cucumber/chef/cookbook.rb",
+    "lib/cuken/cucumber/chef/cookbook/action.rb",
+    "lib/cuken/cucumber/chef/cookbook/local.rb",
+    "lib/cuken/cucumber/chef/cookbook/remote.rb",
     "lib/cuken/cucumber/chef/cookbook_steps.rb",
     "lib/cuken/cucumber/chef/data_bag.rb",
     "lib/cuken/cucumber/chef/deploy_steps.rb",
@@ -449,36 +473,57 @@ Gem::Specification.new do |s|
     "lib/cuken/cucumber/chef/search_steps.rb",
     "lib/cuken/cucumber/chef/webrat_steps.rb",
     "lib/cuken/cucumber/cmd.rb",
+    "lib/cuken/cucumber/cmd/execution.rb",
+    "lib/cuken/cucumber/cmd/exit_status.rb",
     "lib/cuken/cucumber/common.rb",
     "lib/cuken/cucumber/file.rb",
+    "lib/cuken/cucumber/git.rb",
+    "lib/cuken/cucumber/git/clone.rb",
+    "lib/cuken/cucumber/git/common.rb",
     "lib/cuken/cucumber/git/hooks.rb",
+    "lib/cuken/cucumber/git/local.rb",
+    "lib/cuken/cucumber/git/remote.rb",
+    "lib/cuken/cucumber/output/all.rb",
+    "lib/cuken/cucumber/output/cmd.rb",
+    "lib/cuken/cucumber/output/stderr.rb",
+    "lib/cuken/cucumber/output/stdout.rb",
     "lib/cuken/cucumber/rvm.rb",
+    "lib/cuken/cucumber/rvm/common.rb",
+    "lib/cuken/cucumber/rvm/gemsets.rb",
+    "lib/cuken/cucumber/rvm/hooks.rb",
     "lib/cuken/cucumber/ssh.rb",
+    "lib/cuken/cucumber/ssh/common.rb",
     "lib/cuken/cucumber/ssh/hooks.rb",
     "lib/cuken/cucumber/vagrant.rb",
     "lib/cuken/cucumber/vagrant/common.rb",
     "lib/cuken/cucumber/vagrant/hooks.rb",
     "lib/cuken/file.rb",
+    "lib/cuken/git.rb",
     "lib/cuken/rvm.rb",
     "lib/cuken/ssh.rb",
     "lib/cuken/vagrant.rb",
     "spec/api/knife_spec.rb",
+    "spec/api/rvm/gemsets/api_spec.rb",
+    "spec/api/rvm/gemsets/helper_spec.rb",
     "spec/api/rvm_spec.rb",
     "spec/api/rvmrc_processor_spec.rb",
-    "spec/cuken_spec.rb",
+    "spec/api/vagrant/v_m/Vagrantfile",
+    "spec/api/vagrant/v_m/api_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/hedgehog/cuken}
+  s.homepage = "http://github.com/hedgehog/cuken"
   s.licenses = ["Apache 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Reusable Cucumber steps and API for post-convergence system integration descriptions}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Reusable Cucumber steps and API for post-convergence system integration descriptions"
   s.test_files = [
     "examples/chef/features/support/env.rb",
     "spec/api/knife_spec.rb",
+    "spec/api/rvm/gemsets/api_spec.rb",
+    "spec/api/rvm/gemsets/helper_spec.rb",
     "spec/api/rvm_spec.rb",
     "spec/api/rvmrc_processor_spec.rb",
-    "spec/cuken_spec.rb",
+    "spec/api/vagrant/v_m/api_spec.rb",
     "spec/spec_helper.rb"
   ]
 
@@ -486,60 +531,69 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aruba>, ["~> 0.3.6"])
-      s.add_runtime_dependency(%q<cucumber>, [">= 0"])
       s.add_runtime_dependency(%q<chef>, ["~> 0.10.0"])
+      s.add_runtime_dependency(%q<childprocess>, [">= 0.1.7"])
+      s.add_runtime_dependency(%q<cucumber>, ["> 1.0.0"])
       s.add_runtime_dependency(%q<grit>, ["~> 2.4.1"])
-      s.add_runtime_dependency(%q<rvm>, ["~> 1.5.2"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<vagrant>, ["~> 0.7.2"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_runtime_dependency(%q<rvm>, ["~> 1.8.0"])
+      s.add_runtime_dependency(%q<vagrant>, ["= 0.8.7"])
       s.add_development_dependency(%q<rr>, ["~> 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_development_dependency(%q<chef>, ["~> 0.10.0"])
+      s.add_development_dependency(%q<cucumber>, ["> 1.0.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.11"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.21"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.3.1"])
+      s.add_development_dependency(%q<vagrant>, ["= 0.8.7"])
     else
-      s.add_dependency(%q<aruba>, ["~> 0.3.6"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<chef>, ["~> 0.10.0"])
+      s.add_dependency(%q<childprocess>, [">= 0.1.7"])
+      s.add_dependency(%q<cucumber>, ["> 1.0.0"])
       s.add_dependency(%q<grit>, ["~> 2.4.1"])
-      s.add_dependency(%q<rvm>, ["~> 1.5.2"])
       s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<vagrant>, ["~> 0.7.2"])
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_dependency(%q<rvm>, ["~> 1.8.0"])
+      s.add_dependency(%q<vagrant>, ["= 0.8.7"])
       s.add_dependency(%q<rr>, ["~> 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_dependency(%q<chef>, ["~> 0.10.0"])
+      s.add_dependency(%q<cucumber>, ["> 1.0.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.11"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.21"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_dependency(%q<roodi>, ["~> 2.1.0"])
       s.add_dependency(%q<fakefs>, ["~> 0.3.1"])
+      s.add_dependency(%q<vagrant>, ["= 0.8.7"])
     end
   else
-    s.add_dependency(%q<aruba>, ["~> 0.3.6"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<chef>, ["~> 0.10.0"])
+    s.add_dependency(%q<childprocess>, [">= 0.1.7"])
+    s.add_dependency(%q<cucumber>, ["> 1.0.0"])
     s.add_dependency(%q<grit>, ["~> 2.4.1"])
-    s.add_dependency(%q<rvm>, ["~> 1.5.2"])
     s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<vagrant>, ["~> 0.7.2"])
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
+    s.add_dependency(%q<rvm>, ["~> 1.8.0"])
+    s.add_dependency(%q<vagrant>, ["= 0.8.7"])
     s.add_dependency(%q<rr>, ["~> 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
+    s.add_dependency(%q<chef>, ["~> 0.10.0"])
+    s.add_dependency(%q<cucumber>, ["> 1.0.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.11"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.21"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<reek>, ["~> 1.2.8"])
     s.add_dependency(%q<roodi>, ["~> 2.1.0"])
     s.add_dependency(%q<fakefs>, ["~> 0.3.1"])
+    s.add_dependency(%q<vagrant>, ["= 0.8.7"])
   end
 end
 

data/features/about.md

@@ -111,6 +111,10 @@ If you need to change a default hook, add your variation of the following to you
       @aruba_timeout_seconds.nil? || @aruba_timeout_seconds < 3600 ? @aruba_timeout_seconds = 3600 : @aruba_timeout_seconds
     end
 
+    Before('@ssh_local') do
+      @aruba_io_wait_seconds.nil? || @aruba_io_wait_seconds < 0.3 ? @aruba_io_wait_seconds = 0.3 : @aruba_io_wait_seconds
+    end
+
 ### Aruba
 Aruba will timeout if a command takes too long.  A convention is to tag Features/Scenarios
 according to the size of the timeout threshold:

data/features/avagrant_steps/vagrant_steps.feature

@@ -0,0 +1,13 @@
+@chef @vagrant @step_features @announce
+Feature: Vagrant steps
+  In order to test automated Chef deployments
+  As an administrator
+  I want to know what Vagrant steps are available
+
+  Background:
+    Given that "cuken/chef" has been required
+
+  Scenario: Vagrant
+    Then these steps are defined for "cuken/cucumber/vagrant.rb":
+      | step                                                   |
+      |the Vagrantfile "([^\"]*)" exists |

data/features/chef_examples/cookbooks_cookbook.feature

@@ -31,7 +31,7 @@ Feature: Cookbook Validity
      When I clone the Cookbooks:
      | cookbook | tag       | destination                         |
      | hfgrt    | 37s.0.1.0 | ckbk/scratch/myapp/cookbooks/hosts3 |
-     Then the output should contain "Could not find Repository cookbooks/hfgrt"
+     Then the output contains "Could not find Repository cookbooks/hfgrt"
 
   Scenario: Clone multiple Cookbooks from a Cookbooks URI
     Given the remote Cookbooks URI "git://github.com/cookbooks/"

data/features/chef_examples/cookbooks_metadata.feature

@@ -7,7 +7,7 @@ Feature: Cookbook Metadata
   Background:
     Given a default base Chef repository in "ckbk/scratch/myapp"
       And the local Chef repository exists
-      And a file named "ckbk/scratch/myapp/.chef/knife.rb" with:
+      And the file "ckbk/scratch/myapp/.chef/knife.rb" contains:
       """
       current_dir = File.dirname(__FILE__)
       log_level :debug
@@ -27,15 +27,15 @@ Feature: Cookbook Metadata
 
   Scenario: Generate metadata for all cookbooks
      When I successfully generate all Cookbook metadata
-      And the output should contain "DEBUG: Generated "
-      And the output should not contain "DEBUG: No "
+      And the output contains "DEBUG: Generated "
+      And the output does not contain "DEBUG: No "
     Then the file "ckbk/scratch/myapp/cookbooks/hosts/metadata.json" exists
 
   Scenario: Generate metadata for a specific cookbook
      When we record the a-mtime of "ckbk/scratch/myapp/cookbooks/hosts/metadata.json"
       And I successfully generate Cookbook "hosts" metadata
-      And the output should contain "DEBUG: Generated "
-      And the output should not contain "DEBUG: No "
+      And the output contains "DEBUG: Generated "
+      And the output does not contain "DEBUG: No "
     Then the file "ckbk/scratch/myapp/cookbooks/hosts/metadata.json" exists
       And the mtime of "ckbk/scratch/myapp/cookbooks/hosts/metadata.json" changes
 

data/features/chef_examples/cookbooks_repo.feature

@@ -5,7 +5,7 @@ Feature: Clone local Chef repository for cookbooks
   I want to automatically clone a generic base Chef repository
 
   Background:
-      Given a directory named "ckbk/scratch"
+      Given the directory "ckbk/scratch"
 
   Scenario: Clone a local Chef skeleton repository
       And the remote Chef repository "./../../features/data/repositories/chef-repo/.git"

data/features/chef_examples/knife_admin_client.feature

@@ -15,8 +15,8 @@ Feature: Reusable Chef Knife steps
   Background:
     Given the Chef server URI "http://localhost:4000"
       And the Chef admin client "bobo-admin" exists
-      And a directory named "foo/bar"
-      And a file named "foo/bar/bobo-admin.pem" with:
+      And the directory "foo/bar"
+      And the file "foo/bar/bobo-admin.pem" contains:
     """
     -----BEGIN RSA PRIVATE KEY-----
     MIIEogIBAAKCAQEA2iu6ETTD3Ig/0dlbbQSPsVcSUGQ3O3Kgt+6h6OwD1HnQUHge
@@ -46,7 +46,7 @@ Feature: Reusable Chef Knife steps
     osFXY7fq6Hd9CEFLcDacyxXShu095MPJGTSBwwykWo+C+DUC5ts=
     -----END RSA PRIVATE KEY-----
     """
-    And a file named "foo/bar/.chef/knife.rb" with:
+    And the file "foo/bar/.chef/knife.rb" contains:
     """
     current_dir = File.dirname(__FILE__)
     log_level :debug
@@ -63,7 +63,7 @@ Feature: Reusable Chef Knife steps
   Scenario: Knife steps default knife.rb path
      Given I cd to "foo/bar"
       When I successfully run `knife node list`
-      Then the output should contain:
+      Then the output contains:
      """
      DEBUG: Signing the request as bobo-admin
      DEBUG: Sending HTTP Request via GET to localhost:4000/nodes
@@ -76,7 +76,7 @@ Feature: Reusable Chef Knife steps
       When the Nodes are:
       | node |
       |      |
-      Then the output should contain:
+      Then the output contains:
      """
      DEBUG: Signing the request as bobo-admin
      DEBUG: Sending HTTP Request via GET to localhost:4000/nodes
@@ -88,7 +88,7 @@ Feature: Reusable Chef Knife steps
       And I cd to "./../../"
       And a Cookbook path "features/data/cookbooks_not_uploaded_at_feature_start"
      When I successfully run Knife's "cookbook upload version_updated"
-     Then the output should contain:
+     Then the output contains:
     """
     ERROR: Could not find cookbook version_updated in your cookbook path, skipping it
 
@@ -99,14 +99,14 @@ Feature: Reusable Chef Knife steps
       And I cd to "./../../"
       And a Cookbook path "features/data/repositories/cookbooks_not_uploaded_at_feature_start/version_updated"
      When I successfully run Knife's "cookbook upload version_updated"
-     Then the output should contain "INFO: Uploading files"
-      And the output should contain "DEBUG: Committing sandbox"
-      And the output should contain "INFO: Upload complete!"
+     Then the output contains "INFO: Uploading files"
+      And the output contains "DEBUG: Committing sandbox"
+      And the output contains "INFO: Upload complete!"
 
   Scenario: Verify a cookbook with path to knife.rb created earlier
     Given the Knife file "foo/bar/.chef/knife.rb"
     And I successfully run Knife's "cookbook show version_updated"
-    And the output should contain:
+    And the output contains:
     """
     DEBUG: Signing the request as bobo-admin
     DEBUG: Sending HTTP Request via GET to localhost:4000/cookbooks/version_updated
@@ -123,7 +123,7 @@ Feature: Reusable Chef Knife steps
      When I interactively run Knife's "cookbook delete version_updated"
       And I type "Y"
       And wait "5" seconds
-     Then the output should contain:
+     Then the output contains:
       """
       DEBUG: Signing the request as bobo-admin
       DEBUG: Sending HTTP Request via GET to localhost:4000/cookbooks/version_updated
@@ -140,7 +140,7 @@ Feature: Reusable Chef Knife steps
       And I interactively run Knife's "cookbook delete version_updated 2.0.0"
       And I type "Y"
       And wait "5" seconds
-     Then the output should contain:
+     Then the output contains:
       """
       Do you really want to delete version_updated version 2.0.0? (Y/N) DEBUG: Signing the request as bobo-admin
       DEBUG: Sending HTTP Request via DELETE to localhost:4000/cookbooks/version_updated/2.0.0

data/features/chef_examples/knife_client_create.feature

@@ -10,4 +10,4 @@
 #Background:
 #  Given the Chef server URI "http://localhost:4000"
 #    And the Chef admin client "bobo-admin" exists
-#    And a directory named "foo/bar"
+#    And the directory "foo/bar"

data/features/chef_examples/zenoss_example/01_chef_server_setup.feature

@@ -191,7 +191,7 @@ Feature: 01) Chef-Server VM
       And I type "sudo chmod 0644 /etc/chef/certificates/key.pem"
       And I type "stat -c %A /etc/chef/webui.pem"
       And I type "stat -c %A /etc/chef/certificates/key.pem"
-     Then the output should contain:
+     Then the output contains:
           """
           -rw-r--r--
           -rw-r--r--

data/features/chef_examples/zenoss_example/02_monitor_vm_setup.feature

@@ -95,7 +95,7 @@ Feature: 02) Prepare Monitor VM
 
     Scenario: Configure Knife file for the Monitor's client certificate
         Given the directory ".chef"
-          And a file named ".chef/knife.rb" with:
+          And the file ".chef/knife.rb" contains:
               """
               current_dir = File.dirname(__FILE__)
               user = ENV['CHEF_USER'] || ENV['OPSCODE_USER'] || ENV['USER'] || `whoami`

data/features/chef_steps/cookbook_steps.feature

@@ -7,17 +7,8 @@ Feature: Cookbook steps
   Background:
     Given that "cuken/chef" has been required
 
-  Scenario: Generic Cookbook steps
-    Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
-      | step                                                                |
-      |a Cookbook path "([^"]*)"                                            |
-      |a Cookbooks path "([^"]*)"                                           |
-      |I successfully generate all Cookbook metadata                        |
-      |I successfully generate Cookbook "([^"]*)" metadata                  |
-      |the local Cookbook "([^"]*)" exists                                  |
-
   Scenario: Cookbook action steps
-    Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
+    Then these steps are defined for "cuken/cucumber/chef/cookbook/action.rb":
       | step                                                                |
       |I clone the remote Cookbook repository branch "([^"]*)" to "([^"]*)" |
       |I clone the Cookbook "([^"]*)" branch "([^"]*)" to "([^"]*)"         |
@@ -27,14 +18,13 @@ Feature: Cookbook steps
       |I successfully generate Cookbook "([^"]*)" metadata                  |
 
   Scenario: Local Cookbook and repository commands
-    Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
+    Then these steps are defined for "cuken/cucumber/chef/cookbook/local.rb":
       | step                                                                |
+      |a Cookbook path "([^"]*)"                                            |
+      |a Cookbooks path "([^"]*)"                                           |
+      |the local Cookbook "([^"]*)" exists                                  |
       |the local Cookbook repository "([^"]*)"                              |
       |the local Cookbook repository exists                                 |
-      |these local Cookbooks exist:                                         |
-      |the local Cookbook repository "([^"]*)"                              |
-      |the local Cookbook repository exists                                 |
-      |the local Cookbook "([^"]*)" exists                                  |
       |the local Site\-Cookbook "([^"]*)" exists                            |
       |the local Site\-Cookbook repository exists                           |
       |these local Cookbooks exist:                                         |
@@ -42,7 +32,7 @@ Feature: Cookbook steps
       |these local Site\-Cookbooks exist:                                   |
 
   Scenario: Remote Cookbook and repository commands
-    Then these steps are defined for "cuken/cucumber/chef/cookbook.rb":
+    Then these steps are defined for "cuken/cucumber/chef/cookbook/remote.rb":
       | step                                                                |
       |the remote Cookbook repository "([^"]*)"                             |
       |the remote Cookbooks URI "([^"]*)"                                   |

data/features/command_examples/commands.feature

@@ -11,15 +11,15 @@ Feature: Executing commands
 
   Scenario: Check Stdout
     When I run `echo 'i like cheese'`
-    Then the stdout from "echo 'i like cheese'" should contain "i like cheese"
+    Then the stdout from "echo 'i like cheese'" contains "i like cheese"
 
   Scenario: Check Stderr
     When I run `some_error`
-    Then the stderr from "some_error" should contain "No such file or directory - some_error"
+    Then the stderr from "some_error" contains "No such file or directory - some_error"
 
   Scenario: Check Stdout for multiple lines
     When I run `echo 'one\none\none\n'`
-    Then the output should contain:
+    Then the output contains:
     """
     one
     one

data/features/command_examples/exit_statuses.feature

@@ -0,0 +1,49 @@
+Feature: exit statuses
+
+  In order to specify expected exit statuses
+  As a developer using Cucumber
+  I want to use the "the exit status should be" step
+
+  Scenario: exit status of 0
+    When I run `ruby -h`
+    Then the exit status should be 0
+
+  Scenario: exit status of 0 with `
+    When I run `ruby -h`
+    Then the exit status should be 0
+
+  Scenario: Not explicitly exiting at all
+    When I run `ruby -e '42'`
+    Then the exit status should be 0
+    
+  Scenario: non-zero exit status
+    When I run `ruby -e 'exit 56'`
+    Then the exit status should be 56
+    And the exit status should not be 0
+
+  Scenario: Successfully run something
+    When I successfully run `ruby -e 'exit 0'`
+
+  Scenario: run something somewhere not yet existing outside Aruba's scratch
+    When I successfully run `pwd` in "/tmp/just/created"
+    Then the output should contain:
+      """
+      /tmp/just/created
+      """
+     And I successfully run `rm -rf /tmp/just/created`
+
+  Scenario: Successfully run something with `
+    When I successfully run `ruby -e 'exit 0'`
+
+  Scenario: Unsuccessfully run something
+    When I do aruba I successfully run `ruby -e 'exit 10'`
+    Then aruba should fail with "Exit status was 10"
+
+  Scenario: Try to run something that doesn't exist
+    When I run `does_not_exist`
+    Then the exit status should be 1
+
+  Scenario: Try to run something that doesn't exist somewhere that does not exist outside Aruba's scratch
+    When I run `does_not_exist` in "/tmp/in/the/blue/moon"
+    Then the exit status should be 1
+    And I successfully run `rm -rf /tmp/in/the/blue/moon`