beanstalk-client 1.0.0 → 1.0.2

data/History.txt

@@ -1,3 +1,15 @@
+== 1.0.2 2008-06-18
+
+* Support reserve-with-timeout on pools. (Dustin Sallings)
+
+== 1.0.1 (never released)
+
+* Fix bug preventing jobs from being deleted.
+* Remove an extraneous message. (Dustin Sallings)
+* Fix the github gemspec so beanstalk-client builds. (Isaac Feliu)
+* Support the new reserve-with-timeout command in dev beanstalkd.
+  (Dustin Sallings)
+
 == 1.0.0 2008-05-29
 
 * Preserve the watch list when a Pool instance reconnects.

data/lib/beanstalk-client/connection.rb

@@ -26,10 +26,9 @@ module Beanstalk
   class Connection
     attr_reader :addr
 
-    def initialize(addr, jptr=self, default_tube=nil)
+    def initialize(addr, default_tube=nil)
       @waiting = false
       @addr = addr
-      @jptr = jptr
       connect
       @last_used = 'default'
       @watch_list = [@last_used]
@@ -75,9 +74,13 @@ module Beanstalk
       interact("peek-buried\r\n", :job)
     end
 
-    def reserve()
+    def reserve(timeout=nil)
       raise WaitingForJobError if @waiting
-      @socket.write("reserve\r\n")
+      if timeout.nil?
+        @socket.write("reserve\r\n")
+      else
+        @socket.write("reserve-with-timeout #{timeout}\r\n")
+      end
 
       begin
         @waiting = true
@@ -89,7 +92,7 @@ module Beanstalk
         @waiting = false
       end
 
-      Job.new(@jptr, *read_job('RESERVED'))
+      Job.new(self, *read_job('RESERVED'))
     end
 
     def delete(id)
@@ -181,7 +184,7 @@ module Beanstalk
     end
 
     def found_job()
-      Job.new(@jptr, *read_job('FOUND'))
+      Job.new(self, *read_job('FOUND'))
     rescue NotFoundError
       nil
     end
@@ -224,8 +227,7 @@ module Beanstalk
       @addrs.each do |addr|
         begin
           if !@connections.include?(addr)
-            puts "connecting to beanstalk at #{addr}"
-            @connections[addr] = Connection.new(addr, self, @default_tube)
+            @connections[addr] = Connection.new(addr, @default_tube)
             prev_watched = @connections[addr].list_tubes_watched()
             to_ignore = prev_watched - @watch_list
             @watch_list.each{|tube| @connections[addr].watch(tube)}
@@ -255,8 +257,8 @@ module Beanstalk
       send_to_rand_conn(:yput, obj, pri, delay, ttr)
     end
 
-    def reserve()
-      send_to_rand_conn(:reserve)
+    def reserve(timeout=nil)
+      send_to_rand_conn(:reserve, timeout)
     end
 
     def use(tube)

data/lib/beanstalk-client/errors.rb

@@ -76,6 +76,10 @@ module Beanstalk
     WORD = 'JOB_TOO_BIG'
   end
 
+  class TimedOut < UnexpectedResponse
+    WORD = 'TIMED_OUT'
+  end
+
   class WaitingForJobError < RuntimeError
   end
 

data/lib/beanstalk-client/version.rb

@@ -1,5 +1,5 @@
 module Beanstalk #:nodoc:
   module VERSION #:nodoc:
-    STRING = '1.0.0'
+    STRING = '1.0.2'
   end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Beanstalk Client</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/beanstalk"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">1.0.0</a>
+      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">1.0.2</a>
     </div>
     <h1>&#x2192; &#8216;beanstalk-client&#8217;</h1>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: beanstalk-client
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2008-05-29 00:00:00 -07:00
+  version: 1.0.2
+date: 2008-06-18 00:00:00 -07:00
 summary: Ruby client library for the Beanstalk protocol
 require_paths: 
 - lib