ruby-debug-ide 0.4.6 → 0.4.7

data/ChangeLog

@@ -1,3 +1,42 @@
+2009-08-26 19:06  Martin Krauskopf
+
+	* ChangeLog, Rakefile, bin/rdebug-ide, ext, ext/extconf.rb,
+	  lib/ruby-debug.rb, lib/ruby-debug/command.rb,
+	  lib/ruby-debug/event_processor.rb, lib/ruby-debug/processor.rb,
+	  lib/ruby-debug/xml_printer.rb: Patch by Mark Moseley supporting
+	  ruby-debug-base19.
+	  
+	  Dynamically installs right ruby-debug-base dependency depending
+	  on the version
+	  of a Ruby platform being used. ruby-debug-base19 is the only
+	  solution these
+	  days for 1.9 debugging, so might be temporary solution until
+	  ruby-debug
+	  projects brings official version.
+
+2009-08-26 17:36  Martin Krauskopf
+
+	* lib/ruby-debug.rb: One more try for the right value for default
+	  'host' value.
+	  
+	  127.0.0.1 seemingly works with all systems and with IPv6 as well.
+	  "localhost" and nil on have problems on some systems.
+
+2009-08-21 08:43  Martin Krauskopf
+
+	* lib/ruby-debug.rb: Ruby 1.9.x vs Java vs 'localhost' seems to be
+	  problematic as well
+
+2009-06-04 16:02  Martin Krauskopf
+
+	* Rakefile, lib/ruby-debug.rb, test/rd_test_base.rb: Increasing
+	  trung version
+
+2009-06-04 15:59  Martin Krauskopf
+
+	* ChangeLog, bin/rdebug-ide: Mentioning RubyMine among
+	  ruby-debug-ide clients.
+
 2009-05-21 18:16  Martin Krauskopf
 
 	* ChangeLog: Changelog update

data/Rakefile

@@ -9,8 +9,7 @@ desc 'Default: run unit tests.'
 task :default => [:test]
 
 # ------- Default Package ----------
