hijack 0.1.9 → 0.2.0.rc1

data/bin/hijack

@@ -11,9 +11,10 @@ new_argv.delete(pid)
 
 new_argv.options do |opts|
   opts.banner = usage
-  opts.on("--gdb-debug", "Print gdb activity to the console.") { |v| options[:gdb_debug] = true }
+  opts.on("--debug", "Enable debugging.") { |v| options[:debug] = true }
   opts.on("--mute", "Ignore stdout/stderr writes from the remote process.") { |v| options[:mute] = true }
   opts.on("-e", "--execute=FILE", String, "Execute the specified file in the remote process and then disconnect.") { |v| options[:execute] = v }
+  opts.on("--version", "Display this version of Hijack.") { |v| puts "Hijack #{Hijack.version}"; exit }
   opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
   opts.parse!
 end

data/lib/hijack/console.rb

@@ -9,13 +9,15 @@ module Hijack
       $stdout.flush
       Payload.inject(@pid)
       connect
+      check_remote_ruby_version
       $stdout.write("\b" * str.size)
       $stdout.flush
       mirror_process
       banner
       execute_file
+      setup_at_exit
       OutputReceiver.start(@remote) unless Hijack.options[:mute]
-      start_irb
+      start_irb      
     end
 
   protected
@@ -39,33 +41,6 @@ module Hijack
       @remote = DRbObject.new(nil, Hijack.socket_for(@pid))
     end
 
-    module OutputReceiver
-      class << self
-        def mute
-          @mute = true
-        end
-
-        def unmute(remote)
-          start(remote) unless @started
-          @mute = false
-        end
-
-        def write(where, str)
-          Object.const_get(where.upcase).write(str) unless @mute
-        end
-
-        def puts(where, str)
-          Object.const_get(where.upcase).puts(str) unless @mute
-        end
-
-        def start(remote)
-          DRb.start_service(Hijack.socket_for(Process.pid), self)
-          remote.evaluate("__hijack_output_receiver_ready_#{Process.pid}")
-          @started = true
-        end
-      end
-    end
-
     def mirror_process
       # Attempt to require all files currently loaded by the remote process so DRb can dump as many objects as possible.
       #
@@ -101,16 +76,16 @@ module Hijack
     end
 
     def start_irb
-      ARGV.replace ["--simple-prompt"]
+      ARGV.clear
+      IRB.conf[:PROMPT_MODE] = :SIMPLE
+      IRB.conf[:USE_READLINE] = true
       IRB.setup(nil)
       workspace = Hijack::Workspace.new
       workspace.remote = @remote
       workspace.pid = @pid
       irb = IRB::Irb.new(workspace)
-      @CONF = IRB.instance_variable_get(:@CONF)
-      @CONF[:IRB_RC].call irb.context if @CONF[:IRB_RC]
-      @CONF[:MAIN_CONTEXT] = irb.context
-      @CONF[:PROMPT_MODE] = :SIMPLE
+      IRB.conf[:IRB_RC].call irb.context if IRB.conf[:IRB_RC]
+      IRB.conf[:MAIN_CONTEXT] = irb.context
       trap('SIGINT') { irb.signal_handle }
       catch(:IRB_EXIT) { irb.eval_input }
     end
@@ -119,6 +94,23 @@ module Hijack
       script, ruby_version, platform, hijack_version = @remote.evaluate('[$0, RUBY_VERSION, RUBY_PLATFORM]')
       puts "=> Hijacked #{@pid} (#{script}) (ruby #{ruby_version} [#{platform}])"
     end
+    
+    def check_remote_ruby_version
+      # TODO: Check patch-level.
+      remote_major, remote_minor = remote_ruby_version.split('.')
+      local_major, local_minor = RUBY_VERSION.split('.')
+      if remote_minor != local_minor
+        $stderr.puts "\nWARNING: The process you are hijacking is running Ruby #{remote_ruby_version} yet you are running #{RUBY_VERSION}."
+      end
+    end
+
+    def remote_ruby_version
+      @remote_ruby_version ||= @remote.evaluate("RUBY_VERSION")
+    end
+    
+    def setup_at_exit
+      at_exit { OutputReceiver.stop }
+    end
 
     def execute_file
       if Hijack.options[:execute]

data/lib/hijack/gdb.rb

@@ -4,28 +4,11 @@ module Hijack
   class GDB
     def initialize(pid)
       @pid = pid
-      @verbose = Hijack.options[:gdb_debug]
+      @verbose = Hijack.options[:debug]
       @exec_path = File.join(Config::CONFIG['bindir'], Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT'])
       attach
     end
 
-    def ensure_attached_to_ruby_process
-      unless backtrace.any? {|line| line =~ /rb_/}
-        puts "\n=> #{@pid} doesn't appear to be a Ruby process!"
-        detach
-        exit 1
-      end
-    end
-
-    def ensure_main_thread_not_blocked_by_join
-      if backtrace.any? {|line| line =~ /rb_thread_join/}
-        puts "\n=> Unable to hijack #{@pid} because the main thread is blocked waiting for another thread to join."
-        puts "=> Check that you are using the most recent version of hijack, a newer version may have solved this shortcoming."
-        detach
-        exit 1
-      end
-    end
-
     def eval(cmd)
       call("(void)rb_eval_string(#{cmd.strip.gsub(/"/, '\"').inspect})")
     end
@@ -40,40 +23,53 @@ module Hijack
     end
 
   protected
+
     def attach
       loop do
         @gdb = IO.popen("gdb -q #{@exec_path} #{@pid} 2>&1", 'r+')
         wait
-        if backtrace.first =~ /Previous frame inner to this frame/
+        if backtrace.first =~ /previous frame inner to this frame/i
           detach
           sleep 0.1
         else
           break
         end
       end
-
-      ensure_attached_to_ruby_process
+      
+      # TODO: Check for "Unable to attach to process-id 44528: No child processes (10)"
       ensure_main_thread_not_blocked_by_join
-      set_trap_pending
       set_breakpoint
       continue
-      clear_breakpoint
+      delete_breakpoint
+    end
+    
+    def set_breakpoint
+      exec("break rb_call")
     end
 
-    def backtrace
-      @backtrace ||= exec('bt').reverse
+    def delete_breakpoint
+      exec("delete breakpoints")
     end
 
-    def set_trap_pending
-      exec("set variable (int)rb_trap_pending=1")
+    def ensure_main_thread_not_blocked_by_join
+      if backtrace.any? {|line| line =~ /rb_thread_join/}
+        puts "\n=> Unable to hijack #{@pid} because the main thread is blocked waiting for another thread to join."
+        puts "=> Check that you are using the most recent version of hijack, a newer version may have solved this shortcoming."
+        detach
+        exit 1
+      end
     end
 
-    def set_breakpoint
-      exec("break rb_trap_exec")
+    def ensure_attached_to_ruby_process
+      unless backtrace.any? {|line| line =~ /(rb|ruby)_/}
+        puts "\n=> #{@pid} doesn't appear to be a Ruby process!"
+        detach
+        exit 1
+      end
     end
 
-    def clear_breakpoint
-      exec("clear rb_trap_exec")
+    def backtrace
+      @backtrace ||= exec('bt').reverse
     end
 
     def continue

data/lib/hijack/helper.rb

@@ -2,7 +2,7 @@ module Hijack
   module Helper
     class << self
       def helpers
-        methods.find_all {|meth| meth =~ /^hijack_/}
+        methods.find_all {|meth| meth =~ /^hijack_/}.map { |meth| meth.to_s }
       end
 
       def find_helper(statements)
@@ -15,12 +15,12 @@ module Hijack
       end
 
       def hijack_mute(remote)
-        Hijack::Console::OutputReceiver.mute
+        Hijack::OutputReceiver.mute
         true
       end
 
       def hijack_unmute(remote)
-        Hijack::Console::OutputReceiver.unmute(remote)
+        Hijack::OutputReceiver.unmute
         true
       end
 
@@ -28,11 +28,11 @@ module Hijack
         hijack_mute(remote)
         require 'rubygems'
         require 'ruby-debug'
-        remote.evaluate(<<-RB)
+        remote.evaluate(<<-RUBY)
           require 'rubygems'
           require 'ruby-debug'
           Debugger.start_remote
-        RB
+        RUBY
         true
       end
 

data/lib/hijack/output_receiver.rb

@@ -0,0 +1,74 @@
+module Hijack
+  class OutputReceiver
+    attr_reader :pid
+    
+    def self.start(remote)
+      @instance = new(remote)
+      @instance.start
+    end
+    
+    def self.stop
+      @instance.stop if @instance
+    end
+
+    def self.mute
+      @instance.mute if @instance
+    end
+    
+    def self.unmute
+      @instance.unmute if @instance
+    end
+
+    def initialize(remote)
+      @remote = remote
+    end
+    
+    def start
+      @pid = fork do
+        setup_signal_traps
+        DRb.start_service(Hijack.socket_for(Process.pid), self)
+        @remote.evaluate("__hijack_output_receiver_ready_#{Process.pid}")
+        DRb.thread.join
+      end
+    end
+    
+    def stop
+      Process.kill("KILL", @pid)
+      Process.waitpid(@pid)
+    end
+    
+    def setup_signal_traps
+      Signal.trap("USR1") { @mute = true }
+      Signal.trap("USR2") { @mute = false }
+    end
+    
+    def mute
+      Process.kill("USR1", @pid)
+    end
+    
+    def unmute
+      Process.kill("USR2", @pid)
+    end
+    
+    def write(io, str)
+      return if @mute
+      get_io(io).write(str)
+    end
+    
+    def puts(io, str)
+      return if @mute
+      get_io(io).puts(str)
+    end
+
+    def get_io(io)
+      case io.to_s
+      when 'stdout'
+        $stdout
+      when 'stderr'
+        $stderr
+      else
+        raise "get_io cannot handle '#{io}'"
+      end
+    end
+  end
+end

