sad 1.0.0 → 1.1.0

data/README.md

@@ -0,0 +1,113 @@
+# sad
+
+:sob: 悲剧，居然找不到好用的基于Eventmachine的后台任务，只好自己写了。
+
+## 快速入门
+
+测试类的定义
+
+```ruby
+class SadJob
+	extend ::Sad::Worker
+	
+	def self.queue
+		'MySadJob'
+	end
+
+	def self.perform(*args)
+		puts "I'm in sad job perform method."
+		puts args
+	end
+end
+```
+
+在一个IRB/PRY中执行
+
+```ruby
+EM.run{
+	EM::PeriodicTimer.new(3){
+		Imdb::SadJob.enqueue('hello',{:x=>['hi',123], :y => {}})
+	}
+}
+```
+
+在另外一个IRB/PRY中执行
+
+```ruby
+EM.run{
+	Sad::Server.run('MySadJob')
+}
+```
+
+两个运行环境都要有SadJob这个测试类的定义存在
+
+--------
+
+## 在项目中使用
+
+在Gemfile中添加:
+
+```ruby
+gem 'sad', :git => 'git@github.com:charlescui/sad.git'
+```
+
+在Rakefile中添加:
+
+```ruby
+require "sad/tasks"
+```
+
+配置redis:
+
+```ruby
+opts = {
+	:host => 'localhost', 
+	:port => 6379,
+	:db => 0,
+	:password => '******'
+}
+Sad::Config.redis = opts
+Sad::Config.namespace = 'MyBackgroundJobQueue'
+```
+
+查看是否有sad的rake任务:
+
+		saimatoMacBook-Pro:rca.imdb cuizheng$ bundle exec rake -T
+		rake sad:restart                # restart sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids
+		rake sad:start                  # start sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids
+		rake sad:stop                   # stop sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids
+
+启动:`bundle exec rake sad:start COUNT=2 QUEUE=sosad DIR=./tmp/pids`
+
+检查下目录是否有pid文件
+
+		saimatoMacBook-Pro:rca.imdb cuizheng$ ll tmp/pids/
+		total 40
+		-rw-r--r--  1 cuizheng  staff  1315  4 26 15:36 Sad-1.output
+		-rw-r--r--  1 cuizheng  staff     5  4 26 15:32 Sad-10.pid
+		-rw-r--r--  1 cuizheng  staff  1138  4 26 15:36 Sad-2.output
+		-rw-r--r--  1 cuizheng  staff     5  4 26 15:32 Sad-20.pid
+
+查看下进程
+
+		saimatoMacBook-Pro:rca.imdb cuizheng$ !ps
+		ps ax|grep Sad
+		 6178   ??  R      0:02.58 Sad-1      
+		 6181   ??  S      0:02.61 Sad-2      
+		 6522 s002  R+     0:00.00 grep Sad
+
+## Contributing to sad
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2013 崔峥. See LICENSE.txt for
+further details.
+

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/sad/config.rb

@@ -9,17 +9,25 @@ module Sad
 				@_namespace || 'SadQueue'
 			end
 
-			def redis=(opts={})
+			def default_rds_opts(inopts={})
 				opts = {
 					:host => 'localhost', 
 					:port => 6379,
 					:db => 0
-					}.update opts
-				@_redis = EM::Protocols::Redis.connect :host => opts[:host], :port => opts[:port], :db => opts[:db]
+					}.update inopts.dup
+				if opts[:password]
+					url = "redis://#{opts[:password]}@#{opts[:host]}:#{opts[:port]}/#{opts[:db]}"
+				else
+					url = "redis://#{opts[:host]}:#{opts[:port]}/#{opts[:db]}"
+				end
+			end
+
+			def redis=(opts={})
+				@_redis = EM::Hiredis.connect default_rds_opts(opts)
 			end
 
 			def redis
-				@_redis || (EM::Protocols::Redis.connect)
+				@_redis || EM::Hiredis.connect
 			end
 		end
 	end

