spe_cuke 0.3.0 → 0.3.1

data/ChangeLog

@@ -1,3 +1,7 @@
+== master
+* improve command invokation error message.
+* workaround for hanging up during spork detection.
+
 == 0.3.0 / 2010-09-14
 * assume test file from product code name.
 

data/Gemfile.lock

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

data/bin/sc

@@ -12,9 +12,14 @@ opt.on('-l', '--line=N', Integer) {|l| $option[:line] = l }
 opt.on('-r', '--rake', TrueClass) {|b| $option[:prefer_rake] = b }
 opt.parse!(ARGV)
 
-SpeCuke::Target.for(ARGV.first).new(
-  SpeCuke::Environment.new($option[:root], :prefer_rake => $option[:prefer_rake]),
-  ARGV.first,
-  $option[:line]
-).execute!
+if target = SpeCuke::Target.for(ARGV.first)
+  target.new(
+    SpeCuke::Environment.new($option[:root], :prefer_rake => $option[:prefer_rake]),
+    ARGV.first,
+    $option[:line]
+  ).execute!
+else
+  $stderr.puts "can't build test commands from `#{ARGV.first}'."
+  exit 1
+end
 

data/lib/spe_cuke/environment.rb

@@ -2,6 +2,7 @@ require 'rbconfig'
 require 'pathname'
 require 'yaml'
 require 'drb'
+require 'timeout'
 require 'bundler'
 
 module SpeCuke
@@ -41,12 +42,16 @@ module SpeCuke
 
     def spork_running?
       begin
-        DRbObject.new_with_uri("druby://127.0.0.1:8989").respond_to?(:run)
-      rescue DRb::DRbConnError, Errno::ECONNREFUSED
+        timeout(1) { spork_server && spork_server.respond_to?(:run) }
+      rescue DRb::DRbConnError, Errno::ECONNREFUSED, Timeout::Error, SocketError, Errno::EADDRNOTAVAIL
         return false
       end
     end
 
+    def spork_server
+      @_spork_server ||= DRbObject.new_with_uri("druby://127.0.0.1:8989")
+    end
+
     private
     def gemfile_dot_lock
       (@root + 'Gemfile.lock').read

data/lib/spe_cuke/target/rspec.rb

@@ -10,12 +10,30 @@ module SpeCuke::Target
     end
     self.default_options = ['--color']
 
+    def execute!
+      @env.spork_running? ? execute_direct! : super
+    end
+
     private
+    # XXX refactor
+    def execute_direct!
+      begin
+        DRb.start_service("druby://localhost:0")
+      rescue SocketError, Errno::EADDRNOTAVAIL
+        DRb.start_service("druby://:0")
+      end
+      puts "direct executing `spork_server.run(#{cmd_parameters.flatten.join(" ")})'"
+      @env.spork_server.run([fn_and_line], STDERR, STDOUT)
+    end
+
     def raw_commands
-      cmds = [@env.command(spec_command_base)]
+      ([@env.command(spec_command_base)] + cmd_parameters).flatten
+    end
+
+    def cmd_parameters
+      cmds = []
       cmds << self.class.default_options
       cmds << '-fn' if @line # XXX
-      cmds << '--drb' if @env.spork_running?
       cmds << fn_and_line
     end
 

data/lib/spe_cuke/version.rb

@@ -1,3 +1,3 @@
 module SpeCuke
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spe_cuke
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - MOROHASHI Kyosuke
@@ -15,16 +14,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +09:00
+date: 2010-11-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424063
         segments: 
         - 1
         - 0
@@ -32,10 +32,8 @@ dependencies:
         - rc
         - 5
         version: 1.0.0.rc.5
-  requirement: *id001
   type: :development
-  name: bundler
-  prerelease: false
+  version_requirements: *id001
 description: An abstraction command for testing frameworks and invokation methods of them.
 email: 
 - moronatural@gmail.com
@@ -83,7 +81,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -92,7 +89,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3