pry-remote-em 1.1.1-java → 1.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b11c8b592e3e16fb9e6ef438cc60055a1471a30
-  data.tar.gz: c2b6cf57bfef90f679ee218dc8f35f581f094af8
+SHA256:
+  metadata.gz: 6b302b9e7797ad2458034b1c002d96e90c7b0b55403fc325117ec36992fc9a88
+  data.tar.gz: a31fcdba0f9533a7c160d38a35b39f0430853f3a571ac490bff282c10aa50458
 SHA512:
-  metadata.gz: 0e21101fe890918c1cb2379e846f98b0839ad235de68b30f667d582cc118bb11accafbefc3d1de9d8bbcf9fa3333bed746d379fdb99a348d0d1e7974bc039f7e
-  data.tar.gz: c6919a9c1b27f6b76ac2b60ed7f2f848e73ae25d567b1807fb8934ef6429218dea9a54f0dea7fe37004f732043053c66c6ee53e62ee37e1c6a8e6dcae4c1ab67
+  metadata.gz: 547390745f033108f5fc1a85c8983bf7248259874e66767d61c3db7f851a355366dd3128f1af69727753e13f54f03e53e739e4697df56c626c7e6fc3fcca52b9
+  data.tar.gz: 3df1eb0e9bfcf392920cde1ac3724225b18b2981d4a1f2d1282d1669d79d8538ccb948ce55d6156d4dccaab747311aa814c36681a57328b382d6238c1e5494e2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.1.2
+
+* Fix for new Pry and Ruby versions
+* Fix catching exception without backtrace
+* Stop heartbeat periodic timer safely
+* Better logs for broker
+
 # 1.1.1
 
 * Fix `java.lang.IncompatibleClassChangeError: Found class jline.Terminal, but interface was expected` by adding `rb-readline` to dependencies on JRuby version

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: java
 authors:
 - Caleb Crane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2020-05-31 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