sqsrun 0.3.0 → 0.4.0

data/lib/sqsrun/command/sqsrun.rb

@@ -1,232 +1,5 @@
-require 'monitor'
-
-module SQSRun
-
-
-class Worker
-  def initialize(conf)
-    require 'right_aws'
-    @key_id = conf[:key_id]
-    @secret_key = conf[:secret_key]
-    @queue_name = conf[:queue]
-    @visibility_timeout = conf[:timeout]
-    @extend_timeout = conf[:extend_timeout]
-    @kill_timeout = conf[:kill_timeout]
-    @interval = conf[:interval]
-    @finished = false
-
-    @extender = VisibilityExtender.new(@visibility_timeout, @extend_timeout)
-    @sqs = RightAws::SqsGen2.new(@key_id, @secret_key)
-    @queue = @sqs.queue(@queue_name)
-
-    @mutex = Mutex.new
-    @cond = ConditionVariable.new
-  end
-
-  def run(run_proc)
-    @run_proc = run_proc
-    @extender.start
-    until @finished
-      msg = @queue.receive(@visibility_timeout)
-      if msg
-        process(msg)
-      else
-        cond_wait(@interval)
-      end
-    end
-  end
-
-  def shutdown
-    @finished = true
-    @extender.shutdown
-    receive!
-  end
-
-  def receive!
-    @mutex.synchronize {
-      @cond.broadcast
-    }
-  end
-
-  def finished?
-    @finished
-  end
-
-  private
-  if ConditionVariable.new.method(:wait).arity == 1
-    require 'timeout'
-    def cond_wait(sec)
-      @mutex.synchronize {
-        Timeout.timeout(sec) {
-          @cond.wait(@mutex)
-        }
-      }
-    rescue Timeout::Error
-    end
-  else
-    def cond_wait(sec)
-      @mutex.synchronize {
-        @cond.wait(@mutex, sec)
-      }
-    end
-  end
-
-  def process(msg)
-    puts "started id=#{msg.id}"
-    thread = Thread.new(msg.to_s, &@run_proc.method(:call))
-
-    @extender.set_message(msg)
-
-    success = false
-    begin
-      joined = thread.join(@kill_timeout)
-      if joined
-        thread.value
-        success = true
-        puts "finished id=#{msg.id}"
-      else
-        thread.kill
-        puts "killed id=#{msg.id}"
-      end
-    rescue
-      puts "failed id=#{msg.id}: #{$!}"
-      $!.backtrace.each {|bt|
-        puts "  #{bt}"
-      }
-    end
-
-    @extender.reset_message
-
-    if success
-      msg.delete
-    else
-      msg.visibility = 0
-    end
-  end
-
-  class VisibilityExtender
-    include MonitorMixin
-
-    def initialize(visibility_timeout, extend_timeout)
-      super()
-      @visibility_timeout = visibility_timeout
-      @extend_timeout = extend_timeout
-      @extend_time = nil
-      @message = nil
-      @finished = false
-    end
-
-    def start
-      @thread = Thread.new(&method(:run))
-    end
-
-    def join
-      @thread.join
-    end
-
-    def set_message(msg)
-      synchronize do
-        @extend_time = Time.now.to_i + @extend_timeout
-        @message = msg
-      end
-    end
-
-    def reset_message
-      synchronize do
-        @message = nil
-      end
-    end
-
-    def shutdown
-      @finished = true
-    end
-
-    private
-    def run
-      until @finished
-        sleep 1
-        synchronize do
-          try_extend(@message) if @message
-        end
-      end
-    end
-
-    def try_extend(msg)
-      now = Time.now.to_i
-      if now > @extend_time
-        ntime = msg.visibility + @visibility_timeout
-        puts "extending timeout=#{ntime} id=#{msg.id}"
-        msg.visibility = ntime
-        @extend_time = now + @extend_timeout
-      end
-    end
-  end
-end
-
-
-class ExecRunner
-  def initialize(cmd)
-    @cmd = cmd + ' ' + ARGV.map {|a| Shellwords.escape(a) }.join(' ')
-    @iobuf = ''
-  end
-
-  def call(message)
-    IO.popen(@cmd, "r+") {|io|
-      io.write(message) rescue nil
-      io.close_write
-      begin
-        while true
-          io.sysread(1024, @iobuf)
-          print @iobuf
-        end
-      rescue EOFError
-      end
-    }
-    if $?.to_i != 0
-      raise "Command failed"
-    end
-  end
-end
-
-
-class Controller
-  def initialize(conf)
-    require 'right_aws'
-    @key_id = conf[:key_id]
-    @secret_key = conf[:secret_key]
-    @queue_name = conf[:queue]
-    @visibility_timeout = conf[:visibility_timeout]
-  end
-
-  def push(body)
-    @sqs = RightAws::SqsGen2.new(@key_id, @secret_key)
-    @queue = @sqs.queue(@queue_name, true, @visibility_timeout)
-    @queue.send_message(body)
-  end
-
-  def list
-    @sqs = RightAws::SqsGen2.new(@key_id, @secret_key)
-    @sqs.queues.map {|q| q.name }
-  end
-end
-
-
-def self.worker=(worker)
-  @worker = worker
-end
-
-def self.receive!
-  @worker.receive!
-end
-
-def self.finished?
-  @worker.finished?
-end
-
-
-end
-
-
+require 'sqsrun/worker'
+require 'sqsrun/controller'
 require 'optparse'
 
 op = OptionParser.new

data/lib/sqsrun/controller.rb

@@ -0,0 +1,28 @@
+
+module SQSRun
+
+
+class Controller
+  def initialize(conf)
+    require 'right_aws'
+    @key_id = conf[:key_id]
+    @secret_key = conf[:secret_key]
+    @queue_name = conf[:queue]
+    @visibility_timeout = conf[:visibility_timeout]
+  end
+
+  def push(body)
+    @sqs = RightAws::SqsGen2.new(@key_id, @secret_key)
+    @queue = @sqs.queue(@queue_name, true, @visibility_timeout)
+    @queue.send_message(body)
+  end
+
+  def list
+    @sqs = RightAws::SqsGen2.new(@key_id, @secret_key)
+    @sqs.queues.map {|q| q.name }
+  end
+end
+
+
+end
+

data/lib/sqsrun/version.rb

@@ -0,0 +1,5 @@
+module SQSRun
+
+VERSION = '0.4.0'
+
+end

data/lib/sqsrun/worker.rb

@@ -0,0 +1,206 @@
+require 'monitor'
+
+module SQSRun
+
+
+class Worker
+  def initialize(conf)
+    require 'right_aws'
+    @key_id = conf[:key_id]
+    @secret_key = conf[:secret_key]
+    @queue_name = conf[:queue]
+    @visibility_timeout = conf[:timeout]
+    @extend_timeout = conf[:extend_timeout]
+    @kill_timeout = conf[:kill_timeout]
+    @interval = conf[:interval]
+    @finished = false
+
+    @extender = VisibilityExtender.new(@visibility_timeout, @extend_timeout)
+    @sqs = RightAws::SqsGen2.new(@key_id, @secret_key)
+    @queue = @sqs.queue(@queue_name)
+
+    @mutex = Mutex.new
+    @cond = ConditionVariable.new
+  end
+
+  def run(run_proc)
+    @run_proc = run_proc
+    @extender.start
+    until @finished
+      msg = @queue.receive(@visibility_timeout)
+      if msg
+        process(msg)
+      else
+        cond_wait(@interval)
+      end
+    end
+  end
+
+  def shutdown
+    @finished = true
+    @extender.shutdown
+    receive!
+  end
+
+  def receive!
+    @mutex.synchronize {
+      @cond.broadcast
+    }
+  end
+
+  def finished?
+    @finished
+  end
+
+  private
+  if ConditionVariable.new.method(:wait).arity == 1
+    require 'timeout'
+    def cond_wait(sec)
+      @mutex.synchronize {
+        Timeout.timeout(sec) {
+          @cond.wait(@mutex)
+        }
+      }
+    rescue Timeout::Error
+    end
+  else
+    def cond_wait(sec)
+      @mutex.synchronize {
+        @cond.wait(@mutex, sec)
+      }
+    end
+  end
+
+  def process(msg)
+    puts "started id=#{msg.id}"
+    thread = Thread.new(msg.to_s, &@run_proc.method(:call))
+
+    @extender.set_message(msg)
+
+    success = false
+    begin
+      joined = thread.join(@kill_timeout)
+      if joined
+        thread.value
+        success = true
+        puts "finished id=#{msg.id}"
+      else
+        thread.kill
+        puts "killed id=#{msg.id}"
+      end
+    rescue
+      puts "failed id=#{msg.id}: #{$!}"
+      $!.backtrace.each {|bt|
+        puts "  #{bt}"
+      }
+    end
+
+    @extender.reset_message
+
+    if success
+      msg.delete
+    else
+      msg.visibility = 0
+    end
+  end
+
+  class VisibilityExtender
+    include MonitorMixin
+
+    def initialize(visibility_timeout, extend_timeout)
+      super()
+      @visibility_timeout = visibility_timeout
+      @extend_timeout = extend_timeout
+      @extend_time = nil
+      @message = nil
+      @finished = false
+    end
+
+    def start
+      @thread = Thread.new(&method(:run))
+    end
+
+    def join
+      @thread.join
+    end
+
+    def set_message(msg)
+      synchronize do
+        @extend_time = Time.now.to_i + @extend_timeout
+        @message = msg
+      end
+    end
+
+    def reset_message
+      synchronize do
+        @message = nil
+      end
+    end
+
+    def shutdown
+      @finished = true
+    end
+
+    private
+    def run
+      until @finished
+        sleep 1
+        synchronize do
+          try_extend(@message) if @message
+        end
+      end
+    end
+
+    def try_extend(msg)
+      now = Time.now.to_i
+      if now > @extend_time
+        ntime = msg.visibility + @visibility_timeout
+        puts "extending timeout=#{ntime} id=#{msg.id}"
+        msg.visibility = ntime
+        @extend_time = now + @extend_timeout
+      end
+    end
+  end
+end
+
+
+class ExecRunner
+  def initialize(cmd)
+    @cmd = cmd + ' ' + ARGV.map {|a| Shellwords.escape(a) }.join(' ')
+    @iobuf = ''
+  end
+
+  def call(message)
+    IO.popen(@cmd, "r+") {|io|
+      io.write(message) rescue nil
+      io.close_write
+      begin
+        while true
+          io.sysread(1024, @iobuf)
+          print @iobuf
+        end
+      rescue EOFError
+      end
+    }
+    if $?.to_i != 0
+      raise "Command failed"
+    end
+  end
+end
+
+
+def self.worker=(worker)
+  @worker = worker
+end
+
+def self.receive!
+  @worker.receive!
+end
+
+def self.finished?
+  @worker.finished?
+end
+
+
+end
+

data/test/cat.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+cat > $1

data/test/exec_test.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__)+'/test_helper'
+
+class ExecTest < Test::Unit::TestCase
+  it 'success' do
+    success_sh  = File.expand_path File.dirname(__FILE__)+"/success.sh"
+    e = SQSRun::ExecRunner.new(success_sh)
+
+    message = 'me ssa ge'
+
+    assert_nothing_raised do
+      e.call(message)
+    end
+  end
+
+  it 'fail' do
+    fail_sh  = File.expand_path File.dirname(__FILE__)+"/fail.sh"
+    e = SQSRun::ExecRunner.new(fail_sh)
+
+    message = 'me ssa ge'
+
+    assert_raise(RuntimeError) do
+      e.call(message)
+    end
+  end
+
+  it 'stdin' do
+    cat_sh  = File.expand_path File.dirname(__FILE__)+"/cat.sh"
+    out_tmp = File.expand_path File.dirname(__FILE__)+"/cat.sh.tmp"
+    e = SQSRun::ExecRunner.new("#{cat_sh} #{out_tmp}")
+
+    message = 'me ssa ge'
+
+    e.call(message)
+
+    assert_equal message, File.read(out_tmp)
+  end
+
+  it 'huge' do
+    huge_sh  = File.expand_path File.dirname(__FILE__)+"/huge.sh"
+    e = SQSRun::ExecRunner.new("#{huge_sh}")
+
+    message = 'me ssa ge'
+
+    e.call(message)
+
+    # should finish
+  end
+end
+

data/test/fail.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 1

data/test/huge.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+dd if=/dev/zero bs=1024 count=1024

data/test/success.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'test/unit'
+$LOAD_PATH << File.dirname(__FILE__)+"/../lib"
+require 'sqsrun/worker'
+require 'sqsrun/controller'
+require 'fileutils'
+
+class Test::Unit::TestCase
+  #class << self
+  #  alias_method :it, :test
+  #end
+	def self.it(name, &block)
+		define_method("test_#{name}", &block)
+	end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqsrun
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +09:00
+date: 2011-07-12 00:00:00 +09:00
 default_executable: sqsrun
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,16 @@ extra_rdoc_files:
 files: 
 - bin/sqsrun
 - lib/sqsrun/command/sqsrun.rb
+- lib/sqsrun/controller.rb
+- lib/sqsrun/version.rb
+- lib/sqsrun/worker.rb
+- test/exec_test.rb
+- test/test_helper.rb
 - README.rdoc
+- test/cat.sh
+- test/fail.sh
+- test/huge.sh
+- test/success.sh
 has_rdoc: true
 homepage: 
 licenses: []
@@ -80,5 +89,10 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Generic SQS Worker Executor Service
-test_files: []
-
+test_files: 
+- test/exec_test.rb
+- test/test_helper.rb
+- test/cat.sh
+- test/fail.sh
+- test/huge.sh
+- test/success.sh