ruby-debug-ide 0.4.23.beta1 → 0.4.23.beta7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjhlMmUxYjViODBlZTIxM2UzNDdlMGI3YjNjNTQ1NjQwNzAwNDA4NA==
+    NmE2MjAzZGVmZjM4NDFkOGViZGVkNTdkM2MwNTJmYWVjNjk1ZGJmMQ==
   data.tar.gz: !binary |-
-    NTFkYjI5OTgzNjhkMzFhZjMyZTJmYzdmOTg0NTYxZGU2ZGZiNzc2Nw==
+    MDBhYmY5NThlMmU0ZGM3ZTkzZTE5MjNkMGMyMzQ4ZGNhYzY5ZjU4Mg==
 SHA512:
   metadata.gz: !binary |-
-    NGNiMGRhMWM1NjhmYTU1ZTQ0YTUxOWRjNzk5NjM4Mzg0Mzc4YmQyY2VkOTlj
-    NTM5YzFmOGU1MTllOTM1MjQ1NWE5NTk1MDM5MzVhMjY5Njg2NzA2NGQ0NjRl
-    MjZjOTA1ZjExNDQ0YWRlMzcyNTQzYzZkYjc0NTJmNDZhYjU2NjA=
+    YzVjY2VkYWQ4MzRlMTMxNGRiYmM0OGVkYzRmNzQ4MThlYmQwNWU4MzAzODI2
+    MmRhMTM1ODBmMWJlYTkzNTM2NWI5ODJiOWIyZTY4NGNkNjlkOGNmMjM0YmJh
+    OGMyYWE5NGE1MTI4MzJlNzM0MTU2NmE0NTczOWE4NDMyNmRiYjE=
   data.tar.gz: !binary |-
-    MzVmNjk5NzcwNDU4NWJkMTFmOWEwZjE0MDU1NGVhNDZmNWUwYzdlZDcwMmRk
-    NTE0MTQ3ZDg3ODI5ODk5NTQxYWFlYjlkM2Q5M2MzOWM3ZDAzNTE3YTY2OGQ2
-    NWMxMmEzMWYyYzBlNGEwYmMyNzQ1MDE5YzVlNTMzNDMwNzMxZDc=
+    ZmU1MDY4ZTVlMjNkMzM5ZTVmNGZiZjQ4Y2Y1YmEzOGQ2M2ZmYTIxNWVkOGIw
+    MzkyNjY2N2U0MDVhYTMxY2RiNjQyZDA3YzhmNGE0NzU4N2RlZmIwMzM0MGFl
+    NzhjMzhkN2I1MzIzMGIyNTUyMjI2OTZlZTExZmRiNzMyMDFlODQ=

data/bin/rdebug-ide

@@ -18,14 +18,16 @@ options = OpenStruct.new(
   'stop'        => false,
   'tracing'     => false,
   'int_handler' => true,
-  'dispatcher_port' => -1
+  'dispatcher_port' => -1,
+  'evaluation_timeout' => 10
 )
 
 opts = OptionParser.new do |opts|
   opts.banner = <<EOB
 Using ruby-debug-base #{Debugger::VERSION}
-Usage: rdebug-ide is supposed to be called from RDT, NetBeans or RubyMine. The
-       command line interface to ruby-debug is rdebug.
+Usage: rdebug-ide is supposed to be called from RDT, NetBeans, RubyMine, or
+       the IntelliJ IDEA Ruby plugin.  The command line interface to
+       ruby-debug is rdebug.
 EOB
   opts.separator ""
   opts.separator "Options:"
@@ -33,7 +35,10 @@ EOB
   opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|port| options.port = port}  
   opts.on("--dispatcher-port PORT", Integer, "Port used for multi-process debugging dispatcher") do |dp| 
     options.dispatcher_port = dp
-  end  
+  end
+  opts.on('--evaluation-timeout TIMEOUT', Integer,'evaluation timeout in seconds (default: 10)') do |timeout|
+    options.evaluation_timeout = timeout
+  end
   opts.on('--stop', 'stop when the script is loaded') {options.stop = true}
   opts.on("-x", "--trace", "turn on line tracing") {options.tracing = true}
   opts.on("-l", "--load-mode", "load mode (experimental)") {options.load_mode = true}
@@ -106,6 +111,7 @@ end
 # set options
 Debugger.keep_frame_binding = options.frame_bind
 Debugger.tracing = options.tracing
+Debugger.evaluation_timeout = options.evaluation_timeout
 
 Debugger.debug_program(options)
 

data/ext/mkrf_conf.rb

@@ -20,18 +20,18 @@ unless jruby || rbx
   if RUBY_VERSION < "1.9"
     dep = Gem::Dependency.new("ruby-debug-base", '>=0.10.4')
   elsif RUBY_VERSION < '2.0'
-    dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.24')
+    dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.30.pre15')
   else    
     dep = Gem::Dependency.new("debase", '> 0')
   end
 
   begin
     puts "Installing base gem"
-    inst = Gem::DependencyInstaller.new    
+    inst = Gem::DependencyInstaller.new :prerelease => dep.prerelease?
     inst.install dep
   rescue
-    inst = Gem::DependencyInstaller.new(:prerelease => true)
     begin
+      inst = Gem::DependencyInstaller.new(:prerelease => true)
       inst.install dep
     rescue Exception => e
       puts e

data/lib/ruby-debug-ide.rb

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

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

@@ -1,8 +1,9 @@
 require 'ruby-debug-ide/helper'
+require 'delegate'
 
 module Debugger
 
-  class Command # :nodoc:
+  class Command < SimpleDelegator # :nodoc:
     SubcmdStruct=Struct.new(:name, :min, :short_help, :long_help) unless
       defined?(SubcmdStruct)
 
@@ -67,6 +68,7 @@ module Debugger
     
     def initialize(state, printer)
       @state, @printer = state, printer
+      super @printer
     end
     
     def match(input)
@@ -75,15 +77,6 @@ module Debugger
 
     protected
 
-    def method_missing(meth, *args, &block)
-      if @printer.respond_to? meth
-        @printer.send meth, *args, &block
-      else
-        super
-      end
-    end
-    
-    # FIXME: use delegate? 
     def errmsg(*args)
       @printer.print_error(*args)
     end
@@ -115,7 +108,7 @@ module Debugger
     def debug_eval(str, b = get_binding)
       begin
         str = str.to_s
-        max_time = 10
+        max_time = Debugger.evaluation_timeout
         to_inspect = str.gsub(/\\n/, "\n")
         @printer.print_debug("Evaluating #{str} with timeout after %i sec", max_time)
         timeout(max_time) do

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

@@ -1,3 +1,5 @@
+require 'pathname' if RUBY_VERSION < '1.9'
+
 module Debugger
   class AddBreakpoint < Command # :nodoc:
     self.control = true
@@ -35,8 +37,7 @@ module Debugger
           end
           file = klass.name if klass
         else
-          file = File.expand_path(file) if file.index(File::SEPARATOR) || \
-            File::ALT_SEPARATOR && file.index(File::ALT_SEPARATOR)
+          file = realpath(file)
         end
       end
       
@@ -63,6 +64,19 @@ module Debugger
         }
       end
     end
+
+    private
+      def realpath(filename)
+        filename = File.expand_path(filename) if filename.index(File::SEPARATOR) || \
+            File::ALT_SEPARATOR && filename.index(File::ALT_SEPARATOR)
+        if defined?(JRUBY_VERSION)
+          java.io.File.new(filename).canonical_path
+        elsif RUBY_VERSION < '1.9'
+          filename
+        else
+          File.realpath(filename)
+        end
+      end
   end
 
   class BreakpointsCommand < Command # :nodoc:

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

@@ -12,8 +12,8 @@ module Debugger
         errmsg "\"condition\" must be followed a breakpoint number and expression\n"
       else
         breakpoints = Debugger.breakpoints.sort_by{|b| b.id }
-        largest = breakpoints.inject(0) do |largest, b| 
-          largest = b.id if b.id > largest
+        largest = breakpoints.inject(0) do |largest_so_far, b|
+          b.id if b.id > largest_so_far
         end
         if 0 == largest
           print "No breakpoints have been set.\n"

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

@@ -3,8 +3,8 @@ module Debugger
   module EnableDisableFunctions # :nodoc:
     def enable_disable_breakpoints(is_enable, args)
       breakpoints = Debugger.breakpoints.sort_by{|b| b.id }
-      largest = breakpoints.inject(0) do |largest, b| 
-        largest = b.id if b.id > largest
+      largest = breakpoints.inject(0) do |largest_so_far, b|
+        b.id if b.id > largest_so_far
       end
       if 0 == largest
         errmsg "No breakpoints have been set.\n"

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

@@ -0,0 +1,65 @@
+require 'stringio'
+require 'irb/ruby-lex'
+
+module Debugger
+
+  class ExpressionInfoCommand < Command
+    def regexp
+      /^\s*ex(?:pression_info)?\s+/
+    end
+
+    def execute
+      string_to_parse = @match.post_match.gsub("\\n", "\n") + "\n\n\n"
+      total_lines = string_to_parse.count("\n") + 1
+
+      lexer = RubyLex.new
+      io = StringIO.new(string_to_parse)
+      # for passing to the lexer
+      io.instance_exec(string_to_parse.encoding) do |string_encoding|
+        @my_encoding = string_encoding
+        def self.encoding
+          @my_encoding
+        end
+      end
+
+      lexer.set_input(io)
+
+      last_statement = ''
+      last_prompt = ''
+      last_indent = 0
+      lexer.set_prompt do |ltype, indent, continue, lineno|
+        next if (lineno >= total_lines)
+
+        last_prompt = ltype || ''
+        last_indent = indent
+      end
+
+      lexer.each_top_level_statement do |line, line_no|
+        last_statement = line
+      end
+
+      incomplete = true
+      if /\A\s*\Z/m =~ last_statement[0]
+        incomplete = false
+      end
+
+      @printer.print_expression_info(incomplete, last_prompt, last_indent)
+    end
+
+    class << self
+      def help_command
+        "expression_info"
+      end
+
+      def help(cmd)
+        %{
+          ex[pression_info] <expression>\t
+          returns parser-related information for the expression given\t\t
+          'incomplete'=true|false\tindicates whether expression is a complete ruby
+          expression and can be evaluated without getting syntax errors
+        }
+      end
+    end
+  end
+
+end

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

