gearman-ruby 3.0.2 → 3.0.3

data/Rakefile

@@ -8,8 +8,8 @@ begin
   Jeweler::Tasks.new do |s|
     s.name = "gearman-ruby"
     s.summary = "Library for the Gearman distributed job system"
-    s.email = "john@unixninjas.org"
-    s.homepage = "http://github.com/johnewart/gearman-ruby"
+    s.email = "gearman.ruby@librelist.com"
+    s.homepage = "http://github.com/gearman-ruby/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: 2
+:patch: 3

data/examples/client_background.rb

@@ -2,13 +2,13 @@ require 'rubygems'
 #require 'gearman'
 require '../lib/gearman'
 
-servers = ['localhost:4731']
+servers = ['localhost:4730',]
   
 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:4731')
+client = Gearman::Client.new('localhost')
 
   
 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,18 +3,25 @@ require '../lib/gearman'
 
 # String reverse worker 
 
-servers = ['localhost:4731']
+servers = ['localhost:4730']
 
+t = nil
 jobnum = 0
 
-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
+(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 }
+  }
 end
-loop { w.work }
 
+puts "Waiting for threads..."
+t.join
 

data/lib/gearman/worker.rb

@@ -248,6 +248,20 @@ class Worker
     @sockets.values.each {|s| announce_ability(s, func, timeout) }
   end
 
+
+  ##
+  # Add an after-ability hook
+  #
+  # The passed-in block of code will be executed after the work block for 
+  # jobs with the same function name. It takes two arguments, the result of
+  # the work and the original job data. This way, if you need to hook into 
+  # *after* the job_complete packet is sent to the server, you can do so. 
+  #
+  # N.B The after-ability hook ONLY runs if the ability was successful and no 
+  # exceptions were raised.
+  #
+  # @param func     function name (without prefix)
+  #
   def after_ability(func, &f)
     @after_abilities[func] = Ability.new(f)
   end
@@ -291,6 +305,7 @@ class Worker
       ret = ability.run(data, Job.new(sock, handle))
     rescue Exception => e
       exception = e
+      Util.logger.debug "GearmanRuby: Exception: #{e}\n#{e.backtrace.join("\n")}\n"
     end
 
     cmd = if ret && exception.nil?
@@ -316,6 +331,7 @@ class Worker
         begin
           after_ability.run(ret, data)
         rescue Exception => e
+          Util.logger.debug "GearmanRuby: Exception: #{e}\n#{e.backtrace.join("\n")}\n"
           nil
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gearman-ruby
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - John Ewart
@@ -22,12 +22,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -07:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: Library for the Gearman distributed job system
-email: john@unixninjas.org
+email: gearman.ruby@librelist.com
 executables: []
 
 extensions: []
@@ -77,9 +77,8 @@ files:
 - test/mock_worker_test.rb
 - test/util_test.rb
 - test/worker_test.rb
-- examples/bgclient.rb
 has_rdoc: true
-homepage: http://github.com/johnewart/gearman-ruby
+homepage: http://github.com/gearman-ruby/gearman-ruby
 licenses: []
 
 post_install_message: 
@@ -118,7 +117,6 @@ 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

data/examples/bgclient.rb

@@ -1,19 +0,0 @@
-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)
-