ruby-debug 0.10.4 → 0.10.5.rc1

data/README

@@ -112,3 +112,42 @@ your program can be minimized.
 == License
 
 See LICENSE for license information.
+
+
+
+= ruby-debug-base for JRuby
+
+== Overview
+
+(j)ruby-debug-base provides the fast debugger extension for JRuby interpreter.
+It is the same as ruby-debug-base native C extension from ruby-debug project
+(http://rubyforge.org/projects/ruby-debug/), but for JRuby.
+
+== Install
+
+(j)ruby-debug-base is available as a RubyGem:
+
+   jruby -S gem install ruby-debug-base
+
+== Usage
+
+The usage is then the same as with native ruby-debugger, but you might need to
+force JRuby which has to run in interpreted mode. Simplest usage is:
+
+  $ jruby --debug -S rdebug <your-script>
+
+Or easier, you might create 'jruby-dm' ('dm' for 'debugger-mode'):
+
+  $ cat ~/bin/jruby-dm
+  #!/bin/bash
+  jruby --debug "$@"
+
+Then you may run just as you used to:
+
+  $ jruby-dm -S rdebug <your-script>
+
+For more information see: http://bashdb.sourceforge.net/ruby-debug.html
+
+== License
+
+See MIT-LICENSE for license information.

data/Rakefile

@@ -1,34 +1,17 @@
 #!/usr/bin/env rake
 # -*- Ruby -*-
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 require 'rake/testtask'
+require 'rake/extensiontask'
+require 'rake/javaextensiontask'
+
+$:.push File.expand_path("../lib", __FILE__)
+require "ruby-debug-base/version"
 
 SO_NAME = "ruby_debug.so"
 ROOT_DIR = File.dirname(__FILE__)
-VERSION_FILE = ROOT_DIR + '/VERSION'
-
-def make_version_file
-  ruby_debug_version = open("ext/ruby_debug.c").
-    grep(/^#define DEBUG_VERSION/).first[/"(.+)"/,1]
-  File.open(VERSION_FILE, 'w') do |f|
-      f.write(
-"# This file was created automatically from data in ext/ruby_debug.c via:
-# 	rake :make_version_file. 
-#{ruby_debug_version}
-")
-    end
-end
-
-make_version_file unless File.exist?(VERSION_FILE)
-ruby_debug_version = nil
-open(VERSION_FILE).each do |line| 
-  next if line =~ /^#/
-  ruby_debug_version = line.chomp
-  break
-end
-
 
 # ------- Default Package ----------
 COMMON_FILES = FileList[
@@ -36,7 +19,6 @@ COMMON_FILES = FileList[
   'CHANGES',
   'LICENSE',
   'README',
-  'VERSION',
   'Rakefile',
 ]                        
 
@@ -52,19 +34,14 @@ CLI_FILES = COMMON_FILES + FileList[
   'test/rdebug-save.1',
   'test/**/data/*.cmd',
   'test/**/data/*.right',
+  'test/**/example/*.rb',
   'test/config.yaml',
   'test/**/*.rb',
   'rdbg.rb',
-  'runner.sh',
    CLI_TEST_FILE_LIST
 ]
 
-BASE_TEST_FILE_LIST = %w(
-  test/base/base.rb 
-  test/base/binding.rb 
-  test/base/catchpoint.rb
-  test/base/reload_bug.rb 
-)
+BASE_TEST_FILE_LIST = FileList['test/base/*.rb']
 
 BASE_FILES = COMMON_FILES + FileList[
   'ext/breakpoint.c',
@@ -72,54 +49,46 @@ BASE_FILES = COMMON_FILES + FileList[
   'ext/ruby_debug.c',
   'ext/ruby_debug.h',
   'ext/win32/*',
-  'lib/**/*',
+  'lib/ruby-debug-base.rb',
+  'lib/ruby-debug-base/version.rb',
   BASE_TEST_FILE_LIST,
 ]
 
-desc "Test everything."
 ext = File.join(ROOT_DIR, 'ext')
-test_and_args = File.exist?(ext) ? {:test => :test_base} : [:test]
-task test_and_args do 
-  Rake::TestTask.new(:test) do |t|
-    t.libs += %W(#{ROOT_DIR}/lib #{ROOT_DIR}/cli)
-    t.libs << ext if File.exist?(ext)
-    t.test_files = CLI_TEST_FILE_LIST
-    t.verbose = true
-  end
-end
 
-desc "Test ruby-debug-base."
-task :test_base => :lib do 
-  Rake::TestTask.new(:test_base) do |t|
-    t.libs += ['./ext', './lib']
-    t.test_files = FileList[BASE_TEST_FILE_LIST]
-    t.verbose = true
-  end
+desc "Test everything."
+Rake::TestTask.new(:test) do |t|
+  t.libs += %W(#{ROOT_DIR}/lib #{ROOT_DIR}/cli)
+  t.libs << ext if File.exist?(ext)
+  t.test_files = CLI_TEST_FILE_LIST
+  t.options = '--verbose' if $VERBOSE
+  t.ruby_opts << "--debug" if defined?(JRUBY_VERSION)
 end
 
-desc "Test everything - same as test."
-task :check => :test
+task :test => :test_base if File.exist?(ext)
 
-desc "Create the core ruby-debug shared library extension"
-task :lib do
-  Dir.chdir("ext") do
-    system("#{Gem.ruby} extconf.rb && make")
-  end
+desc "Test ruby-debug-base."
+Rake::TestTask.new(:test_base) do |t|
+  t.libs += ['./ext', './lib']
+  t.test_files = FileList[BASE_TEST_FILE_LIST]
+  t.options = '--verbose' if $VERBOSE
+  t.ruby_opts << "--debug" if defined?(JRUBY_VERSION)
 end
 
-desc "Compile Emacs code"
-task :emacs => "emacs/rdebug.elc"
-file "emacs/rdebug.elc" => ["emacs/elisp-comp", "emacs/rdebug.el"] do
-  Dir.chdir("emacs") do
-    system("./elisp-comp ./rdebug.el")
-  end
+if defined?(JRUBY_VERSION)
+  task :test_base => 'jruby:compile:java'
+else
+  task :test_base => :compile
 end
 
+desc "Test everything - same as test."
+task :check => :test
+
 desc "Create a GNU-style ChangeLog via svn2cl"
 task :ChangeLog do
-  system('svn2cl --authors=svn2cl_usermap http://ruby-debug.rubyforge.org/svn/trunk')
-  system("svn2cl --authors=svn2cl_usermap http://ruby-debug.rubyforge.org/svn/trunk/ext -o ext/ChangeLog")
-  system("svn2cl --authors=svn2cl_usermap http://ruby-debug.rubyforge.org/svn/trunk/lib -o lib/ChangeLog")
+  system('git log --pretty --numstat --summary     | git2cl >     ChangeLog')
+  system('git log --pretty --numstat --summary ext | git2cl > ext/ChangeLog')
+  system('git log --pretty --numstat --summary lib | git2cl > lib/ChangeLog')
 end
 
 # Base GEM Specification
@@ -135,7 +104,7 @@ provides support that front-ends can build on. It provides breakpoint
 handling, bindings for stack frames among other things.
 EOF
 
-  spec.version = ruby_debug_version
+  spec.version = Debugger::VERSION
 
   spec.author = "Kent Sibilev"
   spec.email = "ksibilev@yahoo.com"
@@ -148,7 +117,8 @@ EOF
   spec.date = Time.now
   spec.rubyforge_project = 'ruby-debug'
   spec.add_dependency('linecache', '>= 0.3')
-  
+  spec.add_development_dependency('rake-compiler')
+
   spec.test_files = FileList[BASE_TEST_FILE_LIST]
   
   # rdoc
@@ -165,7 +135,7 @@ cli_spec = Gem::Specification.new do |spec|
 A generic command line interface for ruby-debug.
 EOF
 
-  spec.version = ruby_debug_version
+  spec.version = Debugger::VERSION
 
   spec.author = "Kent Sibilev"
   spec.email = "ksibilev@yahoo.com"
@@ -179,7 +149,7 @@ EOF
   spec.date = Time.now
   spec.rubyforge_project = 'ruby-debug'
   spec.add_dependency('columnize', '>= 0.1')
-  spec.add_dependency('ruby-debug-base', "~> #{ruby_debug_version}.0")
+  spec.add_dependency('ruby-debug-base', "~> #{Debugger::VERSION}.0")
   
   # FIXME: work out operational logistics for this
   # spec.test_files = FileList[CLI_TEST_FILE_LIST]
@@ -190,14 +160,18 @@ EOF
 end
 
 # Rake task to build the default package
-Rake::GemPackageTask.new(base_spec) do |pkg|
+Gem::PackageTask.new(base_spec) do |pkg|
   pkg.need_tar = true
 end
-Rake::GemPackageTask.new(cli_spec) do |pkg|
+Gem::PackageTask.new(cli_spec) do |pkg|
   pkg.need_tar = true
 end
 
-task :default => [:package]
+Rake::ExtensionTask.new('ruby_debug', base_spec) do |t|
+  t.ext_dir = "ext"
+end
+
+task :default => :test
 
 # Windows specification
 win_spec = base_spec.clone
@@ -244,11 +218,12 @@ task :clean do
     derived_files = Dir.glob(".o") + Dir.glob("*.so")
     rm derived_files unless derived_files.empty?
   end
+  rm 'lib/ruby_debug.jar' if File.exists?("lib/ruby_debug.jar")
 end
 
 # ---------  RDoc Documentation ------
 desc "Generate rdoc documentation"
-Rake::RDocTask.new("rdoc") do |rdoc|
+RDoc::Task.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.title    = "ruby-debug"
   # Show source inline with line numbers
@@ -284,9 +259,9 @@ task :rubyforge_upload do
   end
 end
 
-def install(spec, *opts)
+def install_gem(spec, *opts)
   args = ['gem', 'install', "pkg/#{spec.name}-#{spec.version}.gem"] + opts
-  args.unshift 'sudo' unless 0 == Process.uid
+  args.unshift 'sudo' unless 0 == Process.uid || ENV['rvm_path']
   system(*args)
 end
 
@@ -294,18 +269,28 @@ desc 'Install locally'
 task :install => :package do
   Dir.chdir(File::dirname(__FILE__)) do
     # ri and rdoc take lots of time
-    install(base_spec, '--no-ri', '--no-rdoc')
-    install(cli_spec, '--no-ri', '--no-rdoc')
+    install_gem(base_spec, '--no-ri', '--no-rdoc')
+    install_gem(cli_spec, '--no-ri', '--no-rdoc')
   end
 end    
 
 task :install_full => :package do
   Dir.chdir(File::dirname(__FILE__)) do
-    install(base_spec)
-    install(cli_spec)
+    install_gem(base_spec)
+    install_gem(cli_spec)
   end
 end    
 
-task :make_version_file do 
-  make_version_file 
+namespace :jruby do
+  jruby_spec = base_spec.clone
+  jruby_spec.platform   = "java"
+  jruby_spec.files      = jruby_spec.files.reject {|f| f =~ /^ext/ }
+  jruby_spec.files     += ['lib/ruby_debug.jar']
+  jruby_spec.extensions = []
+
+  Gem::PackageTask.new(jruby_spec) {}
+
+  Rake::JavaExtensionTask.new('ruby_debug') do |t|
+    t.ext_dir = "src"
+  end
 end

data/cli/ruby-debug/commands/breakpoints.rb

@@ -65,11 +65,13 @@ module Debugger
         if LineCache.cache(brkpt_filename, Command.settings[:reload_source_on_change])
           last_line = LineCache.size(brkpt_filename)
           if line > last_line
-            errmsg("There are only %d lines in file \"%s\".\n", last_line, file) 
+            errmsg("There are only %d lines in file \"%s\".\n", last_line, 
+                   CommandProcessor.canonic_file(file))
             return
           end
           unless LineCache.trace_line_numbers(brkpt_filename).member?(line)
-            errmsg("Line %d is not a stopping point in file \"%s\".\n", line, file) 
+            errmsg("Line %d is not a stopping point in file \"%s\".\n", line, 
+                   CommandProcessor.canonic_file(file))
             return
           end
         else

data/cli/ruby-debug/commands/edit.rb

@@ -19,9 +19,10 @@ module Debugger
         errmsg "Invalid file/line number specification: #{@match[1]}\n"
         return
       end
-      editor = ENV['EDITOR'] || 'ex'
+      editor = ENV['EDITOR'] || '/bin/ex'
       if File.readable?(file)
-        system("#{editor} +#{line_number} #{file}")
+        system("#{editor} +#{line_number} \"#{file}\"")
+        msg "Warning: return code was #{$?.exitstatus}" if $?.exitstatus != 0
       else
         errmsg "File \"#{file}\" is not readable.\n"
       end

data/cli/ruby-debug/commands/info.rb

@@ -305,15 +305,16 @@ item. If \'verbose\' is given then the entire stack frame is shown.'],
       end
       
       print "Program stopped. "
+      event_arg = @state.processor.event_arg
       case @state.context.stop_reason
       when :step
         print "It stopped after stepping, next'ing or initial start.\n"
       when :breakpoint
-        print("It stopped at a breakpoint.\n")
+        print("It stopped at breakpoint %d.\n",
+              Debugger.breakpoints.index(event_arg) + 1)
       when :catchpoint
-        print("It stopped at a catchpoint.\n")
-      when :catchpoint
-        print("It stopped at a catchpoint.\n")
+        print("It stopped at catchpoint `%s' (%s) .\n", event_arg,  
+              event_arg.class)
       else
         print "unknown reason: %s\n" % @state.context.stop_reason.to_s
       end

data/cli/ruby-debug/commands/irb.rb

@@ -3,9 +3,10 @@ require 'irb'
 module IRB # :nodoc:
   module ExtendCommand # :nodoc:
 
-    # FIXME: should we read these out of a directory to 
-    #        make this more user-customizable? 
     # A base command class that resume execution
+    #
+    # FIXME: should we read these out of a directory to make this more
+    #        user-customizable?
     class DebuggerResumeCommand
       def self.execute(conf, *opts)
         name = 
@@ -90,15 +91,13 @@ module IRB # :nodoc:
   end
 end
 
-# Monkeypatch to save the current IRB statement to be run and make the instruction sequence
-# "filename" unique. Possibly not needed.
+# Monkeypatch to save the current IRB statement to be run and make the
+# instruction sequence "filename" unique. Possibly not needed.
 class IRB::Context
+  alias_method :_ruby_debug_original_evaluate, :evaluate
   def evaluate(line, line_no)
     $rdebug_irb_statements = line
-    @line_no = line_no
-    set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
-#    @workspace.evaluate("_ = IRB.conf[:MAIN_CONTEXT]._")
-#    @_ = @workspace.evaluate(line, irb_path, line_no)
+    _ruby_debug_original_evaluate(line, line_no)
   end
 end
 

data/cli/ruby-debug/commands/list.rb

@@ -74,7 +74,7 @@ module Debugger
       if lines
         b = lines.size - (e - b) if b >= lines.size
         e = lines.size if lines.size < e
-        print "[%d, %d] in %s\n", b, e, file
+        print "[%d, %d] in %s\n", b, e, CommandProcessor.canonic_file(file)
         [b, 1].max.upto(e) do |n|
           if n > 0 && lines[n-1]
             if n == current

data/cli/ruby-debug/commands/set.rb

@@ -28,6 +28,8 @@ ruby-debug."],
        ['debuggertesting', 8, false,
         "Used when testing the debugger"],
        ['forcestep', 2, true,
+        "Deprecated - same as 'set different'"],
+       ['different', 2, true,
         "Make sure 'next/step' commands always move to a new line"],
        ['fullpath', 2, true,
         "Display full file names in frames"],
@@ -65,7 +67,8 @@ set history size -- Set the size of the command history"],
         print "\"set\" must be followed by the name of an set command:\n"
         print "List of set subcommands:\n\n"
         for subcmd in Subcommands do
-          print "set #{subcmd.name} -- #{subcmd.short_help}\n"
+          print "set #{subcmd.name} -- #{subcmd.short_help}\n" unless
+            subcmd.name == 'forcestep'
         end
       else
         args = @match[1].split(/[ \t]+/)
@@ -135,7 +138,10 @@ set history size -- Set the size of the command history"],
                 if set_on
                   Command.settings[:basename] = true
                 end
+              when /^different$/
+                self.class.settings[:force_stepping] = set_on
               when /^forcestep$/
+                print "This setting deprecated. Please use 'set different'.\n"
                 self.class.settings[:force_stepping] = set_on
               when /^history$/
                 if 2 == args.size

data/cli/ruby-debug/commands/show.rb

@@ -71,9 +71,12 @@ module Debugger
       when /^debuggertesting$/
         on_off = Command.settings[:debuggertesting]
         return "Currently testing the debugger is #{show_onoff(on_off)}."
+      when /^different$/
+        on_off = self.class.settings[:force_stepping]
+        return "different-line stepping is #{show_onoff(on_off)}."
       when /^forcestep$/
         on_off = self.class.settings[:force_stepping]
-        return "force-stepping is #{show_onoff(on_off)}."
+        return "different-line stepping is #{show_onoff(on_off)}."
       when /^fullpath$/
         on_off = Command.settings[:full_path]
         return "Displaying frame's full file names is #{show_onoff(on_off)}."
@@ -166,7 +169,8 @@ ruby-debug."],
        ['callstyle', 2, "Show paramater style used showing call frames"],
        ['commands',  2, "Show the history of commands you typed",
 "You can supply a command number to start with."],
-       ['forcestep', 1, "Show if sure 'next/step' forces move to a new line"],
+       ['different', 2, "Show if 'next/step' forces move to a new line"],
+       ['forcestep', 1, "Deprecated. Please use 'different'"],
        ['fullpath',  2, "Show if full file names are displayed in frames"],
        ['history', 2, "Generic command for showing command history parameters",
 "show history filename -- Show the filename in which to record the command history
@@ -200,7 +204,8 @@ show history size -- Show the size of the command history"],
         print "\"show\" must be followed by the name of an show command:\n"
         print "List of show subcommands:\n\n"
         for subcmd in Subcommands do
-          print "show #{subcmd.name} -- #{subcmd.short_help}\n"
+          print "show #{subcmd.name} -- #{subcmd.short_help}\n"  unless 
+            'forcestep' == subcmd.name 
         end
       else
         args = @match[1].split(/[ \t]+/)