asir 1.2.1 → 1.2.2

data/.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
 *.slides*
 .riterate
-service.fifo
+*.fifo
+*.pipe
 service.log
 example/*service.log
 example/*.out

data/ChangeLog

@@ -1,3 +1,9 @@
+2012-12-31  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.2: New Version: JRuby support.
+	* File: Support for two-way named fifo services.
+	* JRuby: JRuby tests pass.
+
 2012-12-29  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.1: New version: API changes.

data/asir.gemspec

@@ -22,15 +22,15 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [ "README.textile" ]
   s.rdoc_options = ["--charset=UTF-8"]
 
-  if RUBY_PLATFORM !~ /linux/i
-    # see lib/asir/uuid.rb
-    gem.add_dependency "uuid", "~> 2.3.6"
-  end
+  gem.add_dependency "uuid", "~> 2.3.6"
   s.add_dependency "httpclient", "~> 2.3.0"
   s.add_dependency "rack", "~> 1.4.1"
 
   s.add_development_dependency 'rake', '>= 0.9.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   s.add_development_dependency 'simplecov', '>= 0.1'
+  if (RUBY_ENGINE rescue 'UNKNOWN') =~ /jruby/i
+    s.add_development_dependency 'spoon', '>= 0.0.1'
+  end
 end
 

data/example/ex03.rb

@@ -10,9 +10,11 @@ begin
   pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com",
                              :customer => @customer)
+  sleep 1
 end
 
 # !SLIDE END
+# PENDING: RUBY_PLATFORM =~ /java/i
 # EXPECT: : client process
 # EXPECT: : Email.send_mail :pdf_invoice
 # EXPECT: : pr: nil

data/example/ex06.rb

@@ -1,11 +1,9 @@
 # !SLIDE :capture_code_output true
 # One-way, named pipe service
 
-$stderr.puts "  #{$$} at #{__FILE__}:#{__LINE__}"
-
 require 'example_helper'
 begin
-  File.unlink(service_pipe = "service.pipe") rescue nil
+  File.unlink(service_pipe = "#{__FILE__}.service.pipe") rescue nil
   Email.asir.transport = t =
     ASIR::Transport::File.new(:file => service_pipe)
   t.encoder =

data/example/ex09.rb

@@ -7,8 +7,8 @@ begin
     ASIR::Transport::TcpSocket.new(:port => 30909)
   t.encoder =
     ASIR::Coder::Marshal.new
-  t.prepare_server!
   server_process do
+    t.prepare_server!
     t.run_server!
   end
   pr Email.asir.send_email(:pdf_invoice,

data/example/ex10.rb

@@ -7,8 +7,8 @@ begin
     ASIR::Transport::TcpSocket.new(:port => 30910)
   t.encoder =
     ASIR::Coder::Marshal.new
-  t.prepare_server!
   server_process do
+    t.prepare_server!
     t.run_server!
   end
   pr Email.asir.do_raise("Raise Me!")

data/example/ex11.rb

@@ -11,7 +11,7 @@ begin
       ASIR::Transport::Broadcast.new(:transports => [
         file = ASIR::Transport::File.new(:file => service_log,
                                          :encoder => ASIR::Coder::Yaml.new(:yaml_options => { :ASCII_8BIT_ok => true })),
-        ASIR::Transport::Subprocess.new,
+        ASIR::Transport::Local.new,
       ]),
     ])
   pr Email.asir.send_email(:pdf_invoice,

data/example/ex16.rb

@@ -0,0 +1,28 @@
+# !SLIDE :capture_code_output true
+# Two-way, Named Pipe service
+
+require 'example_helper'
+begin
+  File.unlink(service_log = "#{__FILE__}.service.pipe") rescue nil
+  Email.asir.transport = t =
+    ASIR::Transport::File.new(:file => service_log, :one_way => false, :result_fifo => true)
+  t.encoder =
+    ASIR::Coder::Yaml.new(:yaml_options => { :ASCII_8BIT_ok => true })
+  server_process do
+    t.prepare_server!
+    t.run_server!
+  end
+  sleep 1
+  pr Email.asir.send_email(:pdf_invoice,
+                             :to => "user@email.com",
+                             :customer => @customer)
+ensure
+  t.close rescue nil; sleep 1; server_kill
+end
+
+# !SLIDE END
+# PENDING: RUBY_PLATFORM =~ /java/i
+# EXPECT: : client process
+# EXPECT: : server process
+# EXPECT: : Email.send_mail :pdf_invoice
+# EXPECT: : pr: :ok

data/example/ex23.rb

@@ -10,9 +10,12 @@ begin
                              :to => "user@email.com",
                              :customer => @customer) { | resp |
      pr [ :in_block, resp.result ] })
+ensure
+  sleep 1
 end
 
 # !SLIDE END
+# PENDING: RUBY_PLATFORM =~ /java/i
 # EXPECT: : client process
 # EXPECT: : Email.send_mail :pdf_invoice
 # EXPECT: : pr: nil

data/example/example_helper.rb

@@ -1,5 +1,6 @@
 # Sample client support
 #
+
 require 'rubygems'
 case RUBY_PLATFORM
 when /java/i
@@ -25,6 +26,7 @@ require 'delayed_service'
 require 'unsafe_service'
 
 require 'pp'
+require 'timeout'
 require File.expand_path('../../spec/debug_helper', __FILE__)
 
 @customer = 123
@@ -35,63 +37,47 @@ def pr result
   $stdout.puts "*** #{$$}: pr: #{PP.pp(result, '')}"
 end
 
+# Work-around lack of fork in JRuby.
+require 'asir/application'
+$asir_app = ASIR::Application.new
+$asir_app.inc = [ 'example', 'lib' ]
+$asir_server = nil
+
 def server_process &blk
-  # $stderr.puts "  at #{__FILE__}:#{__LINE__}"
-  case RUBY_PLATFORM
-  when /java/i
-    # JRuby cannot fork.
-    # So we must prevent spawn a new jruby and
-    # instruct it to only run the server blk, and not
-    # the subsequent client code.
-    # In other words, we cannot rely on how Process.fork
-    # terminates within the block.
-    if ENV['ASIR_JRUBY_SPAWNED']
-      $stderr.puts "  spawned server at #{__FILE__}:#{__LINE__}"
-      puts "*** #{$$}: server process"; $stdout.flush
-      begin
-        yield
-      rescue ::Exception => exc
-        $stderr.puts "*** #{$$}: service ERROR: #{exc.inspect}\n  #{exc.backtrace * "  \n"}"
-        raise exc
-      end
-      Process.exit!(0)
-      # dont do client, client is our parent process.
-    else
-      $stderr.puts "  spawning at #{__FILE__}:#{__LINE__}"
-      ENV['ASIR_JRUBY_SPAWNED'] = "1"
-      cmd = "ruby -I #{File.dirname(__FILE__)} -I #{File.expand_path('../../lib', __FILE__)} #{$0} #{ARGV * ' '}"
-      $stderr.puts "  cmd = #{cmd}"
-      $server_pid = Spoon.spawnp(cmd)
-      ENV.delete('ASIR_JRUBY_SPAWNED')
-      $stderr.puts "  spawned #{$server_pid} at #{__FILE__}:#{__LINE__}"
-    end
-  else
-    # $stderr.puts "  at #{__FILE__}:#{__LINE__}"
-    $server_pid = Process.fork do
-      puts "*** #{$$}: server process"; $stdout.flush
-      begin
+  $asir_server = $asir_app.spawn :server do
+    puts "*** #{$$}: server process"; $stdout.flush
+    begin
+      Timeout.timeout(20, ASIR::Error::Fatal) do
         yield
-      rescue ::Exception => exc
-        $stderr.puts "*** #{$$}: service ERROR: #{exc.inspect}\n  #{exc.backtrace * "  \n"}"
-        raise exc
       end
+    rescue ::Exception => exc
+      $stderr.puts "*** #{$$}: service ERROR: #{exc.inspect}\n  #{exc.backtrace * "  \n"}"
+      raise exc
     end
   end
-  sleep 1 # wait for server to be ready.
+  $asir_app.main do
+    $asir_server.go!
+    $server_pid = $asir_server.pid
+    sleep 1 # wait for server to be ready.
+  end
   return false # do client.
 end
 
 def server_kill
   if $server_pid
-    Process.kill 9, $server_pid
-    Process.waitpid($server_pid)
+    $asir_server.kill
   end
-rescue Errno::ESRCH
 ensure
   $server_pid = nil
 end
 
+end # class Object
+
+module Process
+  include ASIR::Client
 end
 
-puts "*** #{$$}: client process"; $stdout.flush
+unless $asir_app.in_spawn?
+  puts "*** #{$$}: client process"; $stdout.flush
+end
 

data/hack_night/solution/prob-3.rb

@@ -7,6 +7,8 @@ require 'asir/transport/subprocess'
 require 'math_service'
 MathService.send(:include, ASIR::Client)
 
+Process.exit!(0) if RUBY_PLATFORM =~ /java/i
+
 ######################################################################
 # Driver:
 

data/hack_night/solution/prob-6.rb

@@ -8,6 +8,8 @@ require 'asir/coder/marshal'
 require 'math_service'
 MathService.send(:include, ASIR::Client)
 
+Process.exit!(0) if RUBY_PLATFORM =~ /java/i
+
 port = 3001
 begin
   t = ASIR::Transport::Webrick.new(:uri => "http://localhost:#{port}/")

data/hack_night/solution/prob-7.rb

@@ -9,6 +9,8 @@ require 'asir/coder/chain'
 require 'math_service'
 MathService.send(:include, ASIR::Client)
 
+Process.exit!(0) if RUBY_PLATFORM =~ /java/i
+
 port = 3001
 begin
   t = ASIR::Transport::Webrick.new(:uri => "http://localhost:#{port}/")

data/lab/spoon_test.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'asir/application'
+require 'pp'
+
+begin
+  app = ASIR::Application.new
+  spawn = app.spawn :hello do
+    $stderr.puts "Hello from spawn #{$$}"
+  end
+  app.main do
+    $stderr.puts "Hello from main #{$$}"
+    spawn.go!
+    spawn.wait
+  end
+rescue ::Exception
+  $stderr.puts "ERROR: #{$!.inspect}\n  #{$!.backtrace * "\n  "}"
+end

data/lib/asir.rb

@@ -231,6 +231,7 @@ Asir = ASIR
 
 require "asir/version"
 require 'asir/config'
+require 'asir/system'
 require 'asir/error'
 require 'asir/log'
 require 'asir/initialization'

data/lib/asir/application.rb

@@ -0,0 +1,118 @@
+require 'asir/system'
+
+module ASIR
+  # Ugly workaround JRuby's lack of fork().
+  class Application
+    attr_accessor :inc, :verbose
+
+    def initialize
+      @inc = [ ]
+      @name_to_spawn = { }
+    end
+
+    def spawn name, &blk
+      name = name.to_sym
+      spawn = Spawn.new
+      @name_to_spawn[spawn.name = name] = spawn
+      spawn.app = self
+      spawn.blk = blk
+      spawn
+    end
+
+    class Spawn
+      attr_accessor :name, :blk, :app, :pid, :cmd, :tmp, :tmp_out
+      def verbose; app.verbose; end
+
+      def to_s
+        "#<#{self.class.name} #{name.inspect} #{@pid} >"
+      end
+
+      def go!
+        case RUBY_PLATFORM
+        when /java/i
+          @tmp = "/tmp/#{$$}.#{name}"
+          @tmp_out = "#{tmp}.out"
+          @tmp_run = "#{tmp}.run"
+          File.unlink(@tmp_out) rescue nil
+          File.unlink(@tmp_run) rescue nil
+          begin
+            require 'spoon'
+            ruby = ASIR.ruby_path
+            # ruby = "/usr/bin/ruby"
+            inc = app.inc.map{|x| "-I#{x}"}
+            @cmd = [ ruby ]
+            @cmd.concat(inc)
+            @cmd.concat([ $0, "--asir-spawn=#{name}", @tmp ])
+            $stderr.puts "#{self} cmd #{cmd * ' '}" if verbose
+            @pid = Spoon.spawnp(*cmd)
+            # Wait until started.
+            until File.exist?(@tmp_run)
+              sleep 0.1
+            end
+          ensure
+            File.unlink(@tmp_run) rescue nil
+          end
+        else
+          @pid = Process.fork(&blk)
+        end
+        @pid
+      end
+
+      def kill
+        Process.kill 9, pid
+        wait
+      end
+
+      def wait
+        # Wait until finished and collect output.
+        begin
+          Process.waitpid(pid)
+          while true
+            Process.kill(0, pid)
+            sleep 1
+          end
+        rescue Errno::ECHILD, Errno::ESRCH
+        ensure
+          $stderr.puts "Spawn #{self} finished" if verbose
+          @pid = nil
+          if tmp_out && File.exist?(tmp_out)
+            $stdout.write(File.read(tmp_out))
+            File.unlink(tmp_out)
+          end
+          @tmp_out = nil
+        end
+      end
+    end # class
+
+    def in_spawn?
+      return @in_spawn unless @in_spawn.nil?
+      @in_spawn = false
+      $stderr.puts "#{$$} ARGV = #{ARGV.inspect}" if verbose
+      if ARGV.size >= 1 and ARGV[0] =~ /^--asir-spawn=(.*)/
+        @in_spawn = $1.to_sym
+      end
+      @in_spawn
+    end
+
+    def main
+      if in_spawn?
+        begin
+          name = @in_spawn
+          if tmp = ARGV[1]
+            out = "#{tmp}.out"
+            run = "#{tmp}.run"
+            $stdout = $stderr = File.open(out, "w")
+            STDOUT.reopen($stdout); STDERR.reopen($stderr)
+            File.open(run, "w") { | fh | fh.puts $$ }
+          end
+          spawn = @name_to_spawn[name]
+          raise "#{$$} #{self} Cannot find spawn name #{name.inspect}" unless spawn
+          spawn.blk.call
+        ensure
+          Process.exit!(0)
+        end
+      end
+      yield if block_given?
+    end
+  end
+end

data/lib/asir/channel.rb

@@ -1,5 +1,6 @@
 require 'asir'
 require 'asir/retry_behavior'
+require 'thread'
 
 module ASIR
   # Generic I/O Channel abstraction.
@@ -20,6 +21,7 @@ module ASIR
     end
 
     def initialize opts = nil
+      @mutex = Mutex.new
       @on_close = ON_CLOSE
       @on_error = ON_ERROR
       # @on_retry = ON_RETRY
@@ -48,6 +50,10 @@ module ASIR
           @on_connect.call(self)
         when :retry #, exc
           exc = data
+          case exc
+          when *Error::Unrecoverable.modules
+            raise exc
+          end
           $stderr.puts "RETRY: #{n_try}: ERROR : #{data.inspect}"
           @on_retry.call(self, exc, :connect) if @on_retry
         when :failed
@@ -57,7 +63,7 @@ module ASIR
         end
       end
     end
-    
+
     # Invokes @on_close.call(self, stream).
     # On Exception, invokes @on_error.call(self, exc, :close, stream).
     def close
@@ -65,6 +71,8 @@ module ASIR
         self.stream = nil
         @on_close.call(self, stream) if @on_close
       end
+    rescue *Error::Unrecoverable.modules
+      raise
     rescue ::Exception => exc
       handle_error!(exc, :close, stream)
     end
@@ -75,6 +83,8 @@ module ASIR
       x = stream
       begin
         yield x
+      rescue *Error::Unrecoverable.modules
+        raise
       rescue ::Exception => exc
         handle_error!(exc, :with_stream, x)
       end
@@ -100,6 +110,7 @@ module ASIR
     # Returns a Thread-specific mapping, unique to this process id. 
     # Maps from Channel objects to actual stream.
     def _streams
+      @mutex.synchronize do
       streams = Thread.current[:'ASIR::Channel._streams'] ||= { }
       if  @owning_process != $$ || # child process?
           @owning_process > $$     # PIDs wrapped around?
@@ -107,6 +118,7 @@ module ASIR
         streams.clear
       end
       streams
+      end
     end
     
     # Returns the stream for this Channel, or nil.

data/lib/asir/error.rb

@@ -7,12 +7,22 @@ module ASIR
     # Unsupported Feature.
     class Unsupported < self; end
 
-    # Unimplemented Feature
+    # Unimplemented Feature.
     class Unimplemented < self; end
 
     # Requested Stop.
     class Terminate < self; end
 
+    # Unrecoverable Errors.
+    class Unrecoverable < self
+      def self.modules;    @@modules; end
+      def self.modules= x; @@modules = x; end
+      @@modules ||= [ self ]
+    end
+
+    # Fatal Errors.
+    class Fatal < Unrecoverable; end
+
     # Unforwardable Exception.
     #
     # This encapsulates an Exception that should never be
@@ -38,6 +48,7 @@ module ASIR
         ::Interrupt,
         ::SignalException,
         Error::Terminate,
+        Error::Unrecoverable,
       ]
     end
   end

data/lib/asir/fifo.rb

@@ -0,0 +1,30 @@
+module ASIR
+  # Module to create FIFO/Named Pipes.
+  module Fifo
+    begin
+      require 'ffi'
+      module LIBC
+        extend FFI::Library
+        ffi_lib FFI::Library::LIBC
+        attach_function :mkfifo, [ :string, :long ], :int
+      end
+      def mkfifo file, perms = nil
+        perms ||= 0600
+        if LIBC.mkfifo(file, perms) < 0
+          raise "mkfifo(#{file.inspect}, #{'0%o' % perms}) failed"
+        end
+        true
+      end
+    rescue ::Exception => exc
+      def mkfifo file, perms = nil
+        perms ||= 0600
+        system(cmd = "mkfifo #{file.inspect}") or raise "cannot run #{cmd.inspect}"
+        ::File.chmod(perms, file) rescue nil if perms
+        true
+      end
+    end
+    extend self
+  end
+end
+
+

data/lib/asir/retry_behavior.rb

@@ -24,7 +24,9 @@ module ASIR
         n_try += 1
         result = yield :try, n_try
         done = true
-      rescue *Error::Unforwardable.unforwardable => exc
+      rescue *Error::Unrecoverable.modules
+        raise
+      rescue *Error::Unforwardable.unforwardable
         raise
       rescue ::Exception => exc
         last_exception = exc

data/lib/asir/system.rb

@@ -0,0 +1,12 @@
+module ASIR
+  ::RUBY_ENGINE = 'UNKNOWN'.freeze unless defined? ::RUBY_ENGINE
+  def self.ruby_path
+    @@ruby_path ||=
+      begin
+        require 'rbconfig'
+        File.join(RbConfig::CONFIG["bindir"],
+             RbConfig::CONFIG["RUBY_INSTALL_NAME"] +
+             RbConfig::CONFIG["EXEEXT"]).freeze
+      end
+  end
+end

data/lib/asir/thread_pool.rb

@@ -60,9 +60,6 @@ module ASIR
               @workers << worker
             end
             worker.run!
-#          rescue ::Exception => exc
-#            log! "ERROR: #{exc.inspect}\n#{exc.backtrace * "\n"}"
-#            raise exc
           ensure
             @workers_mutex.synchronize do
               @workers.delete(worker)

data/lib/asir/transport.rb

@@ -157,6 +157,8 @@ module ASIR
       else
         nil
       end
+    rescue *Error::Unrecoverable.modules
+      raise
     rescue ::Exception => exc
       exception = original_exception = exc
       _log [ :message_error, exc ]
@@ -175,6 +177,8 @@ module ASIR
             send_result(state)
           end
         end
+      rescue *Error::Unrecoverable.modules
+        raise
       rescue ::Exception => exc
         _log [ :result_error, exc, exc.backtrace ]
         @on_exception.call(self, exc, :result, state) if @on_exception

data/lib/asir/transport/broadcast.rb

@@ -14,6 +14,8 @@ module ASIR
         transports.each do | transport |
           begin
             result = transport.send_message(state.message)
+          rescue *Error::Unrecoverable.modules
+            raise
           rescue ::Exception => exc
             first_exception ||= exc
             _handle_send_message_exception! transport, state, exc

data/lib/asir/transport/fallback.rb

@@ -14,6 +14,8 @@ module ASIR
             result = transport.send_message(state.message)
             sent = true
             break
+          rescue *Error::Unrecoverable.modules
+            raise
           rescue ::Exception => exc
             first_exception ||= exc
             _handle_send_message_exception! transport, state, exc

data/lib/asir/transport/file.rb

@@ -1,39 +1,79 @@
 require 'asir/transport/stream'
 require 'asir/transport/payload_io'
+require 'asir/fifo'
 
 module ASIR
   class Transport
     # !SLIDE
     # File Transport
     #
-    # Send Message one-way to a file.
+    # Send Message to a file.
     # Can be used as a log or named pipe service.
     class File < Stream
       include PayloadIO # _write, _read
       attr_accessor :file, :mode, :perms, :stream
+      attr_accessor :result_file, :result_fifo
 
       def initialize opts = nil; @one_way = true; super; end
 
-      # Writes a Message payload String.
+      # If not one_way, create a result_file fifo.
+      def send_message message
+        unless one_way || message.one_way
+          result_file =
+            message[:result_file] ||=
+            self.result_file ||
+            begin
+              message.create_identifier!
+              "#{self.file}-result-#{message.identifier}"
+            end
+          unless ::File.exist?(result_file) and result_fifo
+            ::ASIR::Fifo.mkfifo(result_file, perms)
+            message[:result_file_created] = true
+          end
+        end
+        super
+      ensure
+        if message[:result_file_created]
+          ::File.unlink(result_file) rescue nil
+        end
+      end
+
       def _send_message state
         _write(state.message_payload, state.out_stream || stream, state)
       ensure
         close if file && ::File.pipe?(file)
       end
 
-      # Returns a Message payload String.
       def _receive_message state
         state.message_payload = _read(state.in_stream || stream, state)
       end
 
-      # one-way; no Result.
+      # Send result to result_file.
       def _send_result state
-        nil
+        unless one_way || (message = state.message).one_way
+          if result_file = message[:result_file] || self.result_file
+            ::File.open(result_file, "a+") do | stream |
+              _write(state.result_payload, stream, state)
+            end
+          end
+        end
       end
 
-      # one-way; no Result.
+      # Receive result from result_file.
       def _receive_result state
-        nil
+        message = state.message
+        result_file = message[:result_file] || self.result_file
+        unless one_way || message.one_way
+          if result_file
+            ::File.open(result_file, "r") do | stream |
+              state.result_payload = _read(stream, state)
+            end
+          end
+        end
+      end
+
+      def needs_message_identifier? m
+        @needs_message_identifier || ! one_way || ! m.one_way
       end
 
       # !SLIDE
@@ -55,7 +95,7 @@ module ASIR
       def serve_file!
         ::File.open(file, "r") do | stream |
           @running = true
-          _serve_stream! stream, nil # One-way: no result stream.
+          _serve_stream! stream, ! one_way
         end
       end
 
@@ -64,8 +104,7 @@ module ASIR
 
       def prepare_server!
         unless ::File.exist? file
-          system(cmd = "mkfifo #{file.inspect}") or raise "cannot run #{cmd.inspect}"
-          ::File.chmod(perms, file) rescue nil if perms
+          ::ASIR::Fifo.mkfifo(file, perms)
         end
       end
       alias :prepare_pipe_server! :prepare_server!

data/lib/asir/transport/stream.rb

@@ -20,6 +20,8 @@ module ASIR
         while @running && ! stream_eof?(in_stream)
           begin
             serve_stream_message! in_stream, out_stream
+          rescue *Error::Unrecoverable.modules
+            raise
           rescue Error::Terminate => err
             @running = false
             _log [ :serve_stream_terminate, err ]

data/lib/asir/transport/webrick.rb

@@ -33,6 +33,8 @@ module ASIR
           serve_message! rq, rs
         }
         self
+      rescue *Error::Unrecoverable.modules
+        raise
       rescue ::Exception => exc
         raise Error, "Webrick Server #{uri.inspect}: #{exc.inspect}", exc.backtrace
       end

data/lib/asir/uuid.rb

@@ -50,14 +50,14 @@ module UUID
   end
   @@counter ||= 0
   @@counter_mutex = Mutex.new
-  COUNTER_UUID_REGEX = /\A[0-9]+-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\Z/i
+  COUNTER_UUID_REGEX = /\A([0-9]+)-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\Z/i
 
   # Returns a unique counter_uuid for a Thread.
   # thr defaults to Thread.current.
   def thread_uuid thr = nil
     thr ||= Thread.current
-    thr[:'ASIR::UUID.thread_uuid'] || @@thread_uuid_mutex.synchronize do
-      thr[:'ASIR::UUID.thread_uuid'] = counter_uuid
+    @@thread_uuid_mutex.synchronize do
+      thr[:'ASIR::UUID.thread_uuid'] ||= counter_uuid
     end
   end
   @@thread_uuid_mutex = Mutex.new

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/example_spec.rb

@@ -2,20 +2,30 @@ require File.expand_path('../spec_helper', __FILE__)
 
 $:.unshift File.expand_path('../../example', __FILE__)
 
+require 'timeout'
+
+class ASIR::Error::TestTimeout < ASIR::Error::Fatal; end
+
 describe "ASIR Example" do
   attr_accessor :file, :expects
 
   before(:each) do
     @expects = [ ]
+    @verbose = (ENV['SPEC_VERBOSE'] || 0).to_i
   end
 
-  after(:each) do
-    @file.should_not == nil
+  def file! file
+    @file = file
     File.open(@file) do | fh |
       until fh.eof?
         line = fh.readline
         line.chomp!
         case
+        when line.sub!(/^\s*#\s*PENDING:\s*/, '')
+          line.strip!
+          @pending_reason = line
+          @pending = ! ! (eval(line) rescue nil)
+          # $stderr.puts "  PENDING #{@pending_reason.inspect} => #{@pending.inspect}" if ENV['SPEC_VERBOSE']
         when line.sub!(/^\s*#\s*EXPECT\/:\s*/, '')
           expect Regexp.new(line)
         when line.sub!(/^\s*#\s*EXPECT!\/:\s*/, '')
@@ -27,11 +37,23 @@ describe "ASIR Example" do
         end
       end
     end
+
     @output, @exit_code = run_file!(@file)
+
+    if @pending
+      pending @pending_reason do
+        check_result!
+      end
+    else
+      check_result!
+    end
+  end
+
+  def check_result!
     @exit_code.should == 0
     @expects.empty?.should_not == true
     @expects.each do | rx, mode |
-      $stderr.puts "    Checking #{mode} #{rx.inspect}" if ENV['SPEC_VERBOSE']
+      $stderr.puts "    Checking #{mode} #{rx.inspect}" if @verbose >= 2
       case mode
       when :'=~'
         @output.should =~ rx
@@ -43,31 +65,36 @@ describe "ASIR Example" do
     end
   end
 
-  def run_file! file, output = StringIO.new('')
+  def run_file! file
+    output = nil
+    output_file = "#{file}.out"
     progname_save, stdout_save, stderr_save = $0, $stdout, $stderr
+    ruby = ASIR.ruby_path
     exc = system_exit = nil; exit_code = 0
     begin
-      if true
-        cmd = "ASIR_EXAMPLE_SILENT=1 ruby -I example -I lib #{file}"
-        $stderr.puts "\n   Running #{cmd}:" if ENV['SPEC_VERBOSE']
-        output = `#{cmd} 2>&1 | tee #{file}.out`
-      else
-        $stderr.puts "\n   Loading #{file}:" if ENV['SPEC_VERBOSE']
-        $stdout.puts "*** #{$$}: client process"; $stdout.flush
-        $stdout = $stderr = output
-        $0 = file
-        Kernel.load(file, true)
-        output = output.string if StringIO === output
+      Timeout.timeout(20, ASIR::Error::TestTimeout) do
+        cmd = "ASIR_EXAMPLE_SILENT=1 #{ruby.inspect} -I example -I lib #{file}"
+        if @verbose >= 1
+          $stderr.puts "\n  Running #{cmd}:"
+          $stderr.puts "\n    -- #{@title}" if @title
+        end
+        File.unlink(output_file) rescue nil
+        system("#{cmd} >#{output_file} 2>&1")
       end
+    rescue ASIR::Error::TestTimeout
+      $stderr.puts "  Warning: Timeout in #{@file}"
+      exit_code = 0 # OK if checks pass
     rescue ::SystemExit => system_exit
       exit_code = 1 # ???
     rescue ::Exception => exc
       exit_code = -1
     end
+    output = File.read(output_file)
     [ output, exit_code ]
   ensure
     $0, $stdout, $stderr = progname_save, stdout_save, stderr_save
-    $stderr.write output  if ENV['SPEC_VERBOSE']
+    output ||= File.read(output_file)
+    $stderr.write output if @verbose >= 1
     if exc
       stderr_save.puts "ERROR: #{file}: #{exc.inspect}\n#{exc.backtrace * "\n"}"
       raise exc
@@ -82,7 +109,8 @@ describe "ASIR Example" do
     title = File.open(file) { | fh | fh.read(4096) }
     title = title =~ /#\s+!SLIDE[^\n]*\n\s*#\s*([^\n]+)/ && $1
     it "#{file} - #{title}" do
-      @file = file
+      @title = title
+      file! file
     end
   end
 end

data/spec/yaml_spec.rb

@@ -19,16 +19,19 @@ describe "ASIR::Coder::Yaml" do
     [ :Symbol, ':Symbol' ],
   ].each do | x |
     x, str = *x
-    if x == nil and RUBY_VERSION == '1.9.2'
-      str = '!!null '
+    if x == nil
+      if RUBY_VERSION == '1.9.2'
+        str = '!!null '
+      end
     end
     str ||= x.to_s
-    str = "--- #{str}\n"
-    str << "...\n" if RUBY_VERSION !~ /^1\.8/
+    unless x == nil and RUBY_VERSION !~ /^1\.8/ and RUBY_ENGINE =~ /jruby/i
+      str = " #{str}"
+    end
     basic_objs << [ x, str ]
     it "should handle #{x.inspect}" do
       out = @enc.prepare.encode(x)
-      out.should == str
+      out.should =~ /\A---#{str} ?\n(\.\.\.\n)?\Z/
       @dec.prepare.decode(out).should == x
     end
   end
@@ -43,7 +46,7 @@ describe "ASIR::Coder::Yaml" do
     when '1.9.2'
       out.should =~ /^  :binary: |-\n/m
     else
-      out.should =~ /^  :binary: ! "\\x04/m
+      out.should =~ /^  :binary: (! )?"\\x04/m
     end
   end
 
@@ -78,6 +81,10 @@ describe "ASIR::Coder::Yaml" do
       require 'socket'
       hostname = Socket.gethostname
       enc = hostname.encoding
+      if enc.inspect != "#<Encoding:ASCII-8BIT>" # JRUBY?
+        hostname.force_encoding('ASCII-8BIT')
+        enc = hostname.encoding
+      end
       enc.inspect.should == "#<Encoding:ASCII-8BIT>"
 
       str = enc.inspect
@@ -93,7 +100,7 @@ describe "ASIR::Coder::Yaml" do
       end
 
       yaml = ::YAML.dump(str, nil, :never_binary => true)
-      yaml.should == "--- ! '#<Encoding:ASCII-8BIT>'\n"
+      yaml.should =~ /\A--- (! )?['"]\#<Encoding:ASCII-8BIT>['"]\n/
     end
 
     it 'should handle :never_binary options.' do
@@ -103,7 +110,12 @@ describe "ASIR::Coder::Yaml" do
       out = @enc.prepare.encode(str)
       case RUBY_VERSION
       when '1.9.2'
-        out.should == "--- 8bitascii\n...\n"
+        case RUBY_ENGINE
+        when /jruby/i
+          out.should == "--- 8bitascii\n"
+        else
+          out.should == "--- 8bitascii\n...\n"
+        end
       else
         out.should == "--- !binary |-\n  OGJpdGFzY2lp\n"
       end
@@ -112,7 +124,12 @@ describe "ASIR::Coder::Yaml" do
       @enc.yaml_options = { :never_binary => true }
       @dec.yaml_options = @enc.yaml_options
       out = @enc.prepare.encode(str)
-      out.should == "--- 8bitascii\n...\n"
+      case RUBY_ENGINE
+      when /jruby/i
+        out.should == "--- 8bitascii\n"
+      else
+        out.should == "--- 8bitascii\n...\n"
+      end
       inp = @dec.prepare.decode(str)
       inp.should == str
       inp.encoding.inspect.should == "#<Encoding:UTF-8>"

metadata

@@ -1,120 +1,114 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: asir
-version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 2
+  version: 1.2.2
 platform: ruby
-authors:
+authors: 
 - Kurt Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.6
+
+date: 2012-12-31 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 6
         version: 2.3.6
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
+  name: uuid
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :runtime
+  name: httpclient
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
+  name: rack
+  requirement: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  name: rake
+  requirement: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 12
+        - 0
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.1'
+  name: rspec
+  requirement: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  name: simplecov
+  requirement: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: Abstracting Services in Ruby
 email: ks.ruby@kurtstephens.com
-executables:
+executables: 
 - asir
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
-files:
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -148,6 +142,7 @@ files:
 - example/ex13.rb
 - example/ex14.rb
 - example/ex15.rb
+- example/ex16.rb
 - example/ex18.rb
 - example/ex19.rb
 - example/ex22.rb
@@ -175,8 +170,10 @@ files:
 - hack_night/solution/prob-7.rb
 - lab/const_get_speed_spec.rb
 - lab/phony_proc.rb
+- lab/spoon_test.rb
 - lib/asir.rb
 - lib/asir/additional_data.rb
+- lib/asir/application.rb
 - lib/asir/channel.rb
 - lib/asir/client.rb
 - lib/asir/code_block.rb
@@ -197,6 +194,7 @@ files:
 - lib/asir/description.rb
 - lib/asir/environment.rb
 - lib/asir/error.rb
+- lib/asir/fifo.rb
 - lib/asir/identity.rb
 - lib/asir/initialization.rb
 - lib/asir/invoker.rb
@@ -209,6 +207,7 @@ files:
 - lib/asir/poll_throttle.rb
 - lib/asir/result.rb
 - lib/asir/retry_behavior.rb
+- lib/asir/system.rb
 - lib/asir/thread_pool.rb
 - lib/asir/thread_variable.rb
 - lib/asir/transport.rb
@@ -250,32 +249,37 @@ files:
 - spec/uuid_spec.rb
 - spec/yaml_spec.rb
 - stylesheets/slides.css
+has_rdoc: true
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Abstracting Services in Ruby
-test_files:
+test_files: 
 - spec/client_spec.rb
 - spec/debug_helper.rb
 - spec/demux_spec.rb