ruby-debug 0.7.5 → 0.8

data/CHANGES

@@ -1,3 +1,8 @@
+0.8
+- Extract the base debugger API into a separate gem (ruby-debug-base), so it will be easier to add a new interface.
+- Added 'set autoirb' setting.
+- Bugfixes.
+
 0.7.5
 - Fixed 'reload on' command
 - 'reload on' command is removed in favor of 'set autoreload'

data/bin/rdebug

@@ -45,6 +45,7 @@ EOB
     end
   end
   opts.on("--keep-frame-binding", "Keep frame bindings") {options.frame_bind = true}
+  opts.on("--emacs", "Activates emacs mode") {ENV['EMACS'] = '1'}
   opts.separator ""
   opts.separator "Common options:"
   opts.on_tail("--help", "Show this message") do
@@ -89,22 +90,22 @@ else
   trap('INT') { Debugger.interrupt_last }
   
   # set options
-  Debugger.stop_on_connect = !options.nostop
   Debugger.wait_connection = options.wait
   Debugger.keep_frame_binding = options.frame_bind
   
   load_initrc = lambda do
     script_file = "#{ENV["HOME"] || ENV["HOMEPATH" || "."]}/.rdebugrc"
-    Debugger.run_script script_file  if File.exists?(script_file)
+    Debugger.run_script script_file, StringIO.new  if File.exists?(script_file)
   end
   
   if options.server
     # start remote mode
-    Debugger.start_remote(options.host, [options.port, options.cport], options.post_mortem)
-    # load initrc script
-    load_initrc.call
+    Debugger.start_remote(options.host, [options.port, options.cport], options.post_mortem) do
+      # load initrc script
+      load_initrc.call
+    end
     # load script
-    Debugger.debug_load Debugger::PROG_SCRIPT
+    Debugger.debug_load Debugger::PROG_SCRIPT, !options.nostop
   else
     # activate debugger
     Debugger.start
@@ -120,12 +121,8 @@ else
     end
     # activate post-mortem
     Debugger.post_mortem if options.post_mortem
-    if options.tracing
-      Debugger.tracing = true
-    else
-      debugger 2 unless options.nostop
-    end
+    Debugger.tracing = options.nostop = true if options.tracing
     # load script
-    Debugger.debug_load Debugger::PROG_SCRIPT
+    Debugger.debug_load Debugger::PROG_SCRIPT, !options.nostop
   end
 end

data/cli/ruby-debug.rb

@@ -0,0 +1,117 @@
+require 'pp'
+require 'stringio'
+require 'socket'
+require 'thread'
+require 'ruby-debug-base'
+require 'ruby-debug/processor'
+
+module Debugger
+  self.handler = CommandProcessor.new
+  
+  # the port number used for remote debugging
+  PORT = 8989
+
+  class << self
+    # in remote mode, wait for the remote connection 
+    attr_accessor :wait_connection
+    
+    attr_reader :thread, :control_thread
+
+    def interface=(value) # :nodoc:
+      processor.interface = value
+    end
+    
+    #
+    # Starts a remote debugger.
+    #
+    def start_remote(host = nil, port = PORT, post_mortem = false)
+      return if @thread
+      return if started?
+
+      self.interface = nil
+      start
+      self.post_mortem if post_mortem
+
+      if port.kind_of?(Array)
+        cmd_port, ctrl_port = port
+      else
+        cmd_port, ctrl_port = port, port + 1
+      end
+
+      start_control(host, ctrl_port)
+      
+      yield if block_given?
+      
+      mutex = Mutex.new
+      proceed = ConditionVariable.new
+      
+      @thread = DebugThread.new do
+        server = TCPServer.new(host, cmd_port)
+        while (session = server.accept)
+          self.interface = RemoteInterface.new(session)
+          if wait_connection
+            mutex.synchronize do
+              proceed.signal
+            end
+          end
+        end
+      end
+      if wait_connection
+        mutex.synchronize do
+          proceed.wait(mutex)
+        end 
+      end
+    end
+    alias start_server start_remote
+    
+    def start_control(host = nil, ctrl_port = PORT + 1)
+      raise "Debugger is not started" unless started?
+      return if @control_thread
+      @control_thread = DebugThread.new do
+        server = TCPServer.new(host, ctrl_port)
+        while (session = server.accept)
+          interface = RemoteInterface.new(session)
+          processor = ControlCommandProcessor.new(interface)
+          processor.process_commands
+        end
+      end
+    end
+    
+    #
+    # Connects to the remote debugger
+    #
+    def start_client(host = 'localhost', port = PORT)
+      require "socket"
+      interface = Debugger::LocalInterface.new
+      socket = TCPSocket.new(host, port)
+      puts "Connected."
+      
+      catch(:exit) do
+        while (line = socket.gets)
+          case line 
+          when /^PROMPT (.*)$/
+            input = interface.read_command($1)
+            throw :exit unless input
+            socket.puts input
+          when /^CONFIRM (.*)$/
+            input = interface.confirm($1)
+            throw :exit unless input
+            socket.puts input
+          else
+            print line
+          end
+        end
+      end
+      socket.close
+    end
+    
+    #
+    # Runs a script file
+    #
+    def run_script(file, out = processor.interface)
+      interface = ScriptInterface.new(file, out)
+      processor = ControlCommandProcessor.new(interface)
+      processor.process_commands
+    end
+  end
+end

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

@@ -18,7 +18,7 @@ module Debugger
           klass.options[o] = v if klass.options[o].nil?
         end
         commands << klass
-      end
+      end 
 
       def load_commands
         dir = File.dirname(__FILE__)
@@ -89,19 +89,8 @@ module Debugger
       end
     end
 
-    def hbinding(hash)
-      code = hash.keys.map{|k| "#{k} = hash['#{k}']"}.join(';') + ';binding'
-      if obj = @state.context.frame_self(@state.frame_pos)
-        obj.instance_eval code
-      else
-        eval code
-      end
-    end
-    private :hbinding
- 
     def get_binding
-      binding = @state.context.frame_binding(@state.frame_pos)
-      binding || hbinding(@state.context.frame_locals(@state.frame_pos))
+      @state.context.frame_binding(@state.frame_pos)
     end
 
     def line_at(file, line)

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

@@ -53,6 +53,8 @@ module Debugger
       cmd = Debugger::RDEBUG_SCRIPT + " " + args
       print "Re exec'ing:\n\t#{cmd}\n"
       exec cmd
+    rescue Errno::EOPNOTSUPP
+      print "Restart command is not available at this time.\n"
     end
 
     class << self

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

@@ -31,6 +31,7 @@ module Debugger
           %{
             e[val] expression\tevaluate expression and print its value,
             \t\t\talias for p.
+            * NOTE - to turn on autoeval, use 'set autoeval'
           }
         end
       end

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

@@ -21,7 +21,7 @@ module Debugger
         cmds.each do |cmd|
           if buf.length + cmd.length > 70
             print "%s\n", buf
-            buf = ""
+            buf = "#{cmd} "
           else
             buf << cmd << ' '
           end

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

@@ -40,7 +40,7 @@ module Debugger
           l[ist] -\tlist backward
           l[ist] =\tlist current line
           l[ist] nn-mm\tlist given lines
-          l[ist] on/off\tprint listing on every stop
+          * NOTE - to turn on autolist, use 'set autolist'
         }
       end
     end
@@ -66,7 +66,7 @@ module Debugger
     end
   end
 
-  class ReloadCommand < Command # :nodoc
+  class ReloadCommand < Command # :nodoc:
     self.control = true
     
     def regexp

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

@@ -20,6 +20,9 @@ module Debugger
       when /^(no)?autoreload$/
         Debugger.reload_source_on_change = $1.nil?
         print "autoreload is #{$1.nil? ? 'on' : 'off'}.\n"
+      when /^(no)?autoirb$/
+        IRBCommand.always_run = $1.nil?
+        print "autoirb is #{$1.nil? ? 'on' : 'off'}.\n"
       else
         print "Unknown setting.\n"
       end
@@ -36,6 +39,7 @@ module Debugger
            autolist   - execute 'list' command on every breakpoint
            autoeval   - evaluate every unrecognized command
            autoreload - enables automatic source code reloading
+           autoirb    - debugger invokes IRB on every stop
            trace      - display stack trace when 'eval' raises exception
            To disable setting, use 'no' prefix, like 'noautolist'
          }

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

@@ -62,7 +62,7 @@ module Debugger
     protect :at_tracing
 
     def at_line(context, file, line)
-      print "%s:%d: %s", file, line, Debugger.line_at(file, line)
+      print "#{"\032\032" if ENV['EMACS']}%s:%d %s", file, line, Debugger.line_at(file, line)
       process_commands(context, file, line)
     end
     protect :at_line
@@ -92,9 +92,11 @@ module Debugger
         s.interface = interface
         s.commands = event_cmds
       end
+      @interface.state = state if @interface.respond_to?('state=')
+      
       commands = event_cmds.map{|cmd| cmd.new(state) }
       commands.select{|cmd| cmd.class.always_run }.each{|cmd| cmd.execute }
-
+      
       splitter = lambda do |str|
         str.split(/;/).inject([]) do |m, v|
           if m.empty?

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
-date: 2007-02-09 02:00:27 -05:00
-summary: Fast Ruby debugger
+  version: "0.8"
+date: 2007-03-14 22:59:58 -04:00
+summary: Command line interface (CLI) for ruby-debug
 require_paths: 
-- lib
+- cli
 email: ksibilev@yahoo.com
 homepage: http://rubyforge.org/projects/ruby-debug/
 rubyforge_project: ruby-debug
-description: ruby-debug is a fast implementation of the standard Ruby debugger debug.rb. It's implemented by utilizing a new hook Ruby C API.
+description: A generic command line interface for ruby-debug.
 autorequire: ruby-debug
 default_executable: 
 bindir: bin
@@ -29,49 +29,53 @@ post_install_message:
 authors: 
 - Kent Sibilev
 files: 
-- Rakefile
 - README
 - LICENSE
 - CHANGES
 - AUTHORS
-- lib/ruby-debug
-- lib/ruby-debug.rb
-- lib/ruby-debug/commands
-- lib/ruby-debug/command.rb
-- lib/ruby-debug/processor.rb
-- lib/ruby-debug/interface.rb
-- lib/ruby-debug/commands/breakpoints.rb
-- lib/ruby-debug/commands/method.rb
-- lib/ruby-debug/commands/control.rb
-- lib/ruby-debug/commands/stepping.rb
-- lib/ruby-debug/commands/eval.rb
-- lib/ruby-debug/commands/help.rb
-- lib/ruby-debug/commands/catchpoint.rb
-- lib/ruby-debug/commands/threads.rb
-- lib/ruby-debug/commands/frame.rb
-- lib/ruby-debug/commands/script.rb
-- lib/ruby-debug/commands/trace.rb
-- lib/ruby-debug/commands/display.rb
-- lib/ruby-debug/commands/variables.rb
-- lib/ruby-debug/commands/tmate.rb
-- lib/ruby-debug/commands/list.rb
-- lib/ruby-debug/commands/irb.rb
-- lib/ruby-debug/commands/settings.rb
-- ext/win32
-- ext/extconf.rb
-- ext/ruby_debug.c
 - bin/rdebug
+- cli/ruby-debug
+- cli/ruby-debug/command.rb
+- cli/ruby-debug/commands
+- cli/ruby-debug/commands/breakpoints.rb
+- cli/ruby-debug/commands/catchpoint.rb
+- cli/ruby-debug/commands/control.rb
+- cli/ruby-debug/commands/display.rb
+- cli/ruby-debug/commands/eval.rb
+- cli/ruby-debug/commands/frame.rb
+- cli/ruby-debug/commands/help.rb
+- cli/ruby-debug/commands/irb.rb
+- cli/ruby-debug/commands/list.rb
+- cli/ruby-debug/commands/method.rb
+- cli/ruby-debug/commands/script.rb
+- cli/ruby-debug/commands/settings.rb
+- cli/ruby-debug/commands/stepping.rb
+- cli/ruby-debug/commands/threads.rb
+- cli/ruby-debug/commands/tmate.rb
+- cli/ruby-debug/commands/trace.rb
+- cli/ruby-debug/commands/variables.rb
+- cli/ruby-debug/interface.rb
+- cli/ruby-debug/processor.rb
+- cli/ruby-debug.rb
 test_files: []
 
 rdoc_options: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 executables: 
 - rdebug
