ost-bin 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mzg5YjIyZTAxMTliOTFjYTE4NWI2MGUwNTMxNWU4MjY2ZjExMDU0YQ==
+  data.tar.gz: !binary |-
+    MzI1ZWRhNmE2NDJlOWZkMTZiZjBlZWUwOGU4MjBjMDNiYzY0YmM4NA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWJhNGNhYzZlNzBhMWI2OTk2OGYwN2U4Y2IzODA4ODM5ZGJhZjcwMWZmNTJh
+    M2E2ZTI2YmZmMjhhN2IxNjA0NzFkMDQ0MmMyNjRkNGY4ZjliODBlMzA2ZDRi
+    OTc5NWM0OWI0M2Q4NDNkOTkyOTliZjYxYzA1ZTBlZWE3NTUyYzg=
+  data.tar.gz: !binary |-
+    MzQ3MDUxYWQ1YTIzN2QwNjA5NGNlMzMyZTk5NDEzNzc5YTFlZjlhYTE4ZGJk
+    YmJlMWMyYTM4NjkzMmViM2NlNTkzNGQwYTk0M2M2MWFlMWVjNWJiZWY2MTYy
+    OWY0NmQ4OGVlNGExMTMwY2ViMjhjMDI4ZDM3YjY1ZDk3NzhmOWY=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
-0.0.3 - 2012-07-05
+# 0.1.0 - 2014-05-26
 
-* Fix graceful handling of `SIGTERM`.
+* Moved to a threaded model.
+
+* Added `Ostfile` to specify which workers you want to run.
+
+* New `-p` switch to specify the path where the PID file should be stored.
+
+* `ost(1)` now accepts `start` and `stop` commands.
+
+# 0.0.3 - 2012-07-05
+
+* Fixed graceful handling of `SIGTERM`.

data/bin/ost

@@ -11,28 +11,119 @@ end
 trap(:INT,  &stop)
 trap(:TERM, &stop)
 
+usage = <<-EOS
+Usage:
+
+  ost start [-r <require>] [-d] [-p <pid-path>]
+  ost stop [-p <pid-path>]
+
+EOS
+
 require "clap"
 require "ost"
 
-opts = {}
+opts = {
+  requires: []
+}
 
-args = Clap.run ARGV,
+command, _ = Clap.run ARGV,
   "-d" => -> {
     opts[:daemonize] = true
+  },
+  "-p" => -> path {
+    opts[:pid_path] = path
+  },
+  "-s" => -> size {
+    opts[:pool_size] = Integer(size)
+  },
+  "-r" => -> file {
+    opts[:requires] << file
+  },
+  "-v" => -> {
+    require_relative "../lib/ost-bin/version"
+
+    puts Ost::Bin::VERSION
+
+    exit 0
+  },
+  "-h" => -> {
+    puts(usage)
+    exit 0
   }
 
-worker = args.shift
-worker_path = File.expand_path("workers/#{worker}")
+opts[:pid_path] = File.expand_path("ost.pid") unless opts.include?(:pid_path)
 
-$stdout.sync = true
+opts[:requires].each do |file|
+  require(file)
+end
 
-if opts[:daemonize]
-  pid_path = File.expand_path("#{worker}.pid", File.dirname(worker_path))
-  Process.daemon(true)
-  File.open(pid_path, File::RDWR|File::EXCL|File::CREAT, 0600) { |io| io.write(Process.pid) }
-  at_exit do
-    File.delete(pid_path) if File.exists?(pid_path)
+module Ost
+  def self.run(worker)
+    workers[worker] = worker.new
+  end
+
+  def self.workers
+    @workers ||= {}
   end
 end
 
-require worker_path
+case command
+when "start"
+  if opts[:daemonize]
+    Process.daemon(true)
+
+    File.open(opts[:pid_path], File::RDWR|File::EXCL|File::CREAT, 0600) do |io|
+      io.write(Process.pid)
+    end
+
+    at_exit do
+      File.delete(opts[:pid_path]) if File.exists?(opts[:pid_path])
+    end
+  end
+
+  load "./Ostfile"
+
+  opts[:pool_size] = Ost.workers.size unless opts.include?(:pool_size)
+
+  threads_per_worker = opts[:pool_size] / Ost.workers.size
+
+  if threads_per_worker == 0
+    abort("Not enough threads for your workers (found #{Ost.workers.size} workers).")
+  end
+
+  pool = Ost.workers.each_with_object([]) do |(queue, handler), accum|
+    accum.concat(Array.new(threads_per_worker) do
+      Thread.new(queue, handler) do |q, h|
+        queue = Ost[q]
+
+        queue.each do |item|
+          handler.call(item)
+        end
+      end
+    end)
+  end
+
+  pool.each(&:join)
+
+when "stop"
+  pid = Integer(File.read(opts[:pid_path]).chomp)
+
+  running = true
+
+  Process.kill(:TERM, pid)
+
+  while running
+    begin
+      Process.kill(0, pid)
+      running = true
+    rescue Errno::ESRCH
+      running = false
+    end
+  end
+
+else
+  $stderr.puts("Unkown command #{command.inspect}.")
+  $stderr.puts(usage)
+
+  exit 2
+end

data/lib/ost-bin/version.rb

@@ -1,5 +1,5 @@
 require "ost"
 
 module Ost::Bin
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/test/bin.rb

@@ -1,65 +1,88 @@
 require "cutest"
 require "redis"
+require "timeout"
 
 at_exit {
   Process.waitall
 }
 
 def wait_for_pid(pid)
-  running = true
+  wait_for { !running?(pid) }
+end
+
+def wait_for_child(pid)
+  Timeout.timeout(5) do
+    Process.wait(pid)
+  end
+end
 
