aruba 0.2.7 → 0.2.8

data/History.txt

@@ -1,3 +1,8 @@
+== In Git
+
+=== 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
 
 === New Features

data/README.rdoc

@@ -9,7 +9,7 @@ a compiled C program, a Java program, a Perl script - anything.
 
 Then, just require the library in one of your ruby files under <tt>features/support</tt>
 
-  require 'aruba'
+  require 'aruba/cucumber'
 
 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

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.2.7'
+  s.version     = '0.2.8'
   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}"
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/aslakhellesoy/aruba'
 
   s.add_dependency 'cucumber', '~> 0.10.0'
-  s.add_dependency 'background_process' # Can't specify a version - bundler/rubygems chokes on '2.1'
-  s.add_development_dependency 'rspec', '~> 2.0.1'
+  s.add_dependency 'childprocess', '~> 0.1.6'
+  s.add_dependency 'rspec', '~> 2.3.0'
 
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

data/features/output.feature

@@ -8,7 +8,7 @@ Feature: Output
     When I run "neverever gonna work"
     Then the output should contain:
     """
-    No such file or directory - neverever gonna work
+    No such file or directory - neverever
     """
 
   Scenario: Detect subset of one-line output

data/features/support/env.rb

@@ -1,15 +1,4 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'aruba/cucumber'
 require 'fileutils'
-
-begin
-  # rspec-2
-  require 'rspec/expectations'
-rescue LoadError
-  # rspec-1
-  require 'spec/expectations'
-end
-
-Before do
-  FileUtils.rm(Dir['config/*.yml'])
-end
+require 'rspec/expectations'

data/lib/aruba/api.rb

@@ -210,9 +210,11 @@ module Aruba
 
     def run_simple(cmd, fail_on_error=true)
       @last_exit_status = run(cmd) do |process|
+        process.stop
         announce_or_puts(process.stdout) if @announce_stdout
         announce_or_puts(process.stderr) if @announce_stderr
-        process.stop
+        # 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       
       end
       @timed_out = @last_exit_status.nil?
 

data/lib/aruba/process.rb

@@ -1,19 +1,29 @@
-require 'background_process'
+require 'childprocess'
+require 'tempfile'
+require 'shellwords'
 
 module Aruba
   class Process
+    include Shellwords
+
     def initialize(cmd, timeout)
-      @cmd = cmd
       @timeout = timeout
+      @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 = BackgroundProcess.run(@cmd)
+      @process.start
       yield self if block_given?
     end
 
     def stdin
-      @process.stdin
+      sleep 0.1
+      @process.io.stdin
     end
 
     def output
@@ -21,26 +31,22 @@ module Aruba
     end
 
     def stdout
-      if @process
-        @stdout ||= @process.stdout.read
-      else
-        ''
-      end
+      sleep 0.1
+      @out.rewind
+      @out.read
     end
 
     def stderr
-      if @process
-        @stderr ||= @process.stderr.read
-      else
-        ''
-      end
+      sleep 0.1
+      @err.rewind
+      @err.read
     end
 
     def stop
       if @process
         stdout && stderr # flush output
-        status = @process.wait(@timeout)
-        status && status.exitstatus
+        @process.poll_for_exit(@timeout)
+        @process.exit_code
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 +00:00
+date: 2010-12-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,15 +35,17 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: background_process
+  name: childprocess
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 6
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -56,10 +58,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 3
         - 0
-        - 1
-        version: 2.0.1
-  type: :development
+        version: 2.3.0
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
@@ -110,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4224427538675420032
+      hash: -4095997037921119441
       segments: 
       - 0
       version: "0"
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4224427538675420032
+      hash: -4095997037921119441
       segments: 
       - 0
       version: "0"
@@ -129,7 +131,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: aruba-0.2.7
+summary: aruba-0.2.8
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature