spork 1.0.0rc1 → 1.0.0rc2

data/features/steps/sandbox_steps.rb

@@ -31,7 +31,7 @@ Given /^the following code appears in "([^\"]*)" after \/([^\/]*)\/:$/ do |file_
   end
 end
 
-When /^I run (spork|rspec|cucumber)(| .*)$/ do |command, args|
+When /^I run (spork|rspec|spec|cucumber)(| .*)$/ do |command, args|
   run("#{command} #{args}")
 end
 

data/lib/spork.rb

@@ -11,6 +11,7 @@ module Spork
   autoload :Runner,        (LIBDIR + 'spork/runner').to_s
   autoload :Forker,        (LIBDIR + 'spork/forker').to_s
   autoload :Diagnoser,     (LIBDIR + 'spork/diagnoser').to_s
+  autoload :GemHelpers,    (LIBDIR + 'spork/gem_helpers').to_s
 
   class << self
     # Run a block, during prefork mode.  By default, if prefork is called twice in the same file and line number, the supplied block will only be ran once.
@@ -96,8 +97,8 @@ module Spork
       trap_method((class << klass; self; end), method_name)
     end
     
-    def detect_and_require(subfolder)
-      Gem.find_files(subfolder).uniq.each do |path|
+    def detect_and_require(pattern)
+      GemHelpers.find_files_using_latest_spec(pattern).uniq.each do |path|
         next if path.match(/_spec\.rb/)
         require path
       end

data/lib/spork/gem_helpers.rb

@@ -0,0 +1,22 @@
+module Spork::GemHelpers
+  extend self
+
+  def latest_specs
+    Gem::Specification.inject({}) do |h, spec|
+      h[spec.name] = spec if h[spec.name].nil? || (spec.version > h[spec.name].version)
+      h
+    end.values
+  end
+
+  def find_files_using_latest_spec(pattern)
+    case
+    when defined?(Bundler)
+      Gem.find_files(pattern)
+    when Gem.respond_to?(:find_files)
+      latest_specs.map {  |spec| spec.matches_for_glob(pattern) }.flatten
+    else
+      STDERR.puts "No mechanism available to scan for other gems implementing Spork extensions."
+      return []
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spork
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc1
+  version: 1.0.0rc2
   prerelease: 5
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies: []
 description: A forking Drb spec server
 email:
@@ -31,6 +31,7 @@ files:
 - lib/spork/diagnoser.rb
 - lib/spork/ext/ruby-debug.rb
 - lib/spork/forker.rb
+- lib/spork/gem_helpers.rb
 - lib/spork/run_strategy/forking.rb
 - lib/spork/run_strategy/magazine/magazine_slave.rb
 - lib/spork/run_strategy/magazine/magazine_slave_provider.rb