bahia 0.3.0 → 0.4.0

data/.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   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.extra_rdoc_files = ["README.md", "LICENSE.txt"]
   s.license = 'MIT'
 end

data/.travis.yml

@@ -0,0 +1,8 @@
+before_install: bundle init --gemspec=.gemspec
+script: bundle exec rspec spec
+rvm:
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- jruby
+- rbx

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.4
+* Add support for 1.8.7
+* Fix handling of nil and blank $RUBYLIB
+
 == 0.3
 * Add support for quoted args
 * Allow no arguments

data/README.md

@@ -60,7 +60,6 @@ including it:
 
 About
 =====
-
 Bahia uses open3 and is dead simple - so simple that you probably should've read
 the source instead of this readme. Ha!
 

data/lib/bahia.rb

@@ -2,7 +2,7 @@ require 'open3'
 require 'shellwords'
 
 module Bahia
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 
   class DetectionError < StandardError
     def initialize(name)
@@ -19,15 +19,20 @@ module Bahia
       raise DetectionError.new(:command)
     self.command_method ||= File.basename(command)
 
-    define_method(command_method) do |cmd = ''|
-      args = Shellwords.split(cmd)
-      args.unshift Bahia.command
-      args.unshift({'RUBYLIB' => "#{Bahia.project_directory}/lib:" +
-                   ENV['RUBYLIB']})
-      @stdout, @stderr, @process = Open3.capture3(*args)
+    # We want only want ane optional arg, thank 1.8.7 for the splat
+    define_method(command_method) do |*cmd|
+      @stdout, @stderr, @process = Bahia.run_command(cmd.shift || '')
     end
   end
 
+  def self.run_command(cmd)
+    args = Shellwords.split(cmd)
+    args.unshift Bahia.command
+    args.unshift('RUBYLIB' =>
+     "#{Bahia.project_directory}/lib:#{ENV['RUBYLIB']}".sub(/:\s*$/, ''))
+    Open3.capture3(*args)
+  end
+
   def self.set_project_directory(arr)
     arr[0][/^([^:]+):\d+/] or raise DetectionError.new(:project_directory)
     file = $1

data/spec/bahia_spec.rb

@@ -70,7 +70,8 @@ describe Bahia do
     context "helper method blarg correctly calls Open3.capture" do
       def open3_receives(*args)
         Open3.should_receive(:capture3).with(
-          {'RUBYLIB' => "/dir/lib:#{ENV['RUBYLIB']}"}, executable, *args)
+          {'RUBYLIB' => "/dir/lib:#{ENV['RUBYLIB']}".sub(/:\s*$/, '')},
+          executable, *args)
       end
 
       it "with no arguments" do
@@ -97,6 +98,22 @@ describe Bahia do
         open3_receives "can't", 'be', 'stopped'
         test_class.new.blarg("can\\'t be stopped")
       end
+
+      context "when $RUBYLIB" do
+        before { @rubylib = ENV.delete('RUBYLIB') }
+        after { ENV['RUBYLIB'] = @rubylib }
+
+        it "is nil" do
+          open3_receives
+          test_class.new.blarg
+        end
+
+        it "is blank" do
+          ENV['RUBYLIB'] = ''
+          open3_receives
+          test_class.new.blarg
+        end
+      end
     end
   end
 end

metadata

@@ -1,39 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bahia
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Gabriel Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-17 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70169129224660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
-  version_requirements: *id001
-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.
+  prerelease: false
+  version_requirements: *70169129224660
+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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE.txt
-files: 
+files:
 - lib/bahia.rb
 - spec/bahia_spec.rb
 - README.md
@@ -42,33 +39,30 @@ files:
 - spec/deps.rip
 - Rakefile
 - .gemspec
-has_rdoc: true
+- .travis.yml
 homepage: http://github.com/cldwalker/bahia
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: aruba for non-cucumber test frameworks
 test_files: []
-