bahia 0.4.0 → 0.5.0

data/.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.summary =  "aruba for non-cucumber test frameworks"
   s.description = "Bahia - where commandline acceptance tests are easy, the people are festive and onde nasceu capoeira. In other words, aruba for any non-cucumber test framework."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_development_dependency 'rspec', '~> 2.7.0'
-  s.files = Dir.glob(%w[{lib,spec}/**/*.rb bin/* [A-Z]*.{md,txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
-  s.files += %w{.travis.yml}
+  s.add_dependency 'open4', '~> 1.3.0'
+  s.add_development_dependency 'rspec', '~> 2.8.0'
+  s.files = Dir.glob(%w[{lib,spec}/**/*.rb bin/* [A-Z]*.{md,txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec .travis.yml}
   s.extra_rdoc_files = ["README.md", "LICENSE.txt"]
   s.license = 'MIT'
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.5
+* Add support for other rubies with open4
+
 == 0.4
 * Add support for 1.8.7
 * Fix handling of nil and blank $RUBYLIB

data/README.md

@@ -3,6 +3,7 @@ Description
 
 Bahia - where commandline acceptance tests are easy, the people are festive and
 onde nasceu capoeira. In other words, aruba for any non-cucumber test framework.
+Works across rubies on 1.8 and 1.9.
 
 Usage
 =====
@@ -63,6 +64,9 @@ About
 Bahia uses open3 and is dead simple - so simple that you probably should've read
 the source instead of this readme. Ha!
 
+Edit: open3 isn't so simple for other rubies so the joke is on me. Rubinius uses
+open4 and jruby doesn't support process.
+
 Contributing
 ============
 [See here](http://tagaholic.me/contributing.html)

data/deps.rip

@@ -0,0 +1 @@
+open4 ~>1.3.0

data/lib/bahia.rb

@@ -2,7 +2,7 @@ require 'open3'
 require 'shellwords'
 
 module Bahia
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 
   class DetectionError < StandardError
     def initialize(name)
@@ -30,7 +30,28 @@ module Bahia
     args.unshift Bahia.command
     args.unshift('RUBYLIB' =>
      "#{Bahia.project_directory}/lib:#{ENV['RUBYLIB']}".sub(/:\s*$/, ''))
-    Open3.capture3(*args)
+    exec_command *args
+  end
+
+  def self.exec_command(*args)
+    unless RUBY_ENGINE[/rbx/] || RUBY_ENGINE[/jruby/]
+      return Open3.capture3(*args)
+    end
+
+    args.shift.each {|k,v| ENV[k] = v }
+
+    if RUBY_ENGINE[/jruby/]
+      i, o, e = IO.popen3(*args)
+      stdout, stderr = read_and_close(i, o, e)
+      # status not supported until Open3 actually works
+      [stdout, stderr, nil]
+    else
+      require 'open4'
+      pid, stdin, stdout, stderr = Open4.open4(*args)
+      _, status = Process.wait2(pid)
+      out, err = read_and_close(stdin, stdout, stderr)
+      [out, err, status]
+    end
   end
 
   def self.set_project_directory(arr)
@@ -46,4 +67,12 @@ module Bahia
     end
     File.dirname dir
   end
+
+  private
+  def self.read_and_close(stdin, stdout, stderr)
+    out_reader = Thread.new { stdout.read }
+    err_reader = Thread.new { stderr.read }
+    stdin.close
+    [out_reader.value, err_reader.value]
+  end
 end

data/spec/bahia_spec.rb

@@ -9,8 +9,8 @@ describe Bahia do
   end
 
   def stub_directory(dir)
-    Bahia.should_receive(:caller).and_return(["#{dir}/helper.rb:5"])
-    File.should_receive(:exists?).and_return(true)
+    Bahia.should_receive(:caller).at_least(1).and_return(["#{dir}/helper.rb:5"])
+    File.should_receive(:exists?).at_least(1).and_return(true)
   end
 
   subject { test_class.send :include, Bahia }
@@ -67,35 +67,35 @@ describe Bahia do
       Bahia.instance_method(:blarg).should_not be_nil
     end
 
-    context "helper method blarg correctly calls Open3.capture" do
-      def open3_receives(*args)
-        Open3.should_receive(:capture3).with(
+    context "helper method blarg correctly executes command" do
+      def command_executes(*args)
+        Bahia.should_receive(:exec_command).with(
           {'RUBYLIB' => "/dir/lib:#{ENV['RUBYLIB']}".sub(/:\s*$/, '')},
           executable, *args)
       end
 
       it "with no arguments" do
-        open3_receives
+        command_executes
         test_class.new.blarg
       end
 
       it "with word arguments" do
-        open3_receives 'is', 'blarg'
+        command_executes 'is', 'blarg'
         test_class.new.blarg('is blarg')
       end
 
       it "with single quoted arguments" do
-        open3_receives 'this', 'single quoteness'
+        command_executes 'this', 'single quoteness'
         test_class.new.blarg("this 'single quoteness'")
       end
 
       it "with double quoted arguments" do
-        open3_receives 'this', 'double quoteness'
+        command_executes 'this', 'double quoteness'
         test_class.new.blarg('this "double quoteness"')
       end
 
       it "with escaped quote arguments" do
-        open3_receives "can't", 'be', 'stopped'
+        command_executes "can't", 'be', 'stopped'
         test_class.new.blarg("can\\'t be stopped")
       end
 
@@ -104,13 +104,13 @@ describe Bahia do
         after { ENV['RUBYLIB'] = @rubylib }
 
         it "is nil" do
-          open3_receives
+          command_executes
           test_class.new.blarg
         end
 
         it "is blank" do
           ENV['RUBYLIB'] = ''
-          open3_receives
+          command_executes
           test_class.new.blarg
         end
       end

data/spec/deps.rip

@@ -1 +1 @@
-rspec ~>2.7.0
+rspec ~>2.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bahia
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-03-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70104834382940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70104834382940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70169129224660 !ruby/object:Gem::Requirement
+  requirement: &70104834382440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70169129224660
+  version_requirements: *70104834382440
 description: Bahia - where commandline acceptance tests are easy, the people are festive
   and onde nasceu capoeira. In other words, aruba for any non-cucumber test framework.
 email: gabriel.horner@gmail.com
@@ -36,6 +47,7 @@ files:
 - README.md
 - LICENSE.txt
 - CHANGELOG.rdoc
+- deps.rip
 - spec/deps.rip
 - Rakefile
 - .gemspec