ruby-debug-ide22 0.7.4 → 0.7.5

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

@@ -1,154 +1,154 @@
-module Debugger
-  class VarConstantCommand < Command # :nodoc:
-    def regexp
-      /^\s*v(?:ar)?\s+c(?:onst(?:ant)?)?\s+/
-    end
-    
-    def execute
-      obj = debug_eval(@match.post_match)
-      unless obj.kind_of? Module
-        print_msg "Should be Class/Module: %s", @match.post_match
-      else
-        print_variables(obj.constants, "constant") do |var|
-          obj.const_get(var)
-        end
-      end
-    end
-    
-    class << self
-      def help_command
-        'var'
-      end
-      
-      def help(cmd)
-        %{
-          v[ar] c[onst] <object>\t\tshow constants of object
-        }
-      end
-    end
-  end
-  
-  class VarGlobalCommand < Command # :nodoc:
-    def regexp
-      /^\s*v(?:ar)?\s+g(?:lobal)?\s*$/
-    end
-    
-    def execute
-      globals = []
-      if RUBY_VERSION < "1.9"
-        globals = global_variables - ['$=', '$IGNORECASE']
-      else
-        globals = global_variables - [:$KCODE, :$-K, :$=, :$IGNORECASE, :$FILENAME]
-      end
-      print_variables(globals, 'global') do |var|
-        debug_eval(var)
-      end
-    end
-    
-    class << self
-      def help_command
-        'var'
-      end
-      
-      def help(cmd)
-        %{
-          v[ar] g[lobal]\t\t\tshow global variables
-        }
-      end
-    end
-  end
-  
-  class VarInstanceCommand < Command # :nodoc:
-    # TODO: try to find out a way to use Kernel.binding for Rubinius
-    # ::Kernel.binding doesn't for for ruby 1.8 (see RUBY-14679)
-    BINDING_COMMAND = (defined?(Rubinius) || RUBY_VERSION < '1.9') ? '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]+)?/
-    end
-    
-    def execute
-      if (@match[1])
-        obj = ObjectSpace._id2ref(@match[1].hex) rescue nil
-
-        unless obj
-          print_element("variables")
-          @printer.print_msg("Unknown object id : %s", @match[1])
-        end
-      else
-        obj = debug_eval(@match.post_match)
-      end
-      return unless obj
-      if obj.is_a?(Array)
-        print_array(obj)
-      elsif obj.is_a?(Hash)
-        print_hash(obj)
-      elsif obj.is_a?(String)
-        print_string(obj)
-      else
-        print_element("variables") do
-          # instance variables
-          kind = 'instance'
-          inst_vars = obj.instance_variables
-          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|
-            print_variable(var, debug_eval(var, instance_binding), kind) unless var == 'self'
-          end
-          
-          # class variables
-          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
-        end
-      end 
-    end
-    
-    class << self
-      def help_command
-        'var'
-      end
-      
-      def help(cmd)
-        %{
-          v[ar] i[nstance] <object>\tshow instance variables of object, object can be given by its id or an expression
-        }
-      end
-    end
-  end
-  
-  class VarLocalCommand < Command # :nodoc:
-    def regexp
-      /^\s*v(?:ar)?\s+l(?:ocal)?\s*$/
-    end
-    
-    def execute
-      locals = @state.context.frame_locals(@state.frame_pos)
-      _self = @state.context.frame_self(@state.frame_pos)
-      begin
-        locals['self'] = _self unless TOPLEVEL_BINDING.eval('self') == _self
-      rescue => ex
-        locals['self'] = "<Cannot evaluate self>"
-        $stderr << "Cannot evaluate self\n#{ex.class.name}: #{ex.message}\n  #{ex.backtrace.join("\n  ")}"
-      end
-      print_variables(locals.keys, 'local') do |var|
-        locals[var]
-      end
-    end
-    
-    class << self
-      def help_command
-        'var'
-      end
-      
-      def help(cmd)
-        %{
-          v[ar] l[ocal]\t\t\tshow local variables
-        }
-      end
-    end
-  end
-end
+module Debugger
+  class VarConstantCommand < Command # :nodoc:
+    def regexp
+      /^\s*v(?:ar)?\s+c(?:onst(?:ant)?)?\s+/
+    end
+    
+    def execute
+      obj = debug_eval(@match.post_match)
+      unless obj.kind_of? Module
+        print_msg "Should be Class/Module: %s", @match.post_match
+      else
+        print_variables(obj.constants, "constant") do |var|
+          obj.const_get(var)
+        end
+      end
+    end
+    
+    class << self
+      def help_command
+        'var'
+      end
+      
+      def help(cmd)
+        %{
+          v[ar] c[onst] <object>\t\tshow constants of object
+        }
+      end
+    end
+  end
+  
+  class VarGlobalCommand < Command # :nodoc:
+    def regexp
+      /^\s*v(?:ar)?\s+g(?:lobal)?\s*$/
+    end
+    
+    def execute
+      globals = []
+      if RUBY_VERSION < "1.9"
+        globals = global_variables - ['$=', '$IGNORECASE']
+      else
+        globals = global_variables - [:$KCODE, :$-K, :$=, :$IGNORECASE, :$FILENAME]
+      end
+      print_variables(globals, 'global') do |var|
+        debug_eval(var)
+      end
+    end
+    
+    class << self
+      def help_command
+        'var'
+      end
+      
+      def help(cmd)
+        %{
+          v[ar] g[lobal]\t\t\tshow global variables
+        }
+      end
+    end
+  end
+  
+  class VarInstanceCommand < Command # :nodoc:
+    # TODO: try to find out a way to use Kernel.binding for Rubinius
+    # ::Kernel.binding doesn't for for ruby 1.8 (see RUBY-14679)
+    BINDING_COMMAND = (defined?(Rubinius) || RUBY_VERSION < '1.9') ? '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]+)?/
+    end
+    
+    def execute
+      if (@match[1])
+        obj = ObjectSpace._id2ref(@match[1].hex) rescue nil
+
+        unless obj
+          print_element("variables")
+          @printer.print_msg("Unknown object id : %s", @match[1])
+        end
+      else
+        obj = debug_eval(@match.post_match)
+      end
+      return unless obj
+      if obj.is_a?(Array)
+        print_array(obj)
+      elsif obj.is_a?(Hash)
+        print_hash(obj)
+      elsif obj.is_a?(String)
+        print_string(obj)
+      else
+        print_element("variables") do
+          # instance variables
+          kind = 'instance'
+          inst_vars = obj.instance_variables
+          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|
+            print_variable(var, debug_eval(var, instance_binding), kind) unless var == 'self'
+          end
+          
+          # class variables
+          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
+        end
+      end 
+    end
+    
+    class << self
+      def help_command
+        'var'
+      end
+      
+      def help(cmd)
+        %{
+          v[ar] i[nstance] <object>\tshow instance variables of object, object can be given by its id or an expression
+        }
+      end
+    end
+  end
+  
+  class VarLocalCommand < Command # :nodoc:
+    def regexp
+      /^\s*v(?:ar)?\s+l(?:ocal)?\s*$/
+    end
+    
+    def execute
+      locals = @state.context.frame_locals(@state.frame_pos)
+      _self = @state.context.frame_self(@state.frame_pos)
+      begin
+        locals['self'] = _self unless TOPLEVEL_BINDING.eval('self') == _self
+      rescue => ex
+        locals['self'] = "<Cannot evaluate self>"
+        $stderr << "Cannot evaluate self\n#{ex.class.name}: #{ex.message}\n  #{ex.backtrace.join("\n  ")}"
+      end
+      print_variables(locals.keys, 'local') do |var|
+        locals[var]
+      end
+    end
+    
+    class << self
+      def help_command
+        'var'
+      end
+      
+      def help(cmd)
+        %{
+          v[ar] l[ocal]\t\t\tshow local variables
+        }
+      end
+    end
+  end
+end

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

