ruby-debug-ide22 0.7.4 → 0.7.5

data/lib/ruby-debug-ide/ide_processor.rb

@@ -1,155 +1,155 @@
-require 'ruby-debug-ide/interface'
-require 'ruby-debug-ide/command'
-
-module Debugger
-  class IdeCommandProcessor
-    def initialize(interface = nil)
-      @interface = interface
-      @printer = XmlPrinter.new(@interface)
-    end
-
-    def print(*args)
-      @interface.print(*args)
-    end
-
-    def process_commands
-      unless Debugger.handler.at_line?
-        @printer.print_error "There is no thread suspended at the time and therefore no context to execute '#{input.gsub('%', '%%')}'"
-        return
-      end
-      context = Debugger.handler.context
-      file = Debugger.handler.file
-      line = Debugger.handler.line
-      state = State.new do |s|
-        s.context = context
-        s.file    = file
-        s.line    = line
-        s.binding = context.frame_binding(0)
-        s.interface = @interface
-      end
-      event_cmds = Command.commands.map{|cmd| cmd.new(state, @printer) }
-      until state.proceed? do
-        input = @interface.command_queue.pop
-        catch(:debug_error) do
-          splitter[input].each do |input|
-            # escape % since print_debug might use printf
-            @printer.print_debug "Processing in context: #{input.gsub('%', '%%')}"
-            if (cmd = event_cmds.find { |c| c.match(input) })
-              if context.dead? && cmd.class.need_context
-                @printer.print_msg "Command is unavailable\n"
-              else
-                cmd.execute
-              end
-            else
-              @printer.print_msg "Unknown command: #{input}"
-            end
-          end
-        end
-        state.restore_context
-      end
-    rescue ::Exception
-      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
-      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
-    end
-
-    def splitter
-      lambda do |str|
-        str.split(/;/).inject([]) do |m, v|
-          if m.empty?
-            m << v
-          else
-            if m.last[-1] == ?\\
-              m.last[-1,1] = ''
-              m.last << ';' << v
-            else
-              m << v
-            end
-          end
-          m
-        end
-      end
-    end    
-  end
-    
-  class IdeControlCommandProcessor < IdeCommandProcessor# :nodoc:
-    def process_commands
-      @printer.print_debug("Starting control thread")
-      ctrl_cmd_classes = Command.commands.select{|cmd| cmd.control}
-      state = ControlState.new(@interface)
-      ctrl_cmds = ctrl_cmd_classes.map{|cmd| cmd.new(state, @printer)}
-      while input = @interface.read_command
-        # escape % since print_debug might use printf
-        # sleep 0.3
-        catch(:debug_error) do
-          if cmd = ctrl_cmds.find{|c| c.match(input) }
-            @printer.print_debug "Processing in control: #{input.gsub('%', '%%')}"
-            cmd.execute
-          else
-            @interface.command_queue << input
-          end
-        end
-      end
-    rescue ::Exception
-      @printer.print_debug "INTERNAL ERROR!!! #{$!}\n" rescue nil
-      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
-      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
-    ensure
-      @interface.close
-    end
-  end
-
-  class State # :nodoc:
-
-    attr_accessor :context, :original_context
-    attr_accessor :file, :line, :binding
-    attr_accessor :frame_pos, :previous_line
-    attr_accessor :interface
-    
-    def initialize
-      @frame_pos = 0
-      @previous_line = nil
-      @proceed = false
-      yield self
-      @original_context = context
-    end
-    
-    def print(*args)
-      @interface.print(*args)
-    end
-    
-    def proceed?
-      @proceed
-    end
-    
-    def proceed
-      @proceed = true
-    end
-
-    def restore_context
-      @context = @original_context
-    end
-  end
-  
-  class ControlState # :nodoc:
-
-    def initialize(interface)
-      @interface = interface
-    end
-    
-    def proceed
-    end
-    
-    def print(*args)
-      @interface.print(*args)
-    end
-    
-    def context
-      nil
-    end
-    
-    def file
-      print "ERROR: No filename given.\n"
-      throw :debug_error
-    end
-  end
-end
+require 'ruby-debug-ide/interface'
+require 'ruby-debug-ide/command'
+
+module Debugger
+  class IdeCommandProcessor
+    def initialize(interface = nil)
+      @interface = interface
+      @printer = XmlPrinter.new(@interface)
+    end
+
+    def print(*args)
+      @interface.print(*args)
+    end
+
+    def process_commands
+      unless Debugger.handler.at_line?
+        @printer.print_error "There is no thread suspended at the time and therefore no context to execute '#{input.gsub('%', '%%')}'"
+        return
+      end
+      context = Debugger.handler.context
+      file = Debugger.handler.file
+      line = Debugger.handler.line
+      state = State.new do |s|
+        s.context = context
+        s.file    = file
+        s.line    = line
+        s.binding = context.frame_binding(0)
+        s.interface = @interface
+      end
+      event_cmds = Command.commands.map{|cmd| cmd.new(state, @printer) }
+      until state.proceed? do
+        input = @interface.command_queue.pop
+        catch(:debug_error) do
+          splitter[input].each do |input|
+            # escape % since print_debug might use printf
+            @printer.print_debug "Processing in context: #{input.gsub('%', '%%')}"
+            if (cmd = event_cmds.find { |c| c.match(input) })
+              if context.dead? && cmd.class.need_context
+                @printer.print_msg "Command is unavailable\n"
+              else
+                cmd.execute
+              end
+            else
+              @printer.print_msg "Unknown command: #{input}"
+            end
+          end
+        end
+        state.restore_context
+      end
+    rescue ::Exception
+      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+    end
+
+    def splitter
+      lambda do |str|
+        str.split(/;/).inject([]) do |m, v|
+          if m.empty?
+            m << v
+          else
+            if m.last[-1] == ?\\
+              m.last[-1,1] = ''
+              m.last << ';' << v
+            else
+              m << v
+            end
+          end
+          m
+        end
+      end
+    end    
+  end
+    
+  class IdeControlCommandProcessor < IdeCommandProcessor# :nodoc:
+    def process_commands
+      @printer.print_debug("Starting control thread")
+      ctrl_cmd_classes = Command.commands.select{|cmd| cmd.control}
+      state = ControlState.new(@interface)
+      ctrl_cmds = ctrl_cmd_classes.map{|cmd| cmd.new(state, @printer)}
+      while input = @interface.read_command
+        # escape % since print_debug might use printf
+        # sleep 0.3
+        catch(:debug_error) do
+          if cmd = ctrl_cmds.find{|c| c.match(input) }
+            @printer.print_debug "Processing in control: #{input.gsub('%', '%%')}"
+            cmd.execute
+          else
+            @interface.command_queue << input
+          end
+        end
+      end
+    rescue ::Exception
+      @printer.print_debug "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+    ensure
+      @interface.close
+    end
+  end
+
+  class State # :nodoc:
+
+    attr_accessor :context, :original_context
+    attr_accessor :file, :line, :binding
+    attr_accessor :frame_pos, :previous_line
+    attr_accessor :interface
+    
+    def initialize
+      @frame_pos = 0
+      @previous_line = nil
+      @proceed = false
+      yield self
+      @original_context = context
+    end
+    
+    def print(*args)
+      @interface.print(*args)
+    end
+    
+    def proceed?
+      @proceed
+    end
+    
+    def proceed
+      @proceed = true
+    end
+
+    def restore_context
+      @context = @original_context
+    end
+  end
+  
+  class ControlState # :nodoc:
+
+    def initialize(interface)
+      @interface = interface
+    end
+    
+    def proceed
+    end
+    
+    def print(*args)
+      @interface.print(*args)
+    end
+    
+    def context
+      nil
+    end
+    
+    def file
+      print "ERROR: No filename given.\n"
+      throw :debug_error
+    end
+  end
+end