-extensions: 
-- ext/extconf.rb
-requirements: []
+extensions: []
 
-dependencies: []
+requirements: []
 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug-base
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "0.8"
+    version: 

data/Rakefile

@@ -1,120 +0,0 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-
-SO_NAME = "ruby_debug.so"
-
-# ------- Default Package ----------
-RUBY_DEBUG_VERSION = open("ext/ruby_debug.c"){|f| f.grep(/^#define DEBUG_VERSION/).first[/"(.+)"/,1]}
-
-FILES = FileList[
-  'Rakefile',
-  'README',
-  'LICENSE',
-  'CHANGES',
-  'AUTHORS',
-  'lib/**/*',
-  'ext/*',
-  'doc/*',
-  'bin/*'
-]
-
-# Default GEM Specification
-default_spec = Gem::Specification.new do |spec|
-  spec.name = "ruby-debug"
-  
-  spec.homepage = "http://rubyforge.org/projects/ruby-debug/"
-  spec.summary = "Fast Ruby debugger"
-  spec.description = <<-EOF
-ruby-debug is a fast implementation of the standard Ruby debugger debug.rb.
-It's implemented by utilizing a new hook Ruby C API.
-EOF
-
-  spec.version = RUBY_DEBUG_VERSION
-
-  spec.author = "Kent Sibilev"
-  spec.email = "ksibilev@yahoo.com"
-  spec.platform = Gem::Platform::RUBY
-  spec.require_path = "lib" 
-  spec.bindir = "bin"
-  spec.executables = ["rdebug"]
-  spec.extensions = ["ext/extconf.rb"]
-  spec.autorequire = "ruby-debug"
-  spec.files = FILES.to_a  
-
-  spec.required_ruby_version = '>= 1.8.2'
-  spec.date = DateTime.now
-  spec.rubyforge_project = 'ruby-debug'
-  
-  # rdoc
-  spec.has_rdoc = true
-end
-
-# Rake task to build the default package
-Rake::GemPackageTask.new(default_spec) do |pkg|
-  pkg.need_tar = true
-  pkg.need_tar = true
-end
-
-task :default => [:package]
-
-# Windows specification
-win_spec = default_spec.clone
-win_spec.extensions = []
-win_spec.platform = Gem::Platform::WIN32
-win_spec.files += ["lib/#{SO_NAME}"]
-
-desc "Create Windows Gem"
-task :win32_gem do
-  # Copy the win32 extension the top level directory
-  current_dir = File.expand_path(File.dirname(__FILE__))
-  source = File.join(current_dir, "ext", "win32", SO_NAME)
-  target = File.join(current_dir, "lib", SO_NAME)
-  cp(source, target)
-
-  # Create the gem, then move it to pkg
-	Gem::Builder.new(win_spec).build
-	gem_file = "#{win_spec.name}-#{win_spec.version}-#{win_spec.platform}.gem"
-  mv(gem_file, "pkg/#{gem_file}")
-
-  # Remove win extension fro top level directory	
-	rm(target)
-end
-
-
-desc "Publish ruby-debug to RubyForge."
-task :publish do 
-  require 'rake/contrib/sshpublisher'
-  
-  # Get ruby-debug path
-  ruby_debug_path = File.expand_path(File.dirname(__FILE__))
-
-  publisher = Rake::SshDirPublisher.new("kent@rubyforge.org",
-        "/var/www/gforge-projects/ruby-debug", ruby_debug_path)
-end
-
-desc "Clear temp files"
-task :clean do
-  cd "ext" do
-    if File.exists?("Makefile")
-      sh "make clean"
-      rm "Makefile"
-    end
-  end
-end
-
-# ---------  RDoc Documentation ------
-desc "Generate rdoc documentation"
-Rake::RDocTask.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  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/**/*',
-                          'lib/**/*.rb',
-                          'ext/**/ruby_debug.c',
-                          'README',
-                          'LICENSE')
-end