data/lib/hijack/payload.rb

@@ -17,7 +17,9 @@ module Hijack
         require 'stringio'
         require 'drb'
 
-        unless defined?(Hijack)
+        debug = #{Hijack.options[:debug] || false}
+        if debug || !defined?(Hijack)
+          puts 'Hijack: Debugging enabled' if debug
           module Hijack
             class OutputCopier
               def self.remote
@@ -38,13 +40,15 @@ module Hijack
 
               def self.start(pid)
                 @remote = DRbObject.new(nil, 'drbunix://tmp/hijack.' + pid + '.sock')
+                puts @remote.inspect if Hijack.debug?
 
                 class << $stdout
                   def write_with_copying(str)
                     write_without_copying(str)
                     begin
                       Hijack::OutputCopier.remote.write('stdout', str)
-                    rescue Exception
+                    rescue Exception => e
+                      write_without_copying(e.message) if Hijack.debug?
                       Hijack.stop
                     end
                   end
@@ -57,7 +61,8 @@ module Hijack
                     write_without_copying(str)
                     begin
                       Hijack::OutputCopier.remote.write('stderr', str)
-                    rescue Exception
+                    rescue Exception => e
+                      write_without_copying(e.message) if Hijack.debug?
                       Hijack.stop
                     end
                   end
@@ -86,8 +91,13 @@ module Hijack
               end
             end
 
-            def self.start(context)
+            def self.debug?
+              @debug
+            end
+
+            def self.start(context, debug)
               return if @service && @service.alive?
+              @debug = debug
               evaluator = Hijack::Evaluator.new(context)
               @service = DRb.start_service('#{Hijack.socket_for(pid)}', evaluator)
               File.chmod(0600, '#{Hijack.socket_path_for(pid)}')
@@ -103,7 +113,7 @@ module Hijack
             end
           end
         end
-        Hijack.start(self)
+        Hijack.start(self, #{Hijack.options[:debug] || false})
       RUBY
     end
   end

data/lib/hijack/workspace.rb

@@ -1,20 +1,19 @@
 module Hijack
-  HijackCompletionProc = proc {|input|
+  Readline.completion_proc = Proc.new do |input|
     bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
     if helpers = Helper.helpers_like(input)
       helpers
     else
       IRB::InputCompletor::CompletionProc.call(input)
     end
-  }
-  Readline.completion_proc = HijackCompletionProc
+  end
 
   class Workspace < IRB::WorkSpace
     attr_accessor :remote, :pid
     def evaluate(context, statements, file = __FILE__, line = __LINE__)
       if statements =~ /IRB\./
         super
-      elsif statements.strip =~ /^exit/
+      elsif statements.strip =~ /^(exit|quit)/
         remote.evaluate('__hijack_exit') rescue nil
         super
       elsif helper = Hijack::Helper.find_helper(statements)
@@ -22,7 +21,7 @@ module Hijack
       else
         begin
           result = remote.evaluate(statements)
-        rescue DRb::DRbConnError
+        rescue DRb::DRbConnError => e
           puts "=> Lost connection to #{@pid}!"
           exit 1
         end

data/lib/hijack.rb

@@ -10,6 +10,7 @@ require 'hijack/gdb'
 require 'hijack/payload'
 require 'hijack/helper'
 require 'hijack/workspace'
+require 'hijack/output_receiver'
 
 module Hijack
   def self.start(pid, options)
@@ -28,4 +29,8 @@ module Hijack
   def self.socket_path_for(pid)
     "/tmp/hijack.#{pid}.sock"
   end
+  
+  def self.version
+    "0.2.0.rc1"
+  end
 end

data/test/test.rb

@@ -12,7 +12,7 @@ p Process.pid
 t = Thread.new do
   i = 0
   loop do
-    sleep 2
+    sleep 1
     do_shit(i+=1)
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hijack
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  hash: 977940574
+  segments: 
+  - 0
+  - 2
+  - 0
+  - rc1
+  version: 0.2.0.rc1
 platform: ruby
 authors: 
 - Ian Leitch
@@ -9,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -04:00
+date: 2009-09-20 14:00:00 +10:00
 default_executable: 
 dependencies: []
 
 description: Provides an irb session to an existing ruby process.
-email: ian.leitch@systino.net
+email: port001@gmail.com
 executables: 
 - hijack
 extensions: []
@@ -31,15 +37,13 @@ files:
 - lib/hijack/helper.rb
 - lib/hijack/payload.rb
 - lib/hijack/workspace.rb
+- lib/hijack/output_receiver.rb
 - lib/hijack.rb
-- lib/hijack.rbc
 - test/app.rb
 - test/gc.rb
 - test/test.rb
-- test/test.rbc
 - tasks/gem.rake
 - bin/hijack
-- bin/hijack.compiled.rbc
 - examples/rails_dispatcher.rb
 has_rdoc: true
 homepage: http://github.com/ileitch/hijack
@@ -54,18 +58,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
   version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides an irb session to an existing ruby process.