spe_cuke 0.2.0 → 0.2.1

data/.gitignore

@@ -1,4 +1,5 @@
-pkg/*
 *.gem
-vendor/*
 .bundle/*
+pkg/*
+vendor/*
+doc/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spe_cuke (0.2.0)
+    spe_cuke (0.2.1)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -24,7 +24,7 @@ when not bundlized but --format-executable in .gemrc
 and has option to specify invoking via rake.
 
  sc -r --line 32 spec/foobar/foobar_spec.rb #=>
- bundle exec rake18 spec SPEC=spec/foobar/foobar_spec.rb:32
+ bundle18 exec rake spec SPEC=spec/foobar/foobar_spec.rb:32
 
 == Vim script
 

data/lib/spe_cuke/environment.rb

@@ -1,6 +1,8 @@
 require 'rbconfig'
 require 'pathname'
 require 'yaml'
+require 'drb'
+require 'bundler'
 
 module SpeCuke
   class Environment
@@ -30,7 +32,26 @@ module SpeCuke
       (@root + 'Rakefile').exist?
     end
 
+    def bundled_version(gem_name)
+      return nil unless bundlized?
+
+      lp = Bundler::LockfileParser.new(gemfile_dot_lock)
+      lp.specs.detect{|bs| bs.name == gem_name}.version rescue nil
+    end
+
+    def spork_running?
+      begin
+        DRbObject.new_with_uri("druby://127.0.0.1:8989").respond_to?(:run)
+      rescue DRb::DRbConnError, Errno::ECONNREFUSED
+        return false
+      end
+    end
+
     private
+    def gemfile_dot_lock
+      (@root + 'Gemfile.lock').read
+    end
+
     def bundle_exec
       [executable_name('bundle'), 'exec']
     end

data/lib/spe_cuke/target/rspec.rb

@@ -12,14 +12,19 @@ module SpeCuke::Target
 
     private
     def raw_commands
-      cmds = [@env.command('spec')]
+      cmds = [@env.command(spec_command_base)]
       cmds << self.class.default_options
-      if @line
-        cmds << '-fn' # XXX
-      end
+      cmds << '-fn' if @line # XXX
+      cmds << '--drb' if @env.spork_running?
       cmds << fn_and_line
     end
 
+    def spec_command_base
+      v = @env.bundled_version('rspec')
+
+      (v.nil? || v < Gem::Version.new("2.0.0.beta.0")) ? 'spec' : 'rspec'
+    end
+
     def rake_commands
       cmds = [@env.command('rake'), 'spec', "SPEC=#{fn_and_line}"]
       if @line

data/lib/spe_cuke/version.rb

@@ -1,3 +1,3 @@
 module SpeCuke
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fixtures/.bundle/config

@@ -0,0 +1,3 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"
+BUNDLE_PATH: foo

data/spec/fixtures/Gemfile.lock.rspec1

@@ -0,0 +1,10 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rspec (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (< 2.0.0)

data/spec/fixtures/Gemfile.lock.rspec2

@@ -0,0 +1,18 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (>= 2.0.0.beta)

data/spec/spe_cuke/environment_spec.rb

@@ -12,6 +12,28 @@ describe Environment do
   end
   subject { @env.command('rails') }
 
+  describe 'bundled_version' do
+    before do
+      @env.stub(:bundlized?).and_return true
+    end
+    subject { @env.bundled_version('rspec') }
+
+    context 'rspec 1.3.0' do
+      before do
+        @env.stub(:gemfile_dot_lock).and_return File.read('spec/fixtures/Gemfile.lock.rspec1')
+      end
+      it { should == Gem::Version.new("1.3.0") }
+    end
+
+    context 'rspec 2.0' do
+      before do
+        @env.stub(:gemfile_dot_lock).and_return File.read('spec/fixtures/Gemfile.lock.rspec2')
+      end
+      it { should == Gem::Version.new("2.0.0.beta.20") }
+      it { should >  Gem::Version.new("2.0.0.beta.0") }
+    end
+  end
+
   describe '#command()' do
     context 'bundlized & --gem_format_executable' do
       before do

data/spec/spe_cuke/target_rspec_spec.rb

@@ -13,6 +13,7 @@ describe Target::Rspec do
     @env = Environment.new
     @env.stub!(:bundlized?).and_return false
     @env.stub!(:gem_format_executable?).and_return false
+    @env.stub!(:spork_running?).and_return false
 
     Target::Rspec.default_options = ['--color']
   end
@@ -38,6 +39,17 @@ describe Target::Rspec do
     it(%q[spec --color -l 40 spec/foo/bar_spec.rb]){ @target.execute! }
   end
 
+  context 'spec/foo/bar_spec.rb on line:40/spork:true' do
+    before do
+      @env.stub!(:spork_running?).and_return true
+      @env.stub!(:prefer_rake?).and_return false
+      @target = Target::Rspec.new(@env, 'spec/foo/bar_spec.rb', 40)
+      SpeCuke.should_receive(:wrap_execute!).with(%w[spec --color -fn --drb spec/foo/bar_spec.rb:40])
+    end
+
+    it(%q[spec --color -l 40 spec/foo/bar_spec.rb]){ @target.execute! }
+  end
+
   context 'spec/foo/bar_spec.rb w/Rakefile' do
     before do
       @env.stub!(:prefer_rake?).and_return true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spe_cuke
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - MOROHASHI Kyosuke
@@ -60,6 +60,9 @@ files:
 - lib/spe_cuke/target/rspec.rb
 - lib/spe_cuke/version.rb
 - spe_cuke.gemspec
+- spec/fixtures/.bundle/config
+- spec/fixtures/Gemfile.lock.rspec1
+- spec/fixtures/Gemfile.lock.rspec2
 - spec/spe_cuke/environment_spec.rb
 - spec/spe_cuke/target_cucumber_spec.rb
 - spec/spe_cuke/target_rspec_spec.rb