@@ -1,71 +1,71 @@
-require 'ruby-debug-ide/xml_printer'
-
- module Debugger
-   
-   class EventProcessor
-   
-     attr_accessor :line, :file, :context
-    
-     def initialize(interface)
-       @printer = XmlPrinter.new(interface)
-       @interface = interface
-       @line = nil
-       @file = nil
-       @last_breakpoint = nil
-     end
-    
-     def at_breakpoint(context, breakpoint)
-       raise "@last_breakpoint supposed to be nil. is #{@last_breakpoint}" if @last_breakpoint
-       # at_breakpoint is immediately followed by #at_line event in
-       # ruby-debug-base. So postpone breakpoint printing until #at_line.
-       @last_breakpoint = breakpoint
-     end
-     
-     def at_catchpoint(context, excpt)
-       @printer.print_catchpoint(excpt)
-     end
-     
-     def at_tracing(context, file, line)
-       @printer.print_trace(context, file, line)
-     end
-     
-     def at_line(context, file, line)
-       @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(context, file, line)
-       context.stop_frame = -1
-       line_event(context, file, line)
-     end
-
-     def line_event(context, file, line)
-       @line = line
-       @file = file
-       @context = context
-       if @last_breakpoint
-         # followed after #at_breakpoint in the same thread. Print breakpoint
-         # now when @line, @file and @context are correctly set to prevent race
-         # condition with `control thread'.
-         n = Debugger.breakpoints.index(@last_breakpoint) + 1
-         @printer.print_breakpoint n, @last_breakpoint
-         @last_breakpoint = nil
-       end
-       raise "DebuggerThread are not supposed to be traced (#{context.thread})" if context.thread.is_a?(Debugger::DebugThread)
-       @printer.print_debug("Stopping Thread %s (%s)", context.thread.to_s, Process.pid.to_s)
-       @printer.print_debug("Threads equal: %s", Thread.current == context.thread)
-       IdeCommandProcessor.new(@interface).process_commands
-       InspectCommand.clear_references
-       @printer.print_debug("Resumed Thread %s", context.thread.to_s)
-       @line = nil
-       @file = nil
-       @context = nil
-     end
-
-     def at_line?
-        @line
-     end     
-    
-   end
- end
+require 'ruby-debug-ide/xml_printer'
+
+ module Debugger
+   
+   class EventProcessor
+   
+     attr_accessor :line, :file, :context
+    
+     def initialize(interface)
+       @printer = XmlPrinter.new(interface)
+       @interface = interface
+       @line = nil
+       @file = nil
+       @last_breakpoint = nil
+     end
+    
+     def at_breakpoint(context, breakpoint)
+       raise "@last_breakpoint supposed to be nil. is #{@last_breakpoint}" if @last_breakpoint
+       # at_breakpoint is immediately followed by #at_line event in
+       # ruby-debug-base. So postpone breakpoint printing until #at_line.
+       @last_breakpoint = breakpoint
+     end
+     
+     def at_catchpoint(context, excpt)
+       @printer.print_catchpoint(excpt)
+     end
+     
+     def at_tracing(context, file, line)
+       @printer.print_trace(context, file, line)
+     end
+     
+     def at_line(context, file, line)
+       @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(context, file, line)
+       context.stop_frame = -1
+       line_event(context, file, line)
+     end
+
+     def line_event(context, file, line)
+       @line = line
+       @file = file
+       @context = context
+       if @last_breakpoint
+         # followed after #at_breakpoint in the same thread. Print breakpoint
+         # now when @line, @file and @context are correctly set to prevent race
+         # condition with `control thread'.
+         n = Debugger.breakpoints.index(@last_breakpoint) + 1
+         @printer.print_breakpoint n, @last_breakpoint
+         @last_breakpoint = nil
+       end
+       raise "DebuggerThread are not supposed to be traced (#{context.thread})" if context.thread.is_a?(Debugger::DebugThread)
+       @printer.print_debug("Stopping Thread %s (%s)", context.thread.to_s, Process.pid.to_s)
+       @printer.print_debug("Threads equal: %s", Thread.current == context.thread)
+       IdeCommandProcessor.new(@interface).process_commands
+       InspectCommand.clear_references
+       @printer.print_debug("Resumed Thread %s", context.thread.to_s)
+       @line = nil
+       @file = nil
+       @context = nil
+     end
+
+     def at_line?
+        @line
+     end     
+    
+   end
+ end

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

