pry-remote-em 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb2fef30aebb03b29a47ab39a495d19c783446b9
-  data.tar.gz: a9afc9ef8a5966ced35d9aeeb6bee9253d43621b
+SHA256:
+  metadata.gz: c7dad27ae4840cedbea4338af3a87d1561e03282ff77ed0b81fc1c76839f6f29
+  data.tar.gz: 0ae17448380fb4862cf08aded5c03fdb092f3199a86b0f75e8f5ecebd52407a5
 SHA512:
-  metadata.gz: 2624c72b7b06af9d206d32e831f6901332f012de7ab553def8c483d7cf6fc83d9fd9fbff02f60e722e9880504278349b5b22fa3ff2995050560da9e9fd2e8e0d
-  data.tar.gz: 884e3e2714ae350229810666e57a952b803e5a2e958cb307bdb6c04eb281a7887ac6b14c176650885ceca55fa4f0a9811ae1553f2d154ca51913734247b34a9e
+  metadata.gz: b4e953bbc9237296e15d2af2b86ed8dba9cd5dfb91deacb4214c5c67eec85eb6a70be588227b0108d4d44084ee239a9a2b904bdb9a0c2578d913cbf3a9bbbcf9
+  data.tar.gz: 3898ada0d193ad7c7ecc94f0e6c385e41baace3cbdbef95c8e81430626c8815f6e51d9c1dbe90cf10e97fae5fdde68a1c6b85b5e6516b7b2b8d274a392c3c323

data/bin/pry-remote-em

@@ -22,14 +22,14 @@ OptionParser.new do |opts|
     if host =~ /^pryems?:\/\//
       ARGV.push(host)
     else
-      options[:filter_host] = Regexp.new(host)
+      options[:filter_host] = Regexp.new(host, Regexp::IGNORECASE)
     end
   end
   opts.on('--fn NAME', '--filter-name NAME', 'only show servers with a matching name (regexp)') do |name|
     if name =~ /^pryems?:\/\//
       ARGV.push(name)
     else
-      options[:filter_name] = Regexp.new(name)
+      options[:filter_name] = Regexp.new(name, Regexp::IGNORECASE)
     end
   end
   opts.on('--[no-]fs', '--[no-]filter-ssl', 'show only servers that support ssl') do |ssl|

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

@@ -78,9 +78,9 @@ module PryRemoteEm
         server[:metrics].update(description[:metrics])
       end
 
-      def unregister_server(id)
+      def unregister_server(id, reason: nil)
         server = servers.delete(id) or return
-        log.warn("[pry-remote-em broker] unregister #{id} #{server.inspect}")
+        log.warn("[pry-remote-em broker] unregister by #{reason || 'unknown reason'} #{id} #{server.inspect}")
         timer = timers.delete(id)
         timer.cancel if timer
         hbeats.delete(id)
@@ -90,7 +90,7 @@ module PryRemoteEm
         interval = ENV['PRYEMHBCHECK'].nil? || ENV['PRYEMHBCHECK'].empty? ? HEARTBEAT_CHECK_INTERVAL : ENV['PRYEMHBCHECK']
         timers[id] ||= EM::PeriodicTimer.new(interval) do
           if !hbeats[id] || (Time.new - hbeats[id]) > 20
-            unregister_server(id)
+            unregister_server(id, reason: 'heartbeats checker')
           end
         end
       end
@@ -169,7 +169,7 @@ module PryRemoteEm
 
     def receive_unregister_server(id)
       server = Broker.servers[id]
-      Broker.unregister_server(id) if server
+      Broker.unregister_server(id, reason: 'remote command') if server
     end
 
     def receive_proxy_connection(url)
@@ -222,7 +222,7 @@ module PryRemoteEm
 
     def unbind
       @ids.each do |id|
-        Broker.unregister_server(id)
+        Broker.unregister_server(id, reason: 'disconnection')
       end
     end
   end # module::Broker

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

@@ -30,8 +30,8 @@ module PryRemoteEm
     end
 
     def self.add_error(exception, source_binding = nil)
-      unless exception.kind_of?(Exception) && exception.backtrace && (source_binding.nil? || source_binding.kind_of?(Binding))
-        raise ArgumentError, 'exception with backtrace and optional binding expected'
+      unless exception.kind_of?(Exception) && (source_binding.nil? || source_binding.kind_of?(Binding))
+        raise ArgumentError, 'exception and optional binding expected'
       end
 
       return if @@last_errors.map(&:object_id).include?(exception.object_id) || @@ignore_errors.include?(exception.class)
@@ -83,6 +83,6 @@ module PryRemoteEm
       'sandbox'
     end
 
-    Pry.config.prompt_safe_objects.push(self)
+    Pry.config.prompt_safe_objects&.push(self)
   end
 end

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

@@ -60,6 +60,7 @@ module PryRemoteEm
 
       servers_to_stop.each do |id, description|
         EM.stop_server(description[:server]) if EM.get_sockname(description[:server])
+        description[:heartbeat_timer].cancel
         Broker.unregister(id)
         servers.delete(id)
       end
@@ -202,10 +203,13 @@ module PryRemoteEm
           logger: description[:logger]
         }
         Broker.run(description[:broker_host], description[:broker_port], broker_options) do |broker|
+          description[:broker] = broker
+
           broker.register(broker_description)
 
-          rereg = EM::PeriodicTimer.new(description[:heartbeat_interval]) do
-            EM.get_sockname(description[:server]) ? broker.register(broker_description) : nil #rereg.cancel
+          description[:heartbeat_timer] = EM::PeriodicTimer.new(description[:heartbeat_interval]) do
+            next description[:heartbeat_timer].cancel unless EM.get_sockname(description[:server])
+            broker.register(broker_description)
           end
         end
       end

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

@@ -1,3 +1,3 @@
 module PryRemoteEm
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-remote-em
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Caleb Crane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -127,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Connect to Pry remotely using EventMachine