bahia 0.5.1 → 0.6.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.6.0
+* Fix overriding project_directory and command
+* Actually auto detect project_directory for rspec
+
 == 0.5.1
 * Support unusually named test directories
 

data/README.md

@@ -77,4 +77,5 @@ Contributing
 Credits
 =======
 
-* @spicycode
+* @spicycode - initial testing
+* @rsanheim - allow project\_directory override

data/lib/bahia.rb

@@ -2,7 +2,7 @@ require 'open3'
 require 'shellwords'
 
 module Bahia
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 
   class DetectionError < StandardError
     def initialize(name)
@@ -14,12 +14,12 @@ module Bahia
   attr_reader :stdout, :stderr, :process
 
   def self.included(mod)
-    self.project_directory = set_project_directory(caller)
-    self.command = Dir[self.project_directory + '/bin/*'][0] or
+    self.project_directory ||= set_project_directory(caller)
+    self.command ||= Dir[self.project_directory + '/bin/*'][0] or
       raise DetectionError.new(:command)
     self.command_method ||= File.basename(command)
 
-    # We want only want ane optional arg, thank 1.8.7 for the splat
+    # We want only want one optional arg, thank 1.8.7 for the splat
     define_method(command_method) do |*cmd|
       @stdout, @stderr, @process = Bahia.run_command(cmd.shift || '')
     end
@@ -55,6 +55,8 @@ module Bahia
   end
 
   def self.set_project_directory(arr)
+    # get rid of rspec backtrace
+    arr = arr.drop_while {|e| e[/rspec/] } if arr[0][/rspec/]
     arr[0][/^([^:]+):\d+/] or raise DetectionError.new(:project_directory)
     file = $1
     raise DetectionError.new(:project_directory) unless File.exists?(file)

data/spec/bahia_spec.rb

@@ -8,8 +8,9 @@ describe Bahia do
     Bahia.command = Bahia.project_directory = Bahia.command_method = nil
   end
 
-  def stub_directory(dir)
-    Bahia.should_receive(:caller).at_least(1).and_return(["#{dir}/helper.rb:5"])
+  def stub_directory(dir, options = {})
+    stack = options[:stack] || ["#{dir}/helper.rb:5"]
+    Bahia.should_receive(:caller).at_least(1).and_return(stack)
     File.should_receive(:exists?).at_least(1).and_return(true)
   end
 
@@ -42,29 +43,77 @@ describe Bahia do
     end
   end
 
-  context "on successful inclusion" do
-    let(:executable) { '/dir/bin/blarg' }
-
+  context "when overriding" do
     before do
-      stub_directory '/dir/spec'
-      Dir.stub(:[]).with('/dir/bin/*').and_return([executable])
-      subject
+      Dir.stub(:[]).with('/blah/bin/*').and_return(["/blah/bin/blah"])
     end
 
     it "sets project_directory" do
-      Bahia.project_directory.should == '/dir'
+      Bahia.project_directory = "/blah"
+
+      subject
+      Bahia.project_directory.should == "/blah"
     end
 
     it "sets command" do
-      Bahia.command.should == executable
+      stub_directory '/blah/spec'
+      Bahia.command = 'blarg'
+
+      subject
+      Bahia.command.should == "blarg"
     end
 
     it "sets command_method" do
-      Bahia.command_method.should == 'blarg'
+      stub_directory '/blah/spec'
+      Bahia.command_method = 'derp'
+
+      subject
+      Bahia.command_method.should == 'derp'
     end
+  end
+
+  context "on successful inclusion" do
+    let(:executable) { '/dir/bin/blarg' }
+    let(:stub_directory_options) { {} }
 
-    it "defines helper method named blarg" do
-      Bahia.instance_method(:blarg).should_not be_nil
+    before do
+      stub_directory '/dir/spec', stub_directory_options
+      Dir.stub(:[]).with('/dir/bin/*').and_return([executable])
+      subject
+    end
+
+    context "for normal backtrace" do
+      it "sets project_directory" do
+        Bahia.project_directory.should == '/dir'
+      end
+
+      it "sets command" do
+        Bahia.command.should == executable
+      end
+
+      it "sets command_method" do
+        Bahia.command_method.should == 'blarg'
+      end
+
+      it "defines helper method named blarg" do
+        Bahia.instance_method(:blarg).should_not be_nil
+      end
+    end
+
+    context "for rspec backtrace" do
+      let(:stub_directory_options) {
+        {
+          :stack => [
+            "/gems/rspec-core-2.8.0/lib/rspec/core/configuration.rb:680: in `include'",
+            "/gems/rspec-core-2.8.0/lib/rspec/core/configuration.rb:680: in `block in configure_group'",
+            '/dir/spec/helper.rb:5'
+          ]
+        }
+      }
+
+      it "sets project_directory" do
+        Bahia.project_directory.should == '/dir'
+      end
     end
 
     context "helper method blarg correctly executes command" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bahia
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70096433531440 !ruby/object:Gem::Requirement
+  requirement: &70110518358440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096433531440
+  version_requirements: *70110518358440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096433530940 !ruby/object:Gem::Requirement
+  requirement: &70110518357520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70096433530940
+  version_requirements: *70110518357520
 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