ileitch-hijack 0.1.6 → 0.1.7

data/COPYING

@@ -0,0 +1,18 @@
+Copyright (c) 2009 Ian Leitch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,9 +1,4 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-
-spec = eval(File.read('hijack.gemspec'))
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+require 'rake'
+require 'rake/clean'
 
+Dir['tasks/**/*.rake'].each { |rake| load rake }

data/TODO

@@ -3,4 +3,3 @@
 * Improve startup experience
 * Check if attached process is in fact a ruby process
 * Require actual remote script if possible so that if it defines any classes we can dump those too.
-* (eval):211: [BUG] object allocation during garbage collection phase

data/lib/hijack/payload.rb

@@ -11,7 +11,7 @@ module Hijack
     end
 
     def self.payload(pid)
-      <<-EOS
+      <<-RUBY
         require 'stringio'
         require 'drb'
 
@@ -19,16 +19,32 @@ module Hijack
           module Hijack
             class OutputCopier
               def self.remote
-                @@remote
+                @remote
+              end
+
+              def self.stop
+                @remote = nil
+                [$stdout, $stderr].each do |io|
+                  if io.respond_to?(:write_with_copying)
+                    class << io
+                      alias_method :write, :write_without_copying
+                      remove_method :write_with_copying
+                    end
+                  end
+                end
               end
 
               def self.start(pid)
-                @@remote = DRbObject.new(nil, 'drbunix://tmp/hijack.' + pid + '.sock')
+                @remote = DRbObject.new(nil, 'drbunix://tmp/hijack.' + pid + '.sock')
 
                 class << $stdout
                   def write_with_copying(str)
                     write_without_copying(str)
-                    Hijack::OutputCopier.remote.write('stdout', str) rescue nil
+                    begin
+                      Hijack::OutputCopier.remote.write('stdout', str)
+                    rescue Exception
+                      Hijack.stop
+                    end
                   end
                   alias_method :write_without_copying, :write
                   alias_method :write, :write_with_copying
@@ -37,7 +53,11 @@ module Hijack
                 class << $stderr
                   def write_with_copying(str)
                     write_without_copying(str)
-                    Hijack::OutputCopier.remote.write('stderr', str) rescue nil
+                    begin
+                      Hijack::OutputCopier.remote.write('stderr', str)
+                    rescue Exception
+                      Hijack.stop
+                    end
                   end
                   alias_method :write_without_copying, :write
                   alias_method :write, :write_with_copying
@@ -56,6 +76,8 @@ module Hijack
                   OutputCopier.start($1)
                 elsif rb =~ /__hijack_get_remote_file_name/
                   @file
+                elsif rb =~ /__hijack_exit/
+                  Hijack.stop
                 else
                   @context.instance_eval(rb)
                 end
@@ -68,11 +90,20 @@ module Hijack
               @service = DRb.start_service('#{Hijack.socket_for(pid)}', evaluator)
               File.chmod(0600, '#{Hijack.socket_path_for(pid)}')
             end
+
+            def self.stop
+              begin
+                OutputCopier.stop
+                @service.stop_service
+                @service = nil
+              rescue Exception
+              end
+            end
           end
         end
         __hijack_context = self
         Signal.trap('USR2') { Hijack.start(__hijack_context) }
-      EOS
+      RUBY
     end
   end
 end

data/lib/hijack/workspace.rb

@@ -12,7 +12,10 @@ module Hijack
   class Workspace < IRB::WorkSpace
     attr_accessor :remote, :pid
     def evaluate(context, statements, file = __FILE__, line = __LINE__)
-      if statements =~ /(IRB\.|exit)/
+      if statements =~ /IRB\./
+        super
+      elsif statements.strip =~ /^exit/
+        remote.evaluate('__hijack_exit') rescue nil
         super
       elsif helper = Hijack::Helper.find_helper(statements)
         Hijack::Helper.send(helper, remote)

data/tasks/gem.rake

@@ -0,0 +1,41 @@
+require 'rake/gempackagetask'
+require 'yaml'
+
+HIJACK_VERSION = '0.1.7'
+
+task :clean => :clobber_package
+
+spec = Gem::Specification.new do |s|  
+  s.name                  = 'hijack'
+  s.version               = HIJACK_VERSION
+  s.platform              = Gem::Platform::RUBY
+  s.summary               = 
+  s.description           = 'Provides an irb session to an existing ruby process.'
+  s.author                = "Ian Leitch"
+  s.email                 = 'ian.leitch@systino.net'
+  s.homepage              = 'http://github.com/ileitch/hijack'
+  s.has_rdoc              = false
+  s.files                 = %w(COPYING TODO README.rdoc Rakefile) + Dir.glob("{lib,test,tasks,bin,examples}/**/*")
+  s.bindir                = "bin"
+  s.executables           = %w( hijack )
+  s.require_path          = "lib"
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
+
+namespace :gem do
+  desc "Update the gemspec for GitHub's gem server"
+  task :github do
+    File.open("hijack.gemspec", 'w') { |f| f << YAML.dump(spec) }
+  end  
+end
+
+task :install => [:clean, :clobber, :package] do
+  sh "sudo gem install pkg/#{spec.full_name}.gem"
+end
+
+task :uninstall => :clean do
+  sh "sudo gem uninstall -v #{HIJACK_VERSION} -x hijack"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ileitch-hijack
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Ian Leitch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-16 00:00:00 -07:00
+date: 2009-09-13 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,24 +19,26 @@ executables:
 - hijack
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- COPYING
+- TODO
 - README.rdoc
 - Rakefile
-- TODO
 - lib/hijack
-- lib/hijack.rb
 - lib/hijack/console.rb
 - lib/hijack/gdb.rb
 - lib/hijack/helper.rb
 - lib/hijack/payload.rb
 - lib/hijack/workspace.rb
-- examples/rails_dispatcher.rb
-- bin/hijack
+- lib/hijack.rb
 - test/app.rb
 - test/gc.rb
 - test/test.rb
+- tasks/gem.rake
+- bin/hijack
+- examples/rails_dispatcher.rb
 has_rdoc: true
 homepage: http://github.com/ileitch/hijack
 post_install_message: 
@@ -61,7 +63,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Provides an irb session to an existing ruby process.
 test_files: []