aruba 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    aruba (0.4.0)
+    aruba (0.4.1)
       bcat (>= 0.6.1)
       childprocess (>= 0.1.9)
-      cucumber (>= 0.10.5)
+      cucumber (>= 0.10.7)
       rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
 
@@ -16,7 +16,7 @@ GEM
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (1.0.0)
+    cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.0)
@@ -26,7 +26,7 @@ GEM
     ffi (1.0.9)
     gherkin (2.4.0)
       json (>= 1.4.6)
-    json (1.5.1)
+    json (1.5.2)
     rack (1.3.0)
     rdiscount (1.6.8)
     rspec (2.6.0)

data/{History.txt → History.md}

@@ -1,85 +1,69 @@
-== 0.4.0
+## [v0.4.1](https://github.com/cucumber/aruba/compare/v0.4.0...v0.4.1)
+
+* Move more logic into Aruba::Api (Aslak Hellesøy)
+
+## [v0.4.0](https://github.com/cucumber/aruba/compare/v0.3.7...v0.4.0)
 
 * New, awesome HTML reporting feature that captures everything that happens during a scenario. (Aslak Hellesøy)
 * ANSI escapes from output are stripped by default. Override this with the @ansi tag. (Aslak Hellesøy)
 
-== 0.3.7
+## [v0.3.7](https://github.com/cucumber/aruba/compare/v0.3.6...v0.3.7)
 
 * Make Aruba::Api#get_process return the last executed process with passed cmd (Potapov Sergey)
 * Replace announce with puts to comply with cucumber 0.10.6 (Aslak Hellesøy)
 * Fix childprocess STDIN to be synchronous (#40, #71 Tim Ekl)
 
-== 0.3.6
+## [v0.3.6](https://github.com/cucumber/aruba/compare/v0.3.5...v0.3.6)
 
 * Changed default value of @aruba_timeout_seconds from 1 to 3. (Aslak Hellesøy)
 * Separate hooks and steps to make it easier to build your own steps on top of Aruba's API (Mike Sassak)
 * @no-clobber to prevent cleanup before each scenario (Mike Sassak)
 
-== 0.3.5
+## [v0.3.5](https://github.com/cucumber/aruba/compare/v0.3.4...v0.3.5)
 
-=== Bugfixes
 * Store processes in an array to ensure order of operations on Ruby 1.8.x (#48 Mike Sassak)
 
-== 0.3.4
+## [v0.3.4](https://github.com/cucumber/aruba/compare/v0.3.3...v0.3.4)
 
-* Use backticks (`) instead of quotes (") to specify command line. Quote still works, but is deprecated. (Anthony Eden, Aslak Hellesøy)
+* Use backticks (\`) instead of quotes (") to specify command line. Quote still works, but is deprecated. (Anthony Eden, Aslak Hellesøy)
 
-== 0.3.3
+## [v0.3.3](https://github.com/cucumber/aruba/compare/v0.3.2...v0.3.3)
 
 * Updated RSpec development requirement to 2.5 (Robert Speicher, Mike Sassak, Aslak Hellesøy)
 * Updated RubyGems dependency to 1.6.1 (Robert Speicher)
 
-== 0.3.2
+## [v0.3.2](https://github.com/cucumber/aruba/compare/v0.3.1...v0.3.2)
 
-=== Bugfixes
 * Wrong number of args in the When I overwrite step (Aslak Hellesøy)
 
-== 0.3.1
+## [v0.3.1](https://github.com/cucumber/aruba/compare/v0.3.0...v0.3.1)
 
-=== Bugfixes
 * Broken 0.3.0 release (#43, #44 Mike Sassak)
-
-=== Changed Features
 * Quotes (") and newline (\n) in step arguments are no longer unescaped. (Aslak Hellesøy)
 
-== 0.3.0
+## [v0.3.0](https://github.com/cucumber/aruba/compare/v0.2.8...v0.3.0)
 
-=== Bugfixes
 * Remove latency introduced in the 0.2.8 release (#42 Mike Sassak)
-
-=== New Features
 * New stepdef Then /^the stdout should contain:$/ do |partial_output| (Aslak Hellesøy)
-
-=== Changed Features
 * Quotes (") and newline (\n) in step arguments no longer need to be backslash-escaped. (Aslak Hellesøy)
 
-== 0.2.8
+## [v0.2.8](https://github.com/cucumber/aruba/compare/v0.2.7...v0.2.8)
 
-=== New Features
 * Replaced background_process with childprocess, a cross-platform process control library. This will allow Aruba to run on Windows and JRuby in addition to *nix MRI. (#16, #27, #31 Mike Sassak, Jari Bakken, Matt Wynne, Arve Knudsen)
 
-== 0.2.7
+## [v0.2.7](https://github.com/cucumber/aruba/compare/v0.2.6...v0.2.7)
 
-=== New Features
 * Upgrade to Cucumber 0.10.0. (Aslak Hellesøy)
-
-=== Changed Features
 * require 'aruba' does nothing - you have to require 'aruba/cucumber' now. This is to prevent bundler from loading it when we don't want to. (Aslak Hellesøy)
-
-=== Bug fixes
 * Outputting a lot of data causes process to time out (#30 Mike Sassak)
 
-== 0.2.6
+## [v0.2.6](https://github.com/cucumber/aruba/compare/v0.2.5...v0.2.6)
 
-=== New Features
 * You can set @aruba_timeout_seconds in a Before hook to tell Aruba to wait for a process to complete. Default: 1 second. (Aslak Hellesøy)
-
-=== Bug fixes
 * Fixed small bug in /^the stdout should contain exactly:$/ (Aslak Hellesøy)
 
-== 0.2.5
+## [v0.2.5](https://github.com/cucumber/aruba/compare/v0.2.4...v0.2.5)
 
-=== New Features
 * Added 'a file named "whatever" should (not) exist' (Robert Speicher)
 * Added 'a directory named "whatever" should (not) exist' (Robert Speicher)
 * Added /^the stderr should contain exactly:"$/ (Aslak Hellesøy)
@@ -87,90 +71,82 @@
 * Added /it should pass with exactly:/ (Aslak Hellesøy)
 * @announce, @announce-dir and @announce-cmd for interactive processes (Mike Sassak)
 * Add step defs for detecting output, stdout and stderr by process name (Mike Sassak)
-
-=== Bug fixes
 * Stop all processes before verifying filesystem changes to ensure async operations are complete (#17 Mike Sassak)
 * Outputting large amounts of data causes run steps to hang (#18 Mike Sassak)
 
-== 0.2.4
+## [v0.2.4](https://github.com/cucumber/aruba/compare/v0.2.3...v0.2.4)
 
-=== New Features
 * Added step definitions for removing files and checking presence of a single file. (Aslak Hellesøy)
 
-== 0.2.3
+## [v0.2.3](https://github.com/cucumber/aruba/compare/v0.2.2...v0.2.3)
 
-=== Bug fixes
 * Directory should not exist gives false-positive (#13,#15 Nicholas Rutherford)
-
-=== New Features
 * Added step definitions for comparing file contents with regexps (#9 Aslak Hellesøy)
 * Always put ./bin at the beginning of $PATH to make it easier to run own executables (#7 Aslak Hellesøy)
 * Communication with interactive processes (#4 Mike Sassak)
 * Remove hyphens separating stdout and stderr (Arve Knudsen)
 
-== 0.2.2
+## [v0.2.2](https://github.com/cucumber/aruba/compare/v0.2.1...v0.2.2)
 
-=== New Features
 * Added a @bin tag that sets up './bin' first on the path (Aslak Hellesøy)
 * Richer API making aruba easier to use from Ruby code. (Mark Nijhof, Aslak Hellesøy)
-
-=== Removed Features
 * No more support for RVM. Use rvm 1.9.2,1.8.7 exec cucumber .... instead. (Mark Nijhof, Aslak Hellesøy)
 
-== 0.2.1
+## [v0.2.1](https://github.com/cucumber/aruba/compare/v0.2.0...v0.2.1)
 
-=== Bugfixes
 * Always compare with RSpec should =~ instead of should match. This gives a diff when there is no match. (Aslak Hellesøy)
 
-== 0.2.0
+## [v0.2.0](https://github.com/cucumber/aruba/compare/v0.1.9...v0.2.0)
 
-=== New Features
 * Added aruba.gemspec. (David Chelimsky)
-
-=== Changed features
 * Several step definitions regarding output have changed. (#1 Aslak Hellesøy)
 
-  - /^I should see "([^\"]*)"$/
-  + /^the output should contain "([^"]*)"$/
+    - /^I should see "([^\"]*)"$/
+    + /^the output should contain "([^"]*)"$/
+
+    - /^I should not see "([^\"]*)"$/
+    + /^the output should not contain "([^"]*)"$/
 
-  - /^I should not see "([^\"]*)"$/
-  + /^the output should not contain "([^"]*)"$/
+    - /^I should see:$/
+    + /^the output should contain:$/
 
-  - /^I should see:$/
-  + /^the output should contain:$/
+    - /^I should not see:$/
+    + /^the output should not contain:$/
 
-  - /^I should not see:$/
-  + /^the output should not contain:$/
+    - /^I should see exactly "([^\"]*)"$/
+    + /^the output should contain exactly "([^"]*)"$/
 
-  - /^I should see exactly "([^\"]*)"$/
-  + /^the output should contain exactly "([^"]*)"$/
+    - /^I should see exactly:$/
+    + /^the output should contain exactly:$/
 
-  - /^I should see exactly:$/
-  + /^the output should contain exactly:$/
+    - /^I should see matching \/([^\/]*)\/$/
+    + /^the output should match \/([^\/]*)\/$/
 
-  - /^I should see matching \/([^\/]*)\/$/
-  + /^the output should match \/([^\/]*)\/$/
+    - /^I should see matching:$/
+    + /^the output should match:$/
 
-  - /^I should see matching:$/
-  + /^the output should match:$/
+## [v0.1.9](https://github.com/cucumber/aruba/compare/v0.1.8...v0.1.9)
 
-== 0.1.9
 * If the GOTGEMS environment variable is set, bundler won't run (faster). (Aslak Hellesøy)
 
-== 0.1.8
+## [v0.1.8](https://github.com/cucumber/aruba/compare/v0.1.7...v0.1.8)
+
 * Use // instead of "" for "I should see matching" step. (Aslak Hellesøy)
 * Replace rvm gemset character '%' with '@' for rvm 0.1.24 (#5 Ashley Moran)
 * Support gem bundler, making it easier to specify gems. (Aslak Hellesøy)
 
-== 0.1.7
+## [v0.1.7](https://github.com/cucumber/aruba/compare/v0.1.6...v0.1.7)
+
 * New @announce-stderr tag (Robert Wahler)
 * New "I should see matching" steps using Regexp (Robert Wahler)
 
-== 0.1.6
+## [v0.1.6](https://github.com/cucumber/aruba/compare/v0.1.5...v0.1.6)
+
 * When /^I successfully run "(.*)"$/ now prints the combined output if exit status is not 0. (Aslak Hellesøy)
 * Add bundle to list of common ruby scripts. (Aslak Hellesøy)
 
-== 0.1.5
+## [v0.1.5](https://github.com/cucumber/aruba/compare/v0.1.4...v0.1.5)
+
 * Added ability to map rvm versions to a specific version with config/aruba-rvm.yml. (Aslak Hellesøy)
 * Check for presence of files. (Aslak Hellesøy)
 * Allow specification of rvm gemsets. (Aslak Hellesøy)
@@ -178,17 +154,22 @@
 * Added support for rvm, making it possible to choose Ruby interpreter. (Aslak Hellesøy)
 * Added @announce-cmd, @announce-stdout and @announce tags, useful for seeing what's executed and outputted. (Aslak Hellesøy)
 
-== 0.1.4
+## [v0.1.4](https://github.com/cucumber/aruba/compare/v0.1.3...v0.1.4)
+
 * New step definition for appending to a file (Aslak Hellesøy)
 
-== 0.1.3
+## [v0.1.3](https://github.com/cucumber/aruba/compare/v0.1.2...v0.1.3)
+
 * New step definition for cd (change directory) (Aslak Hellesøy)
 
-== 0.1.2
+## [v0.1.2](https://github.com/cucumber/aruba/compare/v0.1.1...v0.1.2)
+
 * Separated API from Cucumber step definitions, makes this usable without Cucumber. (Aslak Hellesøy)
 
-== 0.1.1
+## [v0.1.1](https://github.com/cucumber/aruba/compare/v0.1.0...v0.1.1)
+
 * Better Regexp escaping (David Chelimsky)
 
-== 0.1.0
+## [v0.1.0](https://github.com/cucumber/aruba/compare/ed6a175d23aaff62dbf355706996f276f304ae8b...v0.1.1)
+
 * First release (David Chelimsky and Aslak Hellesøy)

data/{README.rdoc → README.md}

@@ -4,70 +4,89 @@ Aruba is Cucumber extension for Command line applications written in any program
 * Manipulate the file system
 * Create great HTML documentation based on your own Cucumber scenarios
 
-== Usage
+## Usage
 
-  gem install aruba
+If you have a `Gemfile`, add `aruba`. Otherwise, install it like this:
 
-Then, just require the library in one of your ruby files under <tt>features/support</tt> (e.g. <tt>env.rb</tt>)
+    gem install aruba
 
-  require 'aruba/cucumber'
+Then, `require` the library in one of your ruby files under `features/support` (e.g. `env.rb`)
 
-You now have a bunch of step definitions that you can use in your features. Look at aruba/cucumber.rb
-to see all the step definitions. Look at features/*.feature for examples (which are also testing Aruba
+    require 'aruba/cucumber'
+
+You now have a bunch of step definitions that you can use in your features. Look at `lib/aruba/cucumber.rb`
+to see them all. Look at `features/*.feature` for examples (which are also testing Aruba
 itself).
 
-== Tags
+## Configuration
 
-Aruba has tags you can put on on individual scenarios, or on a feature.
+Aruba has some default behaviour that you can change if you need to.
 
-To get more information use these tags:
+### Use a different working directory
 
-* <tt>@announce-cmd</tt> - See what command is is run
-* <tt>@announce-stdout</tt> - See the stdout
-* <tt>@announce-stderr</tt> - See the stderr
-* <tt>@announce-dir</tt> - See the current directory
-* <tt>@announce-env</tt> - See environment variables set by Aruba
-* <tt>@announce</tt> - Does all of the above
+Per default Aruba will create a directory `tmp/aruba` where it performs its file operations.
+If you want to change this behaviour put this into your `features/support/env.rb`:
 
-To prevent Aruba from removing its working directory before each scenario:
+    Before do
+      @dirs = ["somewhere/else"]
+    end
 
-* <tt>@no-clobber</tt> - Don't cleanup before scenarios
 
-Aruba strips away ANSI escapes from the stdout and stderr of spawned children by default. If you want to override this behaviour
-and leave the ANSI escape characters intact, just tag your scenario with <tt>@ansi</tt>. Alternatively you can add your own Before
-hook that sets @aruba_keep_ansi=true
+### Modify the PATH
 
-== Runtime Configuration
+If testing an executable in your project's `bin` directory, it might not be in the `PATH` Aruba 
+uses.  An easy way to set it is to put the following in `features/support/env.rb`:
 
-Per default Aruba will create a directory <tt>tmp/aruba</tt> where it performs it's file operations.
-If you want to change this behaviour put this into your <tt>features/support/env.rb</tt>:
+    ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
-  Before do
-    @dirs = ["somewhere/else"]
-  end
+### Increasing timeouts
 
-If testing an executable in your project's `bin` directory, it might not be in the path Aruba 
-uses.  An easy way to set it is to put the following in <tt>features/support/env.rb</tt>:
+A process sometimes takes longer than expected to terminate, and Aruba will kill them off (and fail your scenario) if it is still alive after 3 seconds. If you need more time you can modify the timeout by assigning a different value to `@aruba_timeout_seconds` in a `Before` block: 
 
-    ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+    Before do
+      @aruba_timeout_seconds = 5
+    end
 
-Set <tt>@aruba_timeout_seconds</tt> to control the amount of time Aruba will wait for a process to 
-finish running before terminating it: 
-
-  Before do
-    @aruba_timeout_seconds = 5
-  end
+### Increasing IO wait time
 
 Running processes interactively can result in race conditions when Aruba executes an IO-related step
 but the interactive process has not yet flushed or read some content. To help prevent this Aruba waits
 before reading or writing to the process if it is still running. You can control the wait by setting
-<tt>@aruba_io_wait_seconds</tt> to an appropriate value. This is particularly useful with tags:
+`@aruba_io_wait_seconds` to an appropriate value. This is particularly useful with tags:
+
+    Before('@slow_process') do
+      @aruba_io_wait_seconds = 5
+    end
+
+### Tags
+
+Aruba defines several tags that you can put on on individual scenarios, or on a feature.
+
+#### Seeing more output with `@announce-*`
+
+To get more information on what Aruba is doing, use these tags:
 
-  Before('@slow_process') do
-    @aruba_io_wait_seconds = 5
-  end
+* `@announce-cmd` - See what command is is run
+* `@announce-stdout` - See the stdout
+* `@announce-stderr` - See the stderr
+* `@announce-dir` - See the current directory
+* `@announce-env` - See environment variables set by Aruba
+* `@announce` - Does all of the above
 
-== Reporting
+#### Keep files around with `@no-clobber`
+
+Aruba clobbers all files in its working directory before each scenario. -Unless you tag it with `@no-clobber`
+
+#### Making assertions about ANSI escapes with `@ansi`
+
+Aruba strips away ANSI escapes from the stdout and stderr of spawned child processes by default. It's usually rather cumbersome to
+make assertions about coloured output. Still, there might be cases where you want to leave the ANSI escapes intact. Just tag your
+scenario with `@ansi`. Alternatively you can add your own Before
+hook that sets `@aruba_keep_ansi = true`.
+
+## Reporting
+
+*Important* - you need [Pygments](http://pygments.org/) installed to use this feature.
 
 Aruba can generate a HTML page for each scenario that contains:
 
@@ -75,9 +94,9 @@ Aruba can generate a HTML page for each scenario that contains:
 * The description from the scenario (You can use Markdown here)
 * The command(s) that were run
 * The output from those commands (in colour if the output uses ANSI escapes)
-* The files that were created (in colour - syntax highlighted by [Pygments](http://pygments.org/))
+* The files that were created (syntax highlighted in in colour)
 
-Reporting is off by default, but you can enable it by defining the`ARUBA_REPORT_DIR` environment variable, giving it the value
+Reporting is off by default, but you can enable it by defining the `ARUBA_REPORT_DIR` environment variable, giving it the value
 where reports should be written:
 
     ARUBA_REPORT_DIR=doc cucumber features
@@ -89,10 +108,10 @@ This will use Aruba's built-in template by default (See the `templates` folder).
 The templates directory must contain a `main.erb` and `files.erb` template. It can also contain other assets such
 as css, javascript and images. All of these files will be copied over to the report dir well.
 
-=== Escaping Markdown
+### Escaping Markdown
 
 There are some edge cases where Gherkin and Markdown don't agree. Bullet lists using `*` is one example. The `*` is also an alias for
-step keywords in Gherkin. Markdown headers (the kind starting with a #) is another example. They are parsed as comments by Gherkin. To use either of these, just escape them with a backslash. So instead of writing:
+step keywords in Gherkin. Markdown headers (the kind starting with a `#`) is another example. They are parsed as comments by Gherkin. To use either of these, just escape them with a backslash. So instead of writing:
 
     Scenario: Make tea
       ## Making tea
@@ -117,31 +136,22 @@ Another option is to use alternative Markdown syntax and omit conflicts and esca
 
     Scenario: Make tea
       Making tea
-      ==========
+      ----------
       - Get a pot
       - And some hot water
   
       Given...
 
-=== Prerequisites
-
-Aruba doesn't bundle all of the tools needed for report generation. You have to add these yourself to your project:
-
-* bcat (gem)
-* rdiscount (gem)
-* pygments
-
-== Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.  Note: the existing tests may fail
-  with pre-1.9 versions of ruby; upgrade to get clean runs.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with Rakefile, gemspec or History.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2010 Aslak Hellesøy and David Chelimsky. See LICENSE for details.
+Copyright (c) 2010,2011 Aslak Hellesøy, David Chelimsky and Mike Sassak. See LICENSE for details.

data/aruba.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.4.0'
+  s.version     = '0.4.1'
   s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak"]
   s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
   s.summary     = "aruba-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = 'http://github.com/aslakhellesoy/aruba'
 
-  s.add_dependency 'cucumber', '>= 0.10.5'
+  s.add_dependency 'cucumber', '>= 0.10.7'
   s.add_dependency 'childprocess', '>= 0.1.9'
   s.add_dependency 'rspec', '>= 2.6.0'
   s.add_dependency 'bcat', '>= 0.6.1'
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "History.txt"]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 end

data/lib/aruba/api.rb

@@ -148,6 +148,14 @@ module Aruba
       unescape(actual).should include(unescape(expected))
     end
 
+    def assert_matching_output(expected, actual)
+      unescape(actual).should =~ /#{unescape(expected)}/m
+    end
+
+    def assert_no_partial_output(unexpected, actual)
+      actual.should_not include(unexpected)
+    end
+
     def assert_passing_with(expected)
       assert_exit_status_and_partial_output(true, expected)
     end
@@ -158,7 +166,7 @@ module Aruba
 
     def assert_exit_status_and_partial_output(expect_to_pass, expected)
       assert_partial_output(expected, all_output)
-      assert_exiting_with(expect_to_pass)
+      assert_success(expect_to_pass)
     end
 
     # TODO: Remove this. Call more methods elsewhere instead. Reveals more intent.
@@ -168,15 +176,19 @@ module Aruba
       else
         assert_partial_output(expected_output, all_output)
       end
-      assert_exiting_with(expect_to_pass)
+      assert_success(expect_to_pass)
     end
 
-    def assert_exiting_with(expect_to_pass)
-      if expect_to_pass
-        @last_exit_status.should == 0
-      else
-        @last_exit_status.should_not == 0
-      end
+    def assert_success(success)
+      success ? assert_exit_status(0) : assert_not_exit_status(0)
+    end
+
+    def assert_exit_status(status)
+      @last_exit_status.should == status
+    end
+
+    def assert_not_exit_status(status)
+      @last_exit_status.should_not == status
     end
     
     def processes

data/lib/aruba/cucumber.rb

@@ -79,20 +79,20 @@ Then /^the output from "([^"]*)" should contain "([^"]*)"$/ do |cmd, expected|
   assert_partial_output(expected, output_from(cmd))
 end
 
-Then /^the output from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, partial_output|
-  output_from(cmd).should_not include(partial_output)
+Then /^the output from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, unexpected|
+  assert_no_partial_output(unexpected, output_from(cmd))
 end
 
-Then /^the output should not contain "([^"]*)"$/ do |partial_output|
-  all_output.should_not include(partial_output)
+Then /^the output should not contain "([^"]*)"$/ do |unexpected|
+  assert_no_partial_output(unexpected, all_output)
 end
 
 Then /^the output should contain:$/ do |expected|
   assert_partial_output(expected, all_output)
 end
 
-Then /^the output should not contain:$/ do |partial_output|
-  all_output.should_not include(partial_output)
+Then /^the output should not contain:$/ do |unexpected|
+  assert_no_partial_output(unexpected, all_output)
 end
 
 Then /^the output should contain exactly "([^"]*)"$/ do |expected|
@@ -107,20 +107,20 @@ end
 # you don't need regex, use "the output should contain" instead since
 # that way, you don't have to escape regex characters that
 # appear naturally in the output
-Then /^the output should match \/([^\/]*)\/$/ do |partial_output|
-  all_output.should =~ /#{partial_output}/
+Then /^the output should match \/([^\/]*)\/$/ do |expected|
+  assert_matching_output(expected, all_output)
 end
  
-Then /^the output should match:$/ do |partial_output|
-  all_output.should =~ /#{partial_output}/m
+Then /^the output should match:$/ do |expected|
+  assert_matching_output(expected, all_output)
 end
 
 Then /^the exit status should be (\d+)$/ do |exit_status|
-  @last_exit_status.should == exit_status.to_i
+  assert_exit_status(exit_status.to_i)
 end
 
 Then /^the exit status should not be (\d+)$/ do |exit_status|
-  @last_exit_status.should_not == exit_status.to_i
+  assert_not_exit_status(exit_status.to_i)
 end
 
 Then /^it should (pass|fail) with:$/ do |pass_fail, partial_output|
@@ -131,25 +131,21 @@ Then /^it should (pass|fail) with exactly:$/ do |pass_fail, exact_output|
   assert_exit_status_and_output(pass_fail == "pass", exact_output, true)
 end
 
-Then /^it should (pass|fail) with regexp?:$/ do |pass_fail, partial_output|
-  Then "the output should match:", partial_output
-  if pass_fail == 'pass'
-    @last_exit_status.should == 0
-  else
-    @last_exit_status.should_not == 0
-  end
+Then /^it should (pass|fail) with regexp?:$/ do |pass_fail, expected|
+  assert_matching_output(expected, all_output)
+  assert_success(pass_fail == 'pass')
 end
 
-Then /^the stderr should contain "([^"]*)"$/ do |partial_output|
-  all_stderr.should include(partial_output)
+Then /^the stderr should contain "([^"]*)"$/ do |expected|
+  assert_partial_output(expected, all_stderr)
 end
 
-Then /^the stderr should contain:$/ do |partial_output|
-  all_stderr.should include(partial_output)
+Then /^the stderr should contain:$/ do |expected|
+  assert_partial_output(expected, all_stderr)
 end
 
-Then /^the stderr should contain exactly:$/ do |exact_output|
-  all_stderr.should == exact_output
+Then /^the stderr should contain exactly:$/ do |expected|
+  assert_exact_output(expected, all_stderr)
 end
 
 Then /^the stdout should contain "([^"]*)"$/ do |expected|
@@ -160,40 +156,40 @@ Then /^the stdout should contain:$/ do |expected|
   assert_partial_output(expected, all_stdout)
 end
 
-Then /^the stdout should contain exactly:$/ do |exact_output|
-  all_stdout.should == exact_output
+Then /^the stdout should contain exactly:$/ do |expected|
+  assert_exact_output(expected, all_stdout)
 end
 
-Then /^the stderr should not contain "([^"]*)"$/ do |partial_output|
-  all_stderr.should_not include(partial_output)
+Then /^the stderr should not contain "([^"]*)"$/ do |unexpected|
+  assert_no_partial_output(unexpected, all_stderr)
 end
 
-Then /^the stderr should not contain:$/ do |partial_output|
-  all_stderr.should_not include(partial_output)
+Then /^the stderr should not contain:$/ do |unexpected|
+  assert_no_partial_output(unexpected, all_stderr)
 end
 
-Then /^the stdout should not contain "([^"]*)"$/ do |partial_output|
-  all_stdout.should_not include(partial_output)
+Then /^the stdout should not contain "([^"]*)"$/ do |unexpected|
+  assert_no_partial_output(unexpected, all_stdout)
 end
 
-Then /^the stdout should not contain:$/ do |partial_output|
-  all_stdout.should_not include(partial_output)
+Then /^the stdout should not contain:$/ do |unexpected|
+  assert_no_partial_output(unexpected, all_stdout)
 end
 
-Then /^the stdout from "([^"]*)" should contain "([^"]*)"$/ do |cmd, partial_output|
-  stdout_from(cmd).should include(partial_output)
+Then /^the stdout from "([^"]*)" should contain "([^"]*)"$/ do |cmd, expected|
+  assert_partial_output(expected, stdout_from(cmd))
 end
 
-Then /^the stdout from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, partial_output|
-  stdout_from(cmd).should_not include(partial_output)
+Then /^the stdout from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, unexpected|
+  assert_no_partial_output(unexpected, stdout_from(cmd))
 end
 
-Then /^the stderr from "([^"]*)" should contain "([^"]*)"$/ do |cmd, partial_output|
-  stderr_from(cmd).should include(partial_output)
+Then /^the stderr from "([^"]*)" should contain "([^"]*)"$/ do |cmd, expected|
+  assert_partial_output(expected, stderr_from(cmd))
 end
 
-Then /^the stderr from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, partial_output|
-  stderr_from(cmd).should_not include(partial_output)
+Then /^the stderr from "([^"]*)" should not contain "([^"]*)"$/ do |cmd, unexpected|
+  assert_no_partial_output(unexpected, stderr_from(cmd))
 end
 
 Then /^the file "([^"]*)" should not exist$/ do |file_name|

data/lib/aruba/reporting.rb

@@ -41,7 +41,7 @@ if(ENV['ARUBA_REPORT_DIR'])
 
       def output
         @aruba_keep_ansi = true # We want the output coloured!
-        escaped_stdout = CGI.escape_html(all_stdout)
+        escaped_stdout = CGI.escapeHTML(all_stdout)
         html = Bcat::ANSI.new(escaped_stdout).to_html
         Bcat::ANSI::STYLES.each do |name, style|
           html.gsub!(/style='#{style}'/, %{class="xterm_#{name}"})

metadata

@@ -2,7 +2,7 @@
 name: aruba
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +01:00
+date: 2011-06-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.5
+        version: 0.10.7
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -76,19 +76,17 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-- History.txt
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- History.txt
+- History.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - aruba.gemspec
 - config/.gitignore
@@ -133,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1136291250320371611
+      hash: 2933985755347301009
       segments: 
       - 0
       version: "0"
@@ -142,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1136291250320371611
+      hash: 2933985755347301009
       segments: 
       - 0
       version: "0"
@@ -152,7 +150,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: aruba-0.4.0
+summary: aruba-0.4.1
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature