asir 1.1.1 → 1.1.2

data/ChangeLog

@@ -1,3 +1,8 @@
+2012-12-04  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.1.2: New version.
+	* Resque: Moved Resque support to gem asir_resque.
+
 2012-12-04  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.1: New version.

data/asir.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |s|
     # see lib/asir/uuid.rb
     gem.add_dependency "uuid", "~> 2.3.6"
   end
-  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"

data/example/asir_control.sh

@@ -33,31 +33,4 @@ 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/config/asir_config.rb

@@ -36,9 +36,6 @@ when :transport
 
   # Setup requested Transport.
   case asir.adjective
-  when :beanstalk
-    require 'asir/transport/beanstalk'
-    transport = ASIR::Transport::Beanstalk.new
   when :http, :webrick
     require 'asir/transport/webrick'
     transport = ASIR::Transport::Webrick.new
@@ -47,10 +44,6 @@ when :transport
     require 'asir/transport/rack'
     transport = ASIR::Transport::Rack.new
     transport.uri = "http://localhost:#{30000 + 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

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,38 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.6
-- !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
@@ -211,7 +179,6 @@ files:
 - doc/sequence.pic
 - example/asir_control.sh
 - example/asir_control_client_http.rb
-- example/asir_control_client_resque.rb
 - example/config/asir_config.rb
 - example/delayed_service.rb
 - example/ex01.rb
@@ -233,7 +200,6 @@ files:
 - example/ex22.rb
 - example/ex23.rb
 - example/ex24.rb
-- example/ex25.rb
 - example/ex26.rb
 - example/example_helper.rb
 - example/sample_service.rb
@@ -310,7 +276,6 @@ files:
 - lib/asir/transport/null.rb
 - lib/asir/transport/payload_io.rb
 - lib/asir/transport/rack.rb
-- lib/asir/transport/resque.rb
 - lib/asir/transport/retry.rb
 - lib/asir/transport/stream.rb
 - lib/asir/transport/subprocess.rb
@@ -327,7 +292,6 @@ files:
 - spec/json_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
-- spec/resque_spec.rb
 - spec/spec_helper.rb
 - spec/thread_pool_spec.rb
 - spec/thread_variable_spec.rb
@@ -349,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4360037996371201597
+      hash: 947396790058340770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -358,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4360037996371201597
+      hash: 947396790058340770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -373,7 +337,6 @@ test_files:
 - spec/json_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
-- spec/resque_spec.rb
 - spec/spec_helper.rb
 - spec/thread_pool_spec.rb
 - spec/thread_variable_spec.rb

data/example/asir_control_client_resque.rb

@@ -1,16 +0,0 @@
-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/ex25.rb

@@ -1,41 +0,0 @@
-# !SLIDE :capture_code_output true
-# One-way Resque service.
-
-require 'rubygems'
-gem 'resque'
-require 'example_helper'
-require 'asir/transport/resque'
-begin
-  t = ASIR::Transport::Resque.new(:port => 31925,
-                              :encoder => ASIR::Coder::Marshal.new)
-  # Control throttling of Resque::Worker inside ASIR::Transport::Resque
-  t.throttle = {
-    # :verbose => true,
-    :min_sleep => 0.0,
-    :max_sleep => 2.0,
-    :inc_sleep => 0.1,
-    :mul_sleep => 1.5,
-    :rand_sleep => 0.1,
-  }
-  t.start_conduit!; sleep 1
-  server_process do
-    t.prepare_server!
-    t.run_server!
-  end
-  UnsafeService.asir.transport = t
-  pr UnsafeService.asir.do_it(":ok")
-rescue ::Exception => err
-  $stderr.puts "### #{$$}: ERROR: #{err.inspect}\n  #{err.backtrace * "\n  "}"
-  raise
-ensure
-  sleep 5
-  t.close rescue nil; sleep 1; server_kill
-  t.stop_conduit!
-end
-
-# !SLIDE END
-# EXPECT: : client process
-# EXPECT: : server process
-# EXPECT: UnsafeService.do_it => :ok
-# EXPECT: : pr: nil
-# EXPECT!: ERROR

data/lib/asir/transport/resque.rb

@@ -1,246 +0,0 @@
-require 'asir/transport/connection_oriented'
-require 'resque'
-require 'asir/poll_throttle'
-
-module ASIR
-  class Transport
-    # !SLIDE
-    # Resque Transport
-    class Resque < ConnectionOriented
-      include PollThrottle
-
-      attr_accessor :queues, :queue, :namespace, :throttle
-
-      def initialize *args
-        @port_default = 6379
-        @scheme_default = 'redis'.freeze
-        super
-        self.one_way = true
-      end
-
-      # !SLIDE
-      # Resque client.
-      def _client_connect!
-        # $stderr.puts "  #{$$} #{self} _client_connect!"
-        resque_connect!
-      rescue ::Exception => exc
-        raise exc.class, "#{self.class} #{uri}: #{exc.message}", exc.backtrace
-      end
-
-      # !SLIDE
-      # Resque server (worker).
-      def _server!
-        # $stderr.puts "  #{$$} #{self} _server!"
-        resque_connect!
-        resque_worker
-      rescue ::Exception => exc
-        raise exc.class, "#{self.class} #{uri}: #{exc.message}", exc.backtrace
-      end
-
-      def _receive_result message, opaque_result
-        return nil if one_way || message.one_way
-        super
-      end
-
-      def _send_result message, result, result_payload, stream, message_state
-        return nil if one_way || message.one_way
-        super
-      end
-
-      def _send_message message, message_payload
-        stream.with_stream! do | io |  # Force connect
-          queue = message[:resque_queue] || message[:queue] || self.queue
-          $stderr.puts "  #{$$} #{self} _send_message #{message_payload.inspect} to queue=#{queue.inspect} as #{self.class} :process_job" if @verbose >= 2
-          # Invokes Transport::Resque.perform(metadata, payload)
-          metadata = message[:resque_metadata] || message.description
-          ::Resque.enqueue_to(queue, self.class, metadata, message_payload)
-        end
-      end
-
-      def queues
-        @queues ||=
-          (
-          x = nil
-          x = path if @uri
-          x ||= ""
-          root, x = x.split('/')
-          x ||= ""
-          x = x.split(/(\s+|\s*,\s*)/)
-          x.each(&:freeze)
-          x.freeze
-          )
-      end
-
-      # Defaults to [ 'asir' ].
-      def queues_
-        @queues_ ||=
-          queues.empty? ? [ DEFAULT_QUEUE ] : queues.freeze
-      end
-
-      # Defaults to 'asir'.
-      def queue
-        @queue ||= queues_.first || DEFAULT_QUEUE
-      end
-
-      # Defaults to 'asir'.
-      def namespace_
-        @namespace_ ||= namespace || DEFAULT_QUEUE
-      end
-
-      DEFAULT_QUEUE = 'asir'.freeze
-
-      def _server_accept_connection! server
-        [ server, server ]
-      end
-
-      # Resque is message-oriented, process only one message per "connection".
-      def stream_eof? stream
-        false
-      end
-
-      # Nothing to be closed for Resque.
-      def _server_close_connection! in_stream, out_stream
-        # NOTHING
-      end
-
-      def serve_stream_message! in_stream, out_stream # ignored
-        save = ::Thread.current[:asir_transport_resque_instance]
-        ::Thread.current[:asir_transport_resque_instance] = self
-        poll_throttle throttle do
-          $stderr.puts "  #{$$} #{self} serve_stream_message!: resque_worker = #{resque_worker} on queues #{resque_worker.queues.inspect}" if @verbose >= 3
-          if job = resque_worker.reserve
-            $stderr.puts "  #{$$} #{self} serve_stream_message! job=#{job.class}:#{job.inspect}" if @verbose >= 2
-            resque_worker.process(job)
-          end
-          job
-        end
-        self
-      ensure
-        ::Thread.current[:asir_transport_resque_instance] = save
-      end
-
-      # Class method entry point from Resque::Job.perform.
-      def self.perform metadata, payload = nil
-        payload ||= metadata # old calling signature (just payload).
-        # $stderr.puts "  #{self} process_job payload=#{payload.inspect}"
-        t = ::Thread.current[:asir_transport_resque_instance]
-        # Pass payload as in_stream; _receive_message will return it.
-        t.serve_message! payload, nil
-      end
-
-      def _receive_message payload, additional_data # is actual payload
-        # $stderr.puts "  #{$$} #{self} _receive_message payload=#{payload.inspect}"
-        [ payload, nil ]
-      end
-
-      ####################################
-
-      def resque_uri
-        @resque_uri ||=
-          (
-          unless scheme == 'redis'
-            raise ArgumentError, "Invalid resque URI: #{uri.inspect}"
-          end
-          _uri
-          )
-      end
-
-      def resque_connect!
-        @redis_config = {
-          :host => host,
-          :port => port,
-          :thread_safe => true,
-        }
-        @redis =
-          ::Redis.new(@redis_config)
-        if namespace_
-          ::Resque.redis =
-            @redis =
-            ::Redis::Namespace.new(namespace_, :redis => @redis)
-          ::Resque.redis.namespace = namespace_
-        else
-          ::Resque.redis = @redis
-        end
-        # $stderr.puts "  *** #{$$} #{self} resque_connect! #{@redis.inspect}"
-        @redis
-      end
-
-      def resque_disconnect!
-        ::Resque.redis = nil
-      end
-
-      def resque_worker
-        @resque_worker ||= ::Resque::Worker.new(*queues_)
-      end
-
-      def server_on_start!
-        # prune_dead_workers expects processes to have "resque " in the name.
-        @save_progname ||= $0.dup
-        $0 = "resque #{$0}"
-        if worker = resque_worker
-          worker.prune_dead_workers
-          worker.register_worker
-        end
-        self
-      end
-
-      def server_on_stop!
-        $0 = @save_progname if @save_progname
-        if worker = @resque_worker
-          worker.unregister_worker
-        end
-        self
-      rescue Redis::CannotConnectError
-        # This error is not actionable since server
-        # is stopping.
-        nil
-      end
-
-      #########################################
-
-      @@redis_server_version = nil
-      def redis_server_version
-        @@redis_server_version ||=
-          begin
-            case v = `redis-server --version`
-            when /v=([.0-9]+)/ # 3.x
-              v = $1
-            when / version ([.0-9]+)/ # 2.x
-              v = $1
-            else
-              v = 'UNKNOWN'
-            end
-            v
-          end
-      end
-
-      def _start_conduit!
-        @redis_dir ||= "/tmp"
-        @redis_conf ||= "#{@redis_dir}/asir-redis-#{port}.conf"
-        @redis_log ||= "#{@redis_dir}/asir-redis-#{port}.log"
-        @redis_cmd = [ 'redis-server' ]
-        case redis_server_version
-        when /^2\.4/
-          ::File.open(@redis_conf, "w+") do | out |
-            out.puts "daemonize no"
-            out.puts "port #{port}"
-            out.puts "loglevel warning"
-            out.puts "logfile #{@redis_log}"
-          end
-          @redis_cmd << @redis_conf
-        else
-          @redis_cmd <<
-            '--port'     << port <<
-            '--loglevel' << 'warning' <<
-            '--logfile'  << @redis_log
-        end
-        @redis_cmd.map! { | x | x.to_s }
-        # $stderr.puts "  redis_cmd = #{@redis_cmd * ' '}" if @verbose >= 1
-        exec *@redis_cmd
-      end
-    end
-    # !SLIDE END
-  end # class
-end # module
-
-

data/spec/resque_spec.rb

@@ -1,210 +0,0 @@
-require 'rubygems'
-gem 'redis'
-gem 'resque'
-require 'asir'
-require 'asir/transport/resque'
-require 'asir/coder/marshal'
-require 'timeout'
-
-describe "ASIR::Transport::Resque" do
-  it "should be able to start/stop redis" do
-    with_cleanup! do
-      create_transport!
-      pid = Process.fork do
-        # exec "false" # simulate failure to start.
-        transport._start_conduit!
-      end
-      sleep 1
-      Process.kill('TERM', pid)
-      sleep 1
-      wpid, status = nil, nil
-      Timeout.timeout(5) do
-        wpid, status = Process.waitpid2(pid, Process::WUNTRACED)
-      end
-      # puts status.inspect
-      wpid.should == pid
-      status.stopsig.should == nil
-      status.termsig.should == nil
-      status.exited?.should == true
-      status.exitstatus.should == 0
-      status.success?.should == true
-    end
-  end
-
-  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 |
-        message_count += 1
-        $stderr.write ">#{message_count}" if verbose
-        if message_count >= 5
-          t.stop!
-        end
-      end
-      Timeout.timeout(20) do
-        start_server!
-      end
-
-      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 |
-          message_count += 1
-          $stderr.write ">#{message_count}" if verbose
-          if message_count >= 10
-            t.stop!
-          end
-        end
-        Timeout.timeout(20) do
-          start_server!
-        end
-      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 |
-          message_count += 1
-          $stderr.write ">#{message_count}" if verbose
-          if message_count >= 5
-            stop_client!
-            stop_conduit! :signal => 9
-          end
-          if message_count >= 10
-            t.stop!
-          end
-        end
-        Timeout.timeout(20) do
-          start_server!
-        end
-        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 = (ENV['ASIR_TEST_VERBOSE'] || 0).to_i > 0
-  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
-    if verbose
-      transport._logger = $stderr
-      transport._log_enabled = true
-    end
-    ASIR::Client::Proxy.config_callbacks[target.class] = lambda do | proxy |
-      proxy.transport = transport
-    end
-  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
-        i += 1
-        $stderr.write "<#{i}" 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
-
-