xing-gearman-ruby 1.3.0 → 1.3.1

data/VERSION.yml

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

data/gearman-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gearman-ruby}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Erat", "Ladislav Martincik", "Pablo Delgado", "Mauro Pompilio", "Antonio Garrote", "Kim Altintop"]
-  s.date = %q{2009-08-04}
+  s.date = %q{2009-08-06}
   s.description = %q{Library for the Gearman distributed job system}
   s.email = %q{ladislav.martincik@xing.com}
   s.extra_rdoc_files = [

data/lib/gearman/taskset.rb

@@ -225,12 +225,21 @@ class TaskSet
   # Wait for all tasks in the set to finish.
   #
   # @param timeout  maximum amount of time to wait, in seconds
-  def wait(timeout=1)
-    end_time = Time.now.to_f + timeout
+  def wait(timeout = 1)
+    end_time = if timeout
+      Time.now.to_f + timeout
+    else
+      nil
+    end
+
     while not @tasks_in_progress.empty?
-      remaining = end_time - Time.now.to_f
-      ready_socks = IO::select(
-        @sockets.values, nil, nil, remaining > 0 ? remaining : 0)
+      remaining = if end_time
+        (t = end_time - Time.now.to_f) > 0 ? t : 0
+      else
+        nil
+      end
+
+      ready_socks = IO::select(@sockets.values, nil, nil, remaining)
       if not ready_socks or not ready_socks[0]
         Util.log "Timed out while waiting for tasks to finish"
         # not sure what state the connections are in, so just be lame and
@@ -241,7 +250,7 @@ class TaskSet
       end
       ready_socks[0].each do |sock|
         begin
-          read_packet(sock, end_time - Time.now.to_f)
+          read_packet(sock, (end_time ? end_time - Time.now.to_f : nil))
         rescue ProtocolError
           hostport = @client.get_hostport_for_socket(sock)
           Util.log "Ignoring bad packet from #{hostport}"
@@ -261,7 +270,7 @@ class TaskSet
     end
     true
   end
-  
+
   private
     def tasks_in_progress(hostport, handle, remove_task = false)
       js_handle = Util.handle_to_str(hostport, handle)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xing-gearman-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Daniel Erat
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: []