@@ -1,42 +1,42 @@
-if RUBY_VERSION < '2.0' || defined?(JRUBY_VERSION)
-  require 'ruby-debug-base'
-else
-  require 'debase'
-end
-
-require 'ruby-debug-ide/version'
-require 'ruby-debug-ide/ide_processor'
-
-module Debugger
-
-  class << self
-    def print_greeting_msg(stream, host, port, debugger_name = "Fast", socket_path = nil)
-      base_gem_name = if defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0'
-                        'ruby-debug-base'
-                      elsif RUBY_VERSION < '2.0.0'
-                        'ruby-debug-base19x'
-                      else
-                        'debase'
-                      end
-
-      file_filtering_support = if Command.file_filter_supported?
-                                 'supported'
-                               else
-                                 'not supported'
-                               end
-
-      if host && port
-        listens_on = " listens on #{host}:#{port}\n"
-      elsif socket_path
-        listens_on = " listens on #{socket_path}\n"
-      else
-        listens_on = "\n"
-      end
-
-      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
-  end
-
-end
+if RUBY_VERSION < '2.0' || defined?(JRUBY_VERSION)
+  require 'ruby-debug-base'
+else
+  require 'debase'
+end
+
+require 'ruby-debug-ide/version'
+require 'ruby-debug-ide/ide_processor'
+
+module Debugger
+
+  class << self
+    def print_greeting_msg(stream, host, port, debugger_name = "Fast", socket_path = nil)
+      base_gem_name = if defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0'
+                        'ruby-debug-base'
+                      elsif RUBY_VERSION < '2.0.0'
+                        'ruby-debug-base19x'
+                      else
+                        'debase'
+                      end
+
+      file_filtering_support = if Command.file_filter_supported?
+                                 'supported'
+                               else
+                                 'not supported'
+                               end
+
+      if host && port
+        listens_on = " listens on #{host}:#{port}\n"
+      elsif socket_path
+        listens_on = " listens on #{socket_path}\n"
+      else
+        listens_on = "\n"
+      end
+
+      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
+  end
+
+end

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

@@ -1,33 +1,33 @@
-module Debugger
-
-  module ParseFunctions
-    # Parse 'str' of command 'cmd' as an integer between
-    # min and max. If either min or max is nil, that
-    # value has no bound.
-    def get_int(str, cmd, min=nil, max=nil, default=1)
-      return default unless str
-      begin
-        int = Integer(str)
-        if min and int < min
-          print_error "%s argument '%s' needs to at least %s.\n" % [cmd, str, min]
-          return nil
-        elsif max and int > max
-          print_error "%s argument '%s' needs to at most %s.\n" % [cmd, str, max]
-          return nil
-        end
-        return int
-      rescue
-        print_error "%s argument '%s' needs to be a number.\n" % [cmd, str]
-        return nil
-      end
-    end
-
-    # Return true if code is syntactically correct for Ruby.
-    def syntax_valid?(code)
-      eval("BEGIN {return true}\n#{code}", nil, "", 0)
-    rescue Exception
-      false
-    end 
-
-  end
-end
+module Debugger
+
+  module ParseFunctions
+    # Parse 'str' of command 'cmd' as an integer between
+    # min and max. If either min or max is nil, that
+    # value has no bound.
+    def get_int(str, cmd, min=nil, max=nil, default=1)
+      return default unless str
+      begin
+        int = Integer(str)
+        if min and int < min
+          print_error "%s argument '%s' needs to at least %s.\n" % [cmd, str, min]
+          return nil
+        elsif max and int > max
+          print_error "%s argument '%s' needs to at most %s.\n" % [cmd, str, max]
+          return nil
+        end
+        return int
+      rescue
+        print_error "%s argument '%s' needs to be a number.\n" % [cmd, str]
+        return nil
+      end
+    end
+
+    # Return true if code is syntactically correct for Ruby.
+    def syntax_valid?(code)
+      eval("BEGIN {return true}\n#{code}", nil, "", 0)
+    rescue Exception
+      false
+    end 
+
+  end
+end