ileitch-hijack 0.1.5 → 0.1.6

data/README.rdoc

@@ -8,7 +8,7 @@ Hijack uses DRb over a unix socket file, so you need to be on the same machine a
 
 == WARNING
 
-Hijack is new code, I'd think twice about trying it out on your critical production systems. I'd love to get some feedback though so if you have any staging systems to try it out on then please do... ;)
+Hijack is new code, I'd think twice about trying it out on your critical production systems. I'd love to get some feedback though so if you have any development or staging systems to try it out on then please do!
 
 == Using Hijack
 
@@ -113,12 +113,12 @@ Instead of pasting your code into hijack, you can pass hijack the -e option at s
 
 == Process Output
 
-By default hijack will forward your process output to the hijack client. This can get a little messy if your trying to type and command at the same time as the target process writes to STDOUT/STDERR. You can mute and unmute the process with:
+By default hijack will forward your process output to the hijack client. This can get a little messy if your trying to write code at the same time as the target process writes to STDOUT/STDERR. You can mute and unmute the process with:
 
   >> hijack_mute
-  >> true
+  => true
   >> hijack_unmute
-  >> true
+  => true
 
 == Process Mirroring
 

data/lib/hijack/gdb.rb

@@ -15,20 +15,43 @@ module Hijack
     end
 
     def eval(cmd)
+      set_trap_pending
+      set_breakpoint
+      continue
+      clear_breakpoint
       call("(void)rb_eval_string(#{cmd.strip.gsub(/"/, '\"').inspect})")
     end
 
     def detach
-      @gdb.puts('detach')
-      wait
-      @gdb.puts('quit')
+      exec('detach')
+      exec('quit')
       @gdb.close
     end
 
   protected
+    def set_trap_pending
+      exec("set variable (int)rb_trap_pending=1")
+    end
+
+    def set_breakpoint
+      exec("break rb_trap_exec")
+    end
+
+    def clear_breakpoint
+      exec("clear rb_trap_exec")
+    end
+
+    def continue
+      exec('continue')
+    end
+
     def call(cmd)
-      puts "(gdb) call #{cmd}" if @verbose
-      @gdb.puts("call #{cmd}")
+      exec("call #{cmd}")
+    end
+
+    def exec(str)
+      puts("(gdb) #{str}")  if @verbose
+      @gdb.puts(str)
       wait
     end
 

data/test/app.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/ruby
+require 'rubygems'
+require 'sinatra'
+
+get '/' do
+    'You got it'
+end

data/test/gc.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/ruby
+
+class MyObject
+  def initialize(i)
+    @i = i
+  end
+end
+
+puts Process.pid
+n = 0
+loop do
+  (n+=1).times {|i| MyObject.new(i)}
+  GC.start
+end

data/test/test.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/ruby
+
+def do_shit(i)
+  puts i
+end
+
+p Process.pid
+
+t = Thread.new do
+  i = 0
+  loop do
+    sleep 2
+    do_shit(i+=1)
+  end
+end
+
+t.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ileitch-hijack
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ian Leitch
@@ -34,9 +34,11 @@ files:
 - lib/hijack/workspace.rb
 - examples/rails_dispatcher.rb
 - bin/hijack
+- test/app.rb
+- test/gc.rb
+- test/test.rb
 has_rdoc: true
 homepage: http://github.com/ileitch/hijack
-licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -57,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Provides an irb session to an existing ruby process.