guard-spork 1.2.1 → 1.2.2

data/lib/guard/spork.rb

@@ -3,6 +3,7 @@ require 'guard/guard'
 require 'sys/proctable'
 require 'childprocess'
 require 'rinda/ring'
+require 'guard/spork/rinda_ring_finger_patch'
 
 module Guard
   class Spork < Guard

data/lib/guard/spork/rinda_ring_finger_patch.rb

@@ -0,0 +1,26 @@
+# Patch for Rinda::RingFinger.primary hanging forever on Ruby 1.9.2 & 1.9.3
+# from http://www.ruby-forum.com/topic/4229908
+require 'rinda/ring'
+
+module Rinda
+  class RingFinger
+    def lookup_ring_any(timeout=5)
+      queue = Queue.new
+
+      Thread.new do
+        self.lookup_ring(timeout) do |ts|
+          queue.push(ts)
+        end
+        queue.push(nil)
+      end
+
+      @primary = queue.pop
+      raise('RingNotFound') if @primary.nil?
+      while it = queue.pop
+        @rings.push(it)
+      end
+
+      @primary
+    end
+  end
+end

data/lib/guard/spork/spork_instance.rb

@@ -117,7 +117,7 @@ module Guard
         Rinda::RingFinger.class_variable_set :@@finger, nil
         ts = Rinda::RingFinger.primary
         ts.read_all([:name, :MagazineSlave, nil, nil]).size > 0
-      rescue DRb::DRbConnError
+      rescue
         false
       end
 

data/lib/guard/spork/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module SporkVersion
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-spork
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -130,6 +130,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/guard/spork/rinda_ring_finger_patch.rb
 - lib/guard/spork/runner.rb
 - lib/guard/spork/spork_instance.rb
 - lib/guard/spork/templates/Guardfile