aruba 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.5
+
+=== Bugfixes
+* Store processes in an array to ensure order of operations on Ruby 1.8.x (#48 Mike Sassak)
+
 == 0.3.4
 
 * Use backticks (`) instead of quotes (") to specify command line. Quote still works, but is deprecated. (Anthony Eden, Aslak Hellesøy)

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.3.4'
+  s.version     = '0.3.5'
   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}"

data/features/file_system_commands.feature

@@ -6,7 +6,7 @@ Feature: file system commands
   
   Scenario: create a dir
     Given a directory named "foo/bar"
-    When I run "ruby -e \"puts test ?d, 'foo'\""
+    When I run `ruby -e "puts test ?d, 'foo'"`
     Then the stdout should contain "true"
   
   Scenario: create a file
@@ -14,7 +14,7 @@ Feature: file system commands
       """
       puts "hello world"
       """
-    When I run "ruby foo/bar/example.rb"
+    When I run `ruby foo/bar/example.rb`
     Then the output should contain "hello world"
 
   Scenario: append to a file
@@ -26,12 +26,12 @@ Feature: file system commands
       """
       puts "this was appended"
       """
-    When I run "ruby foo/bar/example.rb"
+    When I run `ruby foo/bar/example.rb`
     Then the output should contain "hello world"
     And the output should contain "this was appended"
 
   Scenario: clean up files generated in previous scenario
-    When I run "ruby foo/bar/example.rb"
+    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"
   
@@ -41,11 +41,11 @@ Feature: file system commands
       puts "hello world"
       """
     When I cd to "foo/bar"
-    And I run "ruby example.rb"
+    And I run `ruby example.rb`
     Then the output should contain "hello world"
 
   Scenario: Reset current directory from previous scenario
-    When I run "ruby example.rb"
+    When I run `ruby example.rb`
     Then the exit status should be 1
 
   Scenario: Holler if cd to bad dir

data/lib/aruba/api.rb

@@ -115,26 +115,25 @@ module Aruba
 
     def output_from(cmd)
       cmd = detect_ruby(cmd)
-      processes[cmd].output
+      get_process(cmd).output
     end
 
     def stdout_from(cmd)
       cmd = detect_ruby(cmd)
-      processes[cmd].stdout
+      get_process(cmd).stdout
     end
 
     def stderr_from(cmd)
       cmd = detect_ruby(cmd)
-      processes[cmd].stderr
+      get_process(cmd).stderr
     end
 
     def all_stdout
-      processes.values.inject("") { |out, ps| out << ps.stdout }
+      only_processes.inject("") { |out, ps| out << ps.stdout }
     end
 
-    # Note, with pre-1.9 ruby, the ordering of this may change.  Use ruby 1.9.x or later.
     def all_stderr
-      processes.values.inject("") { |out, ps| out << ps.stderr }
+      only_processes.inject("") { |out, ps| out << ps.stderr }
     end
 
     def all_output
@@ -180,7 +179,7 @@ module Aruba
     end
     
     def processes
-      @processes ||= {}
+      @processes ||= []
     end
 
     def stop_processes!
@@ -189,6 +188,18 @@ module Aruba
       end
     end
 
+    def register_process(name, process)
+      processes << [name, process]
+    end
+
+    def get_process(wanted)
+      processes.find{ |name, _| name == wanted }[-1]
+    end
+
+    def only_processes
+      processes.collect{ |_, process| process }
+    end
+
     def run(cmd)
       cmd = detect_ruby(cmd)
 
@@ -196,7 +207,8 @@ module Aruba
         announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
         announce_or_puts("$ #{cmd}") if @announce_cmd
         
-        process = processes[cmd] = Process.new(cmd, exit_timeout, io_wait)
+        process = Process.new(cmd, exit_timeout, io_wait)
+        register_process(cmd, process)
         process.run!
 
         block_given? ? yield(process) : process

metadata

@@ -2,7 +2,7 @@
 name: aruba
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +00:00
+date: 2011-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2705483300968521573
+      hash: 1240099733914019053
       segments: 
       - 0
       version: "0"
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2705483300968521573
+      hash: 1240099733914019053
       segments: 
       - 0
       version: "0"
@@ -114,7 +114,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: aruba-0.3.4
+summary: aruba-0.3.5
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature