rudebug 0.3.0 → 0.3.1

data/COPYING

@@ -1,56 +1,56 @@
-rudebug is copyrighted free software by Florian Gross <flgr@ccan.de>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see http://www.gnu.org/licenses/gpl.html), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+rudebug is copyrighted free software by Florian Gross <flgr@ccan.de>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see http://www.gnu.org/licenses/gpl.html), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/NEWS

@@ -1,6 +1,10 @@
-= NEWS
-
-This file sums up important changes that happened between releases.
-
-== rudebug 0.3.0
-* Initial release
+= NEWS
+
+This file sums up important changes that happened between releases.
+
+== rudebug 0.3.1
+* Fixed a bug where rudebug wouldn't work with ruby-gtk2-0.14.1-1 because of a
+  fix from gtk-patch.rb
+
+== rudebug 0.3.0
+* Initial release

data/README

@@ -1,31 +1,31 @@
-= README for rudebug -- A graphical debugger for Ruby
-
-rudebug is written using Ruby-GNOME2 and Glade. It has support for local and remote debugging with ruby-debug and ruby-breakpoint. It should work fine on Windows and Linux.
-
-It has stepping stepping, a source code display, a powerful object browser and an interactive shell as well as additional integration and polish to make those components work together well.
-
-It is in an early stage and will likely remain so until I have a way of using it on Mac OS X. I don't want this to molder on my hard disk however without ever having seen a public release.
-
-With ~900 lines of actual code (excluding the glade file) it is fairly light-weight. Code quality fluctuates. Some of the code needs to be unusual because it is executed on the server and can't touch its environment, other bits could probably need some refactoring.
-
-It was developed as part of a Summer of Code 2006 project for RubyCentral Inc.
-
-
-* Dependencies: Ruby-GNOME2, rsyntax*, ruby-debug* (* = automatically installed by RubyGems)
-* Dual-licensed under GPL and Ruby's license.
-* Homepage: http://code.google.com/p/rudebug/
-* Author: Florian Gross <flgr@ccan.de>
-
-See the NEWS file for the changes that were done in this release.
-
-
-== Installation
-
-De-compress archive and enter its top directory. Then type:
-
-  ($ su)
-  # ruby setup.rb
-
-This simple step installs this program under the default location of Ruby
-libraries. You can also install files into your favorite directory by supplying
-setup.rb with some options. Try "ruby setup.rb --help".
+= README for rudebug -- A graphical debugger for Ruby
+
+rudebug is written using Ruby-GNOME2 and Glade. It has support for local and remote debugging with ruby-debug and ruby-breakpoint. It should work fine on Windows and Linux.
+
+It has stepping stepping, a source code display, a powerful object browser and an interactive shell as well as additional integration and polish to make those components work together well.
+
+It is in an early stage and will likely remain so until I have a way of using it on Mac OS X. I don't want this to molder on my hard disk however without ever having seen a public release.
+
+With ~900 lines of actual code (excluding the glade file) it is fairly light-weight. Code quality fluctuates. Some of the code needs to be unusual because it is executed on the server and can't touch its environment, other bits could probably need some refactoring.
+
+It was developed as part of a Summer of Code 2006 project for RubyCentral Inc.
+
+
+* Dependencies: Ruby-GNOME2, rsyntax*, ruby-debug* (* = automatically installed by RubyGems)
+* Dual-licensed under GPL and Ruby's license.
+* Homepage: http://code.google.com/p/rudebug/
+* Author: Florian Gross <flgr@ccan.de>
+
+See the NEWS file for the changes that were done in this release.
+
+
+== Installation
+
+De-compress archive and enter its top directory. Then type:
+
+  ($ su)
+  # ruby setup.rb
+
+This simple step installs this program under the default location of Ruby
+libraries. You can also install files into your favorite directory by supplying
+setup.rb with some options. Try "ruby setup.rb --help".

data/bin/rudebug

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift("../lib")
-require 'rudebug'
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift("../lib")
+require 'rudebug'

