ruby-debug-ide 0.4.11 → 0.4.16

data/Rakefile

@@ -3,23 +3,24 @@ require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
+require 'lib/ruby-debug/version'
 require 'date'
 
 desc 'Default: run unit tests.'
 task :default => [:test]
 
 # ------- Default Package ----------
-RUBY_DEBUG_IDE_VERSION = "0.4.11"
+RUBY_DEBUG_IDE_VERSION = Debugger::IDE_VERSION
 
 FILES = FileList[
-  'CHANGES',
-  'ChangeLog',
-  'ChangeLog.archive',
+#  'CHANGES',
+#  'ChangeLog',
+#  'ChangeLog.archive',
   'MIT-LICENSE',
   'Rakefile',
   'bin/*',
   'lib/**/*',
-  'test/**/*',
+#  'test/**/*',
   'ext/mkrf_conf.rb'
 ]
 
@@ -29,18 +30,19 @@ ide_spec = Gem::Specification.new do |spec|
   spec.homepage = "http://rubyforge.org/projects/debug-commons/"
   spec.summary = "IDE interface for ruby-debug."
   spec.description = <<-EOF
-An interface which glues ruby-debug to IDEs like Eclipse (RDT) and NetBeans.
+An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans and RubyMine.
 EOF
 
   spec.version = RUBY_DEBUG_IDE_VERSION
 
-  spec.author = "Markus Barchfeld, Martin Krauskopf"
-  spec.email = "rubyeclipse-dev-list@sourceforge.net"
+  spec.author = "Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team"
+  spec.email = "rubymine-feedback@jetbrains.com"
   spec.platform = Gem::Platform::RUBY
   spec.require_path = "lib"
   spec.bindir = "bin"
   spec.executables = ["rdebug-ide"]
   spec.files = FILES.to_a
+
   spec.extensions << "ext/mkrf_conf.rb"
   spec.add_dependency("rake", ">= 0.8.1")
 

data/ext/mkrf_conf.rb

@@ -12,9 +12,9 @@ unless jruby
   inst = Gem::DependencyInstaller.new
   begin
     if RUBY_VERSION < "1.9"
-      inst.install "ruby-debug-base", "~> 0.10.3"
+      inst.install "ruby-debug-base", '>=0.10.4'
     else
-      inst.install "ruby-debug-base19", "~> 0.11.15" 
+      inst.install "ruby-debug-base19", '>=0.11.24'
     end
     rescue
       exit(1)

data/lib/ruby-debug-ide.rb

@@ -4,10 +4,12 @@ require "socket"
 require 'thread'
 require 'ruby-debug-base'
 if RUBY_VERSION < "1.9"
+  require 'ruby-debug/version'
   require 'ruby-debug/xml_printer'
   require 'ruby-debug/processor'
   require 'ruby-debug/event_processor'
 else
+  require_relative 'ruby-debug/version'
   require_relative 'ruby-debug/xml_printer'
   require_relative 'ruby-debug/processor'
   require_relative 'ruby-debug/event_processor'
@@ -24,6 +26,7 @@ module Debugger
         $stderr.flush
       end
     end
+
   end
 
   class Context
@@ -125,10 +128,10 @@ module Debugger
       return if @control_thread
       @control_thread = DebugThread.new do
         begin
-          $stderr.printf "Fast Debugger (ruby-debug-ide 0.4.10) listens on #{host}:#{port}\n"
           # 127.0.0.1 seemingly works with all systems and with IPv6 as well.
-          # "localhost" and nil on have problems on some systems.
+          # "localhost" and nil have problems on some systems.
           host ||= '127.0.0.1'
+          $stderr.printf "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, ruby-debug-base #{VERSION}) listens on #{host}:#{port}\n"
           server = TCPServer.new(host, port)
           while (session = server.accept)
             begin
@@ -136,12 +139,14 @@ module Debugger
               @event_processor = EventProcessor.new(interface)
               ControlCommandProcessor.new(interface).process_commands
             rescue StandardError, ScriptError => ex
-              $stderr.printf "Exception in DebugThread loop: #{ex}\n"
+              bt = ex.backtrace
+              $stderr.printf "Exception in DebugThread loop: #{ex.message}\nBacktrace:\n#{bt ? bt.join("\n  from: ") : "<none>"}\n"
               exit 1
             end
           end
         rescue
-          $stderr.printf "Exception in DebugThread: #$!\n"
+          bt = $!.backtrace
+          $stderr.printf "Fatal exception in DebugThread loop: #{$!.message}\nBacktrace:\n#{bt ? bt.join("\n  from: ") : "<none>"}\n"
           exit 2
         end
       end

data/lib/ruby-debug/command.rb

@@ -102,8 +102,8 @@ module Debugger
     # in ruby-debug.c
     def timeout(sec)
       return yield if sec == nil or sec.zero?
-      if RUBY_VERSION < "1.9"
-        raise ThreadError, "timeout within critical session" if Thread.critical
+      if Thread.respond_to?(:critical) and Thread.critical
+        raise ThreadError, "timeout within critical session"      
       end
       begin
         x = Thread.current
@@ -122,7 +122,7 @@ module Debugger
         str = str.to_s
         max_time = 10
         to_inspect = str.gsub(/\\n/, "\n")
-        @printer.print_debug("Evaluating with timeout after %i sec", max_time)
+        @printer.print_debug("Evaluating #{str} with timeout after %i sec", max_time)
         timeout(max_time) do
           eval(to_inspect, b)
         end

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

@@ -15,7 +15,8 @@ module Debugger
     end
     #    
     def execute
-      obj = debug_eval(@match.post_match)
+      binding = @state.context ? get_binding : TOPLEVEL_BINDING
+      obj = debug_eval(@match.post_match, binding)
       InspectCommand.reference_result(obj)
       @printer.print_inspect(obj)
     end

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

@@ -0,0 +1,73 @@
+module Debugger
+
+  # Implements debugger "jump" command
+  class JumpCommand < Command
+    self.need_context = true
+
+    def numeric?(object)
+      true if Float(object) rescue false
+    end
+
+    def regexp
+      / ^\s*
+         j(?:ump)? \s*
+         (?:\s+(\S+))?\s*
+         (?:\s+(\S+))?\s*
+         $
+      /ix
+    end
+
+    def execute
+      unless @state.context.respond_to?(:jump)
+        print_msg "Not implemented"
+        return
+      end
+      if !@match[1]
+        print_msg "\"jump\" must be followed by a line number"
+        return
+      end
+      if !numeric?(@match[1])
+        print_msg "Bad line number: " + @match[1]
+        return
+      end
+      line = @match[1].to_i
+      line = @state.context.frame_line(0) + line if @match[1][0] == '+' or @match[1][0] == '-'
+      if line == @state.context.frame_line(0)
+        return
+      end
+      file = @match[2]
+      file = @state.context.frame_file(file.to_i) if numeric?(file)
+      file = @state.context.frame_file(0) if !file
+      case @state.context.jump(line, file)
+      when 0
+        @state.proceed
+        return
+      when 1
+        print_msg "Not possible to jump from here"
+      when 2
+        print_msg "Couldn't find debugged frame"
+      when 3
+        print_msg "Couldn't find active code at " + file + ":" + line.to_s
+      else
+        print_msg "Unknown error occurred"
+      end
+      @printer.print_at_line(@state.context, @state.context.frame_file, @state.context.frame_line)
+    end
+
+    class << self
+      def help_command
+        %w[jump]
+      end
+
+      def help(cmd)
+        %{
+          j[ump] line\tjump to line number (absolute)
+          j[ump] -line\tjump back to line (relative)
+          j[ump] +line\tjump ahead to line (relative)
+
+          Change the next line of code to be executed.
+         }
+     end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Debugger
+
+  # Implements debugger "pause" command
+  class PauseCommand < Command
+    self.control = true
+
+    def regexp
+      /^\s*pause\s*(?:\s+(\S+))?\s*$/
+    end
+
+    def execute
+      c = get_context(@match[1].to_i)
+      unless c.respond_to?(:pause)
+        print_msg "Not implemented"
+        return
+      end
+      c.pause
+    end
+
+    class << self
+      def help_command
+        %w[pause]
+      end
+
+      def help(cmd)
+        %{
+          pause <nnn>\tpause a running thread
+         }
+     end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Debugger
+
+  # Implements debugger "set_type" command
+  class SetTypeCommand < Command
+    self.need_context = true
+
+    def regexp
+      / ^\s*
+         set_type? \s*
+         (?:\s+(\S+))?\s*
+         (?:\s+(\S+))?\s*
+         $
+      /ix
+    end
+
+    def execute
+      if RUBY_VERSION < "1.9"
+        print_msg "Not implemented"
+        return
+      end
+      begin
+        expr = @match[1] + " = " + @match[2] + "(" + @match[1] + ".inspect)"
+        eval(expr)
+      rescue
+        begin
+          expr = @match[1] + " = " + @match[2] + ".new(" + @match[1] + ".inspect)"
+          eval(expr)
+        rescue nil
+        end
+      end
+    end
+
+    class << self
+      def help_command
+        %w[set_type]
+      end
+
+      def help(cmd)
+        %{
+          set_type <var> <type>
+
+          Change the type of <var> to <type>
+         }
+     end
+    end
+  end
+end

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

@@ -34,9 +34,13 @@ module Debugger
     end
     
     def execute
-      # Avoid accessing deprecated global $= and its alias $IGNORECASE,
-      # as doing so triggers a spurious warning on JRuby.
-      print_variables(global_variables - ['$=', '$IGNORECASE'], 'global') do |var|
+      globals = []
+      if RUBY_VERSION < "1.9"
+        globals = global_variables - ['$=', '$IGNORECASE']
+      else
+        globals = global_variables - [:$KCODE, :$-K, :$=, :$FILENAME]
+      end
+      print_variables(globals, 'global') do |var|
         debug_eval(var)
       end
     end

data/lib/ruby-debug/event_processor.rb

@@ -32,12 +32,12 @@ end
      end
      
      def at_line(context, file, line)
-       @printer.print_at_line(file, line) if context.nil? || context.stop_reason == :step
+       @printer.print_at_line(context, file, line) if context.nil? || context.stop_reason == :step
        line_event(context, file, line)
      end
 
      def at_return(context, file, line)
-       @printer.print_at_line(file, line)
+       @printer.print_at_line(context, file, line)
        context.stop_frame = -1
        line_event(context, file, line)
      end

data/lib/ruby-debug/version.rb

@@ -0,0 +1,3 @@
+module Debugger
+  IDE_VERSION='0.4.16'
+end

data/lib/ruby-debug/xml_printer.rb

@@ -100,7 +100,7 @@ module Debugger
     
     def print_variable(name, value, kind)
       name = name.to_s
-      unless value != nil
+      if value.nil?
         print("<variable name=\"%s\" kind=\"%s\"/>", CGI.escapeHTML(name), kind)
         return
       end
@@ -223,9 +223,9 @@ module Debugger
       # print "<trace file=\"%s\" line=\"%s\" threadId=\"%d\" />", file, line, context.thnum
     end
     
-    def print_at_line(file, line)
+    def print_at_line(context, file, line)
       print "<suspended file=\'%s\' line=\'%s\' threadId=\'%d\' frames=\'%d\'/>",
-        File.expand_path(file), line, Debugger.current_context.thnum, Debugger.current_context.stack_size
+        File.expand_path(file), line, context.thnum, context.stack_size
     end
     
     def print_exception(exception, binding)

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 4
-  - 11
-  version: 0.4.11
+  - 16
+  version: 0.4.16
 platform: ruby
 authors: 
-- Markus Barchfeld, Martin Krauskopf
+- Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +03:00
+date: 2010-11-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,9 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: |
-  An interface which glues ruby-debug to IDEs like Eclipse (RDT) and NetBeans.
+  An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans and RubyMine.
 
-email: rubyeclipse-dev-list@sourceforge.net
+email: rubymine-feedback@jetbrains.com
 executables: 
 - rdebug-ide
 extensions: 
@@ -45,9 +45,6 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- CHANGES
-- ChangeLog
-- ChangeLog.archive
 - MIT-LICENSE
 - Rakefile
 - bin/rdebug-ide
@@ -60,7 +57,10 @@ files:
 - lib/ruby-debug/commands/eval.rb
 - lib/ruby-debug/commands/frame.rb
 - lib/ruby-debug/commands/inspect.rb
+- lib/ruby-debug/commands/jump.rb
 - lib/ruby-debug/commands/load.rb
+- lib/ruby-debug/commands/pause.rb
+- lib/ruby-debug/commands/set_type.rb
 - lib/ruby-debug/commands/stepping.rb
 - lib/ruby-debug/commands/threads.rb
 - lib/ruby-debug/commands/variables.rb
@@ -69,18 +69,9 @@ files:
 - lib/ruby-debug/interface.rb
 - lib/ruby-debug/printers.rb
 - lib/ruby-debug/processor.rb
+- lib/ruby-debug/version.rb
 - lib/ruby-debug/xml_printer.rb
 - lib/ruby-debug-ide.rb
-- test/rd_basic_test.rb
-- test/rd_catchpoint_test.rb
-- test/rd_condition_test.rb
-- test/rd_enable_disable_test.rb
-- test/rd_inspect_test.rb
-- test/rd_stepping_breakpoints_test.rb
-- test/rd_test_base.rb
-- test/rd_threads_and_frames_test.rb
-- test/rd_variables_test.rb
-- test/ruby-debug/xml_printer_test.rb
 - ext/mkrf_conf.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/debug-commons/

data/CHANGES

@@ -1,75 +0,0 @@
-This document is not maintained since version 0.1.10. See ``Changes'' section
-in the ``ruby-debug-ide protocol'' document:
-
-  http://debug-commons.rubyforge.org/protocol-spec.html
-
-and ChangeLog for details. protocol-spec.html is generated from
-doc/protocol-spec.texi file.
-
-========================================================================
-
-0.1.9 - 0.1.10
---------------
-
-  * fixed bug when inspected variable's to_s methods returns non-String.
-    Returns diagonstic message now.
-  * do not use '==' from within debugger to prevent runtime error
-  * Workarounding JRuby issue (http://jira.codehaus.org/browse/JRUBY-2063)
-  * switching to ruby-debug-base 0.1.10 (all tests pass)
-
-0.1.8 - 0.1.9
--------------
-
-  * be sure 'exit' is always called.
-  * to_inspect = str.gsub(/\\n/, "\n") in debug_eval() to make possible to
-    evaluate multiline expressions. Frontend must escape new lines
-    accordingly.
-  * prevent exception when to_s returns nil on being evaluated value
-
-0.1.7 - 0.1.8
--------------
-
-  * fixed error during breakpoint removing
-  * (protocols merge) print debug message on $stderr like classic debugger
-
-0.1.6 - 0.1.7
--------------
-
-  * ensure 'yaml' (is_binary_data?) is always loaded in xml_printer.rb
-  * VarInstanceCommand enumerates also variables of an object's class, as it
-    is done in the classic-debugger
-  * do not send unneeded end-of-lines (fast and classic protocol merging)
-  * do not send non-xml PROMPT and CONFIRM + getting rid of 'confirm' methods
-    in the whole codebase (fast and classic protocol merging)
-  * send info <message> when 'delete' is used without given 'pos' (deleting of
-    all breakpoints is not supported)
-  * return <error> on 'delete <negative_int>' (protocol unification)
-  * always use one-based frame numbering (was not the case in <frame[s]>)
-  * send message 'finished' back when exiting
-
-0.1.5 - 0.1.6
--------------
-
-  * do not send binary data within values of variables. See
-    http://www.netbeans.org/nonav/issues/show_bug.cgi?id=101748 for more
-    details
-
-0.1.4 - 0.1.5
--------------
-
-  * fixed subtle bug in xml_printer.rb#print_variable which caused the
-    debugger to die when == method was overridden and did not count on nil
-    parameters
-  * Hash and Array subclasses did not have children thus cannot be expanded in
-    a GUI. E.g. @params in Rails controller (HashWithIndifferentAccess)
-
-0.1.3 - 0.1.4
--------------
-
-  * migration to ruby-debug 0.1.4
-
-0.1.2 - 0.1.3
--------------
-
-  * adding step+ and next+ commands (since ruby-debug 0.9.1)
-