aruba 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aruba (0.4.3)
+    aruba (0.4.4)
       bcat (>= 0.6.1)
       childprocess (>= 0.1.9)
       cucumber (>= 0.10.7)
@@ -14,20 +14,20 @@ GEM
     bcat (0.6.1)
       rack (~> 1.0)
     builder (3.0.0)
-    childprocess (0.1.9)
+    childprocess (0.2.0)
       ffi (~> 1.0.6)
-    cucumber (1.0.0)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
     ffi (1.0.9)
-    gherkin (2.4.1)
+    gherkin (2.4.5)
       json (>= 1.4.6)
     json (1.5.3)
-    rack (1.3.0)
+    rack (1.3.1)
     rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)

data/History.md

@@ -1,3 +1,7 @@
+## [v0.4.4](https://github.com/cucumber/aruba/compare/v0.4.3...v0.4.4)
+
+* Fix various bugs with interative processes. (Matt Wynne)
+
 ## [v0.4.3](https://github.com/cucumber/aruba/compare/v0.4.2...v0.4.3)
 
 * Aruba reporting now creates an index file for reports, linking them all together. (Aslak Hellesøy)

data/aruba.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.4.3'
-  s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak"]
+  s.version     = '0.4.4'
+  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}"
   s.email       = 'cukes@googlegroups.com'
-  s.homepage    = 'http://github.com/aslakhellesoy/aruba'
+  s.homepage    = 'http://github.com/cucumber/aruba'
 
   s.add_dependency 'cucumber', '>= 0.10.7'
   s.add_dependency 'childprocess', '>= 0.1.9'

data/features/interactive.feature

@@ -15,7 +15,7 @@ Feature: Interactive process control
     When I run `ruby echo.rb` interactively
     And I type "hello, world"
     And I type "quit"
-    Then the output should contain:
+    Then it should pass with:
       """
       dlrow ,olleh
       """

data/lib/aruba/api.rb

@@ -80,11 +80,11 @@ module Aruba
         end
       end
     end
-  
+
     def check_exact_file_content(file, exact_content)
       prep_for_fs_check { IO.read(file).should == exact_content }
     end
-  
+
     def check_directory_presence(paths, expect_presence)
       prep_for_fs_check do
         paths.each do |path|
@@ -166,18 +166,18 @@ module Aruba
     end
 
     def assert_exit_status_and_partial_output(expect_to_pass, expected)
-      assert_partial_output(expected, all_output)
       assert_success(expect_to_pass)
+      assert_partial_output(expected, all_output)
     end
 
     # TODO: Remove this. Call more methods elsewhere instead. Reveals more intent.
     def assert_exit_status_and_output(expect_to_pass, expected_output, expect_exact_output)
+      assert_success(expect_to_pass)
       if expect_exact_output
         assert_exact_output(expected_output, all_output)
       else
         assert_partial_output(expected_output, all_output)
       end
-      assert_success(expect_to_pass)
     end
 
     def assert_success(success)
@@ -185,20 +185,20 @@ module Aruba
     end
 
     def assert_exit_status(status)
-      @last_exit_status.should == status
+      last_exit_status.should == status
     end
 
     def assert_not_exit_status(status)
-      @last_exit_status.should_not == status
+      last_exit_status.should_not == status
     end
-    
+
     def processes
       @processes ||= []
     end
 
     def stop_processes!
       processes.each do |_, process|
-        process.stop(@aruba_keep_ansi)
+        stop_process(process)
       end
     end
 
@@ -223,7 +223,7 @@ module Aruba
       in_current_dir do
         announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
         announce_or_puts("$ #{cmd}") if @announce_cmd
-        
+
         process = Process.new(cmd, exit_timeout, io_wait)
         register_process(cmd, process)
         process.run!
@@ -245,12 +245,8 @@ module Aruba
     end
 
     def run_simple(cmd, fail_on_error=true)
-      @last_exit_status = run(cmd) do |process|
-        process.stop(@aruba_keep_ansi)
-        announce_or_puts(process.stdout(@aruba_keep_ansi)) if @announce_stdout
-        announce_or_puts(process.stderr(@aruba_keep_ansi)) if @announce_stderr
-        # need to replace with process.exit_code or similar, or remove the block entirely... it doesn't add as much as I thought it would
-        process.stop(@aruba_keep_ansi)
+      run(cmd) do |process|
+        stop_process(process)
       end
       @timed_out = @last_exit_status.nil?
 
@@ -330,9 +326,25 @@ module Aruba
         ENV[key] = value
       end
     end
-    
+
     def original_env
       @original_env ||= {}
     end
+
+  # TODO: move some more methods under here!
+  private
+
+    def last_exit_status
+      return @last_exit_status if @last_exit_status
+      stop_processes!
+      @last_exit_status
+    end
+
+    def stop_process(process)
+      @last_exit_status = process.stop(@aruba_keep_ansi)
+      announce_or_puts(process.stdout(@aruba_keep_ansi)) if @announce_stdout
+      announce_or_puts(process.stderr(@aruba_keep_ansi)) if @announce_stderr
+    end
+
   end
 end

metadata

@@ -2,17 +2,18 @@
 name: aruba
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
 - David Chelimsky
 - Mike Sassak
+- Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 Z
+date: 2011-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -117,7 +118,7 @@ files:
 - templates/js/filesystem.js
 - templates/js/jquery-1.6.1.min.js
 - templates/main.erb
-homepage: http://github.com/aslakhellesoy/aruba
+homepage: http://github.com/cucumber/aruba
 licenses: []
 
 post_install_message: 
@@ -130,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1621863180174633909
+      hash: 1265581284183582104
       segments: 
       - 0
       version: "0"
@@ -139,17 +140,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1621863180174633909
+      hash: 1265581284183582104
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: aruba-0.4.3
+summary: aruba-0.4.4
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature