beanstalk-client 0.11.0 → 1.0.0

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.0 2008-05-29
+
+* Preserve the watch list when a Pool instance reconnects.
+* Allow user to get the cached list of tubes watched for a Pool.
+* Allow user to specify a default tube for all connections. (Dustin Sallings)
+* Added a gemspec for github. (Dustin Sallings)
+* More exception classes, including one for each server error response.
+
 == 0.11.0 2008-04-17
 
 * Fix an infinite loop bug when the server goes away.

data/config/hoe.rb

@@ -1,7 +1,7 @@
 require 'beanstalk-client/version'
 
 AUTHOR = 'Keith Rarick'  # can also be an array of Authors
-EMAIL = 'kr@essembly.com'
+EMAIL = 'kr@causes.com'
 DESCRIPTION = 'Ruby client library for the Beanstalk protocol'
 GEM_NAME = 'beanstalk-client' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'beanstalk' # The unix name for your project

data/lib/beanstalk-client/connection.rb

@@ -26,12 +26,15 @@ module Beanstalk
   class Connection
     attr_reader :addr
 
-    def initialize(addr, jptr=self)
+    def initialize(addr, jptr=self, default_tube=nil)
+      @waiting = false
       @addr = addr
       @jptr = jptr
       connect
       @last_used = 'default'
-      @watch_list = ['default']
+      @watch_list = [@last_used]
+      self.use(default_tube) if default_tube
+      self.watch(default_tube) if default_tube
     end
 
     def connect
@@ -107,6 +110,8 @@ module Beanstalk
     def use(tube)
       return tube if tube == @last_used
       @last_used = interact("use #{tube}\r\n", %w(USING))[0]
+    rescue BadFormatError
+      raise InvalidTubeName.new(tube)
     end
 
     def watch(tube)
@@ -114,6 +119,8 @@ module Beanstalk
       r = interact("watch #{tube}\r\n", %w(WATCHING))[0].to_i
       @watch_list += [tube]
       return r
+    rescue BadFormatError
+      raise InvalidTubeName.new(tube)
     end
 
     def ignore(tube)
@@ -201,28 +208,14 @@ module Beanstalk
     end
   end
 
-  class CleanupWrapper
-    def initialize(addr, multi)
-      @conn = Connection.new(addr, self)
-      @multi = multi
-    end
-
-    def method_missing(selector, *args, &block)
-      begin
-        @multi.last_conn = @conn
-        @conn.send(selector, *args, &block)
-      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, UnexpectedResponse => ex
-        @multi.remove(@conn)
-        raise ex
-      end
-    end
-  end
-
   class Pool
     attr_accessor :last_conn
 
-    def initialize(addrs)
+    def initialize(addrs, default_tube=nil)
       @addrs = addrs
+      @watch_list = ['default']
+      @default_tube=default_tube
+      @watch_list = [default_tube] if default_tube
       connect()
     end
 
@@ -232,7 +225,11 @@ module Beanstalk
         begin
           if !@connections.include?(addr)
             puts "connecting to beanstalk at #{addr}"
-            @connections[addr] = CleanupWrapper.new(addr, self)
+            @connections[addr] = Connection.new(addr, self, @default_tube)
+            prev_watched = @connections[addr].list_tubes_watched()
+            to_ignore = prev_watched - @watch_list
+            @watch_list.each{|tube| @connections[addr].watch(tube)}
+            to_ignore.each{|tube| @connections[addr].ignore(tube)}
           end
         rescue Exception => ex
           puts "#{ex.class}: #{ex}"
@@ -267,11 +264,15 @@ module Beanstalk
     end
 
     def watch(tube)
-      send_to_all_conns(:watch, tube)
+      r = send_to_all_conns(:watch, tube)
+      @watch_list = send_to_rand_conn(:list_tubes_watched, true)
+      return r
     end
 
     def ignore(tube)
-      send_to_all_conns(:ignore, tube)
+      r = send_to_all_conns(:ignore, tube)
+      @watch_list = send_to_rand_conn(:list_tubes_watched, true)
+      return r
     end
 
     def raw_stats()
@@ -298,8 +299,8 @@ module Beanstalk
       send_to_all_conns(:list_tube_used)
     end
 
-    def list_tubes_watched()
-      send_to_all_conns(:list_tubes_watched)
+    def list_tubes_watched(*args)
+      send_to_all_conns(:list_tubes_watched, *args)
     end
 
     def remove(conn)
@@ -333,7 +334,15 @@ module Beanstalk
 
     private
 
-    def wrap(*args)
+    def call_wrap(c, *args)
+      self.last_conn = c
+      c.send(*args)
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, UnexpectedResponse => ex
+      self.remove(c)
+      raise ex
+    end
+
+    def retry_wrap(*args)
       yield
     rescue DrainingError
       # Don't reconnect -- we're not interested in this server
@@ -345,17 +354,17 @@ module Beanstalk
 
     def send_to_each_conn_first_res(*args)
       connect()
-      wrap{open_connections.inject(nil) {|r,c| r or c.send(*args)}}
+      retry_wrap{open_connections.inject(nil) {|r,c| r or call_wrap(c, *args)}}
     end
 
     def send_to_rand_conn(*args)
       connect()
-      wrap{pick_connection.send(*args)}
+      retry_wrap{call_wrap(pick_connection, *args)}
     end
 
     def send_to_all_conns(*args)
       connect()
-      wrap{compact_hash(map_hash(@connections){|c| c.send(*args)})}
+      retry_wrap{compact_hash(map_hash(@connections){|c| call_wrap(c, *args)})}
     end
 
     def pick_connection()

data/lib/beanstalk-client/errors.rb

@@ -44,6 +44,41 @@ module Beanstalk
     WORD = 'NOT_FOUND'
   end
 
+  class DeadlineSoonError < UnexpectedResponse
+    WORD = 'DEADLINE_SOON'
+  end
+
+  class NotIgnoredError < UnexpectedResponse
+    WORD = 'NOT_IGNORED'
+  end
+
+  class OutOfMemoryError < UnexpectedResponse
+    WORD = 'OUT_OF_MEMORY'
+  end
+
+  class InternalError < UnexpectedResponse
+    WORD = 'INTERNAL_ERROR'
+  end
+
+  class BadFormatError < UnexpectedResponse
+    WORD = 'BAD_FORMAT'
+  end
+
+  class UnknownCommandError < UnexpectedResponse
+    WORD = 'UNKNOWN_COMMAND'
+  end
+
+  class ExpectedCRLFError < UnexpectedResponse
+    WORD = 'EXPECTED_CRLF'
+  end
+
+  class JobTooBigError < UnexpectedResponse
+    WORD = 'JOB_TOO_BIG'
+  end
+
   class WaitingForJobError < RuntimeError
   end
+
+  class InvalidTubeName < RuntimeError
+  end
 end

data/lib/beanstalk-client/version.rb

@@ -1,5 +1,5 @@
 module Beanstalk #:nodoc:
   module VERSION #:nodoc:
-    STRING = '0.11.0'
+    STRING = '1.0.0'
   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">0.11.0</a>
+      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">1.0.0</a>
     </div>
     <h1>&#x2192; &#8216;beanstalk-client&#8217;</h1>
 
@@ -134,7 +134,7 @@ discussion regarding <tt>beanstalkd</tt> and the various client libraries.</p>
 	<p>Comments are welcome. Send any questions or comments to the
 <a href="http://groups.google.com/group/beanstalk-talk">beanstalk-talk</a> google group.</p>
     <p class="coda">
-      <a href="mailto:kr@essembly.com">Keith Rarick</a>, 4th January 2008<br>
+      <a href="mailto:kr@causes.com">Keith Rarick</a>, 27th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/template.rhtml

@@ -37,7 +37,7 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="mailto:kr@essembly.com">Keith Rarick</a>, <%= modified.pretty %><br>
+      <a href="mailto:kr@causes.com">Keith Rarick</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: beanstalk-client
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
-date: 2008-04-17 00:00:00 -07:00
+  version: 1.0.0
+date: 2008-05-29 00:00:00 -07:00
 summary: Ruby client library for the Beanstalk protocol
 require_paths: 
 - lib
-email: kr@essembly.com
+email: kr@causes.com
 homepage: http://beanstalk.rubyforge.org
 rubyforge_project: beanstalk
 description: Ruby client library for the Beanstalk protocol
@@ -57,8 +57,8 @@ files:
 - website/stylesheets/screen.css
 - website/template.rhtml
 test_files: 
-- test/test_helper.rb
 - test/test_beanstalk-client.rb
+- test/test_helper.rb
 rdoc_options: 
 - --main
 - README.txt