-  while running
-    begin
-      Process.kill(0, pid)
-    rescue Errno::ESRCH
-      running = false
+def wait_for
+  Timeout.timeout(5) do
+    until value = yield
+      sleep 0.1
     end
+
+    return value
   end
 end
 
+def running?(pid)
+  begin
+    Process.kill(0, pid)
+    true
+  rescue Errno::ESRCH
+    false
+  end
+end
+
+def read_pid_file(path)
+  wait_for { File.exist?(path) && File.size(path) > 0 }
+
+  Integer(File.read(path))
+end
+
 def root(path)
   File.expand_path("../#{path}", File.dirname(__FILE__))
 end
 
 redis = Redis.connect
 
-test "daemon" do
-  r, w = IO.pipe
+prepare do
+  redis.flushdb
+  Dir["test/workers/**/*.pid"].each { |file| File.delete(file) }
+end
+
+test "start" do
   pid = nil
 
   begin
     redis.flushdb
 
-    pid = spawn("#{root("bin/ost")} echo", out: w, chdir: "test")
+    pid = spawn("#{root("bin/ost")} start", chdir: "test/workers/echo")
 
-    redis.rpush("ost:echo", 1)
+    redis.rpush("ost:Echo", 2)
 
-    assert_equal "1\n", r.gets
+    value = wait_for { redis.get("Echo:result") }
+
+    assert_equal "2", value
   ensure
     Process.kill(:INT, pid) if pid
   end
 end
 
 test "daemonizes" do
-  r, w = IO.pipe
   pid, detached_pid = nil
 
-  redis.flushdb
+  pid_path = "./test/workers/echo/ost.pid"
 
   begin
-    pid = spawn("#{root("bin/ost")} -d echo", out: w, chdir: "test")
-
-    sleep 1
-
-    state = `ps -p #{pid} -o state`.lines.to_a.last[/(\w+)/, 1]
+    pid = spawn("#{root("bin/ost")} -d start", chdir: "test/workers/echo")
 
-    assert_equal "Z", state
+    assert wait_for {
+      `ps -p #{pid} -o state`.lines.to_a.last[/(\w+)/, 1] == "Z"
+    }
 
-    pid_path = "./test/workers/echo.pid"
-
-    assert File.exist?(pid_path)
-
-    detached_pid = File.read(pid_path).to_i
+    detached_pid = read_pid_file(pid_path)
 
     ppid = `ps -p #{detached_pid} -o ppid`.lines.to_a.last[/(\d+)/, 1]
 
@@ -75,30 +98,77 @@ test "daemonizes" do
 end
 
 test "gracefully handles TERM signals" do
-  r, w = IO.pipe
-  pid, detached_pid = nil
+  redis.rpush("ost:Slow", 3)
 
-  redis.flushdb
+  begin
+    spawn("#{root("bin/ost")} -d start", chdir: "test/workers/slow")
 
-  pid_path = "./test/workers/slow.pid"
+    pid = read_pid_file("./test/workers/slow/ost.pid")
 
-  begin
-    redis.rpush("ost:slow", 5)
+    assert wait_for { redis.llen("ost:Slow") == 0 }
+  ensure
+    Process.kill(:TERM, pid)
+  end
 
-    pid = spawn("#{root("bin/ost")} -d slow", out: w, chdir: "test")
+  wait_for_pid(pid)
 
-    until File.exist?(pid_path)
-      sleep 0.5
-    end
+  assert_equal "3", redis.get("slow")
+end
 
-    detached_pid = File.read(pid_path).to_i
+test "stop waits for workers to be done" do
+  spawn("#{root("bin/ost")} start -d", chdir: "test/workers/slow")
 
-    Process.kill(:TERM, detached_pid)
+  pid = read_pid_file("./test/workers/slow/ost.pid")
+
+  stopper = spawn("#{root("bin/ost")} stop", chdir: "test/workers/slow")
+
+  # Let the stop command start.
+  wait_for { running?(stopper) }
+
+  # Let the stop command end.
+  wait_for_child(stopper)
+
+  # Immediately after the stop command exits,
+  # ost shouldn't be running and the pid file
+  # should be gone.
+
+  assert !running?(pid)
+  assert !File.exist?("./test/workers/slow/ost.pid")
+end
+
+test "use a specific path for the pid file" do
+  pid = nil
+  pid_path = "./test/workers/echo/foo.pid"
+
+  begin
+    spawn("#{root("bin/ost")} -d start -p foo.pid", chdir: "test/workers/echo")
+
+    pid = read_pid_file(pid_path)
+
+    assert pid
   ensure
-    Process.kill(:INT, pid)
+    Process.kill(:INT, pid) if pid
   end
 
-  wait_for_pid(detached_pid)
+  wait_for_pid(pid)
 
-  assert_equal "5", redis.get("slow")
+  assert !File.exist?(pid_path)
+end
+
+test "load Ostfile" do
+  pid = nil
+
+  begin
+    redis.flushdb
+
+    pid = spawn("#{root("bin/ost")} start", chdir: "test/workers/echo")
+
+    redis.rpush("ost:Echo", 2)
+
+    value = wait_for { redis.get("Echo:result") }
+
+    assert_equal "2", value
+  ensure
+    Process.kill(:INT, pid) if pid
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ost-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Damian Janowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ost
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,30 +64,28 @@ files:
 - CHANGELOG.md
 - lib/ost-bin/version.rb
 - test/bin.rb
-- !binary |-
-  YmluL29zdA==
+- bin/ost
 homepage: https://github.com/djanowski/ost-bin
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ost(1)
 test_files: []