gearman-ruby 2.0.0 → 3.0.1

data/Rakefile

@@ -2,17 +2,16 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rcov/rcovtask'
-
+ 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "gearman-ruby"
     s.summary = "Library for the Gearman distributed job system"
-    s.email = "kim.altintop@gmail.com"
-    s.homepage = "http://github.com/kim/gearman-ruby"
+    s.email = "john@unixninjas.org"
+    s.homepage = "http://github.com/gearman-ruby/gearman-ruby"
     s.description = "Library for the Gearman distributed job system"
-    s.authors = ["Kim Altintop"]
-    s.add_dependency 'eventmachine', '>= 0.12.8'
+    s.authors = ["John Ewart", "Colin Curtin", "Daniel Erat", "Ladislav Martincik", "Pablo Delgado", "Mauro Pompilio", "Antonio Garrote", "Kim Altintop"]
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -38,4 +37,4 @@ Rcov::RcovTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+task :default => :rcov

data/VERSION.yml

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

data/examples/calculus_client.rb

@@ -3,9 +3,9 @@ require 'rubygems'
 require '../lib/gearman'
 #Gearman::Util.debug = true
 
-# Connect to the local server (at the default port 4730)
+# Connect to the local server (at the default port 7003) 
 client = Gearman::Client.new('localhost')
-taskset = Gearman::Taskset.new
+taskset = Gearman::TaskSet.new(client)
 
 # Get something to echo
 puts '[client] Write a basic arithmetic operation:'
@@ -19,23 +19,21 @@ operations.each do |op|
   # Determining the operation
   case op
     when /\+/
-      type, data = 'addition', op.split('+')
+      type, data = 'addition', op.split('+') 
     when /\-/
-      type, data = 'subtraction', op.split('-')
+      type, data = 'subtraction', op.split('-') 
     when /\*/
-      type, data = 'multiplication', op.split('*')
+      type, data = 'multiplication', op.split('*') 
     when /\//
-      type, data = 'division', op.split('/')
+      type, data = 'division', op.split('/') 
   end
 
   task = Gearman::Task.new(type, Marshal.dump(data.map {|v| v.to_i}))
   task.on_complete {|r| puts "[client] #{type} result is: #{r}" }
-  task.on_warning {|w| puts "[client] warn: #{w}" }
-  task.on_fail { puts "[client] calculation failed" } 
 
   # Sending the task to the server
   puts "[client] Sending values: #{data.inspect}, to the '#{type}' worker"
-  taskset << task
+  taskset.add_task(task)
+  taskset.wait(100)
 end
 
-client.run(taskset)

data/examples/calculus_worker.rb

@@ -5,6 +5,7 @@ require '../lib/gearman'
 #Gearman::Util.debug = true
 
 worker = Gearman::Worker.new('localhost')
+worker.reconnect_sec = 2
 
 # Additon ability
 worker.add_ability('addition') do |data,job|
@@ -39,4 +40,6 @@ worker.add_ability('division') do |data,job|
 end
 
 # Running the workers
-worker.work
+loop do
+  worker.work
+end

data/examples/client.php

@@ -0,0 +1,23 @@
+<?php
+
+require_once 'Net/Gearman/Client.php';
+
+$set = new Net_Gearman_Set();
+
+function result($func, $handle, $result) {
+    var_dump($func);
+    var_dump($handle);
+    var_dump($result);
+}
+
+$task = new Net_Gearman_Task('Sleep', array(
+  'seconds' => 20
+));
+
+$task->attachCallback('result');
+$set->addTask($task);
+
+$client = new Net_Gearman_Client(array('localhost:4730', 'localhost:4731'));
+$client->runSet($set);
+
+?>

data/examples/client.rb

@@ -4,16 +4,12 @@ require '../lib/gearman'
 Gearman::Util.debug = true
 
 servers = ['localhost:4730', 'localhost:4731']
-
+  
 client = Gearman::Client.new(servers)
-taskset = Gearman::Taskset.new
-
-task = Gearman::Task.new('sleep', 2)
-task.on_complete {|d| puts "TASK 1: #{d}" }
-taskset << task
+taskset = Gearman::TaskSet.new(client)
 
