pageme 0.0.2 → 0.0.3

data/README.md

@@ -81,7 +81,11 @@ You can of course enable it again:
 
 ## Known bugs
 
-Closing the pager does not work correctly in some versions of JRuby due to a bug in the Unix domain socket implementation. I've yet to pin down exactly where it's fixed (it might not be fixed in any released versions. It works in head and doesn't work in 1.6.2), but you may see that page continues to block after the pager closes. This is due to JRuby not raising an error when writing to a broken socket and there's not much I can do about it. Sorry.
+The JRuby support is a little flaky:
+
+  * Closing the pager does not work correctly in some versions of JRuby due to a bug in the Unix domain socket implementation. I've yet to pin down exactly where it's fixed (it might not be fixed in any released versions. It works in head and doesn't work in 1.6.2), but you may see that page continues to block after the pager closes. This is due to JRuby not raising an error when writing to a broken socket and there's not much I can do about it. Sorry.
+  * If the JVM has a melt down and dies without running the ensure block (e.g. because it gets SIGKILLed) your terminal can end up in a messed up state. Typing "stty echo" should fix this
+  * Similarly a JVM meltdown will sometimes leave the unix domain sockets used for communicating lying around
 
 ## Contributing
 

data/lib/pageme.rb

@@ -72,23 +72,38 @@ module PageMe
       r.close
     end
 
-    Kernel.trap("SIGINT"){ Process.kill "INT", child_pid }
+    previous_int_handler = Kernel.trap("SIGINT"){ Process.kill "INT", child_pid }
+    previous_term_handler = Kernel.trap("SIGTERM") do 
+      Process.kill "TERM", child_pid 
+      Process.wait child_pid, Process::WUNTRACED 
+      child_pid = nil
+      if previous_term_handler == "DEFAULT"
+        raise SignalException.new("SIGTERM")
+      else
+        previous_term_handler.call
+      end
+    end
 
     begin
       page_to w, args
     rescue Errno::EPIPE
     rescue Exception => e
-      unless w.closed?
-        w.puts "#{e.class}: #{e.message}"
-        e.backtrace.each{|l| w.puts "\t#{l}" }
-      end 
+      begin
+        unless w.closed?
+          w.puts "#{e.class}: #{e.message}"
+          e.backtrace.each{|l| w.puts "\t#{l}" }
+        end 
+      rescue Errno::EPIPE
+      end
+
       raise 
     ensure
       begin
         w.close unless w.closed?
       ensure
-        Process.wait child_pid
-        Kernel.trap("SIGINT", "DEFAULT")
+        Process.wait child_pid, Process::WUNTRACED  if child_pid
+        Kernel.trap("SIGINT", previous_int_handler)
+        Kernel.trap("SIGTERM", previous_term_handler)
         File.delete(t) if t
         server.close if server
       end

data/lib/pageme/version.rb

@@ -1,3 +1,3 @@
 module Pageme
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,35 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pageme
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - David R. MacIver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 +01:00
+
+date: 2012-05-01 00:00:00 +01:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: posix-spawn
-  requirement: &9034740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 3
+        - 6
         version: 0.3.6
   type: :runtime
-  prerelease: false
-  version_requirements: *9034740
+  version_requirements: *id001
 description: Methods for invoking a pager
-email:
+email: 
 - david@drmaciver.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -41,26 +55,36 @@ files:
 has_rdoc: true
 homepage: https://github.com/DRMacIver/pageme
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Trivial gem for invoking a pager for your program data
 test_files: []
+