ruby-debug-ide 0.4.23 → 0.4.24.beta4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjRjOTFkYzU1MWZiMmE5MGY3NDEzZWVhZmRlMzZjMDBhNmFjODJmNA==
+    NGU4NDUzY2M3ZWY5YjExYmU1YTY3MTJiYzA1ZTFhNGU2MDc4NDc2Yw==
   data.tar.gz: !binary |-
-    YjVmM2NlM2FmZjNmN2JhZWIzNzI0MWUzMTkzYTcxYjFjODAyMTI2OQ==
+    ZTQyNDJlZjIwN2UzZjRiZWU2Yzc5YTVkYjA0NzJlMGRiNGFkOGNmNQ==
 SHA512:
   metadata.gz: !binary |-
-    NDAxYjlhNDY2YzhiN2Y0M2Y1YzMzOTRmZThiYjMyZThjMmQ1ZjA3N2YxMDVm
-    ZWZhMzU1NTdiZTQ5YmUzYjNmMTUyYjc1NmY0ZjI0NzQ0MTc4MDlhNGRkNjYw
-    ZDM2ZmNlNzEzODZlMTk0MDVkZjlmYmM0OTg4M2M3MDc2MjU0YmM=
+    MGE1MDU5ZWEzNDFiM2IwZjY5ZjVkYTc5NjE3MzAwNTU5Y2M5MTU0NGU0OWU3
+    NmQwZjJiZmVmZjUzMGNiYzQ2YTMxMDVhYmE2MGNiNGE0ZWVjMjBjMzM5NWQ4
+    NDczZjEyMTdiN2QxMmZlNWVkYTYzMjFlNmQ4OTU5YjE4MmQ3YmE=
   data.tar.gz: !binary |-
-    YzkyNWUzODdkNTFlOTMxNWQ5ODU0ZTNiYWQ2YmNmYzI5NTcwNDE0MWE0NWZk
-    ZjA0ZWJjNDE2YzI4N2I4ZjBmMDFjYjM0MmFiZjkxZGU3ZmQzNjIyMTczOThm
-    NTE4ZDQwM2U1YTkxOGYwMDY5N2UwMTFjNTE3NTMwNDU1Y2Y2YTY=
+    OWE2YzFjNDExY2UyNjM0ZDUwMDhmNmZkODVmOTNiZTllYmI3MDdhNDA1ZGRm
+    ODkxN2U5NTY5ZWIyZWUwNDBlZWEwN2M5ZjFiODMyNjI3MmZjYzI2M2ExNjE4
+    NTE2YWI2NzdhYjVkZWNmMDllZGIxNWRlY2JlNmFkZTQxZjI1ZWY=

data/ChangeLog.md

