ruby-debug-ide 0.4.22 → 0.4.23.beta1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjhlMmUxYjViODBlZTIxM2UzNDdlMGI3YjNjNTQ1NjQwNzAwNDA4NA==
+  data.tar.gz: !binary |-
+    NTFkYjI5OTgzNjhkMzFhZjMyZTJmYzdmOTg0NTYxZGU2ZGZiNzc2Nw==
+SHA512:
+  metadata.gz: !binary |-
+    NGNiMGRhMWM1NjhmYTU1ZTQ0YTUxOWRjNzk5NjM4Mzg0Mzc4YmQyY2VkOTlj
+    NTM5YzFmOGU1MTllOTM1MjQ1NWE5NTk1MDM5MzVhMjY5Njg2NzA2NGQ0NjRl
+    MjZjOTA1ZjExNDQ0YWRlMzcyNTQzYzZkYjc0NTJmNDZhYjU2NjA=
+  data.tar.gz: !binary |-
+    MzVmNjk5NzcwNDU4NWJkMTFmOWEwZjE0MDU1NGVhNDZmNWUwYzdlZDcwMmRk
+    NTE0MTQ3ZDg3ODI5ODk5NTQxYWFlYjlkM2Q5M2MzOWM3ZDAzNTE3YTY2OGQ2
+    NWMxMmEzMWYyYzBlNGEwYmMyNzQ1MDE5YzVlNTMzNDMwNzMxZDc=

data/ext/mkrf_conf.rb

@@ -1,11 +1,12 @@
 jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+rbx = defined?(RUBY_ENGINE) && 'rbx' == RUBY_ENGINE
 
 def already_installed(dep)
   !Gem::DependencyInstaller.new(:domain => :local).find_gems_with_sources(dep).empty? ||
   !Gem::DependencyInstaller.new(:domain => :local,:prerelease => true).find_gems_with_sources(dep).empty?    
 end
 
-unless jruby
+unless jruby || rbx
   require 'rubygems'
   require 'rubygems/command.rb'
   require 'rubygems/dependency.rb'

data/lib/ruby-debug-ide.rb

@@ -2,7 +2,7 @@ require 'pp'
 require 'stringio'
 require "socket"
 require 'thread'
-if (RUBY_VERSION < '2.0' || defined?(JRUBY_VERSION))
+if RUBY_VERSION < '2.0' || defined?(JRUBY_VERSION)
   require 'ruby-debug-base'
 else
   require 'debase'
@@ -59,20 +59,20 @@ module Debugger
       end
     end
 
-    def start_server(host = nil, port = 1234)
+    def start_server(host = nil, port = 1234, notify_dispatcher = false)
       return if started?
       start
-      start_control(host, port)
+      start_control(host, port, notify_dispatcher)
     end
 
     def prepare_debugger(options)
-      start_server(options.host, options.port)
-
-      raise "Control thread did not start (#{@control_thread}}" unless @control_thread && @control_thread.alive?
-
       @mutex = Mutex.new
       @proceed = ConditionVariable.new
 
+      start_server(options.host, options.port, options.notify_dispatcher)
+
+      raise "Control thread did not start (#{@control_thread}}" unless @control_thread && @control_thread.alive?
+
       # wait for 'start' command
       @mutex.synchronize do
         @proceed.wait(@mutex)
@@ -97,7 +97,7 @@ module Debugger
       end
     end
 
-    def start_control(host, port)
+    def start_control(host, port, notify_dispatcher)
       raise "Debugger is not started" unless started?
       return if @control_thread
       @control_thread = DebugThread.new do
