hustle 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462fcf478bc5d9197719e9ef8bba3fe84b37feb0
-  data.tar.gz: f3fc2d990f6785078a950ba50db9ee054d1f2f3e
+  metadata.gz: 0751e2a30bd9eaa27e1a2d91386ac2e708e3dec2
+  data.tar.gz: b398cd8b489a16bfeb07ad6ecae646dac4633d6d
 SHA512:
-  metadata.gz: 1622258db577a0920d424f748f8a69db14dcf25be289a49c788822badb6afa878913b131f8a66dec1efaeba7e7fd2d8caee9b366fe92b8780de7f366359223ad
-  data.tar.gz: caf7fc6a675195d560c795847ef2a1c59ac2a406dcf082156ffe6fb4d655026ee44ba7bb06be5e40a77b24130ad2a7814502b1640163a6cc030c3fbda1ee9277
+  metadata.gz: 49e168a14e448afe2a261672f0493588219bd86fbb0055374a730fa52bc7d22f33f6479598f0ef7d8516ff75506ebd69a7435fdbad26a86527a7a979dc88fd40
+  data.tar.gz: 046f513b6dd4045aa34091c854f9fd9e1b88ee099689b3787f6ecdc32d64e10c372a749a8d533610eb69a0ceae6d03d08d103fc7167fca8a06c066d08a1d8201

data/lib/hustle/runner.rb

@@ -41,17 +41,10 @@ module Hustle
     end
 
     def run_remote(&block)
+      sleep 0 while !remote_instance_ready?
       remote_instance.run(&block)
     end
 
-    def remote_instance_finished?
-      remote_instance.finished?
-    end
-
-    def remote_value
-      remote_instance.value
-    end
-
     # methods to be run on the remote instance
 
     def stop
@@ -59,20 +52,13 @@ module Hustle
     end
 
     def run
-      Thread.new do
-        begin
-          @value = yield
-        rescue Exception => e
-          @value = e
-        end
-        @finished = true
+      begin
+        yield
+      rescue Exception => e
+        e
       end
     end
 
-    def finished?
-      !!@finished
-    end
-
   end
 
 end

data/lib/hustle/version.rb

@@ -1,3 +1,3 @@
 module Hustle
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/hustle.rb

@@ -27,7 +27,10 @@ module Hustle
     end
 
     def start_drb
-      @drb ||= DRb.start_service
+      @drb ||= begin
+        DRb.start_service
+        sleep 0 while server.is_a?(DRb::DRbServerNotFound)
+      end
     end
 
     def stop_drb
@@ -45,12 +48,10 @@ module Hustle
       uri = "druby://127.0.0.1:#{random_port}"
       runner = Runner.new(uri)
       runner.start_remote_instance
-      sleep 0 while !runner.remote_instance_ready?
       synchronize do
         active_runners[runner.pid] = runner
       end
-      runner.run_remote(&block)
-      finish runner, callback
+      finish runner, callback, &block
     end
 
     def wait
@@ -69,19 +70,26 @@ module Hustle
      port
     end
 
-    def finish(runner, callback)
+    def finish(runner, callback, &block)
       runner.callback_thread = Thread.new do
-        sleep 0.01 while !runner.remote_instance_finished?
-        value = runner.remote_value
+        value = runner.run_remote(&block)
         runner.stop_remote_instance
-        stop_drb
         synchronize do
           active_runners.delete(runner.pid)
         end
+        stop_drb
         callback.call value
       end
     end
 
+    def server
+      begin
+        DRb.current_server
+      rescue DRb::DRbServerNotFound => e
+        e
+      end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hustle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nathan Hopkins