@@ -1,3 +1,9 @@
+## [0.4.24.beta4](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.4.23...v0.4.24.beta4)
+
+* Performance optimisation for variable representation [RUBY-16055](https://youtrack.jetbrains.com/issue/RUBY-16055)
+* Added command line argument to enable RubyMine-specific protocol extensions
+* Several fixes to make debugger more robust [RUBY-16070](https://youtrack.jetbrains.com/issue/RUBY-16070)
+
 ## [0.4.23](https://github.com/ruby-debug/ruby-debug-ide/compare/v0.4.23.beta11...v0.4.23)
 
 * fixed problem with compact name for binary params (strings with invalid encoding)

data/bin/rdebug-ide

@@ -19,7 +19,8 @@ options = OpenStruct.new(
   'tracing'     => false,
   'int_handler' => true,
   'dispatcher_port' => -1,
-  'evaluation_timeout' => 10
+  'evaluation_timeout' => 10,
+  'rm_protocol_extensions' => false
 )
 
 opts = OptionParser.new do |opts|
@@ -54,6 +55,9 @@ EOB
   
   opts.on("--keep-frame-binding", "Keep frame bindings") {options.frame_bind = true}
   opts.on("--disable-int-handler", "Disables interrupt signal handler") {options.int_handler = false}
+  opts.on("--rubymine-protocol-extensions", "Enable RubyMine-specific incompatible protocol extensions") do
+    options.rm_protocol_extensions = true
+  end
   opts.separator ""
   opts.separator "Common options:"
   opts.on_tail("-v", "--version", "Show version") do
@@ -112,6 +116,7 @@ end
 Debugger.keep_frame_binding = options.frame_bind
 Debugger.tracing = options.tracing
 Debugger.evaluation_timeout = options.evaluation_timeout
+Debugger.rm_protocol_extensions = options.rm_protocol_extensions
 
 Debugger.debug_program(options)
 

data/lib/ruby-debug-ide.rb

@@ -41,7 +41,7 @@ module Debugger
        cleared
     end
 
-    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout
+    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout, :rm_protocol_extensions
     attr_accessor :control_thread
     attr_reader :interface
 

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

@@ -129,7 +129,7 @@ module Debugger
       locals = @state.context.frame_locals(@state.frame_pos)
       _self = @state.context.frame_self(@state.frame_pos)
       begin
-        locals['self'] = _self unless _self.to_s == "main"
+        locals['self'] = _self unless "main" == _self.to_s
       rescue => ex
         locals['self'] = "<Cannot evaluate self>"
         $stderr << "Cannot evaluate self\n#{ex.class.name}: #{ex.message}\n  #{ex.backtrace.join("\n  ")}"

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

@@ -28,13 +28,13 @@ module Debugger
         s.interface = @interface
       end
       event_cmds = Command.commands.map{|cmd| cmd.new(state, @printer) }
-      while !state.proceed? do
+      until state.proceed? do
         input = @interface.command_queue.pop
         catch(:debug_error) do
           splitter[input].each do |input|
             # escape % since print_debug might use printf
             @printer.print_debug "Processing in context: #{input.gsub('%', '%%')}"
-            if cmd = event_cmds.find { |c| c.match(input) }
+            if (cmd = event_cmds.find { |c| c.match(input) })
               if context.dead? && cmd.class.need_context
                 @printer.print_msg "Command is unavailable\n"
               else
@@ -42,15 +42,12 @@ module Debugger
               end
             else
               @printer.print_msg "Unknown command: #{input}"
-            end            
+            end
           end
         end
         state.restore_context
       end
-    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
+    rescue ::Exception
       @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
       @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
     end

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.4.23'
+  IDE_VERSION='0.4.24.beta4'
 end

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

@@ -78,7 +78,7 @@ module Debugger
     def print_frame(context, frame_id, current_frame_id)
       # idx + 1: one-based numbering as classic-debugger
       file = context.frame_file(frame_id)
-      print "<frame no=\'%s\' file=\'%s\' line=\'%s\' #{"current='true' " if frame_id == current_frame_id}/>",
+      print "<frame no=\"%s\" file=\"%s\" line=\"%s\" #{"current='true' " if frame_id == current_frame_id}/>",
         frame_id + 1, File.expand_path(file), context.frame_line(frame_id)
     end
     
@@ -171,31 +171,14 @@ module Debugger
         end
       end
       value_str = handle_binary_data(value_str)
-      compact_value_str = build_compact_name(value_str, value)
-      print("<variable name=\"%s\" compactValue=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\">",
-          CGI.escapeHTML(name), CGI.escapeHTML(compact_value_str), kind, CGI.escapeHTML(value_str), value.class,
+      escaped_value_str = CGI.escapeHTML(value_str)
+      print("<variable name=\"%s\" %s kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\">",
+          CGI.escapeHTML(name), build_compact_value_attr(value), kind, build_value_attr(escaped_value_str), value.class,
           has_children, value.respond_to?(:object_id) ? value.object_id : value.id)
-      print("<value><![CDATA[%s]]></value>", CGI.escapeHTML(value_str))
+      print("<value><![CDATA[%s]]></value>", escaped_value_str) if Debugger.rm_protocol_extensions
       print('</variable>')
     end
 
-    def build_compact_name(value_str, value)
-      compact = value_str
-      if value.is_a?(Array)
-        slice = value[0..10]
-        compact = slice.inspect
-        if value.size != slice.size
-          compact = compact[0..compact.size-2] + ", ...]"
-        end
-      end
-      if value.is_a?(Hash)
-        slice = value.sort_by { |k, _| k.to_s }[0..5]
-        compact = slice.map {|kv| "#{kv[0]}: #{handle_binary_data(kv[1])}"}.join(", ")
-        compact = "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"
-      end
-      compact
-    end
-    
     def print_breakpoints(breakpoints)
       print_element 'breakpoints' do
         breakpoints.sort_by{|b| b.id }.each do |b|
@@ -298,7 +281,7 @@ module Debugger
     end
     
     def print_at_line(context, file, line)
-      print "<suspended file=\'%s\' line=\'%s\' threadId=\'%d\' frames=\'%d\'/>",
+      print "<suspended file=\"%s\" line=\"%s\" threadId=\"%d\" frames=\"%d\"/>",
         File.expand_path(file), line, context.thnum, context.stack_size
     end
     
@@ -344,6 +327,7 @@ module Debugger
     end
 
     def handle_binary_data(value)
+      # noinspection RubyResolve
       return '[Binary Data]' if (value.respond_to?('is_binary_data?') && value.is_binary_data?)
       return '[Invalid encoding]' if (value.respond_to?('valid_encoding?') && !value.valid_encoding?)
       value
@@ -357,6 +341,39 @@ module Debugger
       end
     end
 
+    def build_compact_name(value)
+      return compact_array_str(value) if value.is_a?(Array)
+      return compact_hash_str(value) if value.is_a?(Hash)
+      nil
+    rescue ::Exception => e
+      print_debug(e)
+      nil
+    end
+
+    def compact_array_str(value)
+      slice   = value[0..10]
+      compact = slice.inspect
+      if value.size != slice.size
+        compact[0..compact.size-2] + ", ...]"
+      end
+      compact
+    end
+
+    def compact_hash_str(value)
+      slice   = value.sort_by { |k, _| k.to_s }[0..5]
+      compact = slice.map { |kv| "#{kv[0]}: #{handle_binary_data(kv[1])}" }.join(", ")
+      "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"
+    end
+
+    def build_compact_value_attr(value)
+      compact_value_str  = build_compact_name(value)
+      compact_value_str.nil? ? '' : "compactValue=\"#{CGI.escapeHTML(compact_value_str)}\""
+    end
+
+    def build_value_attr(escaped_value_str)
+      Debugger.rm_protocol_extensions ? '' : escaped_value_str
+    end
+
     instance_methods.each do |m|
       if m.to_s.index('print_') == 0
         protect m

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.24.beta4
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,12 +86,12 @@ 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: IDE interface for ruby-debug.