data/lib/sad/runner.rb

@@ -16,13 +16,15 @@ module Sad
 		#     :monitor    => true
 		#   }
 
-		def self.start(opts={})
+		def self.exec(opts={})
 			count = (ENV['COUNT'] && ENV['COUNT'].to_i)
 
 			if count and count != 0
 				count.times do |t|
-					Daemons.run_proc('Sad', opts) do
-						Sad::Server.run(ENV['QUEUE'])
+					Daemons.run_proc("Sad-#{t+1}", opts) do
+						EM.run{
+							Sad::Server.run(ENV['QUEUE'])
+						}
 					end
 				end
 			end

data/lib/sad/server.rb

@@ -8,7 +8,8 @@ module Sad
 			end
 
 			def fetch(queue)
-				::Sad::Config.redis.blpop(queue, 60){|_, data|
+				request = ::Sad::Config.redis.blpop(queue, 60)
+				request.callback{|_, data|
 					if data
 						STDOUT.puts '-'*15 + data.inspect + '-'*15
 						payload = Payload.decode(data)
@@ -16,6 +17,9 @@ module Sad
 					end
 					fetch(queue) unless shutdown?
 				}
+				request.errback{
+					fetch(queue) unless shutdown?
+				}
 			end
 
 			def perform(klass, args)

data/lib/sad/tasks.rb

@@ -1,12 +1,37 @@
 namespace :sad do
-	desc "start sad with args - COUNT=4 QUEUE=sosad"
+	desc "start sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids"
 	task :start do
 		opts = {
 			:dir => ENV['DIR'],
 			:multiple => true,
-			:mode => :exec,
-			:backtrace  => true
+			:log_output => true,
+			:backtrace  => true,
+			:ARGV => ['start']
 		}
-		Sad::Runner.start(opts)
+		Sad::Runner.exec(opts)
 	end
-end
+
+	desc "stop sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids"
+	task :stop do
+		opts = {
+			:dir => ENV['DIR'],
+			:multiple => true,
+			:log_output => true,
+			:backtrace  => true,
+			:ARGV => ['stop']
+		}
+		Sad::Runner.exec(opts)
+	end
+
+	desc "restart sad with args - COUNT=4 QUEUE=sosad DIR=./tmp/pids"
+	task :restart do
+		opts = {
+			:dir => ENV['DIR'],
+			:multiple => true,
+			:log_output => true,
+			:backtrace  => true,
+			:ARGV => ['restart']
+		}
+		Sad::Runner.exec(opts)
+	end
+end

data/sad.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "sad"
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["\u{5d14}\u{5ce5}"]
+  s.date = "2013-04-26"
+  s.description = "a simple em baseed background job worker."
+  s.email = "zheng.cuizh@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/sad.rb",
+    "lib/sad/config.rb",
+    "lib/sad/payload.rb",
+    "lib/sad/runner.rb",
+    "lib/sad/server.rb",
+    "lib/sad/tasks.rb",
+    "lib/sad/worker.rb",
+    "lib/tasks/sad.rake",
+    "sad.gemspec",
+    "test/helper.rb",
+    "test/test_sad.rb"
+  ]
+  s.homepage = "http://github.com/charlescui/sad"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "a simple em baseed background job worker."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<em-hiredis>, [">= 0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+    else
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<em-hiredis>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<em-hiredis>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sad
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -97,13 +97,13 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/sad.rb
@@ -114,6 +114,7 @@ files:
 - lib/sad/tasks.rb
 - lib/sad/worker.rb
 - lib/tasks/sad.rake
+- sad.gemspec
 - test/helper.rb
 - test/test_sad.rb
 homepage: http://github.com/charlescui/sad
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -974806537545998000
+      hash: -705114699202338873
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/README.rdoc

@@ -1,19 +0,0 @@
-= sad
-
-Description goes here.
-
-== Contributing to sad
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2013 崔峥. See LICENSE.txt for
-further details.
-