single_test 0.3.6 → 0.3.7

data/Gemfile

@@ -0,0 +1,5 @@
+source 'http://rubygems.org'
+
+gem 'rake'
+gem 'jeweler'
+gem 'rspec'

data/Gemfile.lock

@@ -0,0 +1,23 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    gemcutter (0.5.0)
+      json_pure
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.3)
+    rake (0.8.7)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  rake
+  rspec

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/single_test.rb

@@ -99,18 +99,38 @@ module SingleTest
     end
   end
 
+  # copied from parallel_tests http://github.com/grosser/parallel_tests/blob/master/lib/parallel_specs.rb#L9
   def spec_executable
-    if File.exist?("script/spec")
+    cmd = if File.file?("script/spec")
       "script/spec"
-    elsif File.exist?('Gemfile')
-      # TODO this fails when single test was started with "bundle exec" and bundler is not part of the bundle 
-      "bundle exec spec"
+    elsif bundler_enabled?
+      cmd = (`bundle show rspec` =~ %r{/rspec-1[^/]+$} ? "spec" : "rspec")
+      "bundle exec #{cmd}"
     else
-      "spec"
+      %w[spec rspec].detect{|cmd| system "#{cmd} --version > /dev/null 2>&1" }
     end
+    cmd or raise("Can't find executables rspec or spec")
   end
 
   def last_modified_file(dir, options={})
     Dir["#{dir}/**/*#{options[:ext]}"].sort_by { |p| File.mtime(p) }.last
   end
+
+  private
+
+  # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
+  def self.bundler_enabled?
+    return true if Object.const_defined?(:Bundler)
+
+    previous = nil
+    current = File.expand_path(Dir.pwd)
+
+    until !File.directory?(current) || current == previous
+      filename = File.join(current, "Gemfile")
+      return true if File.exists?(filename)
+      current, previous = File.expand_path("..", current), current
+    end
+
+    false
+  end
 end

data/single_test.gemspec

@@ -5,14 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{single_test}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2010-08-21}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
-    "Rakefile",
+    "Gemfile",
+     "Gemfile.lock",
+     "Rakefile",
      "Readme.md",
      "VERSION",
      "lib/single_test.rb",

data/spec/single_test_spec.rb

@@ -164,16 +164,16 @@ describe SingleTest do
       SingleTest.run_test('spec','xxx')
     end
 
-    it "runs with spec if script/spec is not found" do
-      File.stub!(:exist?).and_return false
-      File.should_receive(:exist?).with('script/spec').and_return false
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; spec xxx')
+    it "runs with bundled spec if script/spec is not found" do
+      File.stub!(:file?).and_return false
+      File.should_receive(:file?).with('script/spec').and_return false
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec spec xxx')
       SingleTest.run_test('spec','xxx')
     end
 
     it "uses bundler if Gemfile is present" do
-      File.stub!(:exist?).and_return false
-      File.should_receive(:exist?).with('Gemfile').and_return true
+      File.stub!(:file?).and_return false
+      SingleTest.should_receive(:bundler_enabled?).and_return true
       SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; bundle exec spec xxx')
       SingleTest.run_test('spec','xxx')
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 +02:00
+date: 2010-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION