debugger 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.1
+* Fix ruby-debug not being loaded from debugger.rb
+
 ## 1.0.0
 * Add back 1.9.2 support!
 

data/README.md

@@ -1,7 +1,7 @@
 ## Description
 A fork of ruby-debug19 that works on 1.9.2 and 1.9.3 and installs easily for rvm/rbenv rubies.
 
-[![Build Status](https://secure.travis-ci.org/cldwalker/debugger.png?branch=master)](http://travis-ci.org/cldwalker/log_buddy)
+[![Build Status](https://secure.travis-ci.org/cldwalker/debugger.png?branch=master)](http://travis-ci.org/cldwalker/debugger)
 
 ## Install
 
@@ -58,6 +58,7 @@ Let's keep this working for the ruby community!
 ## Credits
 
 * Thanks to the original authors: Kent Sibilev and Mark Moseley
+* Contributors: jnimety
 * Fork started on awesome @relevance fridays!
 
 ## TODO

data/Rakefile

@@ -15,13 +15,13 @@ COMMON_FILES = FileList[
   'Rakefile',
 ]
 
-CLI_TEST_FILE_LIST = FileList['test/cli/commands/unit/*.rb',
-                              'test/cli/commands/*_test.rb',
-                              'test/cli/**/*_test.rb']
+CLI_TEST_FILE_LIST = FileList['test/lib/commands/unit/*.rb',
+                              'test/lib/commands/*_test.rb',
+                              'test/lib/**/*_test.rb']
                               # disabled until requires fixed and tests pass
                               # 'test/test-*.rb']
 CLI_FILES = COMMON_FILES + FileList[
-  "cli/**/*",
+  "lib/**/*",
   'ChangeLog',
   'bin/*',
   'doc/rdebug.1',
@@ -51,7 +51,6 @@ task :test => :test_base do
   Rake::TestTask.new(:test) do |t|
     t.libs << './ext'
     t.libs << './lib'
-    t.libs << './cli'
     t.test_files = CLI_TEST_FILE_LIST
     t.verbose = true
   end

data/bin/rdebug

@@ -6,7 +6,7 @@
 #Fast Ruby Debugger.
 #
 #Command invocation:
-#  
+#
 #   rdebug [options] [--] [script-options] ruby-script-to-debug
 #   rdebug [options] [script-options] [--client]
 #   rdebug [--version | --help]
@@ -89,7 +89,7 @@
 #      Keep frame bindings.
 #
 #<tt>--script=</tt><i>file</i>::
-#      Name of the script file to run 
+#      Name of the script file to run
 #
 #<tt>-s | --server</tt>::
 #      Listen for remote connections. Another rdebug session
@@ -102,19 +102,18 @@
 #<tt>--help</tt>::
 #      Show invocation help and exit.
 
-require 'rubygems'
 require 'optparse'
 require 'ostruct'
-require_relative '../cli/ruby-debug'
+require 'ruby-debug'
 
 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
 
@@ -172,20 +171,20 @@ Usage: #{program} [options] <script.rb> -- <script.rb parameters>
 EOB
     opts.separator ""
     opts.separator "Options:"
-    opts.on("-A", "--annotate LEVEL", Integer, "Set annotation level") do 
+    opts.on("-A", "--annotate LEVEL", Integer, "Set annotation level") do
       |annotate|
         Debugger.annotate = annotate
     end
-    opts.on("-c", "--client", "Connect to remote debugger") do 
+    opts.on("-c", "--client", "Connect to remote debugger") do
       options.client = true
     end
-    opts.on("--cport PORT", Integer, "Port used for control commands") do 
+    opts.on("--cport PORT", Integer, "Port used for control commands") do
       |cport|
       options.cport = cport
     end
     opts.on("-d", "--debug", "Set $DEBUG=true") {$DEBUG = true}
     opts.on("--emacs LEVEL", Integer,
-            "Activates full Emacs support at annotation level LEVEL") do 
+            "Activates full Emacs support at annotation level LEVEL") do
       |level|
       Debugger.annotate = level.to_i
       ENV['EMACS'] = '1'
@@ -193,7 +192,7 @@ EOB
       options.control = false
       options.quit = false
     end
-    opts.on('--emacs-basic', 'Activates basic Emacs mode') do 
+    opts.on('--emacs-basic', 'Activates basic Emacs mode') do
       ENV['EMACS'] = '1'
     end
     opts.on('-h', '--host HOST', 'Host name used for remote debugging') do
@@ -203,23 +202,23 @@ EOB
     opts.on('-I', '--include PATH', String, 'Add PATH to $LOAD_PATH') do |path|
       $LOAD_PATH.unshift(path)
     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.quit = false
     end
     opts.on('--no-rewrite-program',
-            'Do not set $0 to the program being debugged') do 
+            'Do not set $0 to the program being debugged') do
       options.no_rewrite_program = 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.stop = false
     end
     opts.on('-nx', 'Not run debugger initialization files (e.g. .rdebugrc') do
       options.nx = true
     end
-    opts.on('-p', '--port PORT', Integer, 'Port used for remote debugging') do 
+    opts.on('-p', '--port PORT', Integer, 'Port used for remote debugging') do
       |port|
       options.port = port
     end
@@ -231,8 +230,8 @@ EOB
         require name
       end
     end
-    opts.on('--restart-script FILE', String, 
-            'Name of the script file to run. Erased after read') do 
+    opts.on('--restart-script FILE', String,
+            'Name of the script file to run. Erased after read') do
       |restart_script|
       options.restart_script = restart_script
       unless File.exists?(options.restart_script)
@@ -240,7 +239,7 @@ EOB
         exit
       end
     end
-    opts.on('--script FILE', String, 'Name of the script file to run') do 
+    opts.on('--script FILE', String, 'Name of the script file to run') do
       |script|
       options.script = script
       unless File.exists?(options.script)
@@ -248,7 +247,7 @@ EOB
         exit
       end
     end
-    opts.on('-s', '--server', 'Listen for remote connections') do 
+    opts.on('-s', '--server', 'Listen for remote connections') do
       options.server = true
     end
     opts.on('-w', '--wait', 'Wait for a client connection, implies -s option') do
@@ -261,7 +260,7 @@ EOB
       puts opts
       exit
     end
-    opts.on_tail('--version', 
+    opts.on_tail('--version',
                  'Print the version') do
       puts "ruby-debug #{Debugger::VERSION}"
       exit
@@ -270,7 +269,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
@@ -284,7 +283,7 @@ unless defined?(OPTS_INITFILE)
   if RUBY_PLATFORM =~ /mswin/
     # Of course MS Windows has to be different
     OPTS_INITFILE = 'rdbopt.ini'
-    HOME_DIR =  (ENV['HOME'] || 
+    HOME_DIR =  (ENV['HOME'] ||
                  ENV['HOMEDRIVE'].to_s + ENV['HOMEPATH'].to_s).to_s
   else
     OPTS_INITFILE = '.rdboptrc'
@@ -293,7 +292,7 @@ unless defined?(OPTS_INITFILE)
 end
 begin
   initfile = File.join(HOME_DIR, OPTS_INITFILE)
-  eval(File.read(initfile)) if 
+  eval(File.read(initfile)) if
     File.exist?(initfile)
 rescue
 end
@@ -328,18 +327,18 @@ else
     puts 'Must specify a script to run'
     exit(-1)
   end
-  
+
   # save script name
   prog_script = ARGV.shift
   prog_script = whence_file(prog_script) unless File.exist?(prog_script)
   Debugger::PROG_SCRIPT = File.expand_path prog_script
-  
+
   # install interruption handler
   trap('INT') { Debugger.interrupt_last }
-  
+
   # set options
   Debugger.wait_connection = options.wait
-  
+
   if options.server
     # start remote mode
     Debugger.start_remote(options.host, [options.port, options.cport]) do
@@ -355,7 +354,7 @@ else
 
     # load initrc script (e.g. .rdebugrc)
     Debugger.run_init_script(StringIO.new) unless options.nx
-    
+
     # run restore-settings startup script if specified
     if options.restart_script
       require 'fileutils'
@@ -384,7 +383,7 @@ else
         print $!.backtrace.map{|l| "\t#{l}"}.join("\n"), "\n"
         print "Uncaught exception: #{$!}\n"
       end
-      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/lib/debugger.rb

@@ -1,7 +1,5 @@
 module Debugger
 end
-# TODO: merge cli/ into lib/
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../cli')
 
 require 'ruby-debug'
 require 'debugger/version'

data/lib/debugger/version.rb

@@ -1,5 +1,5 @@
 module Debugger
   # TODO: remove version from C ext
   send :remove_const, :VERSION if const_defined? :VERSION
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/ruby-debug-base.rb

@@ -1,12 +1,11 @@
 require 'ruby_debug.so'
-require 'rubygems'
 require 'linecache19'
 
 module Debugger
-  
+
   # Default options to Debugger.start
-  DEFAULT_START_SETTINGS = { 
-    :init        => true,  # Set $0 and save ARGV? 
+  DEFAULT_START_SETTINGS = {
+    :init        => true,  # Set $0 and save ARGV?
     :post_mortem => false, # post-mortem debugging on uncaught exception?
     :tracing     => nil    # Debugger.tracing value. true/false resets,
                            # nil keeps the prior value
@@ -16,7 +15,7 @@ module Debugger
     def interrupt
       self.stop_next = 1
     end
-    
+
     alias __c_frame_binding frame_binding
     def frame_binding(frame)
       __c_frame_binding(frame) || hbinding(frame)
@@ -59,27 +58,27 @@ module Debugger
       handler.at_return(self, file, line)
     end
   end
-  
+
   @reload_source_on_change = false
   @tracing_started = false
-  
+
   class << self
     # interface modules provide +handler+ object
     attr_accessor :handler
-    
+
     # if <tt>true</tt>, checks the modification time of source files and reloads if it was modified
     attr_accessor :reload_source_on_change
 
     attr_accessor :last_exception
     Debugger.last_exception = nil
-    
+
     #
     # Interrupts the current thread
     #
     def interrupt
       current_context.interrupt
     end
-    
+
     #
     # Interrupts the last debugged thread
     #
@@ -90,11 +89,11 @@ module Debugger
       end
       context
     end
-    
+
     def source_reload
       LineCache::clear_file_cache
     end
-    
+
     # Get line +line_number+ from file named +filename+. Return "\n"
     # there was a problem. Leaking blanks are stripped off.
     def line_at(filename, line_number) # :nodoc:
@@ -106,7 +105,7 @@ module Debugger
 
     #
     # Activates the post-mortem mode. There are two ways of using it:
-    # 
+    #
     # == Global post-mortem mode
     # By calling Debugger.post_mortem method without a block, you install
     # at_exit hook that intercepts any unhandled by your script exceptions
@@ -145,9 +144,9 @@ module Debugger
         end
       end
     end
-    
+
     def handle_post_mortem(exp)
-      return if !exp || !exp.__debug_context || 
+      return if !exp || !exp.__debug_context ||
         exp.__debug_context.stack_size == 0
       Debugger.suspend
       orig_tracing = Debugger.tracing, Debugger.current_context.tracing
@@ -160,10 +159,10 @@ module Debugger
     end
     # private :handle_post_mortem
   end
-  
+
   class DebugThread # :nodoc:
   end
-  
+
   class ThreadsTable # :nodoc:
   end
 
@@ -189,27 +188,27 @@ module Debugger
   # <i>Note that if you want to stop debugger, you must call
   # Debugger.stop as many time as you called Debugger.start
   # method.</i>
-  # 
+  #
   # +options+ is a hash used to set various debugging options.
   # Set :init true if you want to save ARGV and some variables which
   # make a debugger restart possible. Only the first time :init is set true
-  # will values get set. Since ARGV is saved, you should make sure 
-  # it hasn't been changed before the (first) call. 
+  # will values get set. Since ARGV is saved, you should make sure
+  # it hasn't been changed before the (first) call.
   # Set :post_mortem true if you want to enter post-mortem debugging
   # on an uncaught exception. Once post-mortem debugging is set, it can't
   # be unset.
   def start(options={}, &block)
     options = Debugger::DEFAULT_START_SETTINGS.merge(options)
     if options[:init]
-      Debugger.const_set('ARGV', ARGV.clone) unless 
+      Debugger.const_set('ARGV', ARGV.clone) unless
         defined? Debugger::ARGV
-      Debugger.const_set('PROG_SCRIPT', $0) unless 
+      Debugger.const_set('PROG_SCRIPT', $0) unless
         defined? Debugger::PROG_SCRIPT
-      Debugger.const_set('INITIAL_DIR', Dir.pwd) unless 
+      Debugger.const_set('INITIAL_DIR', Dir.pwd) unless
         defined? Debugger::INITIAL_DIR
     end
     Debugger.tracing = options[:tracing] unless options[:tracing].nil?
-    retval = Debugger.started? ? block && block.call(self) : Debugger.start_(&block) 
+    retval = Debugger.started? ? block && block.call(self) : Debugger.start_(&block)
     if options[:post_mortem]
       post_mortem
     end
@@ -230,7 +229,7 @@ module Kernel
   # right after the last statement in some scope, because the next
   # step will take you out of some scope.
 
-  # If a block is given (and the debugger hasn't been started, we run the 
+  # If a block is given (and the debugger hasn't been started, we run the
   # block under the debugger. Alas, when a block is given, we can't support
   # running the startup script or support the steps option. FIXME.
   def debugger(steps = 1, &block)
@@ -247,7 +246,7 @@ module Kernel
     end
   end
   alias breakpoint debugger unless respond_to?(:breakpoint)
-  
+
   #
   # Returns a binding of n-th call frame
   #
@@ -283,7 +282,7 @@ class Module
     end
     EOD
   end
-  
+
   #
   # Wraps the +meth+ method with Debugger.post_mortem {...} block.
   #

data/{cli → lib}/ruby-debug/command.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'columnize'
 require_relative 'helper'
 
@@ -29,22 +28,22 @@ module Debugger
       def commands
         @commands ||= []
       end
-      
+
       DEF_OPTIONS = {
-        :allow_in_control     => false, 
+        :allow_in_control     => false,
         :allow_in_post_mortem => true,
-        :event => true, 
+        :event => true,
         :always_run => 0,
         :unknown => false,
         :need_context => false,
       } unless defined?(DEF_OPTIONS)
-      
+
       def inherited(klass)
         DEF_OPTIONS.each do |o, v|
           klass.options[o] = v if klass.options[o].nil?
         end
         commands << klass
-      end 
+      end
 
       def load_commands
         Dir[File.join(Debugger.const_get(:RUBY_DEBUG_DIR), 'commands', '*')].each do |file|
@@ -54,7 +53,7 @@ module Debugger
           include mod
         end
       end
-      
+
       def method_missing(meth, *args, &block)
         if meth.to_s =~ /^(.+?)=$/
           @options[$1.intern] = args.first
@@ -66,7 +65,7 @@ module Debugger
           end
         end
       end
-      
+
       def options
         @options ||= {}
       end
@@ -75,7 +74,7 @@ module Debugger
         @@settings_map ||= {}
       end
       private :settings_map
-      
+
       def settings
         unless true and defined? @settings and @settings
           @settings = Object.new
@@ -126,7 +125,7 @@ module Debugger
       end
     end
 
-    register_setting_var(:basename, false)  # use basename in showing files? 
+    register_setting_var(:basename, false)  # use basename in showing files?
     register_setting_var(:callstyle, :last)
     register_setting_var(:debuggertesting, false)
     register_setting_var(:force_stepping, false)
@@ -134,18 +133,18 @@ module Debugger
     register_setting_var(:listsize, 10)    # number of lines in list command
     register_setting_var(:stack_trace_on_error, false)
     register_setting_var(:tracing_plus, false) # different linetrace lines?
-    
-    # width of line output. Use COLUMNS value if it exists and is 
+
+    # width of line output. Use COLUMNS value if it exists and is
     # not too rediculously large.
-    width = ENV['COLUMNS'].to_i 
+    width = ENV['COLUMNS'].to_i
     width = 80 unless width > 10
-    register_setting_var(:width, width)  
+    register_setting_var(:width, width)
 
     if not defined? Debugger::ARGV
       Debugger::ARGV = ARGV.clone
     end
     register_setting_var(:argv, Debugger::ARGV)
-    
+
     def initialize(state)
       @state = state
     end
@@ -156,7 +155,7 @@ module Debugger
 
     protected
 
-    # FIXME: use delegate? 
+    # FIXME: use delegate?
     def errmsg(*args)
       @state.errmsg(*args)
     end
@@ -204,15 +203,15 @@ module Debugger
 
     def get_context(thnum)
       Debugger.contexts.find{|c| c.thnum == thnum}
-    end  
+    end
   end
-  
+
   Command.load_commands
 
   # Returns setting object.
   # Use Debugger.settings[] and Debugger.settings[]= methods to query and set
   # debugger settings. These settings are available:
-  # 
+  #
   # - :autolist - automatically calls 'list' command on breakpoint
   # - :autoeval - evaluates input in the current binding if it's not recognized as a debugger command
   # - :autoirb - automatically calls 'irb' command on breakpoint
@@ -221,7 +220,7 @@ module Debugger
   # - :frame_class_names - displays method's class name when showing frame stack
   # - :reload_source_on_change - makes 'list' command to always display up-to-date source code
   # - :force_stepping - stepping command asways move to the new line
-  # 
+  #
   def self.settings
     Command.settings
   end