ost-bin 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+0.0.3 - 2012-07-05
+
+* Fix graceful handling of `SIGTERM`.

data/bin/ost

@@ -1,9 +1,16 @@
 #! /usr/bin/env ruby
 
-trap(:INT) do
-  Ost.stop if defined?(Ost)
+stop = proc do
+  if defined?(Ost)
+    Ost.stop
+  else
+    exit 0
+  end
 end
 
+trap(:INT,  &stop)
+trap(:TERM, &stop)
+
 require "clap"
 require "ost"
 

data/lib/ost-bin/version.rb

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

data/ost-bin.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path("lib/ost-bin/version", File.dirname(__FILE__))
+
 Gem::Specification.new do |s|
   s.name              = "ost-bin"
-  s.version           = "0.0.2"
+  s.version           = Ost::Bin::VERSION
   s.summary           = "ost(1)"
   s.authors           = ["Damian Janowski"]
   s.email             = ["damian.janowski@gmail.com"]

data/test/bin.rb

@@ -73,3 +73,32 @@ test "daemonizes" do
 
   assert !File.exist?(pid_path)
 end
+
+test "gracefully handles TERM signals" do
+  r, w = IO.pipe
+  pid, detached_pid = nil
+
+  redis.flushdb
+
+  pid_path = "./test/workers/slow.pid"
+
+  begin
+    redis.rpush("ost:slow", 5)
+
+    pid = spawn("#{root("bin/ost")} -d slow", out: w, chdir: "test")
+
+    until File.exist?(pid_path)
+      sleep 0.5
+    end
+
+    detached_pid = File.read(pid_path).to_i
+
+    Process.kill(:TERM, detached_pid)
+  ensure
+    Process.kill(:INT, pid)
+  end
+
+  wait_for_pid(detached_pid)
+
+  assert_equal "5", redis.get("slow")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ost-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000 -03:00
-default_executable: 
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ost
-  requirement: &2156982560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156982560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: clap
-  requirement: &2156921700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156921700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2156921220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156921220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - damian.janowski@gmail.com
@@ -54,9 +68,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ost-bin.gemspec
+- CHANGELOG.md
+- lib/ost-bin/version.rb
 - test/bin.rb
-- bin/ost
-has_rdoc: true
+- !binary |-
+  YmluL29zdA==
 homepage: https://github.com/djanowski/ost-bin
 licenses: []
 post_install_message: 
@@ -77,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: ost(1)