ruby-debug-ide 0.6.1.beta3 → 0.6.1.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425519e48f44723b8129340ee99f2a2741aaa07c
-  data.tar.gz: 99cd5ba804e4884644ac5d38465a8ab1f73cd40f
+  metadata.gz: 90ec6589dc3043b457fe0c148595388e8052df55
+  data.tar.gz: b60add310e51a12ed117d28b2710a816aab51575
 SHA512:
-  metadata.gz: c2a4de25b4516fc011791b0d6572e57f52d06335b03b1225deb5c771bbd6cf25db7d954424f916e099f4f961719f933855e875be11f04f14a34454cdf8d638c7
-  data.tar.gz: 5836a80d9904b1b08b87f33b77f2806a1a3bbdc57b4a2697766bbd6c7f2ffda888fe5d2c2573b49b48cab849208a7aba699f03bdb6e97e6d2807187283ce25d0
+  metadata.gz: 19c91299d491b609b74cd72e3ea4d909d5f09322bd015fa3c3451aedb019e3d7e0321c3de08cc283019e408d4612ba3cec1326f0b52890f8e1fe0aa6f520e2db
+  data.tar.gz: b33c0c1e0ac56f69330832dfbc1631dc8dff03c886d33be8127f9352620225c7245cc9af110bfb72997294ae99efb2addac507519f4ddf01bd7810b3b9b93312

data/bin/rdebug-ide

@@ -117,6 +117,7 @@ if options.dispatcher_port != -1
   else
     require_relative '../lib/ruby-debug-ide/multiprocess'
   end
+  Debugger::MultiProcess.do_monkey
 
   ENV['DEBUGGER_STORED_RUBYLIB'] = ENV['RUBYLIB'] 
   old_opts = ENV['RUBYOPT'] || ''
@@ -140,8 +141,6 @@ Debugger.evaluation_timeout = options.evaluation_timeout
 Debugger.catchpoint_deleted_event = options.catchpoint_deleted_event || options.rm_protocol_extensions
 Debugger.value_as_nested_element = options.value_as_nested_element || options.rm_protocol_extensions
 
-Debugger.attached = true
-
 if options.attach_mode
   if Debugger::FRONT_END == "debase"
     Debugger.init_variables

data/lib/ruby-debug-ide/commands/control.rb

@@ -136,9 +136,9 @@ module Debugger
     end
 
     def execute
-      Debugger.attached = false
       Debugger.stop
       Debugger.interface.close
+      Debugger::MultiProcess.undo_monkey
       Debugger.control_thread = nil
       Thread.current.exit #@control_thread is a current thread
     end

data/lib/ruby-debug-ide/multiprocess.rb

@@ -1,7 +1,23 @@
-if RUBY_VERSION < "1.9"
+if RUBY_VERSION < '1.9'
   require 'ruby-debug-ide/multiprocess/pre_child'
-  require 'ruby-debug-ide/multiprocess/monkey'
 else
   require_relative 'multiprocess/pre_child'
-  require_relative 'multiprocess/monkey'
+end
+
+module Debugger
+  module MultiProcess
+    class << self
+      def do_monkey
+        load File.expand_path(File.dirname(__FILE__) + '/multiprocess/monkey.rb')
+      end
+
+      def undo_monkey
+        if ENV['IDE_PROCESS_DISPATCHER']
+          load File.expand_path(File.dirname(__FILE__) + '/multiprocess/unmonkey.rb')
+          ruby_opts = ENV['RUBYOPT'].split(' ')
+          ENV['RUBYOPT'] = ruby_opts.keep_if {|opt| !opt.end_with?('ruby-debug-ide/multiprocess/starter')}.join(' ')
+        end
+      end
+    end
+  end
 end

data/lib/ruby-debug-ide/multiprocess/pre_child.rb

@@ -2,8 +2,6 @@ module Debugger
   module MultiProcess
     class << self
       def pre_child(options = nil)
-        return unless Debugger.attached
-
         require 'socket'
         require 'ostruct'
 

data/lib/ruby-debug-ide/multiprocess/unmonkey.rb

@@ -0,0 +1,31 @@
+module Debugger
+  module MultiProcess
+    def self.restore_fork
+      %Q{
+        alias fork pre_debugger_fork
+      }
+    end
+
+    def self.restore_exec
+      %Q{
+        alias exec pre_debugger_exec
+      }
+    end
+  end
+end
+
+module Kernel
+  class << self
+    module_eval Debugger::MultiProcess.restore_fork
+    module_eval Debugger::MultiProcess.restore_exec
+  end
+  module_eval Debugger::MultiProcess.restore_fork
+  module_eval Debugger::MultiProcess.restore_exec
+end
+
+module Process
+  class << self
+    module_eval Debugger::MultiProcess.restore_fork
+    module_eval Debugger::MultiProcess.restore_exec
+  end
+end

data/lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.6.1.beta3'
+  IDE_VERSION='0.6.1.beta4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.6.1.beta3
+  version: 0.6.1.beta4
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,6 +79,7 @@ files:
 - lib/ruby-debug-ide/multiprocess/monkey.rb
 - lib/ruby-debug-ide/multiprocess/pre_child.rb
 - lib/ruby-debug-ide/multiprocess/starter.rb
+- lib/ruby-debug-ide/multiprocess/unmonkey.rb
 - lib/ruby-debug-ide/version.rb
 - lib/ruby-debug-ide/xml_printer.rb
 - ruby-debug-ide.gemspec