aruba 0.5.0 → 0.5.1

data/.gitignore

@@ -12,6 +12,7 @@ tmtags
 
 ## VIM
 *.swp
+tags
 
 ## PROJECT::GENERAL
 coverage

data/.travis.yml

@@ -1,10 +1,11 @@
+language: ruby
 rvm: 
   - 1.9.3
   - 1.9.2
   - 1.8.7
   - ree
   - jruby-18mode
-  - jruby-19mode
+#  - jruby-19mode
 # whitelist
 branches:
   only:

data/History.md

@@ -1,3 +1,7 @@
+## [v0.5.1](https://github.com/cucumber/aruba/compare/v0.5..v0.5.1)
+* Individual timeout settings when running commands (#124 Jarl Friis)
+* Varous fixes for JRuby tests, should now work on more versions of JRuby
+
 ## [v0.5](https://github.com/cucumber/aruba/compare/v0.4.10..v0.5)
 * Add #with_file_content to the DSL (#110 Pavel Argentov)
 * Make JRuby performance tweaks optional (#102 Taylor Carpenter, #125 Andy Lindeman)

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/cucumber/aruba.png)](http://travis-ci.org/cucumber/aruba)
+[![Build Status](https://secure.travis-ci.org/cucumber/aruba.png)](http://travis-ci.org/cucumber/aruba) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/cucumber/aruba)
 
 Aruba is Cucumber extension for Command line applications written in any programming language. Features at a glance:
 
@@ -71,7 +71,7 @@ Aruba defines several tags that you can put on on individual scenarios, or on a
 
 To get more information on what Aruba is doing, use these tags:
 
-* `@announce-cmd` - See what command is is run
+* `@announce-cmd` - See what command is run
 * `@announce-stdout` - See the stdout
 * `@announce-stderr` - See the stderr
 * `@announce-dir` - See the current directory
@@ -119,7 +119,7 @@ or setting a hook like this example:
 ```
 
 *Note* - no conflict resolution on the JAVA/JRuby environment options is
-done; only merging.  For more complex settings please manually set the
+done; only merging. For more complex settings please manually set the
 environment variables in the hook or externally.
 
 A larger process timeout for java may be needed

data/Rakefile

@@ -7,9 +7,10 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  opts = defined?(JRUBY_VERSION) ? %w{--tags ~@jruby} : []
-  opts += %w{--tags ~@fails-on-travis} if ENV['TRAVIS']
-  t.cucumber_opts = opts 
+end
+
+Cucumber::Rake::Task.new(:cucumber_wip) do |t|
+  t.cucumber_opts = "-p wip"
 end
 
 require 'rspec/core/rake_task'
@@ -20,6 +21,6 @@ RSpec::Core::RakeTask.new do |spec|
 end
 
 desc "Run tests, both RSpec and Cucumber"
-task :test => [:spec, :cucumber]
+task :test => [:spec, :cucumber, :cucumber_wip]
 
 task :default => :test

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.5.0'
+  s.version     = '0.5.1'
   s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak", "Matt Wynne"]
   s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
   s.summary     = "aruba-#{s.version}"
@@ -10,8 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/cucumber/aruba'
 
   s.add_runtime_dependency 'cucumber', '>= 1.1.1'
-  s.add_runtime_dependency 'childprocess', '= 0.2.3'
-  s.add_runtime_dependency 'ffi', '>= 1.0.11'
+  s.add_runtime_dependency 'childprocess', '~> 0.3.6'
   s.add_runtime_dependency 'rspec-expectations', '>= 2.7.0'
   s.add_development_dependency 'bcat', '>= 0.6.1'
   s.add_development_dependency 'rdiscount', '>= 1.6.8'

data/cucumber.yml

@@ -1,2 +1,9 @@
-default: --tags ~@wip
-wip: --wip --tags @wip
+<%
+std_opts = "--color --tags ~@wip"
+std_opts << " --tags ~@wip-jruby" if defined?(JRUBY_VERSION)
+
+wip_opts = "--color --tags @wip:3"
+wip_opts = "--color --tags @wip:3,@wip-jruby:3" if defined?(JRUBY_VERSION)
+%>
+default: <%= std_opts %>
+wip: --wip <%= wip_opts %>

data/features/exit_statuses.feature

@@ -5,38 +5,26 @@ Feature: exit statuses
   I want to use the "the exit status should be" step
 
   Scenario: exit status of 0
-    When I run `ruby -h`
+    When I run `true`
     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
+    When I run `false`
+    Then the exit status should be 1
     And the exit status should not be 0
 
   Scenario: Successfully run something
-    When I successfully run `ruby -e 'exit 0'`
+    When I successfully run `true`
 
-  Scenario: Successfully run something with `
-    When I successfully run `ruby -e 'exit 0'`
+  Scenario: Successfully run something for a long time
+    Given The default aruba timeout is 0 seconds
+    When I successfully run `ruby -e 'sleep 1'` for up to 2 seconds
 
-  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: Unsuccessfully run something that takes too long
+    Given The default aruba timeout is 0 seconds
+    When I do aruba I successfully run `ruby -e 'sleep 1'`
+    Then aruba should fail with "process still alive after 0 seconds"
 
-  @posix
-  Scenario: Try to run something that doesn't exist
-    When I run `does_not_exist`
-    Then the exit status should be 1
-
-  @posix
-  Scenario: Try to run something that doesn't exist with `
-    When I run `does_not_exist`
-    Then the exit status should be 1
+  Scenario: Unsuccessfully run something
+    When I do aruba I successfully run `false`
+    Then aruba should fail with ""

data/features/file_system_commands.feature

@@ -6,16 +6,16 @@ Feature: file system commands
   
   Scenario: create a dir
     Given a directory named "foo/bar"
-    When I run `ruby -e "puts test ?d, 'foo'"`
-    Then the stdout should contain "true"
+    When I run `file foo/bar`
+    Then the stdout should contain "foo/bar: directory"
   
   Scenario: create a file
-    Given a file named "foo/bar/example.rb" with:
+    Given a file named "foo/bar/example.txt" with:
       """
-      puts "hello world"
+      hello world
       """
-    When I run `ruby foo/bar/example.rb`
-    Then the output should contain "hello world"
+    When I run `cat foo/bar/example.txt`
+    Then the output should contain exactly "hello world"
 
   Scenario: create a fixed sized file
     Given a 1048576 byte file named "test.txt"
@@ -30,22 +30,17 @@ Feature: file system commands
     - One
     - Two
 
-    Given a file named "foo/bar/example.feature" with:
-      """
-      Feature: Example
-        Hello World
+    Given a file named "foo/bar/example.txt" with:
       """
-    And a file named "foo/bar/example.rb" with:
-      """
-      puts "\e[31mhello world\e[0m"
-
+      hello world
+      
       """
-    When I append to "foo/bar/example.rb" with:
+    When I append to "foo/bar/example.txt" with:
       """
-      puts "this was appended"
-
+      this was appended
+      
       """
-    When I run `ruby foo/bar/example.rb`
+    When I run `cat foo/bar/example.txt`
     Then the stdout should contain "hello world"
     And the stdout should contain "this was appended"
 
@@ -55,28 +50,23 @@ Feature: file system commands
     Then the file "thedir/thefile" should contain "xy"
 
   Scenario: clean up files generated in previous scenario
-    When I run `ruby foo/bar/example.rb`
-    Then the exit status should be 1
-    And the output should contain "No such file or directory -- foo/bar/example.rb"
+    Then the file "foo/bar/example.txt" should not exist
   
   Scenario: change to a subdir
-    Given a file named "foo/bar/example.rb" with:
+    Given a file named "foo/bar/example.txt" with:
       """
-      puts "hello world"
+      hello world
+      
       """
     When I cd to "foo/bar"
-    And I run `ruby example.rb`
+    And I run `cat example.txt`
     Then the output should contain "hello world"
 
   Scenario: Reset current directory from previous scenario
-    When I run `ruby example.rb`
-    Then the exit status should be 1
+    When I run `pwd`
+    Then the output should match /\057tmp\057aruba$/
 
   Scenario: Holler if cd to bad dir
-    Given a file named "foo/bar/example.rb" with:
-      """
-      puts "hello world"
-      """
     When I do aruba I cd to "foo/nonexistant"
     Then aruba should fail with "tmp/aruba/foo/nonexistant is not a directory"
 

data/features/flushing.feature

@@ -5,19 +5,19 @@ Feature: Flushing output
   I want to make sure that large amounts of output aren't buffered
 
   Scenario: A little output
-    When I run `ruby -e 'puts :a.to_s * 256'`
+    When I run `bash -c 'for ((c=0; c<256; c = c+1)); do echo -n "a"; done'`
     Then the output should contain "a"
     And the output should be 256 bytes long
     And the exit status should be 0
 
   Scenario: Tons of output
-    When I run `ruby -e 'puts :a.to_s * 65536'`
+    When I run `bash -c 'for ((c=0; c<65536; c = c+1)); do echo -n "a"; done'`
     Then the output should contain "a"
     And the output should be 65536 bytes long
     And the exit status should be 0
 
   Scenario: Tons of interactive output
-    When I run `ruby -e 'len = gets.chomp; puts :a.to_s * len.to_i'` interactively
+    When I run `bash -c 'read size; for ((c=0; c<$size; c = c+1)); do echo -n "a"; done'` interactively
     And I type "65536"
     Then the output should contain "a"
     And the output should be 65536 bytes long

data/features/interactive.feature

@@ -4,6 +4,7 @@ Feature: Interactive process control
   As a developer using Cucumber
   I want to use the interactive session steps
 
+  @wip-jruby
   Scenario: Running ruby interactively
     Given a file named "echo.rb" with:
       """
@@ -20,14 +21,14 @@ Feature: Interactive process control
       dlrow ,olleh
       """
 
-  @posix @fails-on-travis
+  @posix
   Scenario: Running a native binary interactively
-    When I run `bc -q` interactively
-    And I type "4 + 3"
-    And I type "quit"
+    When I run `cat` interactively
+    And I type "Hello, world"
+    And I type ""
     Then the output should contain:
       """
-      7
+      Hello, world
       """
 
   @posix

data/features/output.feature

@@ -4,37 +4,24 @@ Feature: Output
   As a developer using Cucumber
   I want to use the "the output should contain" step
 
-  @posix
-  Scenario: Run unknown command
-    When I run `neverever gonna work`
-    Then the output should contain:
-      """
-      No such file or directory - neverever
-      """
-
   @posix
   Scenario: Detect subset of one-line output
-    When I run `ruby -e 'puts \"hello world\"'`
-    Then the output should contain "hello world"
-
-  @posix
-  Scenario: Detect subset of one-line output
-    When I run `echo 'hello world'`
+    When I run `printf 'hello world'`
     Then the output should contain "hello world"
 
   Scenario: Detect absence of one-line output
-    When I run `ruby -e 'puts \"hello world\"'`
+    When I run `printf "hello world"`
     Then the output should not contain "good-bye"
 
   Scenario: Detect subset of multiline output
-    When I run `ruby -e 'puts \"hello\\nworld\"'`
+    When I run `printf "hello\nworld"`
     Then the output should contain:
       """
       hello
       """
 
-  Scenario: Detect subset of multiline output
-    When I run `ruby -e 'puts \"hello\\nworld\"'`
+  Scenario: Detect absence of multiline output
+    When I run `printf "hello\nworld"`
     Then the output should not contain:
       """
       good-bye
@@ -42,51 +29,48 @@ Feature: Output
 
   @posix
   Scenario: Detect exact one-line output
-    When I run `ruby -e 'puts \"hello world\"'`
+    When I run `printf "hello world"`
     Then the output should contain exactly:
       """
       hello world
-      
       """
 
   @ansi
   @posix
   Scenario: Detect exact one-line output with ANSI output
-    When I run `ruby -e 'puts \"\e[36mhello world\e[0m\"'`
+    When I run `printf "\e[36mhello world\e[0m"`
     Then the output should contain exactly:
       """
       \e[36mhello world\e[0m
-
       """
 
   @posix
   Scenario: Detect exact one-line output with ANSI output stripped by default
-    When I run `ruby -e 'puts \"\e[36mhello world\e[0m\"'`
+    When I run `printf "\e[36mhello world\e[0m"`
     Then the output should contain exactly:
       """
       hello world
-
       """
+
   @posix
   Scenario: Detect exact multiline output
-    When I run `ruby -e 'puts "hello\nworld"'`
+    When I run `printf "hello\nworld"`
     Then the output should contain exactly:
       """
       hello
       world
-
       """
 
   @announce
   Scenario: Detect subset of one-line output with regex
-    When I run `ruby --version`
+    When I run `printf "hello, ruby"`
     Then the output should contain "ruby"
-    And the output should match /ruby ([\d]+\.[\d]+\.[\d]+)(\w*\d*)? \(.*$/
+    And the output should match /^hello(, world)?/
 
   @announce
   @posix
   Scenario: Detect subset of multiline output with regex
-    When I run `ruby -e 'puts "hello\nworld\nextra line1\nextra line2\nimportant line"'`
+    When I run `printf "hello\nworld\nextra line1\nextra line2\nimportant line"`
     Then the output should match:
       """
       he..o
@@ -97,14 +81,14 @@ Feature: Output
 
   @announce
   Scenario: Negative matching of one-line output with regex
-    When I run `ruby --version`
+    When I run `printf "hello, ruby"`
     Then the output should contain "ruby"
     And the output should not match /ruby is a better perl$/
 
   @announce
   @posix
   Scenario: Negative matching of multiline output with regex
-    When I run `ruby -e 'puts "hello\nworld\nextra line1\nextra line2\nimportant line"'`
+    When I run `printf "hello\nworld\nextra line1\nextra line2\nimportant line"`
     Then the output should not match:
       """
       ruby
@@ -117,7 +101,7 @@ Feature: Output
   @announce
   @posix
   Scenario: Match passing exit status and partial output
-    When I run `ruby -e 'puts "hello\nworld"'`
+    When I run `printf "hello\nworld"`
     Then it should pass with:
       """
       hello
@@ -125,17 +109,16 @@ Feature: Output
 
   @posix
   Scenario: Match passing exit status and exact output
-    When I run `ruby -e 'puts "hello\nworld"'`
+    When I run `printf "hello\nworld"`
     Then it should pass with exactly:
       """
       hello
       world
-
       """
 
   @announce-stdout
   Scenario: Match failing exit status and partial output
-    When I run `ruby -e 'puts \"hello\\nworld\";exit 99'`
+    When I run `bash -c '(printf "hello\nworld";exit 99)'`
     Then it should fail with:
       """
       hello
@@ -143,18 +126,17 @@ Feature: Output
 
   @posix
   Scenario: Match failing exit status and exact output
-    When I run `ruby -e 'puts "hello\nworld";exit 99'`
+    When I run `bash -c '(printf "hello\nworld";exit 99)'`
     Then it should fail with exactly:
       """
       hello
       world
-
       """
 
   @announce-stdout
   @posix
   Scenario: Match failing exit status and output with regex
-    When I run `ruby -e 'puts \"hello\\nworld\";exit 99'`
+    When I run `bash -c '(printf "hello\nworld";exit 99)'`
     Then it should fail with regex:
       """
       hello\s*world
@@ -163,13 +145,13 @@ Feature: Output
   @announce-cmd
   @posix
   Scenario: Match output in stdout
-    When I run `ruby -e 'puts \"hello\\nworld\"'`
+    When I run `printf "hello\nworld"`
     Then the stdout should contain "hello"
     Then the stderr should not contain "hello"
 
   @announce
   Scenario: Match output on several lines
-    When I run `ruby -e 'puts %{GET /}'`
+    When I run `printf 'GET /'`
     Then the stdout should contain:
       """
       GET /
@@ -177,91 +159,93 @@ Feature: Output
 
   @posix
   Scenario: Match output on several lines using quotes
-    When I run `ruby -e 'puts %{GET "/"}'`
+    When I run `printf 'GET "/"'`
     Then the stdout should contain:
       """
       GET "/"
       """
 
-  @posix
-  Scenario: Match output in stdout
-    When I run `ruby -e 'puts \"hello\\nworld\"'`
-    Then the stdout should contain "hello"
-    Then the stderr should not contain "hello"
-
-
   @posix
   Scenario: Detect output from all processes
-    When I run `ruby -e 'puts \"hello world!\"'`
-    And I run `ruby -e 'puts gets.chomp.reverse'` interactively
-    And I type "hello"
+    When I run `printf "hello world!\n"`
+    And I run `cat` interactively
+    And I type "hola"
+    And I type ""
     Then the output should contain exactly:
       """
       hello world!
-      olleh
+      hola
 
       """
 
   @posix
   Scenario: Detect stdout from all processes
-    When I run `ruby -e 'puts \"hello world!\"'`
-    And I run `ruby -e 'puts gets.chomp.reverse'` interactively
-    And I type "hello"
+    When I run `printf "hello world!\n"`
+    And I run `cat` interactively
+    And I type "hola"
+    And I type ""
     Then the stdout should contain:
       """
       hello world!
-      olleh
-      """
-    And the stderr should not contain:
-      """
-      hello world!
-      olleh
+      hola
+
       """
+    And the stderr should not contain anything
 
   @posix
   Scenario: Detect stderr from all processes
-    When I run `ruby -e 'STDERR.puts \"hello world!\"'`
-    And I run `ruby -e 'STDERR.puts gets.chomp.reverse'` interactively
-    And I type "hello"
+    When I run `bash -c 'printf "hello world!\n" >&2'`
+    And I run `bash -c 'cat >&2 '` interactively
+    And I type "hola"
+    And I type ""
     Then the stderr should contain:
       """
       hello world!
-      olleh
-      """
-    And the stdout should not contain:
-      """
-      hello world!
-      olleh
+      hola
       """
+    And the stdout should not contain anything
 
   Scenario: Detect output from named source
-    When I run `ruby -e 'puts :simple'`
-    And I run `ruby -e 'puts gets.chomp'` interactively
+    When I run `printf 'simple'`
+    And I run `cat` interactively
     And I type "interactive"
-    Then the output from "ruby -e 'puts :simple'" should contain "simple"
-    And the output from "ruby -e 'puts gets.chomp'" should not contain "simple"
+    And I type ""
+    Then the output from "printf 'simple'" should contain "simple"
+    And the output from "printf 'simple'" should contain exactly "simple"
+    And the output from "printf 'simple'" should contain exactly:
+      """
+      simple
+      """
+    And the output from "cat" should not contain "simple"
 
   Scenario: Detect stdout from named source
-    When I run `ruby -e 'puts :hello'`
-    And I run `ruby -e 'puts :goodbye'`
-    Then the stdout from "ruby -e 'puts :hello'" should contain "hello"
-    And the stderr from "ruby -e 'puts :hello'" should not contain "hello"
-    And the stdout from "ruby -e 'puts :goodbye'" should not contain "hello"
+    When I run `printf 'hello'`
+    And I run `printf 'goodbye'`
+    Then the stdout from "printf 'hello'" should contain "hello"
+    And the stdout from "printf 'hello'" should contain exactly "hello"
+    And the stdout from "printf 'hello'" should contain exactly:
+      """
+      hello
+      """
+    And the stderr from "printf 'hello'" should not contain "hello"
+    And the stdout from "printf 'goodbye'" should not contain "hello"
 
   Scenario: Detect stderr from named source
-    When I run `ruby -e 'STDERR.puts :hello'`
-    And I run `ruby -e 'puts :goodbye'`
-    Then the stderr from "ruby -e 'STDERR.puts :hello'" should contain "hello"
-    And the stdout from "ruby -e 'STDERR.puts :hello'" should not contain "hello"
-    And the stderr from "ruby -e 'puts :goodbye'" should not contain "hello"
-
-  @wip
-  Scenario: Detect output from named source with custom name
+    When I run `bash -c 'printf hello >&2'`
+    And I run `printf goodbye`
+    Then the stderr from "bash -c 'printf hello >&2'" should contain "hello"
+    And the stderr from "bash -c 'printf hello >&2'" should contain exactly "hello"
+    And the stderr from "bash -c 'printf hello >&2'" should contain exactly:
+      """
+      hello
+      """
+    And the stdout from "bash -c 'printf hello >&2'" should not contain "hello"
+    And the stderr from "printf goodbye" should not contain "hello"
 
   Scenario: Detect second output from named source with custom name
     When I set env variable "ARUBA_TEST_VAR" to "first"
-    And I run `ruby -e 'puts ENV[%q(ARUBA_TEST_VAR)]'`
-    Then the output from "ruby -e 'puts ENV[%q(ARUBA_TEST_VAR)]'" should contain "first"
+    And I run `bash -c 'printf $ARUBA_TEST_VAR'`
+    Then the output from "bash -c 'printf $ARUBA_TEST_VAR'" should contain "first"
     When I set env variable "ARUBA_TEST_VAR" to "second"
-    And I run `ruby -e 'puts ENV[%q(ARUBA_TEST_VAR)]'`
-    Then the output from "ruby -e 'puts ENV[%q(ARUBA_TEST_VAR)]'" should contain "second"
+    And I run `bash -c 'printf $ARUBA_TEST_VAR'`
+    Then the output from "bash -c 'printf $ARUBA_TEST_VAR'" should contain "second"

data/features/step_definitions/aruba_dev_steps.rb

@@ -24,5 +24,5 @@ Then /^the following step should fail with Spec::Expectations::ExpectationNotMet
 end
 
 Then /^the output should be (\d+) bytes long$/ do |length|
-  all_output.chomp.length.should == length.to_i
+  all_output.length.should == length.to_i
 end

data/features/support/jruby.rb

@@ -0,0 +1,5 @@
+if RUBY_PLATFORM == 'java'
+  Before do
+    @aruba_timeout_seconds = 10
+  end
+end

data/lib/aruba/api.rb

@@ -23,7 +23,7 @@ module Aruba
     end
 
     def dirs
-      @dirs ||= ['tmp/aruba']
+      @dirs ||= ['tmp', 'aruba']
     end
 
     def write_file(file_name, file_content)
@@ -278,7 +278,8 @@ module Aruba
       processes.collect{ |_, process| process }
     end
 
-    def run(cmd)
+    def run(cmd, timeout = nil)
+      timeout ||= exit_timeout
       @commands ||= []
       @commands << cmd
 
@@ -290,7 +291,7 @@ module Aruba
         announcer.dir(Dir.pwd)
         announcer.cmd(cmd)
 
-        process = Process.new(cmd, exit_timeout, io_wait)
+        process = Process.new(cmd, timeout, io_wait)
         register_process(cmd, process)
         process.run!
 
@@ -310,8 +311,8 @@ module Aruba
       @aruba_io_wait_seconds || DEFAULT_IO_WAIT_SECONDS
     end
 
-    def run_simple(cmd, fail_on_error=true)
-      run(cmd) do |process|
+    def run_simple(cmd, fail_on_error=true, timeout = nil)
+      run(cmd, timeout) do |process|
         stop_process(process)
       end
       @timed_out = last_exit_status.nil?
@@ -323,11 +324,17 @@ module Aruba
     end
 
     def type(input)
+      return eot if "" == input ##If on Windows it is actually  (26 == 0x1A)
       _write_interactive(_ensure_newline(input))
     end
 
+    def eot
+      @interactive.stdin.close
+    end
+
     def _write_interactive(input)
       @interactive.stdin.write(input)
+      @interactive.stdin.flush
     end
 
     def _read_interactive

data/lib/aruba/cucumber.rb

@@ -4,6 +4,10 @@ require 'aruba/reporting'
 
 World(Aruba::Api)
 
+Given /The default aruba timeout is (\d+) seconds/ do |seconds|
+  @aruba_timeout_seconds = seconds.to_i
+end
+
 Given /^I'm using a clean gemset "([^"]*)"$/ do |gemset|
   use_clean_gemset(gemset)
 end
@@ -62,8 +66,10 @@ When /^I successfully run "(.*)"$/ do |cmd|
   run_simple(unescape(cmd))
 end
 
-When /^I successfully run `([^`]*)`$/ do |cmd|
-  run_simple(unescape(cmd))
+## I successfully run `echo -n "Hello"`
+## I successfully run `sleep 29` for up to 30 seconds
+When /^I successfully run `(.*?)`(?: for up to (\d+) seconds)?$/ do |cmd, secs|
+  run_simple(unescape(cmd), true, secs && secs.to_i)
 end
 
 When /^I run "([^"]*)" interactively$/ do |cmd|
@@ -112,12 +118,16 @@ Then /^the output should not contain:$/ do |unexpected|
   assert_no_partial_output(unexpected, all_output)
 end
 
-Then /^the output should contain exactly "([^"]*)"$/ do |expected|
-  assert_exact_output(expected, all_output)
+## the output should contain exactly "output"
+## the output from `echo -n "Hello"` should contain exactly "Hello"
+Then /^the output(?: from "(.*?)")? should contain exactly "(.*?)"$/ do |cmd, expected|
+  assert_exact_output(expected, cmd ? output_from(cmd) : all_output)
 end
 
-Then /^the output should contain exactly:$/ do |expected|
-  assert_exact_output(expected, all_output)
+## the output should contain exactly:
+## the output from `echo -n "Hello"` should contain exactly:
+Then /^the output(?: from "(.*?)")? should contain exactly:$/ do |cmd, expected|
+  assert_exact_output(expected, cmd ? output_from(cmd) : all_output)
 end
 
 # "the output should match" allows regex in the partial_output, if
@@ -162,28 +172,52 @@ Then /^it should (pass|fail) with regexp?:$/ do |pass_fail, expected|
   assert_success(pass_fail == 'pass')
 end
 
-Then /^the stderr should contain "([^"]*)"$/ do |expected|
-  assert_partial_output(expected, all_stderr)
-end
-
-Then /^the stderr should contain:$/ do |expected|
-  assert_partial_output(expected, all_stderr)
-end
-
-Then /^the stderr should contain exactly:$/ do |expected|
-  assert_exact_output(expected, all_stderr)
+## the stderr should contain "hello"
+## the stderr from "echo -n 'Hello'" should contain "hello"
+## the stderr should contain exactly:
+## the stderr from "echo -n 'Hello'" should contain exactly:
+Then /^the stderr(?: from "(.*?)")? should contain( exactly)? "(.*?)"$/ do |cmd, exact, expected|
+  if exact
+    assert_exact_output(expected, cmd ? stderr_from(cmd) : all_stderr)
+  else
+    assert_partial_output(expected, cmd ? stderr_from(cmd) : all_stderr)
+  end
 end
 
-Then /^the stdout should contain "([^"]*)"$/ do |expected|
-  assert_partial_output(expected, all_stdout)
+## the stderr should contain:
+## the stderr from "echo -n 'Hello'" should contain:
+## the stderr should contain exactly:
+## the stderr from "echo -n 'Hello'" should contain exactly:
+Then /^the stderr(?: from "(.*?)")? should contain( exactly)?:$/ do |cmd, exact, expected|
+  if exact
+    assert_exact_output(expected, cmd ? stderr_from(cmd) : all_stderr)
+  else
+    assert_partial_output(expected, cmd ? stderr_from(cmd) : all_stderr)
+  end
 end
 
-Then /^the stdout should contain:$/ do |expected|
-  assert_partial_output(expected, all_stdout)
+## the stdout should contain "hello"
+## the stdout from "echo -n 'Hello'" should contain "hello"
+## the stdout should contain exactly:
+## the stdout from "echo -n 'Hello'" should contain exactly:
+Then /^the stdout(?: from "(.*?)")? should contain( exactly)? "(.*?)"$/ do |cmd, exact, expected|
+  if exact
+    assert_exact_output(expected, cmd ? stdout_from(cmd) : all_stdout)
+  else
+    assert_partial_output(expected, cmd ? stdout_from(cmd) : all_stdout)
+  end
 end
 
-Then /^the stdout should contain exactly:$/ do |expected|
-  assert_exact_output(expected, all_stdout)
+## the stdout should contain:
+## the stdout from "echo -n 'Hello'" should contain:
+## the stdout should contain exactly:
+## the stdout from "echo -n 'Hello'" should contain exactly:
+Then /^the stdout(?: from "(.*?)")? should contain( exactly)?:$/ do |cmd, exact, expected|
+  if exact
+    assert_exact_output(expected, cmd ? stdout_from(cmd) : all_stdout)
+  else
+    assert_partial_output(expected, cmd ? stdout_from(cmd) : all_stdout)
+  end
 end
 
 Then /^the stderr should not contain "([^"]*)"$/ do |unexpected|
@@ -194,6 +228,11 @@ Then /^the stderr should not contain:$/ do |unexpected|
   assert_no_partial_output(unexpected, all_stderr)
 end
 
+Then /^the (stderr|stdout) should not contain anything$/ do |stream_name|
+  stream = self.send("all_#{stream_name}")
+  stream.should be_empty
+end
+
 Then /^the stdout should not contain "([^"]*)"$/ do |unexpected|
   assert_no_partial_output(unexpected, all_stdout)
 end
@@ -202,18 +241,10 @@ Then /^the stdout should not contain:$/ do |unexpected|
   assert_no_partial_output(unexpected, all_stdout)
 end
 
-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, unexpected|
   assert_no_partial_output(unexpected, stdout_from(cmd))
 end
 
-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, unexpected|
   assert_no_partial_output(unexpected, stderr_from(cmd))
 end

data/lib/aruba/errors.rb

@@ -0,0 +1,4 @@
+module Aruba
+  class Error < StandardError; end
+  class LaunchError < Error; end
+end

data/lib/aruba/process.rb

@@ -1,6 +1,7 @@
 require 'childprocess'
 require 'tempfile'
 require 'shellwords'
+require 'aruba/errors'
 
 module Aruba
   class Process
@@ -10,24 +11,29 @@ module Aruba
       @exit_timeout = exit_timeout
       @io_wait = io_wait
 
+      @cmd = cmd
+      @process = nil
+      @exit_code = nil
+    end
+
+    def run!(&block)
+      @process = ChildProcess.build(*shellwords(@cmd))
       @out = Tempfile.new("aruba-out")
       @err = Tempfile.new("aruba-err")
-      @process = ChildProcess.build(*shellwords(cmd))
       @process.io.stdout = @out
       @process.io.stderr = @err
       @process.duplex = true
-    end
-
-    def run!(&block)
-      @process.start
+      @exit_code = nil
+      begin
+        @process.start
+      rescue ChildProcess::LaunchError => e
+        raise LaunchError.new(e.message)
+      end
       yield self if block_given?
     end
 
     def stdin
-      wait_for_io do
-        @process.io.stdin.sync = true
-        @process.io.stdin
-      end
+      @process.io.stdin
     end
 
     def output(keep_ansi)
@@ -56,13 +62,15 @@ module Aruba
     end
 
     def stop(reader, keep_ansi)
-      return unless @process
+      return @exit_code unless @process
       unless @process.exited?
-        reader.stdout stdout(keep_ansi)
-        reader.stderr stderr(keep_ansi)
         @process.poll_for_exit(@exit_timeout)
       end
-      @process.exit_code
+      reader.stdout stdout(keep_ansi)
+      reader.stderr stderr(keep_ansi)
+      @exit_code = @process.exit_code
+      @process = nil
+      @exit_code
     end
 
     def terminate(keep_ansi)
@@ -76,7 +84,7 @@ module Aruba
     private
 
     def wait_for_io(&block)
-      sleep @io_wait if @process.alive?
+      sleep @io_wait if @process
       yield
     end
 

data/spec/aruba/api_spec.rb

@@ -19,10 +19,14 @@ describe Aruba::Api  do
     @file_name = "test.txt"
     @file_size = 256
     @file_path = File.join(@aruba.current_dir, @file_name)
-    @directory_name = 'test_dir'
-    @directory_path = File.join(@aruba.current_dir, @directory_name)
 
-    Dir.mkdir(@directory_path) if File.exist?(@directory_path)
+    (@aruba.dirs.length-1).times do |depth| #Ensure all parent dirs exists
+      dir = File.join(*@aruba.dirs[0..depth])
+      Dir.mkdir(dir) unless File.exist?(dir)
+    end
+    raise "We must work with relative paths, everything else is dangerous" if ?/ == @aruba.current_dir[0]
+    FileUtils.rm_rf(@aruba.current_dir)
+    Dir.mkdir(@aruba.current_dir)
   end
 
   describe 'current_dir' do
@@ -33,6 +37,11 @@ describe Aruba::Api  do
 
   describe 'directories' do
     context 'delete directory' do
+      before(:each) do
+        @directory_name = 'test_dir'
+        @directory_path = File.join(@aruba.current_dir, @directory_name)
+        Dir.mkdir(@directory_path)
+      end
       it 'should delete directory' do
         @aruba.remove_dir(@directory_name)
         File.exist?(@directory_path).should == false
@@ -57,7 +66,9 @@ describe Aruba::Api  do
         @aruba.write_fixed_size_file(@file_name, @file_size)
         lambda { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.should raise_error
       end
-
+    end
+    context 'existing' do
+      before(:each) { File.open(@file_path, 'w') { |f| f << "" } }
       it "should delete file" do
         @aruba.remove_file(@file_name)
         File.exist?(@file_path).should == false
@@ -67,12 +78,12 @@ describe Aruba::Api  do
 
   describe 'tags' do
     describe '@announce_stdout' do
-
+      after(:each){@aruba.stop_processes!}
       context 'enabled' do
         it "should announce to stdout exactly once" do
           @aruba.should_receive(:announce_or_puts).once
           @aruba.set_tag(:announce_stdout, true)
-          @aruba.run_simple("ruby -e 'puts \"hello world\"'", false)
+          @aruba.run_simple('echo "hello world"', false)
           @aruba.all_output.should match(/hello world/)
         end
       end
@@ -81,7 +92,7 @@ describe Aruba::Api  do
         it "should not announce to stdout" do
           @aruba.should_not_receive(:announce_or_puts)
           @aruba.set_tag(:announce_stdout, false)
-          @aruba.run_simple("ruby -e 'puts \"hello world\"'", false)
+          @aruba.run_simple('echo "hello world"', false)
           @aruba.all_output.should match(/hello world/)
         end
       end
@@ -122,9 +133,8 @@ describe Aruba::Api  do
   end #with_file_content
 
   describe "#assert_not_matching_output" do
-    before :each do
-      @aruba.run_simple("echo foo", false)
-    end
+    before(:each){ @aruba.run_simple("echo foo", false) }
+    after(:each){ @aruba.stop_processes! }
 
     it "passes when the output doesn't match a regexp" do
       @aruba.assert_not_matching_output "bar", @aruba.all_output
@@ -136,4 +146,20 @@ describe Aruba::Api  do
     end
   end
 
+  describe "#run_interactive" do
+    before(:each){@aruba.run_interactive "cat"}
+    after(:each){@aruba.stop_processes!}
+    it "respond to input" do
+      @aruba.type "Hello"
+      @aruba.type ""
+      @aruba.all_output.should == "Hello\n"
+    end
+
+    it "respond to eot" do
+      @aruba.type "Hello"
+      @aruba.eot
+      @aruba.all_output.should == "Hello\n"
+    end
+  end
+
 end # Aruba::Api

data/spec/aruba/process_spec.rb

@@ -3,7 +3,7 @@ require 'aruba/process'
 module Aruba
   describe Process do
 
-    let(:process) { Process.new('echo "yo"', 0, 0.1) }
+    let(:process) { Process.new('echo "yo"', 0.1, 0.1) }
 
     describe "#stdout" do
       before { process.run! }
@@ -29,5 +29,15 @@ module Aruba
       end
     end
 
+    describe "#run!" do
+      context "upon process launch error" do
+        let(:process_failure) { Process.new('does_not_exists', 1, 1) }
+
+        it "raises a Aruba::LaunchError" do
+          lambda{process_failure.run!}.should raise_error(::Aruba::LaunchError)
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -35,33 +35,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +176,8 @@ files:
   ZmVhdHVyZXMvc3RlcF9kZWZpbml0aW9ucy9hcnViYV9kZXZfc3RlcHMucmI=
 - !binary |-
   ZmVhdHVyZXMvc3VwcG9ydC9lbnYucmI=
+- !binary |-
+  ZmVhdHVyZXMvc3VwcG9ydC9qcnVieS5yYg==
 - !binary |-
   bGliL2FydWJhLnJi
 - !binary |-
@@ -202,6 +188,8 @@ files:
   bGliL2FydWJhL2N1Y3VtYmVyLnJi
 - !binary |-
   bGliL2FydWJhL2N1Y3VtYmVyL2hvb2tzLnJi
+- !binary |-
+  bGliL2FydWJhL2Vycm9ycy5yYg==
 - !binary |-
   bGliL2FydWJhL2pydWJ5LnJi
 - !binary |-
@@ -259,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2122942938856216296
+      hash: 1656561211491698914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -268,13 +256,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2122942938856216296
+      hash: 1656561211491698914
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: aruba-0.5.0
+summary: aruba-0.5.1
 test_files:
 - !binary |-
   ZmVhdHVyZXMvYmVmb3JlX2NtZF9ob29rcy5mZWF0dXJl
@@ -294,6 +282,8 @@ test_files:
   ZmVhdHVyZXMvc3RlcF9kZWZpbml0aW9ucy9hcnViYV9kZXZfc3RlcHMucmI=
 - !binary |-
   ZmVhdHVyZXMvc3VwcG9ydC9lbnYucmI=
+- !binary |-
+  ZmVhdHVyZXMvc3VwcG9ydC9qcnVieS5yYg==
 - !binary |-
   c3BlYy9hcnViYS9hcGlfc3BlYy5yYg==
 - !binary |-