-task = Gearman::Task.new('sleep', 2)
-task.on_complete {|d| puts "TASK 2: #{d}" }
-taskset << task
+task = Gearman::Task.new('sleep', 20)
+task.on_complete {|d| puts d }
 
-client.run(taskset)
+taskset.add_task(task)
+taskset.wait(100)

data/examples/client_background.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
 #require 'gearman'
 require '../lib/gearman'
-Gearman::Util.debug = true
-
-servers = ['localhost:4730', 'localhost:4731']
 
+servers = ['localhost:4730',]
+  
 client = Gearman::Client.new(servers)
+taskset = Gearman::TaskSet.new(client)
 
-task = Gearman::Task.new('sleep', 20, :background => true, :poll_status_interval => 1)
-task.on_complete {|d| puts d } #never called
-task.on_status {|d| puts "Status: #{d}"}
+task = Gearman::Task.new('sleep', 20, { :background => true })
+task.on_complete {|d| puts d }
 
-client.run(task)
+taskset.add_task(task)
+taskset.wait(100)

data/examples/client_data.rb

@@ -4,13 +4,13 @@ require '../lib/gearman'
 Gearman::Util.debug = true
 
 servers = ['localhost:4730']
-
+  
 client = Gearman::Client.new(servers)
-taskset = Gearman::Taskset.new
+taskset = Gearman::TaskSet.new(client)
 
 task = Gearman::Task.new('chunked_transfer')
 task.on_data {|d| puts d }
 task.on_complete {|d| puts d }
 
-taskset << task
-client.run taskset
+taskset.add_task(task)
+taskset.wait(100)

data/examples/client_epoch.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+# Client using Gearman SUBMIT_JOB_EPOCH (currently requires the gearmand branch lp:~jewart/gearmand/scheduled_jobs_support/)
+
+require 'rubygems'
+require '../lib/gearman'
+
+(1..100).each do 
+   # Connect to the local server (at the default port 4730) 
+   client = Gearman::Client.new('localhost')
+   taskset = Gearman::TaskSet.new(client)
+
+   data = rand(36**8).to_s(36)
+   # Set scheduled time to some time in the future
+   time = Time.now() + rand(10)
+   puts "Time as seconds: #{time.to_i}" 
+   task = Gearman::Task.new("reverse_string", data)
+   task.schedule(time)
+
+   # Sending the task to the server
+   puts "[client] Sending task: #{task.inspect}, to the 'reverse_string' worker"
+   taskset.add_task(task)
+end

data/examples/client_exception.rb

@@ -5,13 +5,15 @@ Gearman::Util.debug = true
 servers = ['localhost:4730']
 
 client = Gearman::Client.new(servers)
+taskset = Gearman::TaskSet.new(client)
 
 task = Gearman::Task.new('fail_with_exception', "void")
-task.retries = 2
+task.retry_count = 2
 task.on_complete {|d| puts d }
 task.on_exception {|ex| puts "This should never be called" }
 task.on_warning {|warning| puts "WARNING: #{warning}" }
 task.on_retry { puts "PRE-RETRY HOOK: retry no. #{task.retries_done}" }
 task.on_fail { puts "TASK FAILED, GIVING UP" }
 
-client.run task
+taskset.add_task(task)
+taskset.wait(100)

data/examples/client_prefix.rb

@@ -4,12 +4,14 @@ require '../lib/gearman'
 Gearman::Util.debug = true
 
 servers = ['localhost:4730', 'localhost:4731']
-
+  
 ability_name_with_prefix = Gearman::Util.ability_name_with_prefix("test","sleep")
 
 client = Gearman::Client.new(servers)
+taskset = Gearman::TaskSet.new(client)
 
 task = Gearman::Task.new(ability_name_with_prefix, 20)
 task.on_complete {|d| puts d }
 
-client.run task
+taskset.add_task(task)
+taskset.wait(100)

data/examples/client_reverse.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require '../lib/gearman'
+
+# Client using Gearman SUBMIT_JOB_EPOCH (currently requires the gearmand branch lp:~jewart/gearmand/scheduled_jobs_support/)
+
+t = nil
+threadcounter = 0
+
+client = Gearman::Client.new('localhost')
+
+  
+myid = threadcounter 
+threadcounter += 1
+taskset = Gearman::TaskSet.new(client)
+  
+(1..10000).each do |jid|
+  data = rand(36**8).to_s(36)
+  result = data.reverse
+
+  task = Gearman::Task.new("reverse_string", data)
+  puts "#{jid} #{data}"
+        
+  time = Time.now() + rand(120) + 10
+  task.schedule(time)
+  taskset.add_task(task)
+end

data/examples/scale_image.rb

@@ -4,8 +4,7 @@ $: << '../lib'
 require 'gearman'
 require 'optparse'
 
-Gearman::Util.debug = true
-servers = 'localhost:7003'
+servers = 'localhost:4730'
 format = 'PNG'
 width, height = 100, 100
 
@@ -24,7 +23,9 @@ if ARGV.size != 2
 end
 
 client = Gearman::Client.new(servers.split(','), 'example')
+taskset = Gearman::TaskSet.new(client)
 arg = [width, height, format, File.read(ARGV[0])].join("\0")
 task = Gearman::Task.new('scale_image', arg)
 task.on_complete {|d| File.new(ARGV[1],'w').write(d) }
-client.run task
+taskset.add_task(task)
+taskset.wait(10)

data/examples/scale_image_worker.rb

@@ -31,4 +31,4 @@ worker.add_ability('scale_image') do |data,job|
   image.to_blob
 end
 
-worker.work
+loop { worker.work }

data/examples/worker.rb

@@ -2,9 +2,7 @@ require 'rubygems'
 #require 'gearman'
 require '../lib/gearman'
 
-Gearman::Util.debug = true
-
-servers = ['localhost:4730', 'localhost:4731']
+servers = ['localhost:4730',]
 w = Gearman::Worker.new(servers)
 
 # Add a handler for a "sleep" function that takes a single argument, the
@@ -20,4 +18,4 @@ w.add_ability('sleep') do |data,job|
  # Report success.
  true
 end
-w.work
+loop { w.work }

data/examples/worker_data.rb

@@ -9,8 +9,8 @@ worker = Gearman::Worker.new(servers)
 worker.add_ability('chunked_transfer') do |data, job|
   5.times do |i|
     sleep 1
-    job.send_partial("CHUNK #{i}")
+    job.send_data("CHUNK #{i}")
   end
   "EOD"
 end
-worker.work
+loop { worker.work }

data/examples/worker_exception.rb

@@ -11,4 +11,4 @@ w = Gearman::Worker.new(servers)
 w.add_ability('fail_with_exception') do |data,job|
   raise Exception.new("Exception in worker (args: #{data.inspect})")
 end
-w.work
+loop { w.work }

data/examples/worker_prefix.rb

@@ -22,4 +22,4 @@ w.add_ability(ability_name_with_prefix) do |data,job|
  # Report success.
  true
 end
-w.work
+loop { w.work }

data/examples/worker_reverse_string.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require '../lib/gearman'
+
+# String reverse worker 
+
+servers = ['localhost:4730']
+
+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 }
+  }
+end
+
+puts "Waiting for threads..."
+t.join
+

data/examples/worker_reverse_to_file.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+#require 'gearman'
+require '../lib/gearman'
+
+servers = ['localhost:4730']
+w = Gearman::Worker.new(servers)
+
+# Add a handler for a "sleep" function that takes a single argument, the
+# number of seconds to sleep before reporting success.
+w.add_ability('reverse_to_file') do |data,job|
+  puts "Data: #{data.inspect}"
+ word, file = data.split("\0")
+ puts "Word: #{word}"
+ puts "File: #{file}"
+ # Report success.
+ true
+end
+loop { w.work }

data/examples/{evented_worker.rb → worker_signals.rb}

@@ -1,4 +1,5 @@
 require 'rubygems'
+#require 'gearman'
 require '../lib/gearman'
 
 Gearman::Util.debug = true
@@ -8,19 +9,28 @@ w = Gearman::Worker.new(servers)
 
 # Add a handler for a "sleep" function that takes a single argument, the
 # number of seconds to sleep before reporting success.