data/lib/ruby-debug-ide/interface.rb

@@ -1,45 +1,47 @@
-require 'thread'
-
-module Debugger
-  class Interface
-  end
-
-  class LocalInterface < Interface
-  end
-
-
-  class RemoteInterface < Interface # :nodoc:
-    attr_accessor :command_queue
-
-    def initialize(socket)
-      @socket = socket
-      @command_queue = Queue.new
-    end
-    
-    def read_command
-      result = non_blocking_gets
-      raise IOError unless result
-      result.chomp
-    end
-
-    def print(*args)
-      @socket.printf(*args)
-    end
-    
-    def close
-      @socket.close
-    rescue IOError, SystemCallError
-    end
-
-    # Workaround for JRuby issue http://jira.codehaus.org/browse/JRUBY-2063
-    def non_blocking_gets
-      loop do
-        result, _, _ = IO.select( [@socket], nil, nil, 0.2 )
-        next unless result
-        return result[0].gets
-      end
-    end
-
-  end
-  
-end
+require 'thread'
+
+module Debugger
+  class Interface
+  end
+
+  class LocalInterface < Interface
+  end
+
+
+  class RemoteInterface < Interface # :nodoc:
+    attr_accessor :command_queue
+    attr_accessor :closing
+
+    def initialize(socket)
+      @socket = socket
+      @command_queue = Queue.new
+      @closing = false
+    end
+    
+    def read_command
+      result = non_blocking_gets
+      raise IOError unless result
+      result.chomp
+    end
+
+    def print(*args)
+      @socket.printf(*args) unless (@closing && ENV['DEBUGGER_KEEP_PROCESS_ALIVE'])
+    end
+    
+    def close
+      @socket.close
+    rescue IOError, SystemCallError
+    end
+
+    # Workaround for JRuby issue http://jira.codehaus.org/browse/JRUBY-2063
+    def non_blocking_gets
+      loop do
+        result, _, _ = IO.select( [@socket], nil, nil, 0.2 )
+        next unless result
+        return result[0].gets
+      end
+    end
+
+  end
+  
+end

data/lib/ruby-debug-ide/multiprocess/monkey.rb

@@ -1,47 +1,47 @@
-module Debugger
-  module MultiProcess
-    def self.create_mp_fork(private=false)
-      %Q{
-        alias pre_debugger_fork fork
-    
-        #{private ? "private" : ""}
-        def fork(*args)
-          if block_given?
-            return pre_debugger_fork{Debugger::MultiProcess::pre_child; yield}
-          end
-          result = pre_debugger_fork
-          Debugger::MultiProcess::pre_child unless result
-          result
-        end
-      }
-    end
-
-    def self.create_mp_exec(private=false)
-      %Q{
-        alias pre_debugger_exec exec
-        
-        #{private ? "private" : ""}
-        def exec(*args)
-          Debugger.interface.close
-          pre_debugger_exec(*args)
-        end
-      }
-    end
-  end
-end
-
-module Kernel
-  class << self
-    module_eval Debugger::MultiProcess.create_mp_fork
-    module_eval Debugger::MultiProcess.create_mp_exec
-  end
-  module_eval Debugger::MultiProcess.create_mp_fork(true)
-  module_eval Debugger::MultiProcess.create_mp_exec(true)
-end
-
-module Process
-  class << self
-    module_eval Debugger::MultiProcess.create_mp_fork
-    module_eval Debugger::MultiProcess.create_mp_exec
-  end
+module Debugger
+  module MultiProcess
+    def self.create_mp_fork(private=false)
+      %Q{
+        alias pre_debugger_fork fork
+    
+        #{private ? "private" : ""}
+        def fork(*args)
+          if block_given?
+            return pre_debugger_fork{Debugger::MultiProcess::pre_child; yield}
+          end
+          result = pre_debugger_fork
+          Debugger::MultiProcess::pre_child unless result
+          result
+        end
+      }
+    end
+
+    def self.create_mp_exec(private=false)
+      %Q{
+        alias pre_debugger_exec exec
+        
+        #{private ? "private" : ""}
+        def exec(*args)
+          Debugger.interface.close
+          pre_debugger_exec(*args)
+        end
+      }
+    end
+  end
+end
+
+module Kernel
+  class << self
+    module_eval Debugger::MultiProcess.create_mp_fork
+    module_eval Debugger::MultiProcess.create_mp_exec
+  end
+  module_eval Debugger::MultiProcess.create_mp_fork(true)
+  module_eval Debugger::MultiProcess.create_mp_exec(true)
+end
+
+module Process
+  class << self
+    module_eval Debugger::MultiProcess.create_mp_fork
+    module_eval Debugger::MultiProcess.create_mp_exec
+  end
 end

data/lib/ruby-debug-ide/multiprocess/pre_child.rb

@@ -1,59 +1,59 @@
-module Debugger
-  module MultiProcess
-    class << self
-      def pre_child(options = nil)
-        require 'socket'
-        require 'ostruct'
-
-        host = ENV['DEBUGGER_HOST']
-
-        options ||= OpenStruct.new(
-            'frame_bind'  => false,
-            'host'        => host,
-            'load_mode'   => false,
-            'port'        => Debugger.find_free_port(host),
-            'stop'        => false,
-            'tracing'     => false,
-            'int_handler' => true,
-            'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true'),
-            'notify_dispatcher' => true,
-            'evaluation_timeout' => 10,
-            'trace_to_s' => false,
-            'debugger_memory_limit' => 10,
-            'inspect_time_limit' => 100
-        )
-
-        if(options.ignore_port)
-          options.port = Debugger.find_free_port(options.host)
-          options.notify_dispatcher = true
-        end
-      
-        start_debugger(options)
-      end
-
-      def start_debugger(options)
-        if Debugger.started?
-          # we're in forked child, only need to restart control thread
-          Debugger.breakpoints.clear
-          Debugger.control_thread = nil
-          Debugger.start_control(options.host, options.port, options.notify_dispatcher)
-        end
-
-        if options.int_handler
-          # install interruption handler
-          trap('INT') { Debugger.interrupt_last }
-        end
-
-        # set options
-        Debugger.keep_frame_binding = options.frame_bind
-        Debugger.tracing = options.tracing
-        Debugger.evaluation_timeout = options.evaluation_timeout
-        Debugger.trace_to_s = options.trace_to_s
-        Debugger.debugger_memory_limit = options.debugger_memory_limit
-        Debugger.inspect_time_limit = options.inspect_time_limit
-        Debugger.cli_debug = options.cli_debug
-        Debugger.prepare_debugger(options)
-      end
-    end
-  end
+module Debugger
+  module MultiProcess
+    class << self
+      def pre_child(options = nil)
+        require 'socket'
+        require 'ostruct'
+
+        host = ENV['DEBUGGER_HOST']
+
+        options ||= OpenStruct.new(
+            'frame_bind'  => false,
+            'host'        => host,
+            'load_mode'   => false,
+            'port'        => Debugger.find_free_port(host),
+            'stop'        => false,
+            'tracing'     => false,
+            'int_handler' => true,
+            'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true'),
+            'notify_dispatcher' => true,
+            'evaluation_timeout' => 10,
+            'trace_to_s' => false,
+            'debugger_memory_limit' => 10,
+            'inspect_time_limit' => 100
+        )
+
+        if(options.ignore_port)
+          options.port = Debugger.find_free_port(options.host)
+          options.notify_dispatcher = true
+        end
+      
+        start_debugger(options)
+      end
+
+      def start_debugger(options)
+        if Debugger.started?
+          # we're in forked child, only need to restart control thread
+          Debugger.breakpoints.clear
+          Debugger.control_thread = nil
+          Debugger.start_control(options.host, options.port, options.notify_dispatcher)
+        end
+
+        if options.int_handler
+          # install interruption handler
+          trap('INT') { Debugger.interrupt_last }
+        end
+
+        # set options
+        Debugger.keep_frame_binding = options.frame_bind
+        Debugger.tracing = options.tracing
+        Debugger.evaluation_timeout = options.evaluation_timeout
+        Debugger.trace_to_s = options.trace_to_s
+        Debugger.debugger_memory_limit = options.debugger_memory_limit
+        Debugger.inspect_time_limit = options.inspect_time_limit
+        Debugger.cli_debug = options.cli_debug
+        Debugger.prepare_debugger(options)
+      end
+    end
+  end
 end

data/lib/ruby-debug-ide/multiprocess/starter.rb

@@ -1,11 +1,11 @@
-if ENV['IDE_PROCESS_DISPATCHER']
-  require 'rubygems'
-  ENV['DEBUGGER_STORED_RUBYLIB'].split(File::PATH_SEPARATOR).each do |path|
-    next unless path =~ /ruby-debug-ide|ruby-debug-base|linecache|debase/
-    $LOAD_PATH << path
-  end
-  require 'ruby-debug-ide'
-  require 'ruby-debug-ide/multiprocess'
-  Debugger::MultiProcess::do_monkey
-  Debugger::MultiProcess::pre_child
+if ENV['IDE_PROCESS_DISPATCHER']
+  require 'rubygems'
+  ENV['DEBUGGER_STORED_RUBYLIB'].split(File::PATH_SEPARATOR).each do |path|
+    next unless path =~ /ruby-debug-ide|ruby-debug-base|linecache|debase/
+    $LOAD_PATH << path
+  end
+  require 'ruby-debug-ide'
+  require 'ruby-debug-ide/multiprocess'
+  Debugger::MultiProcess::do_monkey
+  Debugger::MultiProcess::pre_child
 end