@@ -22,4 +22,4 @@ module Debugger
     end
   end
 
-end
+end

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

@@ -67,7 +67,7 @@ module Debugger
 
           Change the next line of code to be executed.
          }
-     end
+      end
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Debugger
         %{
           pause <nnn>\tpause a running thread
          }
-     end
+      end
     end
   end
 end

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

@@ -41,7 +41,7 @@ module Debugger
 
           Change the type of <var> to <type>
          }
-     end
+      end
     end
   end
 end

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

@@ -134,7 +134,7 @@ module Debugger
     end
 
     def restore_context
-      context = @original_context
+      @context = @original_context
     end
   end
   

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

@@ -28,7 +28,7 @@ module Debugger
     
     def close
       @socket.close
-    rescue IOError
+    rescue IOError, SystemCallError
     end
 
     # Workaround for JRuby issue http://jira.codehaus.org/browse/JRUBY-2063

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

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

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

@@ -150,7 +150,8 @@ module Debugger
         unless has_children
           value_str = "Empty #{value.class}"
         else
-          value_str = "#{value.class} (#{value.size} element(s))"
+          size = value.size
+          value_str = "#{value.class} (#{value.size} element#{size > 1 ? "s" : "" })"
         end
       elsif value.is_a?(String)
         has_children = value.respond_to?('bytes') || value.respond_to?('encoding')
@@ -170,9 +171,29 @@ module Debugger
         end 
       end
       value_str = "[Binary Data]" if (value_str.respond_to?('is_binary_data?') && value_str.is_binary_data?)
-      print("<variable name=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\"/>",
-          CGI.escapeHTML(name), kind, CGI.escapeHTML(value_str), value.class,
+      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,
           has_children, value.respond_to?(:object_id) ? value.object_id : value.id)
+      print("<value><![CDATA[%s]]></value>", CGI.escapeHTML(value_str))
+      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,v| k }[0..5]
+        compact = slice.map {|kv| "#{kv[0]}: #{kv[1]}"}.join(", ")
+        compact = "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"
+      end
+      compact
     end
     
     def print_breakpoints(breakpoints)
@@ -218,6 +239,11 @@ module Debugger
     def print_expression(exp, value, idx)
       print "<dispay name=\"%s\" value=\"%s\" no=\"%d\" />", exp, value, idx
     end
+
+    def print_expression_info(incomplete, prompt, indent)
+      print "<expressionInfo incomplete=\"%s\" prompt=\"%s\" indent=\"%s\"></expressionInfo>",
+        incomplete, CGI.escapeHTML(prompt), indent
+    end
     
     def print_eval(exp, value)
       print "<eval expression=\"%s\" value=\"%s\" />",  CGI.escapeHTML(exp), value
@@ -282,7 +308,7 @@ module Debugger
         InspectCommand.reference_result(proxy)
         print_variable('error', proxy, 'exception')
       end
-    rescue Exception => e
+    rescue Exception
       print "<processingException type=\"%s\" message=\"%s\"/>", 
         exception.class, CGI.escapeHTML(exception.to_s)
     end
@@ -294,11 +320,11 @@ module Debugger
     end
     
     def print_load_result(file, exception=nil)
-      if exception then
+      if exception
         print("<loadResult file=\"%s\" exceptionType=\"%s\" exceptionMessage=\"%s\"/>", file, exception.class, CGI.escapeHTML(exception.to_s))        
       else
         print("<loadResult file=\"%s\" status=\"OK\"/>", file)        
-       end    
+      end
     end
 
     def print_element(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.4.23.beta1
+  version: 0.4.23.beta7
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,6 +51,7 @@ files:
 - lib/ruby-debug-ide/commands/control.rb
 - lib/ruby-debug-ide/commands/enable.rb
 - lib/ruby-debug-ide/commands/eval.rb
+- lib/ruby-debug-ide/commands/expression_info.rb
 - lib/ruby-debug-ide/commands/frame.rb
 - lib/ruby-debug-ide/commands/inspect.rb
 - lib/ruby-debug-ide/commands/jump.rb