ruby-debug-ide 0.6.1 → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58463736d53be1eaadb08e9afbd21a2c1243f951
-  data.tar.gz: 35f18cafbee8ec4aab79592e4283aee5c602b00d
+  metadata.gz: 2d69d1cfb5b86870712e0c746ead1254dc1f82e3
+  data.tar.gz: d7f642ffb2759051727072897298cf058faab95f
 SHA512:
-  metadata.gz: 8d8901f0c3476e91f6d861682464afc064cd647d1e3aa86bd409097f3e518e99e3644199c6b4f8d9e96eaec24ad185c33cc366b39fd6a40360a68dafa357c68c
-  data.tar.gz: 4d2a747833b7286fb5f918325f7baede0187ef62dd0ff6f6f92dfa0504722ebc304bed9fd44fbf0590698d043f03bd5e28e1acbb431e679c9109d70c0562d620
+  metadata.gz: 3e822e846ace7dc9926dea1d5ce49f50cf0f5ae748613b498d2de077639938cbe9c6420aa3c61eb9759462404274f9ca9e119a825b72df1ac6ccbd3d7ee8bf6c
+  data.tar.gz: 57c33149c8ac6ca7649f11b1c0a146f1fb93fd5ea3918ea66ca916e330178183cbe830af89b1f90211c386a55d2ef4c8ce1eedad2f29b606cd13ed102489af26

data/bin/rdebug-ide

@@ -131,6 +131,14 @@ else
   Debugger::PROG_SCRIPT = $0
 end
 
+if RUBY_VERSION < "1.9"
+   lib_path = File.expand_path(File.dirname(__FILE__) + "/../lib/")
+   $: << lib_path unless $:.include? lib_path
+   require 'ruby-debug-ide/thread_alias.rb'
+else
+  require_relative '../lib/ruby-debug-ide/thread_alias'
+end
+
 if options.dispatcher_port != -1
   ENV['IDE_PROCESS_DISPATCHER'] = options.dispatcher_port.to_s
   if RUBY_VERSION < "1.9"

data/lib/ruby-debug-ide.rb

@@ -18,6 +18,13 @@ require 'ruby-debug-ide/event_processor'
 module Debugger
 
   class << self
+    def find_free_port(host)
+      server = TCPServer.open(host, 0)
+      port   = server.addr[1]
+      server.close
+      port
+    end
+
     # Prints to the stderr using printf(*args) if debug logging flag (-d) is on.
     def print_debug(*args)
       if Debugger.cli_debug
@@ -111,9 +118,15 @@ module Debugger
           # 127.0.0.1 seemingly works with all systems and with IPv6 as well.
           # "localhost" and nil have problems on some systems.
           host ||= '127.0.0.1'
-          server = TCPServer.new(host, port)
-          print_greeting_msg($stderr, host, port) if defined? IDE_VERSION
-          notify_dispatcher(port) if notify_dispatcher
+
+          server = notify_dispatcher_if_needed(host, port, notify_dispatcher) do |real_port, port_changed = false|
+            s = TCPServer.new(host, real_port)
+            print_greeting_msg $stderr, host, real_port, port_changed ? "Subprocess" : "Fast" if defined? IDE_VERSION
+            s
+          end
+
+          return unless server
+
           while (session = server.accept)
             $stderr.puts "Connected from #{session.peeraddr[2]}" if Debugger.cli_debug
             dispatcher = ENV['IDE_PROCESS_DISPATCHER']
@@ -141,8 +154,9 @@ module Debugger
 
     private
 
+    def notify_dispatcher_if_needed(host, port, need_notify)
+      return yield port unless need_notify
 
-    def notify_dispatcher(port)
       return unless ENV['IDE_PROCESS_DISPATCHER']
       acceptor_host, acceptor_port = ENV['IDE_PROCESS_DISPATCHER'].split(":")
       acceptor_host, acceptor_port = '127.0.0.1', acceptor_host unless acceptor_port
@@ -151,11 +165,19 @@ module Debugger
       3.times do |i|
         begin
           s = TCPSocket.open(acceptor_host, acceptor_port)
