ruby-debug-ide 0.4.17.beta14 → 0.4.17.beta16

data/Gemfile

@@ -6,7 +6,7 @@ gem "ruby-debug-base19x", ">= 0.11.30.pre4", :platforms => [:ruby_19, :mingw_19]
 gemspec
 
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
 end
 
 group :test do

data/bin/rdebug-ide

@@ -1,13 +1,4 @@
 #!/usr/bin/env ruby
-# start by patching require, so command-line debug won't get in the way
-::Kernel.module_eval do
-  alias ide_debug_original_require require
-  def self.require(file)
-    ide_debug_original_require(file) if file !~ /ruby-debug(.rb)?$/
-  end
-  private :require
-end
-
 require 'rubygems'
 require 'optparse'
 require "ostruct"

data/ext/mkrf_conf.rb

@@ -18,8 +18,10 @@ unless jruby
 
   if RUBY_VERSION < "1.9"
     dep = Gem::Dependency.new("ruby-debug-base", '>=0.10.4')
-  else
+  elsif RUBY_VERSION < '2.0'
     dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.24')
+  else    
+    # dep = Gem::Dependency.new("debase", '> 0')
   end
 
   begin
@@ -35,7 +37,7 @@ unless jruby
       puts e.backtrace.join "\n  "
       exit(1)
     end
-  end unless already_installed(dep)
+  end unless dep.nil? || already_installed(dep)
 end
 
 # create dummy rakefile to indicate success

data/lib/ruby-debug-ide.rb

@@ -2,7 +2,11 @@ require 'pp'
 require 'stringio'
 require "socket"
 require 'thread'
-require 'ruby-debug-base'
+if (RUBY_VERSION < '2.0')
+  require 'ruby-debug-base'
+else
+  require 'debase'
+end  
 
 require 'ruby-debug-ide/version'
 require 'ruby-debug-ide/xml_printer'
@@ -36,56 +40,11 @@ module Debugger
        end
        cleared
     end
-  end
-
-  class Context
-    def interrupt
-      self.stop_next = 1
-    end
-    
-    private
-    
-    def event_processor
-      Debugger.event_processor
-    end
-    
-    def at_breakpoint(breakpoint)
-      event_processor.at_breakpoint(self, breakpoint)
-    end
-    
-    def at_catchpoint(excpt)
-      event_processor.at_catchpoint(self, excpt)
-    end
-    
-    def at_tracing(file, line)
-      if event_processor
-        event_processor.at_tracing(self, file, line)
-      else
-        Debugger::print_debug "trace: location=\"%s:%s\", threadId=%d", file, line, self.thnum
-      end
-    end
-    
-    def at_line(file, line)
-      event_processor.at_line(self, file, line)
-    end
- 
-    def at_return(file, line)
-      event_processor.at_return(self, file, line)
-    end
-  end
-  
-  class << self
     
-    attr_accessor :event_processor, :cli_debug, :xml_debug
+    attr_accessor :cli_debug, :xml_debug
     attr_accessor :control_thread
     attr_reader :interface
-    
-    #
-    # Interrupts the current thread
-    #
-    def interrupt
-      current_context.interrupt
-    end
+
     
     #
     # Interrupts the last debugged thread
@@ -146,7 +105,9 @@ 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'
-          $stderr.printf "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, ruby-debug-base #{VERSION}) listens on #{host}:#{port}\n"
+          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"
           server = TCPServer.new(host, port)
           while (session = server.accept)
             $stderr.puts "Connected from #{session.addr[2]}" if Debugger.cli_debug
@@ -156,7 +117,7 @@ module Debugger
             end  
             begin
               @interface = RemoteInterface.new(session)
-              @event_processor = EventProcessor.new(interface)
+              self.handler = EventProcessor.new(interface)
               IdeControlCommandProcessor.new(interface).process_commands
             rescue StandardError, ScriptError => ex
               bt = ex.backtrace
@@ -177,21 +138,4 @@ module Debugger
   class Exception # :nodoc:
     attr_reader :__debug_file, :__debug_line, :__debug_binding, :__debug_context
   end
-  
-  module Kernel
-    #
-    # Stops the current thread after a number of _steps_ made.
-    #
-    def debugger(steps = 1)
-      Debugger.current_context.stop_next = steps
-    end
-    
-    #
-    # Returns a binding of n-th call frame
-    #
-    def binding_n(n = 0)
-      Debugger.current_context.frame_binding[n+1]
-    end
-  end
-  
 end

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

@@ -79,6 +79,8 @@ module Debugger
         print_array(obj)
       elsif (obj.is_a?(Hash)) then
         print_hash(obj)
+      elsif (obj.is_a?(String))
+        print_string(obj)
       else
         print_element("variables") do
           # instance variables

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

@@ -13,13 +13,13 @@ module Debugger
     end
 
     def process_commands
-      unless Debugger.event_processor.at_line?
+      unless Debugger.handler.at_line?
         @printer.print_error "There is no thread suspended at the time and therefore no context to execute '#{input.gsub('%', '%%')}'"
         return
       end
-      context = Debugger.event_processor.context
-      file = Debugger.event_processor.file
-      line = Debugger.event_processor.line
+      context = Debugger.handler.context
+      file = Debugger.handler.file
+      line = Debugger.handler.line
       state = State.new do |s|
         s.context = context
         s.file    = file

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

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.4.17.beta14'
+  IDE_VERSION='0.4.17.beta16'
 end

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

@@ -127,6 +127,13 @@ module Debugger
         }
       end
     end
+
+    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')         
+      end
+    end
     
     def print_variable(name, value, kind)
       name = name.to_s
@@ -141,13 +148,20 @@ module Debugger
         else
           value_str = "#{value.class} (#{value.size} element(s))"
         end
-      else
+      elsif value.is_a?(String)
+        has_children = value.respond_to?('bytes') || value.respond_to?('encoding')
+        value_str = value
+      else  
         has_children = !value.instance_variables.empty? || !value.class.class_variables.empty?
         value_str = value.to_s || 'nil' rescue "<#to_s method raised exception: #$!>"
         unless value_str.is_a?(String)
           value_str = "ERROR: #{value.class}.to_s method returns #{value_str.class}. Should return String." 
         end
       end
+
+      if value_str.respond_to?('encode')
+         value_str = value_str.encode("UTF-8")
+      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,
@@ -256,12 +270,12 @@ module Debugger
     end
     
     def print_exception(exception, binding)
-      print_variables(%w(error), 'exception') do |var|
+      print_element("variables") do
         proxy = ExceptionProxy.new(exception)
         InspectCommand.reference_result(proxy)
-        proxy
+        print_variable('error', proxy, 'exception')
       end
-    rescue
+    rescue Exception => e
       print "<processingException type=\"%s\" message=\"%s\"/>", 
         exception.class, CGI.escapeHTML(exception.to_s)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.4.17.beta14
+  version: 0.4.17.beta16
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake