beanstalk-client 0.7.0 → 0.9.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.0 2008-02-27
+
+* Skipping 0.8.x; beanstalkd 0.8 was a botched release.
+* Protocol updates, support for all new commands and changes to existing
+  commands.
+* Bugfix: don't add stats values that aren't aggregations already.
+
 == 0.7.0 2008-02-01
 
 * Add a close method to connections and pools.

data/lib/beanstalk-client/connection.rb

@@ -18,6 +18,7 @@
 require 'socket'
 require 'fcntl'
 require 'yaml'
+require 'set'
 require 'beanstalk-client/bag'
 require 'beanstalk-client/errors'
 require 'beanstalk-client/job'
@@ -91,13 +92,48 @@ module Beanstalk
       :ok
     end
 
+    def use(tube)
+      @socket.write("use #{tube}\r\n")
+      check_resp('USING')[0]
+    end
+
+    def watch(tube)
+      @socket.write("watch #{tube}\r\n")
+      check_resp('WATCHING')[0]
+    end
+
+    def ignore(tube)
+      @socket.write("ignore #{tube}\r\n")
+      check_resp('WATCHING')[0]
+    end
+
     def stats()
       @socket.write("stats\r\n")
       read_yaml('OK')
     end
 
     def job_stats(id)
-      @socket.write("stats #{id}\r\n")
+      @socket.write("stats-job #{id}\r\n")
+      read_yaml('OK')
+    end
+
+    def stats_tube(tube)
+      @socket.write("stats-tube #{tube}\r\n")
+      read_yaml('OK')
+    end
+
+    def list_tubes()
+      @socket.write("list-tubes\r\n")
+      read_yaml('OK')
+    end
+
+    def list_tube_used()
+      @socket.write("list-tube-used\r\n")
+      check_resp('USING')[0]
+    end
+
+    def list_tubes_watched()
+      @socket.write("list-tubes-watched\r\n")
       read_yaml('OK')
     end
 
@@ -122,10 +158,10 @@ module Beanstalk
       # Give the user a chance to select on multiple fds.
       Beanstalk.select.call([@socket]) if Beanstalk.select
 
-      id, pri, bytes = check_resp(word).map{|s| s.to_i}
+      id, bytes = check_resp(word).map{|s| s.to_i}
       body = read_bytes(bytes)
       raise 'bad trailer' if read_bytes(2) != "\r\n"
-      [id, pri, body]
+      [id, body]
     end
 
     def read_yaml(word)
@@ -230,34 +266,64 @@ module Beanstalk
       @last_conn.addr
     end
 
-    def send_to_conn(sel, *args)
-      (@last_conn = pick_connection).send(sel, *args)
-    rescue DrainingError
-      # Don't reconnect -- we're not interested in this server
-      retry
-    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
-      connect()
-      retry
+    def send_to_rand_conn(sel, *args)
+      wrap(pick_connection, sel, *args)
+    end
+
+    def send_to_all_conns(sel, *args)
+      make_hash(@connections.map{|a, c| [a, wrap(c, sel, *args)]})
     end
 
     def put(body, pri=65536, delay=0, ttr=120)
-      send_to_conn(:put, body, pri, delay, ttr)
+      send_to_rand_conn(:put, body, pri, delay, ttr)
     end
 
     def yput(obj, pri=65536, delay=0, ttr=120)
-      send_to_conn(:yput, obj, pri, delay, ttr)
+      send_to_rand_conn(:yput, obj, pri, delay, ttr)
     end
 
     def reserve()
-      send_to_conn(:reserve)
+      send_to_rand_conn(:reserve)
+    end
+
+    def use(tube)
+      send_to_all_conns(:use, tube)
+    end
+
+    def watch(tube)
+      send_to_all_conns(:watch, tube)
+    end
+
+    def ignore(tube)
+      send_to_all_conns(:ignore, tube)
     end
 
     def raw_stats()
-      Hash[*@connections.map{|a,c| [a, c.stats()]}.inject([]){|a,b|a+b}]
+      send_to_all_conns(:stats)
     end
 
     def stats()
-      raw_stats.values.inject({}){|sums,h| sums.merge(h) {|k,o,n| o + n}}
+      sum_hashes(raw_stats.values)
+    end
+
+    def raw_stats_tube(tube)
+      send_to_all_conns(:stats_tube, tube)
+    end
+
+    def stats_tube(tube)
+      sum_hashes(raw_stats_tube(tube).values)
+    end
+
+    def list_tubes()
+      send_to_all_conns(:list_tubes)
+    end
+
+    def list_tube_used()
+      send_to_all_conns(:list_tube_used)
+    end
+
+    def list_tubes_watched()
+      send_to_all_conns(:list_tubes_watched)
     end
 
     def remove(conn)
@@ -284,5 +350,28 @@ module Beanstalk
     def pick_connection()
       open_connections[rand(open_connections.size)] or raise NotConnected
     end
+
+    def wrap(conn, sel, *args)
+      (@last_conn = conn).send(sel, *args)
+    rescue DrainingError
+      # Don't reconnect -- we're not interested in this server
+      retry
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
+      connect()
+      retry
+    end
+
+    def make_hash(pairs)
+      Hash[*pairs.inject([]){|a,b|a+b}]
+    end
+
+    def sum_hashes(hs)
+      hs.inject({}){|a,b| a.merge(b) {|k,o,n| combine_stats(k, o, n)}}
+    end
+
+    DONT_ADD = Set['name', 'version', 'pid']
+    def combine_stats(k, a, b)
+      DONT_ADD.include?(k) ? Set[a] + Set[b] : a + b
+    end
   end
 end

data/lib/beanstalk-client/job.rb

@@ -18,7 +18,7 @@
 require 'yaml'
 
 class Beanstalk::Job
-  attr_reader :id, :pri, :body, :conn
+  attr_reader :id, :body, :conn
 
   # Convenience method for getting ybody elements.
   def [](name)
@@ -36,10 +36,9 @@ class Beanstalk::Job
     (@ybody ||= [begin YAML.load(body) rescue nil end])[0]
   end
 
-  def initialize(conn, id, pri, body)
+  def initialize(conn, id, body)
     @conn = conn
     @id = id
-    @pri = pri
     @body = body
     @deleted = false
   end
@@ -49,8 +48,8 @@ class Beanstalk::Job
     @deleted = true
   end
 
-  def put_back(pri=self.pri)
-    @conn.put(body, pri)
+  def put_back(pri=self.pri, delay=0, ttr=self.ttr)
+    @conn.put(body, pri, delay, ttr)
   end
 
   def release(newpri=pri, delay=0)
@@ -69,7 +68,9 @@ class Beanstalk::Job
   def time_left() stats['time-left'] end
   def age() stats['age'] end
   def state() stats['state'] end
-  def delay() stats.fetch('delay', 0) end
+  def delay() stats['delay'] end
+  def pri() stats['pri'] end
+  def ttr() stats['ttr'] end
 
   def server()
     @conn.addr
@@ -88,6 +89,6 @@ class Beanstalk::Job
   end
 
   def inspect
-    "(job server=#{server} id=#{id} pri=#{pri} size=#{body.size})"
+    "(job server=#{server} id=#{id} size=#{body.size})"
   end
 end

data/lib/beanstalk-client/version.rb

@@ -1,5 +1,5 @@
 module Beanstalk #:nodoc:
   module VERSION #:nodoc:
-    STRING = '0.7.0'
+    STRING = '0.9.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.7.0</a>
+      <a href="http://rubyforge.org/projects/beanstalk" class="numbers">0.9.0</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: 0.7.0
-date: 2008-02-01 00:00:00 -08:00
+  version: 0.9.0
+date: 2008-02-27 00:00:00 -08:00
 summary: Ruby client library for the Beanstalk protocol
 require_paths: 
 - lib