aruba 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,11 @@
+== 0.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
 
 === New Features

data/aruba.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = "0.2.5"
-  s.authors     = ["Aslak Hellesøy", "David Chelimsky"]
+  s.version     = "0.2.6"
+  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'

data/features/exit_statuses.feature

@@ -7,6 +7,10 @@ Feature: exit statuses
   Scenario: exit status of 0
     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'"

data/features/flushing.feature

@@ -4,10 +4,17 @@ Feature: Flushing output
   As a developer using Aruba
   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'"
+    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'"
     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

data/lib/aruba/api.rb

@@ -196,19 +196,26 @@ module Aruba
         announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
         announce_or_puts("$ #{cmd}") if @announce_cmd
         
-        process = processes[cmd] = Process.new(cmd)
+        process = processes[cmd] = Process.new(cmd, timeout)
         process.run!
 
         block_given? ? yield(process) : process
       end
     end
 
+    DEFAULT_TIMEOUT_SECONDS = 1
+
+    def timeout
+      @aruba_timeout_seconds || DEFAULT_TIMEOUT_SECONDS
+    end
+
     def run_simple(cmd, fail_on_error=true)
       @last_exit_status = run(cmd) do |process|
         announce_or_puts(process.stdout) if @announce_stdout
         announce_or_puts(process.stderr) if @announce_stderr
         process.stop
       end
+      @timed_out = @last_exit_status.nil?
 
       if(@last_exit_status != 0 && fail_on_error)
         fail("Exit status was #{@last_exit_status}. Output:\n#{all_output}")

data/lib/aruba/cucumber.rb

@@ -181,7 +181,7 @@ Then /^the stderr should contain "([^"]*)"$/ do |partial_output|
 end
 
 Then /^the stderr should contain exactly:$/ do |exact_output|
-  @last_stderr.should == exact_output
+  all_stderr.should == exact_output
 end
 
 Then /^the stdout should contain "([^"]*)"$/ do |partial_output|
@@ -189,7 +189,7 @@ Then /^the stdout should contain "([^"]*)"$/ do |partial_output|
 end
 
 Then /^the stdout should contain exactly:$/ do |exact_output|
-  @stdout.should == exact_output
+  all_stdout.should == exact_output
 end
 
 Then /^the stderr should not contain "([^"]*)"$/ do |partial_output|

data/lib/aruba/process.rb

@@ -2,8 +2,9 @@ require 'background_process'
 
 module Aruba
   class Process
-    def initialize(cmd)
+    def initialize(cmd, timeout)
       @cmd = cmd
+      @timeout = timeout
     end
 
     def run!(&block)
@@ -37,7 +38,7 @@ module Aruba
 
     def stop
       if @process
-        status = @process.wait(1)
+        status = @process.wait(@timeout)
         status && status.exitstatus
       end
     end

metadata

@@ -5,12 +5,13 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
 - David Chelimsky
+- Mike Sassak
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -109,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1671730072629991587
+      hash: -1582580386571401091
       segments: 
       - 0
       version: "0"
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1671730072629991587
+      hash: -1582580386571401091
       segments: 
       - 0
       version: "0"
@@ -128,7 +129,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: aruba-0.2.5
+summary: aruba-0.2.6
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature