ruby-debug-ide22 0.7.4 → 0.7.5

data/lib/ruby-debug-ide/attach/util.rb

@@ -1,115 +1,115 @@
-require 'ruby-debug-ide/attach/lldb'
-require 'ruby-debug-ide/attach/gdb'
-require 'socket'
-require 'set'
-
-def attach_and_return_thread(options, pid, debugger_loader_path, argv)
-  Thread.new(argv) do |argv|
-
-    debugger = choose_debugger(options.ruby_path, pid, options.gems_to_include, debugger_loader_path, argv)
-
-    trap('INT') do
-      unless debugger.exited?
-        $stderr.puts "backtraces for threads:\n\n"
-        process_threads = debugger.process_threads
-        if process_threads
-          process_threads.each do |thread|
-            $stderr.puts "#{thread.thread_info}\n#{thread.last_bt}\n\n"
-          end
-        end
-        debugger.exit
-      end
-      exit!
-    end
-
-    debugger.attach_to_process
-    debugger.set_flags
-
-    if debugger.check_already_under_debug
-      $stderr.puts "Process #{debugger.pid} is already under debug"
-      debugger.exit
-      exit!
-    end
-
-    should_check_threads_state = true
-
-    while should_check_threads_state
-      should_check_threads_state = false
-      debugger.update_threads.each do |thread|
-        thread.switch
-        while thread.need_finish_frame
-          should_check_threads_state = true
-          thread.finish
-        end
-      end
-    end
-
-    debugger.wait_line_event
-    debugger.load_debugger
-    debugger.exit
-  end
-end
-
-def get_child_pids(pid)
-  return [] unless command_exists 'pgrep'
-
-  pids = Array.new
-
-  q = Queue.new
-  q.push(pid)
-
-  until q.empty? do
-    pid = q.pop
-
-    pipe = IO.popen("pgrep -P #{pid}")
-
-    pipe.readlines.each do |child|
-      child_pid = child.strip.to_i
-      q.push(child_pid)
-      pids << child_pid
-    end
-  end
-
-  filter_ruby_processes(pids)
-end
-
-def filter_ruby_processes(pids)
-  pipe = IO.popen(%Q(lsof -c ruby | awk '{print $2 ":" $9}' | grep -E 'bin/ruby([[:digit:]]+\.?)*$'))
-
-  ruby_processes = Set.new
-
-  pipe.readlines.each do |process|
-    pid = process.split(/:/).first
-    ruby_processes.add(pid.to_i)
-  end
-
-  ruby_processes_pids, non_ruby_processes_pids = pids.partition {|pid| ruby_processes.include? pid}
-
-  DebugPrinter.print_debug("The following child processes was added to attach: #{ruby_processes_pids.join(', ')}") unless ruby_processes_pids.empty?
-  DebugPrinter.print_debug("The following child are not ruby processes: #{non_ruby_processes_pids.join(', ')}") unless non_ruby_processes_pids.empty?
-
-  ruby_processes_pids
-end
-
-def command_exists(command)
-  checking_command = "checking command #{command} for existence\n"
-  `command -v #{command} >/dev/null 2>&1 || { exit 1; }`
-  if $?.exitstatus != 0
-    DebugPrinter.print_debug("#{checking_command}command does not exist.")
-  else
-    DebugPrinter.print_debug("#{checking_command}command does exist.")
-  end
-  $?.exitstatus == 0
-end
-
-def choose_debugger(ruby_path, pid, gems_to_include, debugger_loader_path, argv)
-  if command_exists(LLDB.to_s)
-    debugger = LLDB.new(ruby_path, pid, '--no-lldbinit', gems_to_include, debugger_loader_path, argv)
-  elsif command_exists(GDB.to_s)
-    debugger = GDB.new(ruby_path, pid, '-nh -nx', gems_to_include, debugger_loader_path, argv)
-  else
-    raise 'Neither gdb nor lldb was found. Aborting.'
-  end
-
-  debugger
+require 'ruby-debug-ide/attach/lldb'
+require 'ruby-debug-ide/attach/gdb'
+require 'socket'
+require 'set'
+
+def attach_and_return_thread(options, pid, debugger_loader_path, argv)
+  Thread.new(argv) do |argv|
+
+    debugger = choose_debugger(options.ruby_path, pid, options.gems_to_include, debugger_loader_path, argv)
+
+    trap('INT') do
+      unless debugger.exited?
+        $stderr.puts "backtraces for threads:\n\n"
+        process_threads = debugger.process_threads
+        if process_threads
+          process_threads.each do |thread|
+            $stderr.puts "#{thread.thread_info}\n#{thread.last_bt}\n\n"
+          end
+        end
+        debugger.exit
+      end
+      exit!
+    end
+
+    debugger.attach_to_process
+    debugger.set_flags
+
+    if debugger.check_already_under_debug
+      $stderr.puts "Process #{debugger.pid} is already under debug"
+      debugger.exit
+      exit!
+    end
+
+    should_check_threads_state = true
+
+    while should_check_threads_state
+      should_check_threads_state = false
+      debugger.update_threads.each do |thread|
+        thread.switch
+        while thread.need_finish_frame
+          should_check_threads_state = true
+          thread.finish
+        end
+      end
+    end
+
+    debugger.wait_line_event
+    debugger.load_debugger
+    debugger.exit
+  end
+end
+
+def get_child_pids(pid)
+  return [] unless command_exists 'pgrep'
+
+  pids = Array.new
+
+  q = Queue.new
+  q.push(pid)
+
+  until q.empty? do
+    pid = q.pop
+
+    pipe = IO.popen("pgrep -P #{pid}")
+
+    pipe.readlines.each do |child|
+      child_pid = child.strip.to_i
+      q.push(child_pid)
+      pids << child_pid
+    end
+  end
+
+  filter_ruby_processes(pids)
+end
+
+def filter_ruby_processes(pids)
+  pipe = IO.popen(%Q(lsof -c ruby | awk '{print $2 ":" $9}' | grep -E 'bin/ruby([[:digit:]]+\.?)*$'))
+
+  ruby_processes = Set.new
+
+  pipe.readlines.each do |process|
+    pid = process.split(/:/).first
+    ruby_processes.add(pid.to_i)
+  end
+
+  ruby_processes_pids, non_ruby_processes_pids = pids.partition {|pid| ruby_processes.include? pid}
+
+  DebugPrinter.print_debug("The following child processes was added to attach: #{ruby_processes_pids.join(', ')}") unless ruby_processes_pids.empty?
+  DebugPrinter.print_debug("The following child are not ruby processes: #{non_ruby_processes_pids.join(', ')}") unless non_ruby_processes_pids.empty?
+
+  ruby_processes_pids
+end
+
+def command_exists(command)
+  checking_command = "checking command #{command} for existence\n"
+  `command -v #{command} >/dev/null 2>&1 || { exit 1; }`
+  if $?.exitstatus != 0
+    DebugPrinter.print_debug("#{checking_command}command does not exist.")
+  else
+    DebugPrinter.print_debug("#{checking_command}command does exist.")
+  end
+  $?.exitstatus == 0
+end
+
+def choose_debugger(ruby_path, pid, gems_to_include, debugger_loader_path, argv)
+  if command_exists(LLDB.to_s)
+    debugger = LLDB.new(ruby_path, pid, '--no-lldbinit', gems_to_include, debugger_loader_path, argv)
+  elsif command_exists(GDB.to_s)
+    debugger = GDB.new(ruby_path, pid, '-nh -nx', gems_to_include, debugger_loader_path, argv)
+  else
+    raise 'Neither gdb nor lldb was found. Aborting.'
+  end
+
+  debugger
 end

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

