ruby-debug-base 0.10.2 → 0.10.3

data/CHANGES

@@ -1,3 +1,16 @@
+0.10.3
+11/17/08
+
+ - a backtrace now warns when it thinks the callstack is truncated which it
+   gets by comparing with caller()
+ - fix setting $0.
+ - fix bug in showing variables in post-mortem
+ - Document how Debugger.start with a block is intended to be used.
+ - Move Kernel#debugger from ruby-debug-base into ruby-debug
+ - Get regression tests working again
+ - Warn and add a "confirmation" when setting a breakpoint on a
+   file that is not loaded.
+
 0.10.2
  - debugger(steps=0) breaks inside of debugger rather than wait for a line event.
  - trace var varname (stop|nostop) added which issues trace_var.

data/README

@@ -3,7 +3,8 @@
 == Overview
 
 ruby-debug is a fast implementation of the standard debugger debug.rb.
-The faster execution speed is achieved by utilizing a new hook Ruby C API.
+The faster execution speed is achieved by utilizing a new hook in the
+Ruby C API.
 
 == Requirements
 
@@ -28,20 +29,19 @@ ruby-debug is provided as a RubyGem.  To install:
 
 This should also pull in <tt>ruby-debug-base</tt> as a dependency.
 
-(If you install ruby-debug-base explicitly, you can add in the secret
---test option after "install" to have the regression test run before
+(If you install ruby-debug-base explicitly, you can add in the <tt>--test</tt>
+option after "install" to have the regression test run before
 installing.)
 
 For Emacs support and the Reference Manual, get
 <tt>ruby-debug-extra</tt>.  This is not a RubyGem, you'll need a Make
 program and a POSIX shell. With this installed, run:
 
-<pre>
   sh ./configure
   make
   make test # optional, but a good idea
   sudo make install
-</pre>
+
 
 ==== Install on MS Windows
 
@@ -86,13 +86,21 @@ code execution at run time.
     ...
   end
 
+or
+
+  require 'ruby-debug' ; 
+  Debugger.start do 
+    ...
+    debugger
+  end
+
 When Kernel#debugger method is executed, the debugger is activated
 and you will be able to inspect and step through your code.
 
 == Performance
 
-The debug.rb script that comes with the standard Ruby library uses
-Kernel#set_trace_func API. Implementing the debugger in pure Ruby has
+The <tt>debug.rb</tt> script that comes with the standard Ruby library uses
+<tt>Kernel#set_trace_func</tt> API. Implementing the debugger in pure Ruby has
 a negative impact on the speed of your program execution. This is
 because the Ruby interpreter creates a Binding object each trace call,
 even though it is not being used most of the time. ruby-debug moves

data/Rakefile

@@ -20,7 +20,10 @@ COMMON_FILES = FileList[
   'Rakefile',
 ]                        
 
-CLI_TEST_FILE_LIST = FileList['test/test-*.rb', 'test/cli/**/*_test.rb']
+CLI_TEST_FILE_LIST = FileList['test/cli/commands/unit/*.rb',
+                              'test/cli/commands/*_test.rb', 
+                              'test/cli/**/*_test.rb', 
+                              'test/test-*.rb'] 
 CLI_FILES = COMMON_FILES + FileList[
   "cli/**/*",
   'ChangeLog',
@@ -147,7 +150,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)
+  spec.add_dependency('ruby-debug-base', "~> #{RUBY_DEBUG_VERSION}.0")
   
   # FIXME: work out operational logistics for this
   # spec.test_files = FileList[CLI_TEST_FILE_LIST]
@@ -217,13 +220,14 @@ end
 # ---------  RDoc Documentation ------
 desc "Generate rdoc documentation"
 Rake::RDocTask.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'doc'
+  rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.title    = "ruby-debug"
   # Show source inline with line numbers
   rdoc.options << "--inline-source" << "--line-numbers"
   # Make the readme file the start page for the generated html
   rdoc.options << '--main' << 'README'
   rdoc.rdoc_files.include('bin/**/*',
+                          'cli/ruby-debug/commands/*.rb',
                           'lib/**/*.rb',
                           'ext/**/ruby_debug.c',
                           'README',

data/ext/breakpoint.c

@@ -67,7 +67,7 @@ check_breakpoint_by_pos(VALUE breakpoint, char *file, int line)
     return 0;
 }
 
-static int
+int
 check_breakpoint_by_method(VALUE breakpoint, VALUE klass, ID mid)
 {
     debug_breakpoint_t *debug_breakpoint;

data/ext/extconf.rb

@@ -15,4 +15,6 @@ else
   exit(1)
 end
 
+# Temporary: to turn off optimization
+# $CFLAGS='-fno-strict-aliasing -g -fPIC'
 create_makefile("ruby_debug")

data/ext/ruby_debug.c

@@ -4,9 +4,9 @@
 #include <node.h>
 #include <rubysig.h>
 #include <st.h>
-#include <version.h>
+#include <intern.h>
 
-#define DEBUG_VERSION "0.10.2"
+#define DEBUG_VERSION "0.10.3"
 
 
 #ifdef _WIN32
@@ -341,6 +341,7 @@ debug_context_mark(void *data)
         frame = &(debug_context->frames[i]);
         rb_gc_mark(frame->binding);
         rb_gc_mark(frame->self);
+        rb_gc_mark(frame->arg_ary);
         if(frame->dead)
         {
             rb_gc_mark(frame->info.copy.locals);
@@ -466,26 +467,6 @@ call_at_line(VALUE context, debug_context_t *debug_context, VALUE file, VALUE li
     return rb_protect(call_at_line_unprotected, args, 0);
 }
 
-static VALUE
-call_at_return_unprotected(VALUE args)
-{
-    VALUE context;
-    context = *RARRAY(args)->ptr;
-    return rb_funcall2(context, idAtReturn, RARRAY(args)->len - 1, RARRAY(args)->ptr + 1);
-}
-
-static VALUE
-call_at_return(VALUE context, debug_context_t *debug_context, VALUE file, VALUE line)
-{
-    VALUE args;
-    
-    last_debugged_thnum = debug_context->thnum;
-    save_current_position(debug_context);
-
-    args = rb_ary_new3(3, context, file, line);
-    return rb_protect(call_at_return_unprotected, args, 0);
-}
-
 static void
 save_call_frame(rb_event_t event, VALUE self, char *file, int line, ID mid, debug_context_t *debug_context)
 {
@@ -510,6 +491,7 @@ save_call_frame(rb_event_t event, VALUE self, char *file, int line, ID mid, debu
     debug_frame->orig_id = mid;
     debug_frame->dead = 0;
     debug_frame->self = self;
+    debug_frame->arg_ary = Qnil;
     debug_frame->info.runtime.frame = ruby_frame;
     debug_frame->info.runtime.scope = ruby_scope;
     debug_frame->info.runtime.dyna_vars = event == RUBY_EVENT_LINE ? ruby_dyna_vars : NULL;
@@ -1001,19 +983,28 @@ debug_stop_i(VALUE self)
 /*
  *   call-seq:
  *      Debugger.start_ -> bool
- *      Debugger.start_ { ... } -> obj
+ *      Debugger.start_ { ... } -> bool
  *
  *   This method is internal and activates the debugger. Use
- *   Debugger.start (from ruby-debug-base.rb) instead.
+ *   Debugger.start (from <tt>lib/ruby-debug-base.rb</tt>) instead.
  *
- *   If it's called without a block it returns +true+, unless debugger
- *   was already started.  If a block is given, it starts debugger and
- *   yields to block. When the block is finished executing it stops
- *   the debugger with Debugger.stop method.
+ *   The return value is the value of !Debugger.started? <i>before</i>
+ *   issuing the +start+; That is, +true+ is returned, unless debugger
+ *   was previously started.
+
+ *   If a block is given, it starts debugger and yields to block. When
+ *   the block is finished executing it stops the debugger with
+ *   Debugger.stop method. Inside the block you will probably want to
+ *   have a call to Debugger.debugger. For example:
+ *     Debugger.start{debugger; foo}  # Stop inside of foo
+ * 
+ *   Also, ruby-debug only allows
+ *   one invocation of debugger at a time; nested Debugger.start's
+ *   have no effect and you can't use this inside the debugger itself.
  *
- *   <i>Note that if you want to stop debugger, you must call
- *   Debugger.stop as many time as you called Debugger.start
- *   method.</i>
+ *   <i>Note that if you want to completely remove the debugger hook,
+ *   you must call Debugger.stop as many times as you called
+ *   Debugger.start method.</i>
  */
 static VALUE
 debug_start(VALUE self)
@@ -1034,8 +1025,9 @@ debug_start(VALUE self)
         result = Qtrue;
     }
 
-    if(rb_block_given_p())
-        return rb_ensure(rb_yield, self, debug_stop_i, self);
+    if(rb_block_given_p()) 
+      rb_ensure(rb_yield, self, debug_stop_i, self);
+
     return result;
 }
 
@@ -1046,9 +1038,9 @@ debug_start(VALUE self)
  *   This method disables the debugger. It returns +true+ if the debugger is disabled,
  *   otherwise it returns +false+.
  *
- *   <i>Note that if you want to stop debugger, you must call
- *   Debugger.stop as many times as you called Debugger.start
- *   method.</i>
+ *   <i>Note that if you want to complete remove the debugger hook,
+ *   you must call Debugger.stop as many times as you called
+ *   Debugger.start method.</i>
  */
 static VALUE
 debug_stop(VALUE self)
@@ -1407,6 +1399,8 @@ debug_debug_load(int argc, VALUE *argv, VALUE self)
     debug_context->stack_size = 0;
     if(RTEST(stop))
       debug_context->stop_next = 1;
+    /* Initializing $0 to the script's path */
+    ruby_script(RSTRING(file)->ptr);
     rb_load_protect(file, 0, &state);
     if (0 != state) {
       VALUE errinfo = ruby_errinfo;
@@ -1415,7 +1409,17 @@ debug_debug_load(int argc, VALUE *argv, VALUE self)
       ruby_errinfo = Qnil;
       return errinfo;
     }
-    debug_stop(self);
+
+    /* We should run all at_exit handler's in order to provide, 
+     * for instance, a chance to run all defined test cases */
+    rb_exec_end_proc();
+
+    /* We could have issued a Debugger.stop inside the debug
+       session. */
+    if (start_count > 0) {
+      debug_stop(self);
+    }
+
     return Qnil;
 }
 
@@ -2068,7 +2072,7 @@ context_tracing(VALUE self)
 
 /*
  *   call-seq:
- *      context.tracking = bool
+ *      context.tracing = bool
  *
  *   Controls the tracing for this context.
  */

data/ext/ruby_debug.h

@@ -109,8 +109,10 @@ typedef struct {
 /* routines in breakpoint.c */
 extern int   check_breakpoint_expression(VALUE breakpoint, VALUE binding);
 extern int   check_breakpoint_hit_condition(VALUE breakpoint);
+extern VALUE check_breakpoints_by_method(debug_context_t *debug_context, 
+    VALUE klass, ID mid);
 extern VALUE check_breakpoints_by_pos(debug_context_t *debug_context, 
-				      char *file, int line);
+    char *file, int line);
 extern VALUE create_breakpoint_from_args(int argc, VALUE *argv, int id);
 extern VALUE context_breakpoint(VALUE self);
 extern VALUE context_set_breakpoint(int argc, VALUE *argv, VALUE self);

data/ext/win32/Makefile

@@ -0,0 +1,149 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = ..
+topdir = /usr/local/ruby-mingw32/lib/ruby/1.8/i386-mingw32
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/usr/local/ruby-mingw32
+exec_prefix = $(prefix)
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+psdir = $(docdir)
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
+datadir = $(datarootdir)
+includedir = $(prefix)/include
+infodir = $(datarootdir)/info
+sysconfdir = $(prefix)/etc
+mandir = $(datarootdir)/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
+sitearchdir = $(sitelibdir)/$(sitearch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = i586-mingw32msvc-gcc
+LIBRUBY = lib$(LIBRUBY_SO).a
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -g -O2  
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+CPPFLAGS =  
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L.   -Wl,--enable-auto-image-base,--enable-auto-import,--export-all 
+LDSHARED = i586-mingw32msvc-gcc -shared -s
+AR = i586-mingw32msvc-ar
+EXEEXT = .exe
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby18
+arch = i386-mingw32
+sitearch = i386-msvcrt
+ruby_version = 1.8
+ruby = /usr/local/ruby-mingw32/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L"." -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lwsock32  
+SRCS = ruby_debug.c breakpoint.c
+OBJS = ruby_debug.o breakpoint.o
+TARGET = ruby_debug
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/lib/ChangeLog

@@ -1,3 +1,92 @@
+2008-11-14 19:28  Rocky Bernstein
+
+	* ruby-debug-base.rb: Go over documentation and revise.
+
+2008-11-14 15:32  Rocky Bernstein
+
+	* ChangeLog, ruby-debug-base.rb: Move Debugger#debugger from base
+	  to cli. Revert code in ruby_debug.c and block parameter in
+	  debugger. cf. -> Compare with. Document Debugger.start better.
+
+2008-11-13 10:29  Rocky Bernstein
+
+	* ChangeLog: Make Debugger.start{block} work if Debugger.started?
+	  is false. Second try.
+
+2008-11-11 02:07  Rocky Bernstein
+
+	* ChangeLog: Tweak truncated stack test since Ruby's caller doesn't
+	  seem to include (tail?) recursive calls and we do. Get regression
+	  tests working in light of recent changes.
+
+2008-11-10 01:48  Kent Sibilev
+
+	* ruby-debug-base.rb: a little bit more readable
+
+2008-11-10 01:35  Kent Sibilev
+
+	* ruby-debug-base.rb: Debugger.start must always call the passed
+	  block
+
+2008-11-07 19:35  Rocky Bernstein
+
+	* ChangeLog: Change truncated frame message.
+
+2008-11-07 10:39  Rocky Bernstein
+
+	* ChangeLog: Add check to "where" to see if the call stack is
+	  truncated; task #2354
+
+2008-11-06 16:17  Rocky Bernstein
+
+	* ChangeLog: #22698 Allow ruby-debug-base 0.x.y.z be compatible
+	  with ruby-debug 0.x.y.
+
+2008-11-02 21:59  Rocky Bernstein
+
+	* ChangeLog, ruby-debug-base.rb: Debugger.start with a block now
+	  stops inside the block. Debugger.debugger with a block works like
+	  Debugger.start with a block.
+	  
+	  The whole interface is hopelessly kludgy and needs to be redone.
+
+2008-10-26 14:54  Rocky Bernstein
+
+	* ChangeLog: Doc typo. Add comment to remind me how to turn off
+	  optimizationin extconf.rb
+
+2008-10-25 16:01  Rocky Bernstein
+
+	* ChangeLog: Warn and add a "confirmation" when setting a
+	  breakpoint on a file that is not loaded. Regression tests no
+	  longer fail.
+
+2008-09-22 00:07  Rocky Bernstein
+
+	* ruby-debug-base.rb: #22118 bug in showing variables post mortem.
+	  Patch thanks to rubikitch.
+	  Update pm.rb integration test.
+
+2008-09-03 17:29  Rocky Bernstein
+
+	* ChangeLog: Show line numbers when $DEBUG is set. Patch #21772
+	  from Martin Krauskopf
+
+2008-07-07 07:11  Rocky Bernstein
+
+	* ruby-debug-base.rb: Tracker [#20041] start erroneously moved to
+	  Kernel - should be in
+	  Debugger.start
+
+2008-06-20 06:46  Rocky Bernstein
+
+	* ruby-debug-base.rb: trace.rb: add "trace var"
+	  ruby-debug-base.rb: remove another undefined warning.
+
+2008-05-24 01:27  Rocky Bernstein
+
+	* ChangeLog: Remove dup lines.
+
 2008-05-15 16:05  Rocky Bernstein
 
 	* ChangeLog: Handle "catch nnn off" Forgotten there during r656.

data/lib/ruby-debug-base.rb

@@ -7,7 +7,9 @@ module Debugger
   # Default options to Debugger.start
   DEFAULT_START_SETTINGS = { 
     :init        => true,  # Set $0 and save ARGV? 
-    :post_mortem => false  # post-mortem debugging on uncaught exception?
+    :post_mortem => false, # post-mortem debugging on uncaught exception?
+    :tracing     => nil    # Debugger.tracing value. true/false resets,
+                           # nil keeps the prior value
   } unless defined?(DEFAULT_START_SETTINGS)
 
   class Context
@@ -24,7 +26,7 @@ module Debugger
 
     def hbinding(frame)
       hash = frame_locals(frame)
-      code = hash.keys.map{|k| "#{k} = hash['#{k}']"}.join(';') + ';binding'
+      code = hash.keys.map{|k| "#{k} = hash['#{k}']" unless k=='self' }.compact.join(';') + ';binding'
       if obj = frame_self(frame)
         obj.instance_eval code
       else
@@ -163,20 +165,28 @@ module Debugger
   class ThreadsTable # :nodoc:
   end
 
-  #  Debugger.start(options) -> bool
-  #  Debugger.start(options) { ... } -> obj
+  # Debugger.start(options) -> bool
+  # Debugger.start(options) { ... } -> obj
   #
-  #  This method is internal and activates the debugger. Use
-  #  Debugger.start (from ruby-debug-base.rb) instead.
+  # If it's called without a block it returns +true+, unless debugger
+  # was already started.  If a block is given, it starts debugger and
+  # yields to block. When the block is finished executing it stops
+  # the debugger with Debugger.stop method.
   #
-  #  If it's called without a block it returns +true+, unless debugger
-  #  was already started.  If a block is given, it starts debugger and
-  #  yields to block. When the block is finished executing it stops
-  #  the debugger with Debugger.stop method.
+  # If a block is given, it starts debugger and yields to block. When
+  # the block is finished executing it stops the debugger with
+  # Debugger.stop method. Inside the block you will probably want to
+  # have a call to Debugger.debugger. For example:
   #
-  #  <i>Note that if you want to stop debugger, you must call
-  #  Debugger.stop as many time as you called Debugger.start
-  #  method.</i>
+  #     Debugger.start{debugger; foo}  # Stop inside of foo
+  #
+  # Also, ruby-debug only allows
+  # one invocation of debugger at a time; nested Debugger.start's
+  # have no effect and you can't use this inside the debugger itself.
+  #
+  # <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
@@ -196,7 +206,8 @@ module Debugger
       Debugger.const_set('INITIAL_DIR', Dir.pwd) unless 
         defined? Debugger::INITIAL_DIR
     end
-    retval = Debugger.started? ? nil : Debugger.start_(&block) 
+    Debugger.tracing = options[:tracing] unless options[:tracing].nil?
+    retval = Debugger.started? ? block && block.call(self) : Debugger.start_(&block) 
     if options[:post_mortem]
       post_mortem
     end
@@ -213,16 +224,24 @@ module Kernel
   # Setting _steps_ to 0 will cause a break in the debugger subroutine
   # and not wait for a line event to occur. You will have to go "up 1"
   # in order to be back in your debugged program rather than the
-  # debugger. Settings _stess_ to 0 could be useful you want to stop
+  # debugger. Settings _steps_ to 0 could be useful you want to stop
   # right after the last statement in some scope, because the next
   # step will take you out of some scope.
-  def debugger(steps = 1)
-    Debugger.start unless Debugger.started?
-    Debugger.run_init_script(StringIO.new)
-    if 0 == steps
-      Debugger.current_context.stop_frame = 0
+
+  # 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)
+    if block
+      Debugger.start({}, &block)
     else
-      Debugger.current_context.stop_next = steps
+      Debugger.start unless Debugger.started?
+      Debugger.run_init_script(StringIO.new)
+      if 0 == steps
+        Debugger.current_context.stop_frame = 0
+      else
+        Debugger.current_context.stop_next = steps
+      end
     end
   end
   alias breakpoint debugger unless respond_to?(:breakpoint)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-base
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Kent Sibilev
@@ -9,12 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 -04:00
+date: 2008-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: linecache
-  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,9 +40,12 @@ files:
 - ext/extconf.rb
 - ext/ruby_debug.c
 - ext/ruby_debug.h
+- ext/win32/Makefile
+- ext/win32/ruby_debug.o
+- ext/win32/breakpoint.o
 - ext/win32/ruby_debug.so
-- lib/ChangeLog
 - lib/ruby-debug-base.rb
+- lib/ChangeLog
 - test/base/base.rb
 - test/base/binding.rb
 - test/base/catchpoint.rb
@@ -69,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-debug
-rubygems_version: 1.2.0
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Fast Ruby debugger - core component