asir 1.0.1 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.4

data/asir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asir}
-  s.version = "1.0.1"
+  s.version = "1.0.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kurt Stephens"]
   s.date = %q{2012-04-03}
@@ -20,6 +20,14 @@ Gem::Specification.new do |s|
   s.summary = %q{Abstracting Services in Ruby}
   s.test_files = `git ls-files spec`.split("\n")
 
+  s.add_dependency "uuid", "~> 2.3.5"
+  s.add_dependency "redis", "~> 3.0.2"
+  s.add_dependency "resque", "~> 1.23.0"
+  s.add_dependency "httpclient", "~> 2.3.0"
+  s.add_dependency "libxml-ruby", "~> 2.3.3"
+  s.add_dependency "rack", "~> 1.4.1"
+  s.add_dependency "zmq", "~> 2.1.4"
+
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3

data/lib/asir/error.rb

@@ -31,7 +31,14 @@ module ASIR
       end
       def self.unforwardable;    @@unforwardable; end
       def self.unforwardable= x; @@unforwardable = x; end
-      @@unforwardable ||= [ ::SystemExit, ::Interrupt, ::SignalException ]
+      @@unforwardable ||= [
+        ::SystemExit,
+        ::SystemStackError,
+        ::NoMemoryError,
+        ::Interrupt,
+        ::SignalException,
+        Error::Terminate,
+      ]
     end
   end
 end

data/lib/asir/result.rb

@@ -34,6 +34,12 @@ module ASIR
     def invoke!
       raise resolve_object(@exception_class), @exception_message, @exception_backtrace
     end
+
+    def construct!
+      invoke!
+    rescue ::Exception => exc
+      exc
+    end
   end
   # !SLIDE END
 end

data/lib/asir/transport.rb

@@ -37,17 +37,14 @@ module ASIR
     # Transport#receive_message
     # Receive Message payload from stream.
     def receive_message stream
+      # $stderr.puts "  #{$$} #{self} receive_message #{stream}"
       @message_count ||= 0; @message_count += 1
       additional_data = { }
       if req_and_state = _receive_message(stream, additional_data)
         message = req_and_state[0] = encoder.dup.decode(req_and_state.first)
         message.additional_data!.update(additional_data) if message
         if @after_receive_message
-          begin
-            @after_receive_message.call(self, message)
-          rescue ::Exception => exc
-            _log { [ :receive_message, :after_receive_message, :exception, exc ] }
-          end
+          @after_receive_message.call(self, message)
         end
       end
       req_and_state

data/lib/asir/transport/beanstalk.rb

@@ -60,6 +60,7 @@ module ASIR
             _log { [ :_receive_message, :exception, exc ] }
             additional_data[:beanstalk_error] = exc
             channel.close
+            raise exc
           end
         end
       end

data/lib/asir/transport/broadcast.rb

@@ -17,12 +17,11 @@ module ASIR
           rescue ::Exception => exc
             first_exception ||= exc
             _handle_send_message_exception! transport, message, exc
-            raise unless @continue_on_exception
+            raise exc unless @continue_on_exception
           end
         end
         if first_exception && @reraise_first_exception
-          $! = first_exception
-          raise
+          raise first_exception
         end
         result
       end

data/lib/asir/transport/conduit.rb

@@ -23,9 +23,10 @@ module Asir
         self
       end
 
-      def stop_conduit!
+      def stop_conduit! opts = nil
         if @conduit_pid
-          ::Process.kill 'TERM', @conduit_pid
+          _log { "stop_conduit! #{self} pid=#{@conduit_pid.inspect}" } if @verbose >= 1
+          ::Process.kill( (opts && opts[:signal]) || 'TERM', @conduit_pid)
           ::Process.waitpid @conduit_pid
           # File.unlink @redis_conf
         end

data/lib/asir/transport/fallback.rb

@@ -21,8 +21,7 @@ module ASIR
         end
         unless sent
           if first_exception && @reraise_first_exception
-            $! = first_exception
-            raise
+            raise first_exception
           end
           raise FallbackError, "fallback failed"
         end

data/lib/asir/transport/resque.rb

@@ -16,10 +16,6 @@ module ASIR
         @scheme_default = 'redis'.freeze
         super
         self.one_way = true