@@ -1,187 +1,187 @@
-if RUBY_VERSION < '2.0' || defined?(JRUBY_VERSION)
-  require 'ruby-debug-base'
-else
-  require 'debase'
-end
-
-require 'ruby-debug-ide/thread_alias'
-require 'ruby-debug-ide/helper'
-require 'delegate'
-
-module Debugger
-
-  class Command < SimpleDelegator # :nodoc:
-    SubcmdStruct=Struct.new(:name, :min, :short_help, :long_help) unless
-      defined?(SubcmdStruct)
-
-    # Find param in subcmds. param id downcased and can be abbreviated
-    # to the minimum length listed in the subcommands
-    def find(subcmds, param)
-      param.downcase!
-      for try_subcmd in subcmds do
-        if (param.size >= try_subcmd.min) and
-            (try_subcmd.name[0..param.size-1] == param)
-          return try_subcmd
-        end
-      end
-      return nil
-    end
-
-    class << self
-      def commands
-        @commands ||= []
-      end
-      
-      DEF_OPTIONS = {
-        :event => true, 
-        :control => false, 
-        :unknown => false,
-        :need_context => false,
-      }
-      
-      def inherited(klass)
-        DEF_OPTIONS.each do |o, v|
-          klass.options[o] = v if klass.options[o].nil?
-        end
-        commands << klass
-      end 
-
-      def load_commands
-        dir = File.dirname(__FILE__)
-        Dir[File.join(dir, 'commands', '*')].each do |file|
-          require file if file =~ /\.rb$/
-        end
-        Debugger.constants.grep(/Functions$/).map { |name| Debugger.const_get(name) }.each do |mod|
-          include mod
-        end
-      end
-      
-      def method_missing(meth, *args, &block)
-        if meth.to_s =~ /^(.+?)=$/
-          @options[$1.intern] = args.first
-        else
-          if @options.has_key?(meth)
-            @options[meth]
-          else
-            super
-          end
-        end
-      end
-      
-      def options
-        @options ||= {}
-      end
-
-      def unescape_incoming(str)
-        str.gsub(/((?:^|[^\\])(?:\\\\)*)((?:\\n)+)/) do |_|
-          $1 + "\n" * ($2.size / 2)
-        end.gsub(/\\\\/, '\\')
-      end
-
-      def file_filter_supported?
-        defined?(Debugger.file_filter)
-      end
-    end
-    
-    def initialize(state, printer)
-      @state, @printer = state, printer
-      super @printer
-    end
-    
-    def match(input)
-      @match = regexp.match(input)
-    end
-
-    protected
-
-    def errmsg(*args)
-      @printer.print_error(*args)
-    end
-
-    def print(*args)
-      @state.print(*args)
-    end
-
-    # see Timeout::timeout, the difference is that we must use a DebugThread
-    # because every other thread would be halted when the event hook is reached
-    # in ruby-debug.c
-    def timeout(sec)
-      return yield if sec == nil or sec.zero?
-      if Thread.respond_to?(:critical) and Thread.critical
-        raise ThreadError, "timeout within critical session"      
-      end
-      begin
-        x = Thread.current
-        y = DebugThread.start {
-          sleep sec
-          x.raise StandardError, "Timeout: evaluation took longer than #{sec} seconds." if x.alive?
-        }
-        yield sec
-      ensure
-        y.kill if y and y.alive?
-      end
-    end
-
-    def debug_eval(str, b = get_binding)
-      begin
-        str = str.to_s
-        str.force_encoding('UTF-8') if(RUBY_VERSION >= '2.0')
-        to_inspect = Command.unescape_incoming(str)
-        max_time = Debugger.evaluation_timeout
-        @printer.print_debug("Evaluating %s with timeout after %i sec", str, max_time)
-
-        Debugger::TimeoutHandler.do_thread_alias
-
-        eval_result = nil
-
-        timeout(max_time) do
-          eval_result = eval(to_inspect, b)
-        end
-
-        Debugger::TimeoutHandler.undo_thread_alias
-
-        return eval_result
-      rescue StandardError, ScriptError => e
-        @printer.print_exception(e, @state.binding) 
-        throw :debug_error
-      end
-    end
-
-    def debug_silent_eval(str)
-      begin
-        str = str.to_s
-        eval(str, get_binding)
-      rescue StandardError, ScriptError
-        nil
-      end
-    end
-    
-    def get_binding
-      @state.context.frame_binding(@state.frame_pos)
-    end
-
-    def line_at(file, line)
-      Debugger.line_at(file, line)
-    end
-
-    def get_context(thnum)
-      Debugger.contexts.find{|c| c.thnum == thnum}
-    end
-
-    def realpath(filename)
-      is_dir = filename.end_with?(File::SEPARATOR)
-      if filename.index(File::SEPARATOR) || File::ALT_SEPARATOR && filename.index(File::ALT_SEPARATOR)
-        filename = File.expand_path(filename)
-      end
-      if (RUBY_VERSION < '1.9') || (RbConfig::CONFIG['host_os'] =~ /mswin/)
-        filename
-      else
-        filename = File.realpath(filename) rescue filename
-        filename = filename + File::SEPARATOR if is_dir && !filename.end_with?(File::SEPARATOR)
-        filename
-      end
-    end
-  end
-  
-  Command.load_commands
-end
+if RUBY_VERSION < '2.0' || defined?(JRUBY_VERSION)
+  require 'ruby-debug-base'
+else
+  require 'debase'
+end
+
+require 'ruby-debug-ide/thread_alias'
+require 'ruby-debug-ide/helper'
+require 'delegate'
+
+module Debugger
+
+  class Command < SimpleDelegator # :nodoc:
+    SubcmdStruct=Struct.new(:name, :min, :short_help, :long_help) unless
+      defined?(SubcmdStruct)
+
+    # Find param in subcmds. param id downcased and can be abbreviated
+    # to the minimum length listed in the subcommands
+    def find(subcmds, param)
+      param.downcase!
+      for try_subcmd in subcmds do
+        if (param.size >= try_subcmd.min) and
+            (try_subcmd.name[0..param.size-1] == param)
+          return try_subcmd
+        end
+      end
+      return nil
+    end
+
+    class << self
+      def commands
+        @commands ||= []
+      end
+      
+      DEF_OPTIONS = {
+        :event => true, 
+        :control => false, 
+        :unknown => false,
+        :need_context => false,
+      }
+      
+      def inherited(klass)
+        DEF_OPTIONS.each do |o, v|
+          klass.options[o] = v if klass.options[o].nil?
+        end
+        commands << klass
+      end 
+
+      def load_commands
+        dir = File.dirname(__FILE__)
+        Dir[File.join(dir, 'commands', '*')].each do |file|
+          require file if file =~ /\.rb$/
+        end
+        Debugger.constants.grep(/Functions$/).map { |name| Debugger.const_get(name) }.each do |mod|
+          include mod
+        end
+      end
+      
+      def method_missing(meth, *args, &block)
+        if meth.to_s =~ /^(.+?)=$/
+          @options[$1.intern] = args.first
+        else
+          if @options.has_key?(meth)
+            @options[meth]
+          else
+            super
+          end
+        end
+      end
+      
+      def options
+        @options ||= {}
+      end
+
+      def unescape_incoming(str)
+        str.gsub(/((?:^|[^\\])(?:\\\\)*)((?:\\n)+)/) do |_|
+          $1 + "\n" * ($2.size / 2)
+        end.gsub(/\\\\/, '\\')
+      end
+
+      def file_filter_supported?
+        defined?(Debugger.file_filter)
+      end
+    end
+    
+    def initialize(state, printer)
+      @state, @printer = state, printer
+      super @printer
+    end
+    
+    def match(input)
+      @match = regexp.match(input)
+    end
+
+    protected
+
+    def errmsg(*args)
+      @printer.print_error(*args)
+    end
+
+    def print(*args)
+      @state.print(*args)
+    end
+
+    # see Timeout::timeout, the difference is that we must use a DebugThread
+    # because every other thread would be halted when the event hook is reached
+    # in ruby-debug.c
+    def timeout(sec)
+      return yield if sec == nil or sec.zero?
+      if Thread.respond_to?(:critical) and Thread.critical
+        raise ThreadError, "timeout within critical session"      
+      end
+      begin
+        x = Thread.current
+        y = DebugThread.start {
+          sleep sec
+          x.raise StandardError, "Timeout: evaluation took longer than #{sec} seconds." if x.alive?
+        }
+        yield sec
+      ensure
+        y.kill if y and y.alive?
+      end
+    end
+
+    def debug_eval(str, b = get_binding)
+      begin
+        str = str.to_s
+        str.force_encoding('UTF-8') if(RUBY_VERSION >= '2.0')
+        to_inspect = Command.unescape_incoming(str)
+        max_time = Debugger.evaluation_timeout
+        @printer.print_debug("Evaluating %s with timeout after %i sec", str, max_time)
+
+        Debugger::TimeoutHandler.do_thread_alias
+
+        eval_result = nil
+
+        timeout(max_time) do
+          eval_result = eval(to_inspect, b)
+        end
+
+        Debugger::TimeoutHandler.undo_thread_alias
+
+        return eval_result
+      rescue StandardError, ScriptError => e
+        @printer.print_exception(e, @state.binding) 
+        throw :debug_error
+      end
+    end
+
+    def debug_silent_eval(str)
+      begin
+        str = str.to_s
+        eval(str, get_binding)
+      rescue StandardError, ScriptError
+        nil
+      end
+    end
+    
+    def get_binding
+      @state.context.frame_binding(@state.frame_pos)
+    end
+
+    def line_at(file, line)
+      Debugger.line_at(file, line)
+    end
+
+    def get_context(thnum)
+      Debugger.contexts.find{|c| c.thnum == thnum}
+    end
+
+    def realpath(filename)
+      is_dir = filename.end_with?(File::SEPARATOR)
+      if filename.index(File::SEPARATOR) || File::ALT_SEPARATOR && filename.index(File::ALT_SEPARATOR)
+        filename = File.expand_path(filename)
+      end
+      if (RUBY_VERSION < '1.9') || (RbConfig::CONFIG['host_os'] =~ /mswin/)
+        filename
+      else
+        filename = File.realpath(filename) rescue filename
+        filename = filename + File::SEPARATOR if is_dir && !filename.end_with?(File::SEPARATOR)
+        filename
+      end
+    end
+  end
+  
+  Command.load_commands
+end