pry-remote-em 0.7.1 → 0.7.2

data/lib/pry-remote-em/broker.rb

@@ -32,19 +32,19 @@ module PryRemoteEm
             raise e
           end
         end
+        client { |c| yield self } if block_given?
       end
 
       def restart
         log.info("[pry-remote-em broker] restarting on pryem://#{host}:#{port}")
-        run(@host, @port, @opts)
-        EM::Timer.new(rand(0.9)) do
+        @waiting   = nil
+        @client    = nil
+        run(@host, @port, @opts) do
           PryRemoteEm.servers.each do |url, (sig, name)|
             next unless EM.get_sockname(sig)
             register(url, name)
           end
         end
-        @waiting   = nil
-        @client    = nil
       end
 
       def opts
@@ -113,7 +113,7 @@ module PryRemoteEm
         if @waiting
           @waiting << blk
         else
-          @waiting = []
+          @waiting = [blk]
           EM.connect(host, port, Client::Broker, @opts) do |client|
             client.errback { |e| raise(e || "broker client error") }
             client.callback do

data/lib/pry-remote-em/server.rb

@@ -104,11 +104,12 @@ module PryRemoteEm
         name   = Pry.view_clip(name)
         PryRemoteEm.servers[url] = [server, name]
         (opts[:logger] || ::Logger.new(STDERR)).info("[pry-remote-em] listening for connections on #{url}")
-        Broker.run(opts[:broker_host] || ENV['PRYEMBROKER'] || DEF_BROKERHOST, opts[:broker_port] || ENV['PRYEMBROKERPORT'] || DEF_BROKERPORT, opts)
-        EM::Timer.new(rand(0.9)) { Broker.register(url, name) }
-        rereg = EM::PeriodicTimer.new(15) do
-          EM.get_sockname(server) ? Broker.register(url, name) : nil #rereg.cancel
-        end
+        Broker.run(opts[:broker_host] || ENV['PRYEMBROKER'] || DEF_BROKERHOST, opts[:broker_port] || ENV['PRYEMBROKERPORT'] || DEF_BROKERPORT, opts) do |broker|
+          broker.register(url, name)
+          rereg = EM::PeriodicTimer.new(15) do
+            EM.get_sockname(server) ? broker.register(url, name) : nil #rereg.cancel
+          end
+        end # broker
         url
       end
 

data/lib/pry-remote-em/version.rb

@@ -1,3 +1,3 @@
 module PryRemoteEm
-  VERSION   = '0.7.1'
+  VERSION   = '0.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-remote-em
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine