gearman-ruby 3.0.1 → 3.0.2

data/Rakefile

@@ -9,7 +9,7 @@ begin
     s.name = "gearman-ruby"
     s.summary = "Library for the Gearman distributed job system"
     s.email = "john@unixninjas.org"
-    s.homepage = "http://github.com/gearman-ruby/gearman-ruby"
+    s.homepage = "http://github.com/johnewart/gearman-ruby"
     s.description = "Library for the Gearman distributed job system"
     s.authors = ["John Ewart", "Colin Curtin", "Daniel Erat", "Ladislav Martincik", "Pablo Delgado", "Mauro Pompilio", "Antonio Garrote", "Kim Altintop"]
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 3
 :minor: 0
-:patch: 1
+:patch: 2

data/examples/bgclient.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+#require 'gearman'
+require '../lib/gearman'
+require 'json'
+
+servers = ['localhost:4731']
+  
+client = Gearman::Client.new(servers)
+taskset = Gearman::TaskSet.new(client)
+function = "reverse_string"
+struct_data = {
+  :site_id => 45,
+  :domain => 'www.google.com'
+}
+#data = JSON.generate(struct_data)
+data = "testing"
+task = Gearman::BackgroundTask.new(function, data)
+taskset.add_task(task)
+

data/examples/client_background.rb

@@ -2,13 +2,13 @@ require 'rubygems'
 #require 'gearman'
 require '../lib/gearman'
 
-servers = ['localhost:4730',]
+servers = ['localhost:4731']
   
 client = Gearman::Client.new(servers)
 taskset = Gearman::TaskSet.new(client)
 
 task = Gearman::Task.new('sleep', 20, { :background => true })
-task.on_complete {|d| puts d }
+#task.on_complete {|d| puts d }
 
 taskset.add_task(task)
-taskset.wait(100)
+#taskset.wait(100)

data/examples/client_reverse.rb

@@ -7,7 +7,7 @@ require '../lib/gearman'
 t = nil
 threadcounter = 0
 
-client = Gearman::Client.new('localhost')
+client = Gearman::Client.new('localhost:4731')
 
   
 myid = threadcounter 
@@ -22,6 +22,6 @@ taskset = Gearman::TaskSet.new(client)
   puts "#{jid} #{data}"
         
   time = Time.now() + rand(120) + 10
-  task.schedule(time)
+  #task.schedule(time)
   taskset.add_task(task)
 end

data/examples/worker_reverse_string.rb

@@ -3,25 +3,18 @@ require '../lib/gearman'
 
 # String reverse worker 
 
-servers = ['localhost:4730']
+servers = ['localhost:4731']
 
-t = nil
 jobnum = 0
 
-(0..1).each do 
-  t = Thread.new {
-    w = Gearman::Worker.new(servers)
-    w.add_ability('reverse_string') do |data,job|
-      result = data.reverse
-      puts "Job: #{job.inspect} Data: #{data.inspect} Reverse: #{result} "
-      puts "Completed job ##{jobnum}"
-      jobnum += 1
-      result
-    end
-    loop { w.work }
-  }
+w = Gearman::Worker.new(servers)
+w.add_ability('reverse_string') do |data,job|
+  result = data.reverse
+  puts "Job: #{job.inspect} Data: #{data.inspect} Reverse: #{result} "
+  puts "Completed job ##{jobnum}"
+  jobnum += 1
+  result
 end
+loop { w.work }
 
-puts "Waiting for threads..."
-t.join
 

data/lib/gearman/worker.rb

@@ -54,6 +54,7 @@ class Worker
     def run(data, job)
       @block.call(data, job)
     end
+  
   end
 
   # = Job
@@ -107,6 +108,7 @@ class Worker
     @client_id = Array.new(30) { chars[rand(chars.size)] }.join
     @sockets = {}  # "host:port" -> Socket
     @abilities = {}  # "funcname" -> Ability
+    @after_abilities = {} # "funcname" -> Ability
     @bad_servers = []  # "host:port"
     @servers_mutex = Mutex.new
     %w{client_id reconnect_sec
@@ -246,6 +248,10 @@ class Worker
     @sockets.values.each {|s| announce_ability(s, func, timeout) }
   end
 
+  def after_ability(func, &f)
+    @after_abilities[func] = Ability.new(f)
+  end
+  
   ##
   # Let job servers know that we're no longer able to do something.
   #
@@ -287,12 +293,10 @@ class Worker
       exception = e
     end
 
-
     cmd = if ret && exception.nil?
-      ret = ret.to_s
-      Util.logger.debug "GearmanRuby: Sending work_complete for #{handle} with #{ret.size} byte(s) " +
+      Util.logger.debug "GearmanRuby: Sending work_complete for #{handle} with #{ret.to_s.size} byte(s) " +
         "to #{hostport}"
-      [ Util.pack_request(:work_complete, "#{handle}\0#{ret}") ]
+      [ Util.pack_request(:work_complete, "#{handle}\0#{ret.to_s}") ]
     elsif exception.nil?
       Util.logger.debug "GearmanRuby: Sending work_fail for #{handle} to #{hostport}"
       [ Util.pack_request(:work_fail, handle) ]
@@ -302,6 +306,21 @@ class Worker
     end
 
     cmd.each {|p| Util.send_request(sock, p) }
+    
+    # There are cases where we might want to run something after the worker
+    # successfully completes the ability in question and sends its results
+    if ret && exception.nil?
+      after_ability = @after_abilities[func]
+      if after_ability
+        Util.logger.debug "Running after ability for #{func}..."
+        begin
+          after_ability.run(ret, data)
+        rescue Exception => e
+          nil
+        end
+      end
+    end 
+    
     true
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gearman-ruby
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - John Ewart
@@ -21,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -76,8 +77,9 @@ files:
 - test/mock_worker_test.rb
 - test/util_test.rb
 - test/worker_test.rb
+- examples/bgclient.rb
 has_rdoc: true
-homepage: http://github.com/gearman-ruby/gearman-ruby
+homepage: http://github.com/johnewart/gearman-ruby
 licenses: []
 
 post_install_message: 
@@ -86,23 +88,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Library for the Gearman distributed job system
@@ -112,6 +118,7 @@ test_files:
 - test/mock_worker_test.rb
 - test/util_test.rb
 - test/worker_test.rb
+- examples/bgclient.rb
 - examples/calculus_client.rb
 - examples/calculus_worker.rb
 - examples/client.rb