io_unblock 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+bundler_args: --without human_testing

data/Gemfile

@@ -4,12 +4,12 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-  gem 'autotest'
   gem 'minitest'
-  gem 'minitest-emoji'
 end
 
 group :human_testing do
+  gem 'autotest'
+  gem 'minitest-emoji'
   gem 'autotest-growl'
   gem 'simplecov'
 end

data/lib/io_unblock/stream.rb

@@ -24,6 +24,7 @@ module IoUnblock
     # - started: called when the IO processing has started
     # - stopped: called when the IO processing has stopped
     # - looped:  called when each time the IO processing loops
+    # - callback_failed: called when an exception is raised within a callback
     def initialize io, callbacks=nil
       @io = io
       @io_selector = [@io]
@@ -73,6 +74,13 @@ private
     def trigger_callbacks named, *args, &other
       other && other.call(*args)
       @callbacks.key?(named) && @callbacks[named].call(*args)
+    rescue Exception => ex
+      if named == :callback_failed
+        warn "Exception raised in callback_failed handler: #{ex}"
+        ex.backtrace.each { |b| warn b }
+      else
+        trigger_callbacks :callback_failed, ex, named
+      end
     end
 
     def flush_and_close

data/lib/io_unblock/version.rb

@@ -1,3 +1,3 @@
 module IoUnblock
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/io_unblock/stream_spec.rb

@@ -1,8 +1,4 @@
 require File.expand_path("../../spec_helper.rb", __FILE__)
-require 'stringio'
-require 'logger'
-
-$log = Logger.new $stdout
 
 describe IoUnblock::Stream do
   def dummy_io; @dummy_io ||= DummyIO.new; end
@@ -101,21 +97,21 @@ describe IoUnblock::Stream do
     end
 
     it "triggers started when starting" do
-      cb_stream = callback_stream(started: callback)
+      cb_stream = callback_stream(:started => callback)
       cb_stream.start
       cb_stream.stop
       called_with.must_equal [ [:start] ]
     end
 
     it "triggers stopped when stopping" do
-      cb_stream = callback_stream(stopped: callback)
+      cb_stream = callback_stream(:stopped => callback)
       cb_stream.start
       cb_stream.stop
       called_with.must_equal [ [:stop] ]
     end
 
     it "triggers looped after each read/write cycle" do
-      cb_stream = callback_stream(looped: callback)
+      cb_stream = callback_stream(:looped => callback)
       cb_stream.start
       Thread.pass while called_with.empty?
       cb_stream.stop
@@ -124,7 +120,7 @@ describe IoUnblock::Stream do
 
     it "triggers wrote when writing" do
       dummy_io.max_write = 3
-      cb_stream = callback_stream(wrote: callback)
+      cb_stream = callback_stream(:wrote => callback)
       cb_stream.start
       cb_stream.write "hello"
       cb_stream.stop
@@ -134,7 +130,7 @@ describe IoUnblock::Stream do
     it "triggers read when reading" do
       dummy_io.max_read = 3
       dummy_io.r_stream.string = 'hello'
-      cb_stream = callback_stream(read: callback)
+      cb_stream = callback_stream(:read => callback)
       cb_stream.start
       Thread.pass until dummy_io.r_stream.eof?
       cb_stream.stop
@@ -142,7 +138,7 @@ describe IoUnblock::Stream do
     end
 
     it "triggers closed when closing" do
-      cb_stream = callback_stream(closed: callback)
+      cb_stream = callback_stream(:closed => callback)
       cb_stream.start
       cb_stream.stop
       called_with.must_equal [ [] ]
@@ -150,7 +146,7 @@ describe IoUnblock::Stream do
 
     it "triggers failed when reading raises an error" do
       err = RuntimeError.new "fail"
-      cb_stream = callback_stream(failed: callback)
+      cb_stream = callback_stream(:failed => callback)
       dummy_io.raise_read = err
       cb_stream.start
       Thread.pass until cb_stream.running?
@@ -161,7 +157,7 @@ describe IoUnblock::Stream do
 
     it "triggers failed when writing raises an error" do
       err = RuntimeError.new "fail"
-      cb_stream = callback_stream(failed: callback)
+      cb_stream = callback_stream(:failed => callback)
       dummy_io.raise_write = err
       cb_stream.start
       cb_stream.write "hello"
@@ -186,7 +182,7 @@ describe IoUnblock::Stream do
     it "is not connected when failed is triggered" do
       is_connected = true
       cb_stream = callback_stream(
-        failed: lambda { |ex| is_connected = cb_stream.connected? }
+        :failed => lambda { |ex| is_connected = cb_stream.connected? }
       )
       err = RuntimeError.new "fail"
       dummy_io.raise_write = err
@@ -195,5 +191,24 @@ describe IoUnblock::Stream do
       cb_stream.stop
       is_connected.must_equal false
     end
+
+    it "triggers callback_failed when a callback raises an exception" do
+      cb_err = RuntimeError.new 'failback!'
+      cb_stream = callback_stream(:callback_failed => callback)
+      cb_stream.start
+      cb_stream.write('a test') { raise cb_err }
+      cb_stream.stop
+      called_with.must_equal [ [cb_err, :wrote] ]
+    end
+
+    it "warns when triggering callback_failed raises an exception" do
+      cb_err = RuntimeError.new 'failback!'
+      cb_stream = callback_stream(
+        :callback_failed => lambda { |*_| raise cb_err }
+      )
+      cb_stream.start
+      cb_stream.write('another test') { raise cb_err }
+      cb_stream.stop
+    end
   end
 end

data/spec/spec_helper.rb

@@ -6,8 +6,11 @@ if ENV['SCOV']
   end
 end
 
-require 'minitest/autorun'
-require 'minitest/emoji'
+begin
+  require 'minitest/autorun'
+  require 'minitest/emoji'
+rescue LoadError
+end
 require 'io_unblock'
 require 'stringio'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io_unblock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2161332520 !ruby/object:Gem::Requirement
+  requirement: &2161186640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161332520
+  version_requirements: *2161186640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161331860 !ruby/object:Gem::Requirement
+  requirement: &2161185800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161331860
+  version_requirements: *2161185800
 description: Non-blocking IO reads/writes wrapped in a thread
 email:
 - ian.eccles@gmail.com
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 files:
 - .autotest
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile