debugger 1.0.0 → 1.0.1

data/test/helper.rb

@@ -5,7 +5,6 @@ require 'yaml'
 # require 'diff/lcs'
 # require 'diff/lcs/hunk'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 module TestHelper
@@ -14,13 +13,13 @@ module TestHelper
   def run_debugger(testname, args='', outfile=nil, filter=nil, old_code=false,
                    debug_pgm='tdebug.rb')
     rightfile = File.join('data', "#{testname}.right")
-    
+
     outfile = "#{testname}.out" unless outfile
 
     if File.exists?(outfile)
       FileUtils.rm(outfile)
     end
-    
+
     ENV['RDEBUG'] = debug_pgm
 
     if old_code
@@ -30,7 +29,7 @@ module TestHelper
     end
     puts "'#{cmd}'" if $DEBUG
     output = `#{cmd}`
-    
+
     curr_path = Dir.pwd
     got_lines     = File.read(outfile).split(/\n/).map{|s| s.sub(curr_path, '.') }
     correct_lines = File.read(rightfile).split(/\n/)
@@ -58,14 +57,14 @@ module TestHelper
       end
     end
     if correct_lines.size != got_lines.size
-      puts("difference in number of lines: " + 
+      puts("difference in number of lines: " +
            "#{correct_lines.size} vs. #{got_lines.size}")
       return false
     end
     return true
   end
 
-  # FIXME: using this causes the same test to get run several times 
+  # FIXME: using this causes the same test to get run several times
   # and some tests fail probably because of a lack of environment isolation.
   # Many tests follow a basic pattern: run the debugger with a given
   # debugger script and compare output produced. The following creates
@@ -77,16 +76,16 @@ module TestHelper
     cmd         = 'gcd.rb 3 5' unless cmd
     eval <<-EOF
     def test_#{test_name}
-      Dir.chdir(\"#{src_dir}\") do 
-        assert_equal(true, 
-                     run_debugger(\"#{base_name}\", 
+      Dir.chdir(\"#{src_dir}\") do
+        assert_equal(true,
+                     run_debugger(\"#{base_name}\",
                                   \"--script #{script_name} -- #{cmd}\"))
       end
     end
     EOF
   end
   module_function :add_test
-               
+
   # Adapted from the Ruby Cookbook, Section 6.10: Comparing two files.
   # def diff_as_string(rightfile, checkfile, format=:unified, context_lines=3)
   #   right_data = File.read(rightfile)
@@ -98,7 +97,7 @@ module TestHelper
   #   file_length_difference = 0
   #   diffs.each do |piece|
   #     begin
-  #       hunk = Diff::LCS::Hunk.new(right_data, check_data, piece, 
+  #       hunk = Diff::LCS::Hunk.new(right_data, check_data, piece,
   #                                  context_lines, file_length_difference)
   #       next unless oldhunk
   #
@@ -115,11 +114,11 @@ module TestHelper
   #       output << '\n'
   #     end
   #   end
-  
-  #   # Handle the last remaining hunk 
+
+  #   # Handle the last remaining hunk
   #   output << oldhunk.diff(format) << '\n'
   # end
-  
+
   # Loads key from the _config_._yaml_ file.
   def config_load(key, may_be_nil=false, default_value='')
     conf = File.join('config.private.yaml') # try private first
@@ -139,6 +138,5 @@ module TestHelper
     config_load('ruby_params', true)
   end
   module_function :load_params
-  
-end
 
+end

data/test/{cli → lib}/commands/catchpoint_test.rb

@@ -1,27 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
+require 'ruby-debug'
 
 class TestCatchCommand < Test::Unit::TestCase
-  
-  base_dir = File.expand_path(File.join(File.dirname(__FILE__), 
-                                        '..', '..', '..'))
-  
-  %w(ext lib cli).each do |dir|
-    $: <<  File.join(base_dir, dir)
-  end
-  
-  require File.join(base_dir, 'cli', 'ruby-debug')
-  
+
   class MockState
-    attr_accessor :message 
+    attr_accessor :message
     def context; end
     def confirm(msg); true end
     def print(*args)
       @message = *args
     end
   end
-  
+
   # regression test for bug #20156
   def test_catch_does_not_blow_up
     state = MockState.new

data/test/{cli → lib}/commands/unit/regexp.rb

@@ -2,13 +2,10 @@ require 'test/unit'
 
 
 class TestCommandREs < Test::Unit::TestCase
-  base_dir=File.expand_path(File.join(File.dirname(__FILE__), 
-                                      '..', '..', '..', '..',
-                                      'cli', 'ruby-debug'))
-  require File.join(base_dir, 'command')
-  require File.join(base_dir, 'commands', 'frame')
+  require 'ruby-debug/command'
+  require 'ruby-debug/commands/frame'
   include Debugger
- 
+
   def test_quit
     c = QuitCommand.new(nil)
     assert c.regexp.match('quit')
@@ -39,4 +36,3 @@ class TestCommandREs < Test::Unit::TestCase
     assert_equal(nil, c.regexp.match('dow'))
   end
 end
-

data/test/tdebug.rb

@@ -4,11 +4,10 @@
 # FIXME: use the real rdebug script - DRY.
 
 require 'stringio'
-require 'rubygems'
 require 'optparse'
 require "ostruct"
 
-TOP_SRC_DIR = File.join(File.dirname(__FILE__), "..") unless 
+TOP_SRC_DIR = File.join(File.dirname(__FILE__), "..") unless
   defined?(TOP_SRC_DIR)
 
 $:.unshift File.join(TOP_SRC_DIR, "ext")
@@ -17,12 +16,12 @@ $:.unshift File.join(TOP_SRC_DIR, "cli")
 
 def debug_program(options)
   # Make sure Ruby script syntax checks okay.
-  # Otherwise we get a load message that looks like rdebug has 
-  # a problem. 
+  # Otherwise we get a load message that looks like rdebug has
+  # a problem.
   output = `ruby -c "#{Debugger::PROG_SCRIPT}" 2>&1`
   if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
     puts output
-    exit $?.exitstatus 
+    exit $?.exitstatus
   end
   print "\032\032starting\n" if Debugger.annotate and Debugger.annotate > 2
   unless options.no_rewrite_program
@@ -32,7 +31,7 @@ def debug_program(options)
     # for the first time and then switching to the debug hook that's
     # normally used would be helpful. Doing this would also help other
     # first-time initializations such as reloading debugger state
-    # after a restart. 
+    # after a restart.
 
     # However This is just a little more than I want to take on right
     # now, so I think I'll stick with the slightly hacky approach.
@@ -96,20 +95,20 @@ EOB
     Debugger.annotate = s
   end
   opts.on("-d", "--debug", "Set $DEBUG=true") {$DEBUG = true}
-  opts.on("--emacs-basic", "Activates basic Emacs mode") do 
+  opts.on("--emacs-basic", "Activates basic Emacs mode") do
     ENV['EMACS'] = '1'
     options.emacs = true
   end
-  opts.on("-m", "--post-mortem", "Activate post-mortem mode") do 
+  opts.on("-m", "--post-mortem", "Activate post-mortem mode") do
     options.post_mortem = true
   end
-  opts.on("--no-control", "Do not automatically start control thread") do 
+  opts.on("--no-control", "Do not automatically start control thread") do
     options.control = false
   end
   opts.on("--no-quit", "Do not quit when script finishes") do
     options.noquit = true
   end
-  opts.on("--no-stop", "Do not stop when script is loaded") do 
+  opts.on("--no-stop", "Do not stop when script is loaded") do
     options.nostop = true
   end
   opts.on("-nx", "Not run debugger initialization files (e.g. .rdebugrc") do
@@ -141,7 +140,7 @@ EOB
     puts opts
     exit
   end
-  opts.on_tail("--version", 
+  opts.on_tail("--version",
                "Print the version") do
     puts "ruby-debug #{Debugger::VERSION}"
     exit
@@ -150,7 +149,7 @@ EOB
     $VERBOSE = true
     options.verbose_long = true
   end
-  opts.on_tail("-v", 
+  opts.on_tail("-v",
                "Print version number, then turn on verbose mode") do
     puts "ruby-debug #{Debugger::VERSION}"
     $VERBOSE = true
@@ -183,7 +182,7 @@ if ARGV.empty?
   puts 'Must specify a script to run'
   exit(-1)
 end
-  
+
 # save script name
 Debugger::PROG_SCRIPT = ARGV.shift
 
@@ -204,19 +203,19 @@ Debugger.post_mortem if options.post_mortem
 
 # Set up an interface to read commands from a debugger script file.
 if options.script
-  Debugger.interface = Debugger::ScriptInterface.new(options.script, 
+  Debugger.interface = Debugger::ScriptInterface.new(options.script,
                                                      STDOUT, true)
 end
 options.nostop = true if options.tracing
 Debugger.tracing = options.tracing
 
 # Make sure Ruby script syntax checks okay.
-# Otherwise we get a load message that looks like rdebug has 
-# a problem. 
+# Otherwise we get a load message that looks like rdebug has
+# a problem.
 output = `ruby -c #{Debugger::PROG_SCRIPT} 2>&1`
 if $?.exitstatus != 0 and RUBY_PLATFORM !~ /mswin/
   puts output
-  exit $?.exitstatus 
+  exit $?.exitstatus
 end
 
 # load initrc script (e.g. .rdebugrc)
@@ -236,7 +235,7 @@ if options.noquit
     until Debugger.stop do end
   end
   debug_program(options)
-  print "The program finished.\n" unless 
+  print "The program finished.\n" unless
     Debugger.annotate.to_i > 1 # annotate has its own way
   interface = Debugger::LocalInterface.new
   # Not sure if ControlCommandProcessor is really the right

data/test/test-annotate.rb

@@ -2,7 +2,6 @@
 require 'test/unit'
 require 'fileutils'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test annotate handling.
@@ -15,9 +14,9 @@ class TestAnnotate < Test::Unit::TestCase
 
   def test_basic
     testname='annotate'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
+      assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./gcd.rb 3 5"))
     end

data/test/test-break-bad.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test (mostly) invalid breakpoint commands
@@ -15,19 +14,19 @@ class TestBadBreak < Test::Unit::TestCase
 
   def test_basic
     testname='break_bad'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
       assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./gcd.rb 3 5"))
     end
   end
-  
+
   def test_break_loop
     testname='break_loop_bug'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
-# FIXME: Issue #1     
+# FIXME: Issue #1
 #      assert_equal(true,
 #        run_debugger(testname,
 #          "--script #{script} -- ./bp_loop_issue.rb"))

data/test/test-breakpoints.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test breakpoint commands
@@ -15,9 +14,9 @@ class TestBreakpoints < Test::Unit::TestCase
 
   def test_basic
     testname='breakpoints'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
+      assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./gcd.rb 3 5"))
     end

data/test/test-catch.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test exception catching
@@ -15,7 +14,7 @@ class TestExceptionCatch < Test::Unit::TestCase
 
   def test_basic
     testname='catch'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
       assert_equal(true,
                    run_debugger(testname,