-        # Reraise exception, let Resque::Worker handle it.
-        @on_exeception ||= lambda do | trans, exc, type, message |
-          raise exc, exc.backtrace
-        end
       end
 
       # !SLIDE
@@ -34,6 +30,7 @@ module ASIR
       # !SLIDE
       # Resque server (worker).
       def _server!
+        # $stderr.puts "  #{$$} #{self} _server!"
         resque_connect!
         resque_worker
       rescue ::Exception => exc
@@ -52,7 +49,7 @@ module ASIR
 
       def _send_message message, message_payload
         stream.with_stream! do | io |  # Force connect
-          $stderr.puts "  #{self} _send_message #{message_payload.inspect} to queue=#{queue.inspect} as #{self.class} :process_job" if @verbose >= 2
+          $stderr.puts "  #{$$} #{self} _send_message #{message_payload.inspect} to queue=#{queue.inspect} as #{self.class} :process_job" if @verbose >= 2
           ::Resque.enqueue_to(queue, self.class, message_payload)
         end
       end
@@ -107,9 +104,9 @@ module ASIR
         save = Thread.current[:asir_transport_resque_instance]
         Thread.current[:asir_transport_resque_instance] = self
         poll_throttle throttle do
-          # $stderr.puts "  #{self} resque_worker = #{resque_worker} on queues #{resque_worker.queues}"
+          $stderr.puts "  #{$$} #{self} serve_stream_message!: resque_worker = #{resque_worker} on queues #{resque_worker.queues}" if @verbose >= 3
           if job = resque_worker.reserve
-            $stderr.puts "  #{self} serve_stream_message! job=#{job.class}:#{job.inspect}" if @verbose >= 2
+            $stderr.puts "  #{$$} #{self} serve_stream_message! job=#{job.class}:#{job.inspect}" if @verbose >= 2
             resque_worker.process(job)
           end
           job
@@ -128,7 +125,7 @@ module ASIR
       end
 
       def _receive_message payload, additional_data # is actual payload
-        # $stderr.puts "  #{self} _receive_message payload=#{payload.inspect}"
+        # $stderr.puts "  #{$$} #{self} _receive_message payload=#{payload.inspect}"
         [ payload, nil ]
       end
 
@@ -145,12 +142,13 @@ module ASIR
       end
 
       def resque_connect!
+        @redis_config = {
+          :host => host,
+          :port => port,
+          :thread_safe => true,
+        }
         @redis =
-          ::Redis.new({
-                        :host => address || '127.0.0.1',
-                        :port => port,
-                        :thread_safe => true,
-                      })
+          ::Redis.new(@redis_config)
         if namespace_
           ::Resque.redis =
             @redis =
@@ -188,6 +186,10 @@ module ASIR
           worker.unregister_worker
         end
         self
+      rescue Redis::CannotConnectError
+        # This error is not actionable since server
+        # is stopping.
+        nil
       end
 
       #########################################

data/lib/asir/transport/stream.rb

@@ -24,7 +24,8 @@ module ASIR
             @running = false
             _log [ :serve_stream_terminate, err ]
           rescue ::Exception => err
-            _log [ :serve_stream_error, err ]
+            _log [ :serve_stream_error, err, err.backtrace ]
+            raise err
           end
         end
       end

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.0.1"
+  VERSION = "1.0.4"
 end

data/spec/resque_spec.rb

