debugger 1.1.4 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.0
+* Add the ability to query the command and control port when starting remote debugging
+
 ## 1.1.4
 * Bump ruby_core_source dependency
 

data/README.md

@@ -113,13 +113,17 @@ Let's keep this working for the ruby community!
 
 ## Related projects
 
+* [debugger-completion](https://github.com/cldwalker/debugger-completion) - autocompletion for
+  debugger commands and more
 * [debugger-pry](https://github.com/pry/debugger-pry) - using pry within debugger
 * [pry-debugger](https://github.com/nixme/pry-debugger) - using debugger within pry
+* [ruby-debug-passenger](https://github.com/davejamesmiller/ruby-debug-passenger) - rake task to
+  restart Passenger with debugger connected
 
 ## Credits
 
 * Thanks to the original authors: Kent Sibilev and Mark Moseley
-* Contributors: ericpromislow, jnimety, adammck, hipe
+* Contributors: ericpromislow, jnimety, adammck, hipe, FooBarWidget
 * Fork started on awesome @relevance fridays!
 
 ## TODO

data/Rakefile

@@ -17,7 +17,8 @@ COMMON_FILES = FileList[
 
 CLI_TEST_FILE_LIST = FileList['test/lib/commands/unit/*.rb',
                               'test/lib/commands/*_test.rb',
-                              'test/lib/**/*_test.rb']
+                              'test/lib/**/*_test.rb',
+                              'test/test-remote.rb']
                               # disabled until requires fixed and tests pass
                               # 'test/test-*.rb']
 CLI_FILES = COMMON_FILES + FileList[

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.1.4'
+  VERSION = '1.2.0'
 end

data/lib/ruby-debug.rb

@@ -35,7 +35,7 @@ module Debugger
     # if the call stack is truncated.
     attr_accessor :start_sentinal
 
-    attr_reader :thread, :control_thread
+    attr_reader :thread, :control_thread, :cmd_port, :ctrl_port
 
     def interface=(value) # :nodoc:
       handler.interface = value
@@ -56,15 +56,16 @@ module Debugger
         cmd_port, ctrl_port = port, port + 1
       end
 
-      start_control(host, ctrl_port)
+      ctrl_port = start_control(host, ctrl_port)
 
       yield if block_given?
 
       mutex = Mutex.new
       proceed = ConditionVariable.new
 
+      server = TCPServer.new(host, cmd_port)
+      @cmd_port = cmd_port = server.addr[1]
       @thread = DebugThread.new do
-        server = TCPServer.new(host, cmd_port)
         while (session = server.accept)
           self.interface = RemoteInterface.new(session)
           if wait_connection
@@ -83,15 +84,17 @@ module Debugger
     alias start_server start_remote
 
     def start_control(host = nil, ctrl_port = PORT + 1) # :nodoc:
-      return if defined?(@control_thread) && @control_thread
+      return @ctrl_port if defined?(@control_thread) && @control_thread
+      server = TCPServer.new(host, ctrl_port)
+      @ctrl_port = server.addr[1]
       @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
+      @ctrl_port
     end
 
     #

data/test/test-remote.rb

@@ -0,0 +1,14 @@
+require 'test/unit'
+require 'socket'
+require 'ruby-debug'
+
+# Test Debugger.start_remote, Debugger.cmd_port and Debugger.ctrl_port
+class TestRemote < Test::Unit::TestCase
+  def test_remote
+    Debugger.start_remote('127.0.0.1', [0, 0])
+    assert_block { Debugger.ctrl_port > 0 }
+    assert_block { Debugger.cmd_port > 0 }
+    assert_nothing_raised { TCPSocket.new('127.0.0.1', Debugger.ctrl_port).close }
+    assert_nothing_raised { TCPSocket.new('127.0.0.1', Debugger.cmd_port).close }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debugger
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -366,6 +366,7 @@ files:
 - test/test-output.rb
 - test/test-quit.rb
 - test/test-raise.rb
+- test/test-remote.rb
 - test/test-save.rb
 - test/test-scope-var.rb
 - test/test-setshow.rb