asir 0.2.0 → 1.0.1

data/Gemfile

@@ -7,8 +7,7 @@ source "http://rubygems.org"
   gem 'zmq', '~> 2.1.4'
 
 group :development do
-#  gem "bundler", "~> 1.0.0"
-  gem 'jeweler'
+  gem "bundler", ">= 1.0.0"
   gem "rspec", "~> 2.0"
 
   require File.expand_path('../spec/debug_helper', __FILE__)

data/README.textile

@@ -28,10 +28,11 @@ h3. Features
 ** HTTP under WEBrick or as Rack application.
 ** Beanstalkd.
 ** ZeroMQ.
+** Resque.
 ** Buffered transports.
 ** Broadcast transports.
 ** Fallback transports.
-** Time-decaying retry logic.
+** Time-decaying retry and polling logic.
 * Support for multiple encodings:
 ** Marshal.
 ** XML.
@@ -42,7 +43,8 @@ h3. Features
 ** Chained encodings.
 ** Signed payloads.
 
-h2. Platform support.
+h2. Platform support
+
 * CRuby 1.8.7
 * CRuby 1.9.3-head
 * CRuby 2.0-head

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.1

data/asir.gemspec

@@ -1,11 +1,8 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{asir}
-  s.version = "0.2.0"
+  s.version = "1.0.1"
   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}

data/asir.riterate.yml

@@ -20,6 +20,7 @@ riterate:
   - "Design"
   - "Design: Nouns"
   - "Design: Verbs"
+  - "Abstraction Leads to Rich Features"
   - "Simple"
   - "Client-Side Message"
   - "Server-Side"

data/bin/asir

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
-$: << File.expand_path('../../lib', __FILE__)
+require 'rubygems'
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'asir/main'
 exit ASIR::Main.new.parse_args!.run!.exit_code
 

data/example/asir_control.sh

@@ -4,21 +4,83 @@ dir="$(cd "$(dirname $0)" && /bin/pwd)"
 PATH="$dir/../bin:$PATH"
 export RUBYLIB="$dir/../example:$dir/../lib"
 asir="asir verbose=9 config_rb=$dir/config/asir_config.rb" 
-
+args="$*"
+args="${args:-ALL}"
 # set -e
+
+#############################
+
+case "$args"
+in
+  *webrick*|*ALL*)
+
 $asir start webrick worker
 sleep 1
+$asir pid webrick worker
+if $asir alive webrick worker; then
+  echo "alive webrick worker"
+fi
 
 ruby "$dir/asir_control_client_http.rb"
 sleep 1
 
 $asir stop webrick worker
 sleep 1
+$asir pid webrick worker
+
+;;
+esac
+
+#############################
+
+case "$args"
+in
+  *zmq*|*ALL*)
 
 $asir start zmq worker
 sleep 1
+$asir pid zmq worker
+if $asir alive zmq worker; then
+  echo "alive"
+fi
 
 ruby "$dir/asir_control_client_zmq.rb"
 sleep 1
 
+$asir stop zmq worker
+sleep 1
+$asir pid zmq worker
+
+;;
+esac
+
+#############################
+
+case "$args"
+in
+  *resque*|*ALL*)
+
+$asir start resque conduit
+sleep 1
+if $asir alive resque conduit; then
+  echo "resque conduit alive"
+fi
+$asir start resque worker
+sleep 1
+$asir pid resque worker
+if $asir alive resque worker; then
+  echo "resque worker alive"
+fi
+
+ruby "$dir/asir_control_client_resque.rb"
+sleep 1
+$asir stop resque worker
+sleep 1
+$asir stop resque conduit
+
+;;
+esac
+
+#############################
+
 exit 0

data/example/asir_control_client_http.rb

@@ -2,10 +2,10 @@ require 'example_helper'
 require 'asir/transport/http'
 require 'asir/coder/marshal'
 begin
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::HTTP.new(:uri => "http://localhost:30000/asir")
   t.encoder = ASIR::Coder::Marshal.new
-  pr Email.client.send_email(:pdf_invoice,
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com",
                              :customer => @customer)
 ensure

data/example/asir_control_client_resque.rb

@@ -0,0 +1,16 @@
+require 'example_helper'
+gem 'resque'
+require 'asir/transport/resque'
+require 'asir/coder/marshal'
+begin
+  Email.asir.transport = t =
+    ASIR::Transport::Resque.new
+  t.one_way = true
+  t.encoder = ASIR::Coder::Marshal.new
+  pr Email.asir.send_email(:pdf_invoice,
+                             :to => "user@email.com",
+                             :customer => @customer)
+ensure
+  t.close rescue nil
+end
+

data/example/asir_control_client_zmq.rb

@@ -2,11 +2,11 @@ require 'example_helper'
 require 'asir/transport/zmq'
 require 'asir/coder/marshal'
 begin
-  Email.client.transport = t =
-    ASIR::Transport::Zmq.new :uri => "tcp://localhost:31000" # "/asir"
+  Email.asir.transport = t =
+    ASIR::Transport::Zmq.new(:uri => "tcp://localhost:31000") # "/asir"
   t.one_way = true
   t.encoder = ASIR::Coder::Marshal.new
-  pr Email.client.send_email(:pdf_invoice,
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com",
                              :customer => @customer)
 ensure

data/example/config/asir_config.rb

@@ -1,13 +1,15 @@
 # Used by asir/bin/asir.
 # Configures asir worker transport and error logging.
-# asir object is bound to ASIR::Main instance.
+# asir object is bound to ASIR::Environment instance.
 
-$stderr.puts "asir.verb = #{asir.verb.inspect}"
-case asir.verb
-when :config
+$stderr.puts "asir.phase = #{asir.phase.inspect}" if asir.verbose >= 1
+case asir.phase
+when :configure
   # NOTHING
   true
 when :environment
+  require 'rubygems'
+
   require 'asir'
   require 'asir/transport/file'
   require 'asir/coder/marshal'
@@ -17,6 +19,9 @@ when :environment
   require 'example_helper'
   require 'sample_service'
   require 'unsafe_service'
+when :start
+  # NOTHING
+  true
 when :transport
   # Compose with Marshal for final coding.
   coder = ASIR::Coder::Marshal.new
@@ -32,18 +37,25 @@ when :transport
   # Setup requested Transport.
   case asir.adjective
   when :beanstalk
+    require 'asir/transport/beanstalk'
     transport = ASIR::Transport::Beanstalk.new
-    transport[:worker_processes] = 3
   when :http, :webrick
+    require 'asir/transport/webrick'
     transport = ASIR::Transport::Webrick.new
     transport.uri = "http://localhost:#{30000 + asir.identifier.to_s.to_i}/asir"
   when :rack
+    require 'asir/transport/rack'
     transport = ASIR::Transport::Rack.new
     transport.uri = "http://localhost:#{30000 + asir.identifier.to_s.to_i}/asir"
   when :zmq
+    reqiore 'asir/transport/zmq'
     transport = ASIR::Transport::Zmq.new
     transport.one_way = true
     transport.uri = "tcp://localhost:#{31000 + asir.identifier.to_s.to_i}" # /asir"
+  when :resque
+    gem 'resque'
+    require 'asir/transport/resque'
+    transport = ASIR::Transport::Resque.new
   else
     raise "Cannot configure Transport for #{asir.adjective}"
   end
@@ -51,13 +63,13 @@ when :transport
   transport.encoder = coder
   transport._logger = STDERR
   transport._log_enabled = true
-  transport.verbose = 3
+  # transport.verbose = 3
   transport.on_exception =