@@ -105,10 +105,12 @@ 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'
-          gem_name = (defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0') ? 'ruby-debug-base' :
-                     RUBY_VERSION < '2.0.0' ? 'ruby-debug-base19x' : 'debase'
           server = TCPServer.new(host, port)
+          gem_name = (defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0') ? 'ruby-debug-base' :
+              RUBY_VERSION < '2.0.0' ? 'ruby-debug-base19x' : 'debase'
           $stderr.printf "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, #{gem_name} #{VERSION}) listens on #{host}:#{port}\n"
+          notify_dispatcher(port) if notify_dispatcher
+
           while (session = server.accept)
             $stderr.puts "Connected from #{session.peeraddr[2]}" if Debugger.cli_debug
             dispatcher = ENV['IDE_PROCESS_DISPATCHER']
@@ -122,7 +124,7 @@ module Debugger
               IdeControlCommandProcessor.new(interface).process_commands
             rescue StandardError, ScriptError => ex
               bt = ex.backtrace
-              $stderr.printf "#{Process.pid}: Exception in DebugThread loop: #{ex.message}\nBacktrace:\n#{bt ? bt.join("\n  from: ") : "<none>"}\n"
+              $stderr.printf "#{Process.pid}: Exception in DebugThread loop: #{ex.message}(#{ex.class})\nBacktrace:\n#{bt ? bt.join("\n  from: ") : "<none>"}\n"
               exit 1
             end
           end
@@ -134,6 +136,31 @@ module Debugger
       end
     end
 
+    private
+
+    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
+
+      connected = false
+      3.times do |i|
+        begin
+          s = TCPSocket.open(acceptor_host, acceptor_port)
+          s.print(port)
+          s.close
+          connected = true
+          print_debug "Ide process dispatcher notified about sub-debugger which listens on #{port}\n"
+          return
+        rescue => bt
+          $stderr.puts "#{Process.pid}: connection failed(#{i+1})"
+          $stderr.puts "Exception: #{bt}"
+          $stderr.puts bt.backtrace.map { |l| "\t#{l}" }.join("\n")
+          sleep 0.3
+        end unless connected
+      end
+    end
+
   end
 
   class Exception # :nodoc:

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

@@ -59,6 +59,9 @@ module Debugger
   end
   
   class VarInstanceCommand < Command # :nodoc:
+    # TODO: try to find out a way to use Kernel.binding
+    BINDING_COMMAND = (defined? Rubinius) ? 'binding' : '::Kernel.binding'
+
     def regexp
       # id will be read as first match, name as post match
       /^\s*v(?:ar)?\s+i(?:nstance)?\s+((?:[\\+-]0x)[\dabcdef]+)?/
@@ -67,8 +70,9 @@ module Debugger
     def execute
       if (@match[1])
         obj = ObjectSpace._id2ref(@match[1].hex) rescue nil
+
         unless obj
-          # TODO: ensure that empty variables frame will be printed
+          print_element("variables")
           @printer.print_msg("Unknown object id : %s", @match[1])
         end
       else
@@ -86,7 +90,7 @@ module Debugger
           # instance variables
           kind = 'instance'
           inst_vars = obj.instance_variables
-          instance_binding = obj.instance_eval{::Kernel.binding()}
+          instance_binding = obj.instance_eval(BINDING_COMMAND)
           # print self at top position
           print_variable('self', debug_eval('self', instance_binding), kind) if inst_vars.include?('self')
           inst_vars.sort.each do |var|
@@ -94,7 +98,7 @@ module Debugger
           end
           
           # class variables
-          class_binding = obj.class.class_eval('::Kernel.binding()')
+          class_binding = obj.class.class_eval(BINDING_COMMAND)
           obj.class.class_variables.sort.each do |var|
             print_variable(var, debug_eval(var, class_binding), 'class')
           end

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

@@ -47,7 +47,7 @@ module Debugger
         end
         state.restore_context
       end
-    rescue IOError, Errno::EPIPE
+    rescue IOError, SystemCallError
       @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
       @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
     rescue Exception
@@ -93,10 +93,12 @@ module Debugger
           end
         end
       end
-    rescue IOError, Errno::EPIPE
+    rescue IOError, SystemCallError
+      @printer.print_debug "INTERNAL ERROR!!! #{$!}\n"
       @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
       @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
     rescue Exception
+      @printer.print_debug "INTERNAL ERROR!!! #{$!}\n" rescue nil
       @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
       @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
     ensure

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

@@ -1,19 +1,6 @@
 require 'thread'
 
-class TCPSocket
-  
-  # Workaround for JRuby issue http://jira.codehaus.org/browse/JRUBY-2063
-  def non_blocking_gets
-    loop do
-      result, _, _ = IO.select( [self], nil, nil, 0.2 )
-      next unless result
-      return result[0].gets
-    end
-  end
-  
-end
-
-module Debugger  
+module Debugger
   class Interface
   end
 
@@ -23,7 +10,6 @@ module Debugger
 
   class RemoteInterface < Interface # :nodoc:
     attr_accessor :command_queue
-    attr_accessor :socket
 
     def initialize(socket)
       @socket = socket
@@ -31,7 +17,7 @@ module Debugger
     end
     
     def read_command
-      result = @socket.non_blocking_gets
+      result = non_blocking_gets
       raise IOError unless result
       result.chomp
     end
@@ -42,9 +28,18 @@ module Debugger
     
     def close
       @socket.close
-    rescue Exception
+    rescue IOError
     end
-    
+
+    # Workaround for JRuby issue http://jira.codehaus.org/browse/JRUBY-2063
+    def non_blocking_gets
+      loop do
+        result, _, _ = IO.select( [@socket], nil, nil, 0.2 )
+        next unless result
+        return result[0].gets
+      end
+    end
+
   end
   
 end

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

@@ -17,28 +17,11 @@ module Debugger
             'stop'        => false,
             'tracing'     => false,
             'int_handler' => true,
-            'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true')
+            'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true'),
+            'notify_dispatcher' => true
         )
 
-        acceptor_host, acceptor_port = ENV['IDE_PROCESS_DISPATCHER'].split(":")
-        acceptor_host, acceptor_port = '127.0.0.1', acceptor_host unless acceptor_port
-
-        connected = false
-        3.times do |i|
-          begin
-            s = TCPSocket.open(acceptor_host, acceptor_port)
-            s.print(port)
-            s.close
-            connected = true
-            start_debugger(options)
-            return
-          rescue => bt
-            $stderr.puts "#{Process.pid}: connection failed(#{i+1})"
-            $stderr.puts "Exception: #{bt}"
-            $stderr.puts bt.backtrace.map { |l| "\t#{l}" }.join("\n")
-            sleep 0.3
-          end unless connected
-        end
+        start_debugger(options)
       end
 
       def start_debugger(options)
@@ -46,7 +29,7 @@ module Debugger
           # we're in forked child, only need to restart control thread
           Debugger.breakpoints.clear
           Debugger.control_thread = nil
-          Debugger.start_control(options.host, options.port)
+          Debugger.start_control(options.host, options.port, options.notify_dispatcher)
         end
 
         if options.int_handler

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.4.22'
+  IDE_VERSION='0.4.23.beta1'
 end

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

@@ -130,8 +130,12 @@ module Debugger
 
     def print_string(string)
       print_element("variables") do
-         print_variable('bytes', string.bytes.to_a, 'instance') if string.respond_to?('bytes')
-         print_variable('encoding', string.encoding, 'instance') if string.respond_to?('encoding')         
+        if string.respond_to?('bytes')
+          bytes = string.bytes.to_a
+          InspectCommand.reference_result(bytes)
+          print_variable('bytes', bytes, 'instance')
+        end
+        print_variable('encoding', string.encoding, 'instance') if string.respond_to?('encoding')         
       end
     end
     

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.4.22
-  prerelease: 
+  version: 0.4.23.beta1
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,12 +38,12 @@ files:
 - CHANGES
 - ChangeLog
 - ChangeLog.archive
+- Gemfile
 - MIT-LICENSE
 - Rakefile
-- ext/mkrf_conf.rb
-- Gemfile
-- ruby-debug-ide.gemspec
 - bin/rdebug-ide
+- ext/mkrf_conf.rb
+- lib/ruby-debug-ide.rb
 - lib/ruby-debug-ide/command.rb
 - lib/ruby-debug-ide/commands/breakpoints.rb
 - lib/ruby-debug-ide/commands/catchpoint.rb
@@ -67,35 +64,34 @@ files:
 - lib/ruby-debug-ide/helper.rb
 - lib/ruby-debug-ide/ide_processor.rb
 - lib/ruby-debug-ide/interface.rb
+- lib/ruby-debug-ide/multiprocess.rb
 - 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.rb
 - lib/ruby-debug-ide/version.rb
 - lib/ruby-debug-ide/xml_printer.rb
-- lib/ruby-debug-ide.rb
+- ruby-debug-ide.gemspec
 homepage: https://github.com/ruby-debug/ruby-debug-ide
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: debug-commons
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: IDE interface for ruby-debug.
 test_files: []