-RUBY_DEBUG_BASE_VERSION = "0.10.3"
-RUBY_DEBUG_IDE_VERSION = "0.4.6"
+RUBY_DEBUG_IDE_VERSION = "0.4.7"
 
 FILES = FileList[
   'CHANGES',
@@ -20,7 +19,8 @@ FILES = FileList[
   'Rakefile',
   'bin/*',
   'lib/**/*',
-  'test/**/*'
+  'test/**/*',
+  'ext/extconf.rb'
 ]
 
 ide_spec = Gem::Specification.new do |spec|
@@ -40,13 +40,12 @@ EOF
   spec.require_path = "lib"
   spec.bindir = "bin"
   spec.executables = ["rdebug-ide"]
-  spec.autorequire = "ruby-debug-base"
   spec.files = FILES.to_a
+  spec.extensions << "ext/extconf.rb"
 
   spec.required_ruby_version = '>= 1.8.2'
   spec.date = DateTime.now
   spec.rubyforge_project = 'debug-commons'
-  spec.add_dependency('ruby-debug-base', "~> #{RUBY_DEBUG_BASE_VERSION}.0")
 
   # rdoc
   spec.has_rdoc = false

data/bin/rdebug-ide

@@ -3,7 +3,11 @@
 require 'rubygems'
 require 'optparse'
 require "ostruct"
-require 'ruby-debug'
+if RUBY_VERSION < "1.9"
+  require 'ruby-debug'
+else
+  require_relative '../lib/ruby-debug'
+end
 
 $stdout.sync=true
 
@@ -19,7 +23,8 @@ options = OpenStruct.new(
 opts = OptionParser.new do |opts|
   opts.banner = <<EOB
 Using ruby-debug-base #{Debugger::VERSION}
-Usage: rdebug-ide is supposed to be called from RDT or NetBeans. The command line interface to ruby-debug is rdebug.
+Usage: rdebug-ide is supposed to be called from RDT, NetBeans or RubyMine. The
+       command line interface to ruby-debug is rdebug.
 EOB
   opts.separator ""
   opts.separator "Options:"

data/ext/extconf.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+
+begin
+  Gem::Command.build_args = ARGV
+  rescue NoMethodError
+end
+
+inst = Gem::DependencyInstaller.new
+begin
+  if RUBY_VERSION < "1.9"
+    inst.install "ruby-debug-base", "~> 0.10.3"
+  else
+    inst.install "ruby-debug-base19", "~> 0.11.15" 
+  end
+  rescue
+    exit(1)
+end
+
+# create dummy makefile to indicate success
+f = File.open(File.join(File.dirname(__FILE__), "Makefile"), "w")
+f.write("install:")
+f.close

data/lib/ruby-debug.rb

@@ -3,9 +3,15 @@ require 'stringio'
 require "socket"
 require 'thread'
 require 'ruby-debug-base'
-require 'ruby-debug/xml_printer'
-require 'ruby-debug/processor'
-require 'ruby-debug/event_processor'
+if RUBY_VERSION < "1.9"
+  require 'ruby-debug/xml_printer'
+  require 'ruby-debug/processor'
+  require 'ruby-debug/event_processor'
+else
+  require_relative 'ruby-debug/xml_printer'
+  require_relative 'ruby-debug/processor'
+  require_relative 'ruby-debug/event_processor'
+end
 
 module Debugger
   
@@ -119,10 +125,10 @@ module Debugger
       return if @control_thread
       @control_thread = DebugThread.new do
         begin
-          unless RUBY_PLATFORM =~ /darwin/i # Mac OS X seems to have problem with 'localhost'
-            host ||= 'localhost' # nil does not seem to work for IPv6, localhost does
-          end
-          $stderr.printf "Fast Debugger (ruby-debug-ide 0.4.6) listens on #{host}:#{port}\n"
+          $stderr.printf "Fast Debugger (ruby-debug-ide 0.4.7) 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.
+          host ||= '127.0.0.1'
           server = TCPServer.new(host, port)
           while (session = server.accept)
             begin

data/lib/ruby-debug/command.rb

@@ -1,4 +1,9 @@
-require 'ruby-debug/helper'
+if RUBY_VERSION < "1.9"
+  require 'ruby-debug/helper'
+else
+  require_relative 'helper'
+end
+
 
 module Debugger
 
@@ -97,7 +102,9 @@ module Debugger
     # in ruby-debug.c
     def timeout(sec)
       return yield if sec == nil or sec.zero?
-      raise ThreadError, "timeout within critical session" if Thread.critical
+      if RUBY_VERSION < "1.9"
+        raise ThreadError, "timeout within critical session" if Thread.critical
+      end
       begin
         x = Thread.current
         y = DebugThread.start {
@@ -112,6 +119,7 @@ module Debugger
     
     def debug_eval(str, b = get_binding)
       begin
+        str = str.to_s
         max_time = 10
         to_inspect = str.gsub(/\\n/, "\n")
         @printer.print_debug("Evaluating with timeout after %i sec", max_time)
@@ -126,6 +134,7 @@ module Debugger
 
     def debug_silent_eval(str)
       begin
+        str = str.to_s
         eval(str, get_binding)
       rescue StandardError, ScriptError
         nil

data/lib/ruby-debug/event_processor.rb

@@ -1,4 +1,8 @@
- require 'ruby-debug/xml_printer'
+if RUBY_VERSION < "1.9"
+  require 'ruby-debug/xml_printer'
+else
+  require_relative 'xml_printer'
+end
  module Debugger
    
    class EventProcessor

data/lib/ruby-debug/processor.rb

@@ -1,5 +1,10 @@
-require 'ruby-debug/interface'
-require 'ruby-debug/command'
+if RUBY_VERSION < "1.9"
+  require 'ruby-debug/interface'
+  require 'ruby-debug/command'
+else
+  require_relative 'interface'
+  require_relative 'command'
+end
 
 module Debugger
   

data/lib/ruby-debug/xml_printer.rb

@@ -99,6 +99,7 @@ module Debugger
     end
     
     def print_variable(name, value, kind)
+      name = name.to_s
       unless value
         print("<variable name=\"%s\" kind=\"%s\"/>", CGI.escapeHTML(name), kind)
         return

data/test/rd_test_base.rb

@@ -22,7 +22,7 @@ class RDTestBase < TestBase
     cmd = "#{interpreter}"
     cmd << " --debug" if jruby?
     cmd << " -J-Xdebug -J-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y" if jruby? and debug_jruby?
-    cmd << " -I '#{File.dirname(script)}' #{@rdebug_ide} _0.4.6_" +
+    cmd << " -I '#{File.dirname(script)}' #{@rdebug_ide} _0.4.7_" +
       (@verbose_server ? " -d" : "") +
       " -p #{port} -- '#{script}'"
   end

metadata

@@ -1,33 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Markus Barchfeld, Martin Krauskopf
-autorequire: ruby-debug-base
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 +02:00
+date: 2009-08-26 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug-base
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.3.0
-    version: 
+dependencies: []
+
 description: An interface which glues ruby-debug to IDEs like Eclipse (RDT) and NetBeans.
 email: rubyeclipse-dev-list@sourceforge.net
 executables: 
 - rdebug-ide
-extensions: []
-
+extensions: 
+- ext/extconf.rb
 extra_rdoc_files: []
 
 files: 
@@ -70,6 +61,7 @@ files:
 - test/ruby-debug
 - test/ruby-debug/xml_printer_test.rb
 - test/rd_enable_disable_test.rb
+- ext/extconf.rb
 has_rdoc: false
 homepage: http://rubyforge.org/projects/debug-commons/
 licenses: []