-w.add_ability('sleep') do |data, job|
+w.add_ability('sleep') do |data,job|
  seconds = data
- job.report_warning("this is a warning you can safely ignore")
-
  (1..seconds.to_i).each do |i|
    sleep 1
-   print i
+   Gearman::Util.logger.info i
    # Report our progress to the job server every second.
    job.report_status(i, seconds)
-   job.send_partial(".")
  end
-
  # Report success.
- "SUCCESS"
+ true
 end
-w.work
+
+# Trap signals while is working
+%w(HUP USR1 ALRM TERM).each do |signal|
+  trap(signal) do
+    puts "Received signal #{signal} - setting worker_enabled to false. Worker status is [#{w.status}]"
+    w.worker_enabled = false
+    if w.status == :waiting
+      trap(signal, "DEFAULT")
+      Process.kill( signal, $$ )
+    end
+  end
+end
+
+loop { w.work or break }

data/lib/gearman.rb

@@ -1,29 +1,76 @@
-require 'rubygems'
-require 'eventmachine'
+#!/usr/bin/env ruby
+#
+# = Name
+# Gearman
+#
+# == Description
+# This file provides a Ruby interface for communicating with the Gearman
+# distributed job system.
+#
+# "Gearman is a system to farm out work to other machines, dispatching
+# function calls to machines that are better suited to do work, to do work
+# in parallel, to load balance lots of function calls, or to call functions
+# between languages."  -- http://www.danga.com/gearman/
+#
+# == Version
+# 0.0.1
+#
+# == Author
+# Daniel Erat <dan-ruby@erat.org>
+#
+# == License
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of either:
+#
+# a) the GNU General Public License as published by the Free Software
+#    Foundation; either version 1, or (at your option) any later version,
+#    or
+#
+# b) the "Artistic License" which comes with Perl.
 
+# = Gearman
+#
+# == Usage
+#  require 'gearman'
+#
+#  # Create a new client and tell it about two job servers.
+#  c = Gearman::Client.new
+#  c.job_servers = ['127.0.0.1:7003', '127.0.0.1:7004']
+#
+#  # Create two tasks, using an "add" function to sum two numbers.
+#  t1 = Gearman::Task.new('add', '5 + 2')
+#  t2 = Gearman::Task.new('add', '1 + 3')
+#
+#  # Make the tasks print the data they get back from the server.
+#  t1.on_complete {|d| puts "t1 got #{d}" }
+#  t2.on_complete {|d| puts "t2 got #{d}" }
+#
+#  # Create a taskset, add the two tasks to it, and wait until they finish.
+#  ts = Gearman::TaskSet.new(c)
+#  ts.add_task(t1)
+#  ts.add_task(t2)
+#  ts.wait
+#
+# Or, a more simple example:
+#
+#  c = Gearman::Client.new('127.0.0.1')
+#  puts c.do_task('add', '2 + 2')
+#
 module Gearman
 
-  require File.dirname(__FILE__) + '/gearman/evented/reactor'
-  require File.dirname(__FILE__) + '/gearman/evented/client'
-  require File.dirname(__FILE__) + '/gearman/evented/worker'
-  require File.dirname(__FILE__) + '/gearman/client'
-  require File.dirname(__FILE__) + '/gearman/task'
-  require File.dirname(__FILE__) + '/gearman/taskset'
-  require File.dirname(__FILE__) + '/gearman/util'
-  require File.dirname(__FILE__) + '/gearman/worker'
-  require File.dirname(__FILE__) + '/gearman/job'
+require File.dirname(__FILE__) + '/gearman/client'
+require File.dirname(__FILE__) + '/gearman/task'
+require File.dirname(__FILE__) + '/gearman/taskset'
+require File.dirname(__FILE__) + '/gearman/util'
+require File.dirname(__FILE__) + '/gearman/worker'
 
-  require File.dirname(__FILE__) + '/gearman/protocol'
-
-
-  class InvalidArgsError < Exception
-  end
+class InvalidArgsError < Exception
+end
 
-  class NetworkError < Exception
-  end
+class ProtocolError < Exception
+end
 
-  def log(msg, force = false)
-    Util.log(msg, force)
-  end
+class NetworkError < Exception
+end
 
 end