stud 0.0.7 → 0.0.8

data/lib/stud/trap.rb

@@ -1,20 +1,25 @@
 module Stud
   def self.trap(signal, &block)
     @traps ||= Hash.new { |h,k| h[k] = [] }
-    @traps[signal] << block
 
-    if !@trapped
+    if !@traps.include?(signal)
+      # First trap call for this signal, tell ruby to invoke us.
       previous_trap = Signal::trap(signal) { simulate_signal(signal) }
       # If there was a previous trap (via Kernel#trap) set, make sure we remember it.
       if previous_trap.is_a?(Proc)
-        @traps[signal] << previous_trap
+        # MRI's default traps are "DEFAULT" string
+        # JRuby's default traps are Procs with a source_location of "(internal")
+        if RUBY_ENGINE != "jruby" || previous_trap.source_location.first != "(internal)"
+          @traps[signal] << previous_trap
+        end
       end
-
-      @trapped = true
     end
+
+    @traps[signal] << block
   end
 
   def self.simulate_signal(signal)
+    puts "Simulate: #{signal}"
     @traps[signal].each(&:call)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stud
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec