debugger 1.0.0 → 1.0.1

data/test/test-catch2.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 TestExceptionCatch2 < Test::Unit::TestCase
 
   def test_basic
     testname='catch2'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
       assert_equal(true,
                    run_debugger(testname,

data/test/test-catch3.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 TestExceptionCatch3 < Test::Unit::TestCase
 
   def test_basic
     testname='catch3'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
       assert_equal(true,
                    run_debugger(testname,

data/test/test-condition.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test condition command
@@ -15,9 +14,9 @@ class TestConditionCommand < Test::Unit::TestCase
 
   def test_basic
     testname='condition'
-    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-ctrl.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug' ; Debugger.start
 
 require 'test/unit'
@@ -10,7 +9,7 @@ SRC_DIR = File.join(Dir.pwd, File.dirname(__FILE__)) unless
   $: <<  File.join(SRC_DIR, '..', dir)
 end
 require 'ruby_debug'
-require File.join(SRC_DIR, '..', 'cli', 'ruby-debug')
+require 'ruby-debug'
 
 # Test Local Control Interface
 class TestCtrl < Test::Unit::TestCase

data/test/test-display.rb

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

data/test/test-dollar-0.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test --no-stop and $0 setting.
 class TestDollar0 < Test::Unit::TestCase
-  
+
   @@SRC_DIR = File.join(Dir.pwd, File.dirname(__FILE__)) unless
     defined?(@@SRC_DIR)
 
@@ -15,7 +14,7 @@ class TestDollar0 < Test::Unit::TestCase
 
   def test_basic
     testname='breakpoints'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       home_save = ENV['HOME']
       ENV['HOME'] = '.'
       filter = Proc.new{|got_lines, correct_lines|
@@ -24,14 +23,14 @@ class TestDollar0 < Test::Unit::TestCase
         end
       }
 
-      assert_equal(true, 
-                   run_debugger('dollar-0', 
+      assert_equal(true,
+                   run_debugger('dollar-0',
                                 '-nx --no-stop ./dollar-0.rb',
                                 nil, filter, false, '../bin/rdebug'))
       # Ruby's __FILE__ seems to prepend ./ when no directory was added.
-      assert_equal(true, 
-                   run_debugger('dollar-0b', 
-                                '-nx --no-stop ' + 
+      assert_equal(true,
+                   run_debugger('dollar-0b',
+                                '-nx --no-stop ' +
                                 File.join('..', 'test', 'dollar-0.rb'),
                                 nil, filter, false, '../bin/rdebug'))
       ENV['HOME'] = home_save

data/test/test-edit.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test 'edit' command handling.
@@ -15,10 +14,10 @@ class TestEdit < Test::Unit::TestCase
 
   def test_basic
     testname='edit'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       script = File.join('data', testname + '.cmd')
       ENV['EDITOR']='echo FAKE-EDITOR '
-      assert_equal(true, 
+      assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./gcd.rb 3 5"))
     end

data/test/test-emacs-basic.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# require 'rubygems'
 # require 'ruby-debug'; Debugger.start(:post_mortem => true)
 
 # Test the --emacs-basic option.
@@ -11,14 +10,14 @@ class TestEmacsBasic < Test::Unit::TestCase
   defined?(@@SRC_DIR)
 
   require File.join(@@SRC_DIR, 'helper.rb')
-  
+
   include TestHelper
-  
+
   def test_basic
     testname='emacs_basic'
-    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,
                                 "--emacs-basic --script #{script} -- ./gcd.rb 3 5"))
     end

data/test/test-enable.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test enable and disable commands
@@ -15,9 +14,9 @@ class TestEnable < Test::Unit::TestCase
 
   def test_basic
     testname='enable'
-    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-finish.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# require 'rubygems'
 # require 'ruby-debug'; Debugger.start
 
 # Test finish command
@@ -23,11 +22,11 @@ class TestFinish < Test::Unit::TestCase
 #       end
 #       got_lines[32] = 'return a'
 #     }
-    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", 
+                                "--script #{script} -- ./gcd.rb 3 5",
                                 nil, nil))
     end
   end

data/test/test-frame.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# require 'rubygems'
 # require 'ruby-debug'; Debugger.start(:post_mortem => true)
 
 # Test frame commands
@@ -23,9 +22,9 @@ class TestFrame < Test::Unit::TestCase
         s.sub!(/in file ".*gcd.rb/, 'in file "gcd.rb')
       end
     }
-    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",
                                 nil, filter))

data/test/test-help.rb

@@ -1,17 +1,16 @@
 #!/usr/bin/env ruby
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug' ; Debugger.start
 
 require 'test/unit'
-SRC_DIR = File.dirname(__FILE__) unless 
+SRC_DIR = File.dirname(__FILE__) unless
   defined?(SRC_DIR)
 %w(ext lib cli).each do |dir|
   $:.unshift  File.join(SRC_DIR, '..', dir)
 end
 require 'ruby_debug'
+require 'ruby-debug'
 
-require File.join(SRC_DIR, '..', 'cli', 'ruby-debug')
 $:.shift; $:.shift; $:.shift
 
 def cheap_diff(got_lines, correct_lines)
@@ -25,7 +24,7 @@ def cheap_diff(got_lines, correct_lines)
       return false
     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
@@ -41,7 +40,7 @@ class TestHelp < Test::Unit::TestCase
   def test_basic
     testbase = 'help'
     op = StringIO.new('', 'w')
-    Dir.chdir(SRC_DIR) do 
+    Dir.chdir(SRC_DIR) do
       script = File.join('data', "#{testbase}.cmd")
       Debugger.const_set('Version', 'unit testing')
       Debugger.run_script(script, op)
@@ -51,10 +50,10 @@ class TestHelp < Test::Unit::TestCase
       result = cheap_diff(got_lines, correct_lines)
       unless result
         puts '-' * 80
-        puts got_lines 
+        puts got_lines
         puts '-' * 80
       end
-      assert result 
+      assert result
     end
   end
 end

data/test/test-hist.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test history commands
@@ -24,8 +23,8 @@ class TestHistory < Test::Unit::TestCase
     ENV['HOME']=@@SRC_DIR
     ENV['RDEBUG'] = nil
 
-    debugger_commands = ['show commands', 
-                         'set history save on', 
+    debugger_commands = ['show commands',
+                         'set history save on',
                          'show history',
                          'quit unconditionally']
     debugger_output = 'test-history.out'
@@ -42,13 +41,13 @@ class TestHistory < Test::Unit::TestCase
       # and check that it's reading that correctly.
       debug_pgm=File.join('..', 'rdbg.rb')
       debugged=File.join('gcd.rb')
-      IO.popen("#{debug_pgm} #{debugged} 3 5 >#{debugger_output}", 'w') do 
+      IO.popen("#{debug_pgm} #{debugged} 3 5 >#{debugger_output}", 'w') do
         |pipe|
         debugger_commands.each do |cmd|
           pipe.puts cmd
         end
       end
-      
+
       # Compare output
       got_lines = File.read(@@FILE_HISTORY).split(/\n/)
       # FIXME: Disable for now.
@@ -64,5 +63,3 @@ class TestHistory < Test::Unit::TestCase
     end
   end
 end
-    
-    

data/test/test-info-thread.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test simple thread commands
@@ -15,7 +14,7 @@ class TestInfoThread < Test::Unit::TestCase
 
   def test_basic
     testname='info-thread'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
        filter = Proc.new{|got_lines, correct_lines|
          [got_lines, correct_lines].each do |a|
           a.each do |s|
@@ -24,7 +23,7 @@ class TestInfoThread < Test::Unit::TestCase
         end
        }
       script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
+      assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./gcd.rb 3 5", nil, filter))
     end

data/test/test-info-var.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test info variables command
@@ -15,7 +14,7 @@ class TestInfoVar < Test::Unit::TestCase
 
   def test_info_variables
 
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
 
       filter = Proc.new{|got_lines, correct_lines|
         [got_lines[13-1], correct_lines[13-1]].each do |s|
@@ -31,13 +30,13 @@ class TestInfoVar < Test::Unit::TestCase
 
       testname='info-var'
       script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
+      assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./info-var-bug.rb",
                                 nil, filter))
       testname='info-var-bug2'
       script = File.join('data', testname + '.cmd')
-      assert_equal(true, 
+      assert_equal(true,
                    run_debugger(testname,
                                 "--script #{script} -- ./info-var-bug2.rb",
                                 nil))

data/test/test-info.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test info commands
@@ -16,9 +15,9 @@ class TestInfo < Test::Unit::TestCase
   # Test commands in info.rb
   def test_basic
     testname='info'
-    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-init.rb

@@ -2,7 +2,6 @@
 require 'test/unit'
 require 'rbconfig'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test Debugger.init and setting up ruby-debug variables
@@ -13,7 +12,7 @@ class TestDebuggerInit < Test::Unit::TestCase
 
   def test_basic
     debugger_output = 'test-init.out'
-    Dir.chdir(@@SRC_DIR) do 
+    Dir.chdir(@@SRC_DIR) do
       old_emacs = ENV['EMACS']
       old_columns = ENV['COLUMNS']
       ENV['EMACS'] = nil

data/test/test-jump.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# begin require 'rubygems' rescue LoadError end
 # require 'ruby-debug'; Debugger.start
 
 # Test jump command
@@ -15,9 +14,9 @@ class TestJumpCommand < Test::Unit::TestCase
 
   def test_basic
     testname='jump'
-    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} -- ./#{testname}.rb"))
     end
@@ -25,9 +24,9 @@ class TestJumpCommand < Test::Unit::TestCase
 
   def test_basic_2
     testname='jump2'
-    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} -- ./#{testname}.rb"))
     end