-    lambda { | transport, exc, phase, message, *rest |
+    lambda { | transport, exc, phase, message, result |
       error_transport.send_request(message)
     }
 
   transport
 else
-  $stderr.puts "Warning: unhandled asir.verb: #{asir.verb.inspect}"
+  $stderr.puts "Warning: unhandled asir.phase: #{asir.phase.inspect}"
 end

data/example/ex02.rb

@@ -2,7 +2,7 @@
 # In-core, in-process service
 
 require 'example_helper'
-pr Email.client.send_email(:pdf_invoice,
+pr Email.asir.send_email(:pdf_invoice,
                            :to => "user@email.com",
                            :customer => @customer)
 

data/example/ex03.rb

@@ -4,10 +4,10 @@
 
 require 'example_helper'
 begin
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::Subprocess.new
 
-  pr Email.client.send_email(:pdf_invoice,
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com",
                              :customer => @customer)
 end

data/example/ex04.rb

@@ -4,11 +4,11 @@
 require 'example_helper'
 begin
   File.unlink(service_log = "#{__FILE__}.service.log") rescue nil
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::File.new(:file => service_log)
   t.encoder =
     ASIR::Coder::Yaml.new
-  pr Email.client.send_email(:pdf_invoice,
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com",
                              :customer => @customer)
 ensure

data/example/ex05.rb

@@ -4,7 +4,7 @@
 require 'example_helper'
 begin
   service_log = "#{__FILE__.sub('ex05', 'ex04')}.service.log"
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::File.new(:file => service_log)
   t.encoder =
     ASIR::Coder::Yaml.new

data/example/ex06.rb

@@ -1,19 +1,20 @@
 # !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
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::File.new(:file => service_pipe)
   t.encoder =
     ASIR::Coder::Yaml.new
-  t.prepare_pipe_server!
   server_process do
-    t.run_pipe_server!
+    t.prepare_server!
+    t.run_server!
   end
-  sleep 1
-  pr Email.client.send_email(:pdf_invoice, :to => "user@email.com", :customer => @customer)
+  pr Email.asir.send_email(:pdf_invoice, :to => "user@email.com", :customer => @customer)
 ensure
   t.close; sleep 1; server_kill
 end

data/example/ex07.rb

@@ -4,7 +4,7 @@
 require 'example_helper'
 begin
   File.unlink(service_pipe = "service.pipe") rescue nil
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::File.new(:file => service_pipe)
   t.encoder =
     ASIR::Coder::Chain.new(:encoders =>
@@ -16,7 +16,7 @@ begin
   server_process do
     t.run_pipe_server!
   end
-  pr Email.client.send_email(:pdf_invoice, :to => "user@email.com", :customer => @customer)
+  pr Email.asir.send_email(:pdf_invoice, :to => "user@email.com", :customer => @customer)
 ensure
   t.close; sleep 1; server_kill
 end

data/example/ex08.rb

@@ -4,7 +4,7 @@
 require 'example_helper'
 begin
   File.unlink(service_pipe = "service.pipe") rescue nil
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::File.new(:file => service_pipe)
   t.encoder =
     ASIR::Coder::Chain.new(:encoders =>
@@ -17,7 +17,7 @@ begin
     t.run_pipe_server!
   end
   s.secret = 'I do not know the secret! :('
-  pr Email.client.send_email(:pdf_invoice, :to => "user@email.com", :customer => @customer)
+  pr Email.asir.send_email(:pdf_invoice, :to => "user@email.com", :customer => @customer)
 ensure
   t.close; sleep 1; server_kill
 end

data/example/ex09.rb

@@ -3,7 +3,7 @@
 
 require 'example_helper'
 begin
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::TcpSocket.new(:port => 30909)
   t.encoder =
     ASIR::Coder::Marshal.new
@@ -11,7 +11,7 @@ begin
   server_process do
     t.run_server!
   end
-  pr Email.client.send_email(:pdf_invoice,
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com", :customer => @customer)
 ensure
   t.close; sleep 1; server_kill

data/example/ex10.rb

@@ -3,7 +3,7 @@
 
 require 'example_helper'
 begin
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::TcpSocket.new(:port => 30910)
   t.encoder =
     ASIR::Coder::Marshal.new
@@ -11,7 +11,7 @@ begin
   server_process do
     t.run_server!
   end
-  pr Email.client.do_raise("Raise Me!")
+  pr Email.asir.do_raise("Raise Me!")
 rescue Exception => err
   pr [ :exception, err ]
 ensure

data/example/ex11.rb

@@ -4,7 +4,7 @@
 require 'example_helper'
 begin
   File.unlink(service_log = "#{__FILE__}.service.log") rescue nil
-  Email.client.transport = t =
+  Email.asir.transport = t =
     ASIR::Transport::Fallback.new(:transports => [
       tcp = ASIR::Transport::TcpSocket.new(:port => 31911,
                                            :encoder => ASIR::Coder::Marshal.new),
@@ -14,13 +14,13 @@ begin
         ASIR::Transport::Subprocess.new,
       ]),
     ])
-  pr Email.client.send_email(:pdf_invoice,
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user@email.com", :customer => @customer)
   server_process do
     tcp.prepare_server!
     tcp.run_server!
-  end; sleep 2
-  pr Email.client.send_email(:pdf_invoice,
+  end
+  pr Email.asir.send_email(:pdf_invoice,
                              :to => "user2@email.com", :customer => @customer)
 ensure
   file.close rescue nil;
@@ -38,7 +38,7 @@ end
 # EXPECT: service.log" contents:
 # EXPECT: --- !ruby/object:ASIR::Message
 # EXPECT:   :transport_exceptions:
-# EXPECT: ASIR::Error: Cannot connect to ASIR::Transport::TcpSocket tcp://127.0.0.1:
+# EXPECT: Cannot connect to ASIR::Transport::TcpSocket tcp://127.0.0.1:
 # EXPECT: arguments:
 # EXPECT: - :pdf_invoice
 # EXPECT/: :to: user@email.com