Fix trap API when used with debug gem (#100)

lib/polyphony.rb

@@ -92,8 +92,8 @@ def exit_forked_process
     # @!visibility private
     def install_terminating_signal_handlers
       trap('SIGTERM') { raise SystemExit }
-      orig_trap('SIGINT') do
-        orig_trap('SIGINT') { exit! }
+      Kernel.orig_trap('SIGINT') do
+        Kernel.orig_trap('SIGINT') { exit! }
         Fiber.schedule_priority_oob_fiber { raise Interrupt }
       end
     end

lib/polyphony/extensions/kernel.rb

@@ -2,6 +2,26 @@
 
 require 'open3'
 
+module Polyphony
+  module TrapInterceptor
+    def trap(sig, command = nil, &block)
+      return super(sig, command) if command.is_a? String
+
+      block = command if !block && command.respond_to?(:call)
+
+      # The signal trap can be invoked at any time, including while the system
+      # backend is blocking while polling for events. In order to deal with this
+      # correctly, we run the signal handler code in an out-of-band, priority
+      # scheduled fiber, that will pass any uncaught exception (including
+      # SystemExit and Interrupt) to the main thread's main fiber. See also
+      # `Fiber#schedule_priority_oob_fiber`.
+      super(sig) do
+        Fiber.schedule_priority_oob_fiber(&block)
+      end
+    end
+  end
+end
+
 # Kernel extensions (methods available to all objects / call sites)
 module ::Kernel
   # @!visibility private
@@ -72,6 +92,9 @@ def system(*args)
   end
 
   class << self
+    # @!visibility private
+    alias_method :orig_trap, :trap
+
     # @!visibility private
     alias_method :orig_system, :system
 
@@ -89,30 +112,43 @@ def system(*args)
     end
   end
 
+
   # @!visibility private
   alias_method :orig_trap, :trap
 
-  # @!visibility private
-  def trap(sig, command = nil, &block)
-    return orig_trap(sig, command) if command.is_a? String
-
-    block = command if !block && command.respond_to?(:call)
-
-    # The signal trap can be invoked at any time, including while the system
-    # backend is blocking while polling for events. In order to deal with this
-    # correctly, we run the signal handler code in an out-of-band, priority
-    # scheduled fiber, that will pass any uncaught exception (including
-    # SystemExit and Interrupt) to the main thread's main fiber. See also
-    # `Fiber#schedule_priority_oob_fiber`.
-    orig_trap(sig) do
-      Fiber.schedule_priority_oob_fiber(&block)
-    end
+  prepend Polyphony::TrapInterceptor
+
+  class << self
+    prepend Polyphony::TrapInterceptor
   end
 
+  # # @!visibility private
+  # def trap(sig, command = nil, &block)
+  #   return orig_trap(sig, command) if command.is_a? String
+
+  #   block = command if !block && command.respond_to?(:call)
+
+  #   # The signal trap can be invoked at any time, including while the system
+  #   # backend is blocking while polling for events. In order to deal with this
+  #   # correctly, we run the signal handler code in an out-of-band, priority
+  #   # scheduled fiber, that will pass any uncaught exception (including
+  #   # SystemExit and Interrupt) to the main thread's main fiber. See also
+  #   # `Fiber#schedule_priority_oob_fiber`.
+  #   orig_trap(sig) do
+  #     Fiber.schedule_priority_oob_fiber(&block)
+  #   end
+  # end
+
   private
 
   # @!visibility private
   def pipe_to_eof(src, dest)
     src.read_loop { |data| dest << data }
   end
 end
+
+module ::Process
+  class << self
+    prepend Polyphony::TrapInterceptor
+  end
+end