data/lib/rudebug/connect.rb

@@ -1,203 +1,203 @@
-require 'rudebug/connection'
-
-class RuDebug
-  attr_reader :pages
-
-  def initialize_connect()
-    @connect_dlg = @glade["connect-dialog"]
-    @connectdlg_entry = @glade["connectdlg-server-entry"]
-    @connectdlg_type = @glade["connectdlg-type-combobox"]
-    @connectdlg_btn = @glade["connectdlg-button"]
-
-    load_connect_servers()
-
-    @connect_btn = @glade["connect-button"]
-    @disconnect_btn = @glade["disconnect-button"]
-    @continue_btn = @glade["continue-button"]
-    @step_into_btn = @glade["step-into-button"]
-    @step_over_btn = @glade["step-over-button"]
-
-    @connect_menuitem = @glade["connect-menuitem"]
-    @disconnect_menuitem = @glade["disconnect-menuitem"]
-
-    @connection_status = @glade["status-label"]
-    @connect_dlg.transient_for = @window
-
-    @connect_page = @notebook.get_nth_page(0)
-    @not_connected = @connection_status.text
-    @connection = nil
-  end
-
-  def load_connect_servers()
-    default_servers = [
-      "localhost:8989",
-      "druby://localhost:42531"
-    ]
-
-    conf_servers = @config[:servers].to_ary rescue []
-    servers = (conf_servers + default_servers).uniq
-
-    servers.each do |server|
-      @connectdlg_entry.append_text(server)
-    end
-
-    @connectdlg_entry.active = 0
-  end
-
-  def save_connect_servers()
-    servers = []
-    @connectdlg_entry.model.each do |model, path, iter|
-      servers << iter[0]
-    end
-
-    @config[:servers] = servers
-  end
-
-  def on_connect_button_clicked()
-    @connect_dlg.show
-    @connectdlg_btn.grab_focus
-  end
-  alias :on_connect_activate :on_connect_button_clicked
-
-  def on_disconnect_button_clicked()
-    disconnect()
-  end
-  alias :on_disconnect_activate :on_disconnect_button_clicked
-
-  def on_connect_dialog_delete_event(dialog, event)
-    dialog.hide_on_delete
-  end
-  
-  def on_connectdlg_server_entry_changed()
-    text = @connectdlg_entry.active_text
-    @connectdlg_type.active = text[/druby/i] ? 0 : 1
-    @connectdlg_btn.sensitive = text.size > 0
-  end
-
-  def on_connectdlg_server_entry_key_press_event(server_entry, event)
-    case event.keyval
-      when Gdk::Keyval::GDK_Return then
-        on_connectdlg_button_clicked()
-      else
-        return false
-    end
-
-    return true
-  end
-
-  def on_connectdlg_button_clicked()
-    text = @connectdlg_entry.active_text
-    @connect_dlg.hide
-
-    type_text = @connectdlg_type.active_text
-
-    con_type = case type_text
-      when "ruby-breakpoint" then Connection::Breakpoint
-      when "ruby-debug" then Connection::RubyDebug
-    end
-
-    unless text[/:\d/]
-      text += ":%d" % case type_text
-        when "ruby-breakpoint" then "wtf".to_i(36) # >:)
-        when "ruby-debug" then 8989
-      end
-    end
-
-    connect_to(text, con_type)
-  end
-
-  def connect_to(server, con_type)
-    @connection_status.text = @connect_text = "Connecting to %s..." % server
-
-    @connect_thread = Thread.new do
-      begin
-        @connection = con_type.new
-        @connection.on_session = method(:on_session)
-        @connection.on_disconnect = method(:on_disconnect)
-        @connection.connect(server)
-      rescue Exception => error
-        on_failure(error)
-        sleep 2
-        retry
-      end
-    end
-
-    update_connect_buttons()
-  end
-
-  def update_connect_buttons()
-    @connect_btn.sensitive = @connect_menuitem.sensitive = !@connection
-    @disconnect_btn.sensitive = @disconnect_menuitem.sensitive = @connection
-  end
-
-  def update_session_buttons()
-    has_page = current_page()
-    @continue_btn.sensitive = has_page
-
-    stepping = @connection.stepping_support?() if @connection
-    @step_into_btn.sensitive = @step_over_btn.sensitive = stepping && has_page
-  end
-
-  def disconnect()
-    connection = @connection
-    on_disconnect()
-
-    Thread.new do
-      connection.disconnect unless connection.nil?
-
-      unless @connect_thread.nil?
-        @connect_thread.kill
-        @connect_thread = nil
-      end
-    end
-  end
-
-  def current_page()
-    active_page = @notebook.get_nth_page(@notebook.page)
-    title = @notebook.get_tab_label_text(active_page)
-    @pages[title]
-  end
-
-  def on_session(session)
-    @notebook.remove_page(0) # Remove connect page
-    @notebook.show_tabs = true
-    @pages[session.title] = Page.new(self, session)
-    update_session_buttons()
-  end
-
-  def on_disconnect()
-    @connection = nil
-    update_connect_buttons()
-    update_session_buttons()
-
-    @notebook.show_tabs = false
-    # Remove pages (session and connection)
-    # TODO: Only remove connection
-    @notebook.remove_page(0) until @notebook.n_pages == 0
-
-    @connection_status.text = @not_connected
-    @notebook.append_page(@connect_page)
-  end
-
-  def on_failure(error)
-    puts error, error.backtrace
-
-    @connection_status.text = [
-      @connect_text,
-      "Failed: %s" % error,
-      "Will reconnect..."
-    ].join("\n\n")
-  end
-
-  def on_continue_button_clicked(btn)
-    btn.sensitive = false if current_page().continue().nil?
-  end
-
-  def on_step_into_button_clicked(btn)
-    btn.sensitive = false if current_page().step_into().nil?
-  end
-
-  def on_step_over_button_clicked(btn)
-    btn.sensitive = false if current_page().step_over().nil?
-  end
-end
+require 'rudebug/connection'
+
+class RuDebug
+  attr_reader :pages
+
+  def initialize_connect()
+    @connect_dlg = @glade["connect-dialog"]
+    @connectdlg_entry = @glade["connectdlg-server-entry"]
+    @connectdlg_type = @glade["connectdlg-type-combobox"]
+    @connectdlg_btn = @glade["connectdlg-button"]
+
+    load_connect_servers()
+
+    @connect_btn = @glade["connect-button"]
+    @disconnect_btn = @glade["disconnect-button"]
+    @continue_btn = @glade["continue-button"]
+    @step_into_btn = @glade["step-into-button"]
+    @step_over_btn = @glade["step-over-button"]
+
+    @connect_menuitem = @glade["connect-menuitem"]
+    @disconnect_menuitem = @glade["disconnect-menuitem"]
+
+    @connection_status = @glade["status-label"]
+    @connect_dlg.transient_for = @window
+
+    @connect_page = @notebook.get_nth_page(0)
+    @not_connected = @connection_status.text
+    @connection = nil
+  end
+
+  def load_connect_servers()
+    default_servers = [
+      "localhost:8989",
+      "druby://localhost:42531"
+    ]
+
+    conf_servers = @config[:servers].to_ary rescue []
+    servers = (conf_servers + default_servers).uniq
+
+    servers.each do |server|
+      @connectdlg_entry.append_text(server)
+    end
+
+    @connectdlg_entry.active = 0
+  end
+
+  def save_connect_servers()
+    servers = []
+    @connectdlg_entry.model.each do |model, path, iter|
+      servers << iter[0]
+    end
+
+    @config[:servers] = servers
+  end
+
+  def on_connect_button_clicked()
+    @connect_dlg.show
+    @connectdlg_btn.grab_focus
+  end
+  alias :on_connect_activate :on_connect_button_clicked
+
+  def on_disconnect_button_clicked()
+    disconnect()
+  end
+  alias :on_disconnect_activate :on_disconnect_button_clicked
+
+  def on_connect_dialog_delete_event(dialog, event)
+    dialog.hide_on_delete
+  end
+  
+  def on_connectdlg_server_entry_changed()
+    text = @connectdlg_entry.active_text
+    @connectdlg_type.active = text[/druby/i] ? 0 : 1
+    @connectdlg_btn.sensitive = text.size > 0
+  end
+
+  def on_connectdlg_server_entry_key_press_event(server_entry, event)
+    case event.keyval
+      when Gdk::Keyval::GDK_Return then
+        on_connectdlg_button_clicked()
+      else
+        return false
+    end
+
+    return true
+  end
+
+  def on_connectdlg_button_clicked()
+    text = @connectdlg_entry.active_text
+    @connect_dlg.hide
+
+    type_text = @connectdlg_type.active_text
+
+    con_type = case type_text
+      when "ruby-breakpoint" then Connection::Breakpoint
+      when "ruby-debug" then Connection::RubyDebug
+    end
+
+    unless text[/:\d/]
+      text += ":%d" % case type_text
+        when "ruby-breakpoint" then "wtf".to_i(36) # >:)
+        when "ruby-debug" then 8989
+      end
+    end
+
+    connect_to(text, con_type)
+  end
+
+  def connect_to(server, con_type)
+    @connection_status.text = @connect_text = "Connecting to %s..." % server
+
+    @connect_thread = Thread.new do
+      begin
+        @connection = con_type.new
+        @connection.on_session = method(:on_session)
+        @connection.on_disconnect = method(:on_disconnect)
+        @connection.connect(server)
+      rescue Exception => error
+        on_failure(error)
+        sleep 2
+        retry
+      end
+    end
+
+    update_connect_buttons()
+  end
+
+  def update_connect_buttons()
+    @connect_btn.sensitive = @connect_menuitem.sensitive = !@connection
+    @disconnect_btn.sensitive = @disconnect_menuitem.sensitive = @connection
+  end
+
+  def update_session_buttons()
+    has_page = current_page()
+    @continue_btn.sensitive = has_page
+
+    stepping = @connection.stepping_support?() if @connection
+    @step_into_btn.sensitive = @step_over_btn.sensitive = stepping && has_page
+  end
+
+  def disconnect()
+    connection = @connection
+    on_disconnect()
+
+    Thread.new do
+      connection.disconnect unless connection.nil?
+
+      unless @connect_thread.nil?
+        @connect_thread.kill
+        @connect_thread = nil
+      end
+    end
+  end
+
+  def current_page()
+    active_page = @notebook.get_nth_page(@notebook.page)
+    title = @notebook.get_tab_label_text(active_page)
+    @pages[title]
+  end
+
+  def on_session(session)
+    @notebook.remove_page(0) # Remove connect page
+    @notebook.show_tabs = true
+    @pages[session.title] = Page.new(self, session)
+    update_session_buttons()
+  end
+
+  def on_disconnect()
+    @connection = nil
+    update_connect_buttons()
+    update_session_buttons()
+
+    @notebook.show_tabs = false
+    # Remove pages (session and connection)
+    # TODO: Only remove connection
+    @notebook.remove_page(0) until @notebook.n_pages == 0
+
+    @connection_status.text = @not_connected
+    @notebook.append_page(@connect_page)
+  end
+
+  def on_failure(error)
+    puts error, error.backtrace
+
+    @connection_status.text = [
+      @connect_text,
+      "Failed: %s" % error,
+      "Will reconnect..."
+    ].join("\n\n")
+  end
+
+  def on_continue_button_clicked(btn)
+    btn.sensitive = false if current_page().continue().nil?
+  end
+
+  def on_step_into_button_clicked(btn)
+    btn.sensitive = false if current_page().step_into().nil?
+  end
+
+  def on_step_over_button_clicked(btn)
+    btn.sensitive = false if current_page().step_over().nil?
+  end
+end