+          dispatcher_answer = s.gets.chomp
+
+          if dispatcher_answer == "true"
+            port = Debugger.find_free_port(host)
+          end
+
+          server = yield port, dispatcher_answer == "true"
+
           s.print(port)
           s.close
           connected = true
           print_debug "Ide process dispatcher notified about sub-debugger which listens on #{port}\n"
-          return
+          return server
         rescue => bt
           $stderr.puts "#{Process.pid}: connection failed(#{i+1})"
           $stderr.puts "Exception: #{bt}"
@@ -164,7 +186,6 @@ module Debugger
         end unless connected
       end
     end
-
   end
 
   class Exception # :nodoc:

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

@@ -128,9 +128,18 @@ module Debugger
         to_inspect = Command.unescape_incoming(str)
         max_time = Debugger.evaluation_timeout
         @printer.print_debug("Evaluating %s with timeout after %i sec", str, max_time)
+
+        Debugger::TimeoutHandler.do_thread_alias
+
+        eval_result = nil
+
         timeout(max_time) do
-          eval(to_inspect, b)
+          eval_result = eval(to_inspect, b)
         end
+
+        Debugger::TimeoutHandler.undo_thread_alias
+
+        return eval_result
       rescue StandardError, ScriptError => e
         @printer.print_exception(e, @state.binding) 
         throw :debug_error

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

@@ -10,7 +10,7 @@ require 'ruby-debug-ide/ide_processor'
 module Debugger
 
   class << self
-    def print_greeting_msg(stream, host, port)
+    def print_greeting_msg(stream, host, port, debugger_name = "Fast")
       base_gem_name = if defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0'
                         'ruby-debug-base'
                       elsif RUBY_VERSION < '2.0.0'
@@ -31,7 +31,7 @@ module Debugger
         listens_on = "\n"
       end
 
-      msg = "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, #{base_gem_name} #{VERSION}, file filtering is #{file_filtering_support})" + listens_on
+      msg = "#{debugger_name} Debugger (ruby-debug-ide #{IDE_VERSION}, #{base_gem_name} #{VERSION}, file filtering is #{file_filtering_support})" + listens_on
 
       stream.printf msg
     end

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

@@ -11,7 +11,7 @@ module Debugger
             'frame_bind'  => false,
             'host'        => host,
             'load_mode'   => false,
-            'port'        => find_free_port(host),
+            'port'        => Debugger.find_free_port(host),
             'stop'        => false,
             'tracing'     => false,
             'int_handler' => true,
@@ -24,7 +24,7 @@ module Debugger
         )
 
         if(options.ignore_port)
-          options.port = find_free_port(options.host)
+          options.port = Debugger.find_free_port(options.host)
           options.notify_dispatcher = true
         end
       
@@ -54,14 +54,6 @@ module Debugger
         Debugger.cli_debug = options.cli_debug
         Debugger.prepare_debugger(options)
       end
-
-
-      def find_free_port(host)
-        server = TCPServer.open(host, 0)
-        port   = server.addr[1]
-        server.close
-        port
-      end
     end
   end
 end

data/lib/ruby-debug-ide/thread-alias/alias_thread.rb

@@ -0,0 +1,2 @@
+OldThread = Thread
+Thread = Debugger::DebugThread

data/lib/ruby-debug-ide/thread-alias/unalias_thread.rb

@@ -0,0 +1 @@
+Thread = OldThread

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

@@ -0,0 +1,13 @@
+module Debugger
+  module TimeoutHandler
+    class << self
+      def do_thread_alias
+        load File.expand_path(File.dirname(__FILE__) + '/thread-alias/alias_thread.rb')
+      end
+
+      def undo_thread_alias
+        load File.expand_path(File.dirname(__FILE__) + '/thread-alias/unalias_thread.rb')
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.6.1'
+  IDE_VERSION='0.7.0.beta2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0.beta2
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,9 @@ files:
 - 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/thread-alias/alias_thread.rb
+- lib/ruby-debug-ide/thread-alias/unalias_thread.rb
+- lib/ruby-debug-ide/thread_alias.rb
 - lib/ruby-debug-ide/version.rb
 - lib/ruby-debug-ide/xml_printer.rb
 - ruby-debug-ide.gemspec
@@ -98,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: debug-commons
 rubygems_version: 2.6.10