@@ -0,0 +1,173 @@
+require 'rubygems'
+gem 'redis'
+gem 'resque'
+require 'asir'
+require 'asir/transport/resque'
+require 'asir/coder/marshal'
+
+describe "ASIR::Transport::Resque" do
+  it "should process and stop! gracefully" do
+    with_cleanup! do
+      create_transport!
+      start_conduit!; sleep 1
+      start_client!
+
+      message_count = 0
+      transport.after_receive_message = lambda do | t, message |
+        $stderr.write ">#{message_count += 1}" if verbose
+        if message_count >= 5
+          t.stop!
+        end
+      end
+      start_server!
+
+      message_count.should == 5
+      exceptions.should == [ ]
+    end
+  end
+
+  it "should bubble up Redis::CannotConnectError if redis is not running" do
+    with_cleanup! do
+      create_transport!
+      message_count = 0
+      lambda do
+        transport.after_receive_message = lambda do | t, message |
+          $stderr.write ">#{message_count += 1}" if verbose
+          if message_count >= 10
+            t.stop!
+          end
+        end
+        start_server!
+      end.should raise_error(Redis::CannotConnectError)
+      message_count.should == 0
+      exceptions.should == [ ]
+    end
+  end
+
+  it "should bubble up dropped connection error" do
+    with_cleanup! do
+      create_transport!
+      start_conduit!; sleep 1
+      start_client!
+
+      # Server should have errors.
+      message_count = 0
+      lambda do
+        transport.after_receive_message = lambda do | t, message |
+          $stderr.write ">#{message_count += 1}" if verbose
+          if message_count >= 5
+            stop_client!
+            stop_conduit! :signal => 9
+          end
+          if message_count >= 10
+            t.stop!
+          end
+        end
+        start_server!
+        raise "start_server! exited"
+      end.should raise_error(Redis::CannotConnectError)
+      message_count.should == 5
+      exceptions.should == [ ]
+    end
+  end
+
+  attr_accessor :transport, :target, :exceptions, :verbose
+
+  before :each do
+    @target = ASIR::Test::ResqueTarget.new
+    @exceptions = [ ]
+    @verbose = true
+  end
+
+  def with_cleanup!
+    yield
+  ensure
+    stop_client!
+    stop_server!
+    stop_conduit!
+  end
+
+  def create_transport!
+    @uri = "redis://localhost:23456"
+    @transport = ASIR::Transport::Resque.new(:uri => @uri)
+    transport.encoder = ASIR::Coder::Marshal.new
+    transport._logger = $stderr
+    transport._log_enabled = true
+    ASIR::Client::Proxy.config_callbacks[target.class] = lambda { | proxy |
+      proxy.transport = transport
+    }
+  end
+
+  def start_conduit!
+    transport.verbose = 0
+    transport.start_conduit!
+    transport.verbose = 0
+  end
+
+  def stop_conduit! opts = nil
+    transport.verbose = 0
+    transport.stop_conduit! opts
+    transport.verbose = 0
+  end
+
+  def start_client! &blk
+    @client_pid = Process.fork do
+      # transport.verbose = 3
+      i = 0
+      loop do
+        $stderr.write "<#{i += 1}" if verbose
+        target.asir.eval! "2 + 2"
+        sleep 0.25
+      end
+    end
+  end
+
+  def stop_client!
+    if @client_pid
+      Process.kill 9, @client_pid
+    end
+  ensure
+    @client_pid = nil
+  end
+
+  def start_server!
+    transport.verbose = 0
+    transport.prepare_server!
+    transport.on_exception = lambda do | t, exc, kind, message, result |
+      @exceptions << exc
+      $stderr.puts "  on_exception: #{kind.inspect}: #{exc.inspect}\n  #{exc.backtrace * "\n  "}"
+    end
+    transport.throttle = {
+      :min_sleep => 0.01,
+      :max_sleep => 2,
+      :inc_sleep => 0.1,
+      :mul_sleep => 1.25,
+      # :verbose => true,
+    }
+    transport.run_server!
+    transport.verbose = 0
+  end
+
+  def stop_server!
+    transport.stop!
+  end
+end
+
+module ASIR
+  module Test
+    class TestError < ::Exception; end
+    class ResqueTarget
+      include ASIR::Client
+      def raise_error! msg
+        raise TestError, msg
+      end
+      def eval! expr
+        result = eval expr
+        # $stderr.puts "  #{self} eval!(#{expr.inspect}) => #{result.inspect}"
+        result
+      end
+    end
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-04-03 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.23.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.23.0
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: zmq
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 description: Abstracting Services in Ruby
 email: ks.ruby@kurtstephens.com
 executables:
@@ -152,6 +264,7 @@ files:
 - spec/json_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
+- spec/resque_spec.rb
 - spec/spec_helper.rb
 - spec/thread_variable_spec.rb
 - spec/transport_spec.rb
@@ -190,6 +303,7 @@ test_files:
 - spec/json_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
+- spec/resque_spec.rb
 - spec/spec_helper.rb
 - spec/thread_variable_spec.rb
 - spec/transport_spec.rb