ayl-beanstalk 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 88e80db809fd24274ca8a7ac03f2abb7e7ae8527
+  data.tar.gz: ff8f5cc4c9c5aeb2547f56c2aae430435ea6cc69
+SHA512:
+  metadata.gz: 3dc71dbcf479f955a30ab21606321c6131a7abaacf624015328576f98b2e54b1c5bd8fd9a6bd47dce0a7957c88e500a8b0bc3cdc0b0e760c7100ab89f60423ab
+  data.tar.gz: ae83500715d9fe73bb63f4b4651ff4ed925c2c6a56c965651f59a75e8727c7dc6ab6da7f4811a0578f2633ca43ce57db79aab3c452b156abb0fb5ccdcd79227c

data/Gemfile

@@ -2,21 +2,19 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'ayl', ">= 0.3.0"
-gem 'beanstalk-client', ">= 1.1.0"
-gem 'daemons', ">= 1.1.0"
+gem 'ayl', "~> 0.4"
+gem 'beaneater', '~> 1.0'
+gem 'daemons', "~> 1.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", ">= 2.3.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.6.4"
-  gem "rcov", ">= 0"
-  gem 'pry'
+  gem "rspec", "~> 2.14"
+  gem "bundler", "~> 1.10"
+  gem "jeweler", "~> 2.0"
 end
 
-group :test do
-  gem 'rails', ">= 3.0.0"
-  gem 'pry'
-end
+group :test, :development do
+  gem 'rails', "~> 4.1"
+  gem 'pry', "~> 0.9"
+end

data/Gemfile.lock

@@ -1,125 +1,146 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.2)
-      actionpack (= 3.1.2)
-      mail (~> 2.3.0)
-    actionpack (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-      builder (~> 3.0.0)
+    actionmailer (4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.10)
+      actionview (= 4.1.10)
+      activesupport (= 4.1.10)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.10)
+      activesupport (= 4.1.10)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.0)
-    activemodel (3.1.2)
-      activesupport (= 3.1.2)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
-    activesupport (3.1.2)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    ayl (0.3.0)
-    beanstalk-client (1.1.1)
-    builder (3.0.0)
+    activemodel (4.1.10)
+      activesupport (= 4.1.10)
+      builder (~> 3.1)
+    activerecord (4.1.10)
+      activemodel (= 4.1.10)
+      activesupport (= 4.1.10)
+      arel (~> 5.0.0)
+    activesupport (4.1.10)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    arel (5.0.1.20140414130214)
+    ayl (0.4.0)
+    beaneater (1.0.0)
+    builder (3.2.2)
     coderay (0.9.8)
     daemons (1.1.4)
-    diff-lcs (1.1.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
+    hashie (3.4.2)
+    highline (1.7.2)
+    i18n (0.7.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
-    json (1.6.1)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+      rdoc
+    json (1.8.3)
+    jwt (1.5.0)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
-    mime-types (1.17.2)
-    multi_json (1.0.3)
-    polyglot (0.3.3)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    multi_json (1.11.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     pry (0.9.7.4)
       coderay (~> 0.9.8)
       method_source (~> 0.6.7)
       ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
-    rack (1.3.5)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    rack (1.5.3)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.1.2)
-      actionmailer (= 3.1.2)
-      actionpack (= 3.1.2)
-      activerecord (= 3.1.2)
-      activeresource (= 3.1.2)
-      activesupport (= 3.1.2)
-      bundler (~> 1.0)
-      railties (= 3.1.2)
-    railties (3.1.2)
-      actionpack (= 3.1.2)
-      activesupport (= 3.1.2)
-      rack-ssl (~> 1.3.2)
+    rails (4.1.10)
+      actionmailer (= 4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
+      activemodel (= 4.1.10)
+      activerecord (= 4.1.10)
+      activesupport (= 4.1.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.10)
+      sprockets-rails (~> 2.0)
+    railties (4.1.10)
+      actionpack (= 4.1.10)
+      activesupport (= 4.1.10)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
-      json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.8)
     slop (2.1.0)
-    sprockets (2.1.1)
-      hike (~> 1.2)
+    sprockets (3.2.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    sprockets-rails (2.3.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ayl (>= 0.3.0)
-  beanstalk-client (>= 1.1.0)
-  bundler (>= 1.0.0)
-  daemons (>= 1.1.0)
-  jeweler (>= 1.6.4)
-  pry
-  rails (>= 3.0.0)
-  rcov
-  rspec (>= 2.3.0)
+  ayl (~> 0.4)
+  beaneater (~> 1.0)
+  bundler (~> 1.10)
+  daemons (~> 1.1)
+  jeweler (~> 2.0)
+  pry (~> 0.9)
+  rails (~> 4.1)
+  rspec (~> 2.14)
+
+BUNDLED WITH
+   1.10.3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 j0hnds@gmail.com
+Copyright (c) 2011-2015 j0hnds@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -3,8 +3,8 @@
 This gem provides a reference implementation of a beanstalk Engine for the
 {ayl}[https://github.com/j0hnds/ayl] gem.
 
-If you want to use this technology in a Rails 3.* application you can do the 
-following in your config/environments/*.rb files:
+If you want to use this technology in a Rails 4.* application you can do the 
+following in your config/application.rb or config/environments/*.rb files:
 
     YourApp::Application.configure do
 
@@ -31,6 +31,29 @@ following in your config/environments/*.rb files:
       # The default is 'default'.
       # Ayl::MessageOptions.default_queue_name = '1.2.3'
 
+      # Set the default failed job handler to 'decay'. The default is
+      # 'delete', another option is to 'bury'. So, 'delete' will delete
+      # a failed job. 'bury' will move the job to the 'buried' state
+      # requiring a 'kick' to place it back in the ready state. 'decay'
+      # means that if the job has been reserved less than 'failed_job_count'
+      # (see below), it will be placed back on the tube with a delay of
+      # 'failed_job_delay' (see below). This allows jobs to be retried
+      # with a delay. This is handy for the case where the jobs may be
+      # dependent on a third party that can have spotty availability 
+      # (like anything on the internet).
+      Ayl::MessageOptions.default_failed_job_handler = 'decay'
+
+      # Set the default failed job count to '3'. That is the default.
+      # If the failed job handler is 'decay', this means it retry the
+      # job until it has been reserved three times (initial try, then
+      # two failures).
+      Ayl::MessageOptions.default_failed_job_count = 4
+
+      # Set the default failed job delay to '30'. That is the default.
+      # If the failed job handler is 'decay', this means that there 
+      # will be a 30 second delay between each retry of the job.
+      Ayl::MessageOptions.default_failed_job_delay = 10
+
       # Set up the logger for Ayl
       Ayl::Logger.instance.logger = ::Rails.logger
 
@@ -77,6 +100,6 @@ The ayl_worker_control script can easily be invoked by an /etc/init.d script to
 
 == Copyright
 
-Copyright (c) 2011 j0hnds@gmail.com. See LICENSE.txt for
+Copyright (c) 2011-2015 j0hnds@gmail.com. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/j0hnds/ayl-beanstalk"
   gem.license = "MIT"
   gem.summary = %Q{Ayl extension to provide beanstalk support.}
-  gem.description = %Q{Ayl extension to provide beanstalk support.}
+  gem.description = %Q{Ayl extension to provide beanstalk support for applications requiring async processing.}
   gem.email = "j0hnds@gmail.com"
   gem.authors = ["j0hnds@gmail.com"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/ayl-beanstalk.gemspec

@@ -2,15 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: ayl-beanstalk 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ayl-beanstalk"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["j0hnds@gmail.com"]
-  s.date = "2013-08-07"
-  s.description = "Ayl extension to provide beanstalk support."
+  s.date = "2015-06-15"
+  s.description = "Ayl extension to provide beanstalk support for applications requiring async processing."
   s.email = "j0hnds@gmail.com"
   s.executables = ["ayl_beanstalk", "ayl_worker", "ayl_worker_control"]
   s.extra_rdoc_files = [
@@ -49,41 +51,40 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/j0hnds/ayl-beanstalk"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.4.6"
   s.summary = "Ayl extension to provide beanstalk support."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ayl>, [">= 0.3.0"])
-      s.add_runtime_dependency(%q<beanstalk-client>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<daemons>, [">= 1.1.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_runtime_dependency(%q<ayl>, ["~> 0.4"])
+      s.add_runtime_dependency(%q<beaneater>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<daemons>, ["~> 1.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.10"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<rails>, ["~> 4.1"])
+      s.add_development_dependency(%q<pry>, ["~> 0.9"])
     else
-      s.add_dependency(%q<ayl>, [">= 0.3.0"])
-      s.add_dependency(%q<beanstalk-client>, [">= 1.1.0"])
-      s.add_dependency(%q<daemons>, [">= 1.1.0"])
-      s.add_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<ayl>, ["~> 0.4"])
+      s.add_dependency(%q<beaneater>, ["~> 1.0"])
+      s.add_dependency(%q<daemons>, ["~> 1.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.14"])
+      s.add_dependency(%q<bundler>, ["~> 1.10"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<rails>, ["~> 4.1"])
+      s.add_dependency(%q<pry>, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<ayl>, [">= 0.3.0"])
-    s.add_dependency(%q<beanstalk-client>, [">= 1.1.0"])
-    s.add_dependency(%q<daemons>, [">= 1.1.0"])
-    s.add_dependency(%q<rspec>, [">= 2.3.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<ayl>, ["~> 0.4"])
+    s.add_dependency(%q<beaneater>, ["~> 1.0"])
+    s.add_dependency(%q<daemons>, ["~> 1.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.14"])
+    s.add_dependency(%q<bundler>, ["~> 1.10"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<rails>, ["~> 4.1"])
+    s.add_dependency(%q<pry>, ["~> 0.9"])
   end
 end
 

data/bin/ayl_beanstalk

@@ -4,8 +4,9 @@
 # running this script, enter 'beastalk_info.rb --help' on the command line.
 #
 require 'date'
+require 'json'
 require 'optparse'
-require 'beanstalk-client'
+require 'beaneater'
 
 DEFAULT_COMMAND = 'statistics'
 
@@ -37,7 +38,12 @@ class BeanstalkCommander
   #
   def job_statistics(job_number)
     raise "Must specify a job number to get the statistics for" unless job_number
-    format_statistics(pool.open_connections.first.job_stats(job_number))
+    job = pool.jobs.find(job_number)
+    if job.nil?
+      puts "Unable to find job with id: #{job_number}"
+    else
+      format_statistics(job.stats)
+    end
   end
 
   #
@@ -45,7 +51,12 @@ class BeanstalkCommander
   #
   def tube_statistics(*args)
     puts "Statistics for Tube: #{@tube}"
-    format_statistics(pool.stats_tube(@tube))
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "Unable to find tube: #{@tube}"
+    else
+      format_statistics(tube.stats)
+    end
   end
 
   #
@@ -61,12 +72,8 @@ class BeanstalkCommander
   # Lists the tubes active on beanstalk
   #
   def list_tubes(*args)
-    tubes = pool.list_tubes
-    puts "Tubes in use"
-    puts "------------"
-    tubes.each_pair do | host, tubes |
-      puts host
-      tubes.each { | tube | puts " - #{tube}" }
+    pool.tubes.all.each do | tube |
+      puts " - #{tube.name}"
     end
   end
 
@@ -76,7 +83,7 @@ class BeanstalkCommander
   #
   def peek_job(job_number)
     raise "Must specify a job number to peek" unless job_number
-    job = pool.peek_job(job_number)
+    job = pool.jobs.find(job_number)
     format_job(job)
   end
 
@@ -85,42 +92,63 @@ class BeanstalkCommander
   #
   def delete(job_number)
     raise "Must specify a job number to delete" unless job_number
-    pool.open_connections.first.delete(job_number)
+    job = pool.jobs.find(job_number)
+    if job.nil?
+      puts "Unable to find job with ID: #{job_number}"
+    else
+      job.delete
+    end
   end
 
   #
   # Displays the most current job on the ready queue
   #
   def peek_ready(*args)
-    pool.use(@tube)
-    job = pool.peek_ready
-    format_job(job)
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      job = tube.peek(:ready)
+      format_job(job)
+    end
   end
 
   #
   # Kick any buried/delayed jobs in te queue
   #
   def kick(*args)
-    pool.use(@tube)
-    pool.open_connections.first.kick 1
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      tube.kick
+    end
   end
 
   #
   # Displays the most current job on the delayed queue
   #
   def peek_delayed(*args)
-    pool.use(@tube)
-    job = pool.peek_delayed
-    format_job(job)
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      job = tube.peek(:delayed)
+      format_job(job)
+    end
   end
 
   #
   # Displays the most current job on the buried queue
   #
   def peek_buried(*args)
-    pool.use(@tube)
-    job = pool.peek_buried
-    format_job(job)
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      job = tube.peek(:buried)
+      format_job(job)
+    end
   end
 
   #
@@ -128,10 +156,14 @@ class BeanstalkCommander
   #
   def put_job(job_body)
     raise "Must specify a job body to put" unless job_body
-    puts "Putting (#{job_body}) on tube: #{@tube}"
-    pool.use(@tube)
-    pool.put(job_body)
-    puts "Job was put"
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      puts "Putting (#{job_body}) on tube: #{@tube}"
+      tube.put(job_body)
+      puts "Job was put"
+    end
   end
 
   def kill_worker
@@ -141,15 +173,23 @@ class BeanstalkCommander
   def put_ayl_job(job_body)
     raise "Must specify a job body to put" unless job_body
     puts "Putting (#{job_body}) on tube: #{@tube}"
-    pool.use(@tube)
-    pool.put({:type => :ayl, :code => job_body}.to_yaml)
-    puts "Job was put"
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      tube.put({:type => :ayl, :code => job_body}.to_json)
+      puts "Job was put"
+    end
   end
 
   def put_sleep_job(*args)
     puts "Putting job on tube '#{@tube}' that will sleep for 20 seconds."
-    pool.use(@tube)
-    pool.put(SLEEP_COMMAND.to_yaml)
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      tube.put(SLEEP_COMMAND.to_json)
+    end
   end
 
   #
@@ -158,22 +198,31 @@ class BeanstalkCommander
   #
   def eat_job(*args)
     # Reserve the next job on the queue
-    pool.watch(@tube)
-    job = pool.reserve(10)
-    raise "No job to reserve" unless job
-    puts "Reserved job"
-    format_job(job)
-    job.delete
-    puts "Deleted job"
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      job = tube.peek(:ready)
+      if job.nil?
+        puts "No job to eat"
+      else
+        format_job(job)
+        job.delete
+        puts "Deleted job"
+      end
+    end
   end
 
-  def eat_all_jobs
-    pool.watch(@tube)
-    while (!(job = pool.reserve(0)).nil?)
-      puts "Reserved job"
-      format_job(job)
-      job.delete
-      puts "Deleted job"
+  def eat_all_jobs(state='ready')
+    tube = pool.tubes[@tube]
+    if tube.nil?
+      puts "No tube: #{@tube}"
+    else
+      while (!(job = tube.peek(state.to_sym)).nil?)
+        format_job(job)
+        job.delete
+        puts "Deleted job"
+      end
     end
   end
 
@@ -187,12 +236,16 @@ class BeanstalkCommander
   # It is fast and awesome.
   #
   def move_jobs(to_tube)
-    pool.watch(@tube)
-    pool.use(to_tube)
+    ttube = pool.tubes[to_tube]
+    if ttube.nil?
+      puts "No To Tube: #{to_tube}"
+      return
+    end
+    pool.tubes.watch!(@tube)
     while true
-      job = pool.reserve(0) 
+      job = pool.tubes.reserve(0) 
       if job
-        pool.put(job.body)
+        ttube.put(job.body)
         job.delete
       else
         break
@@ -206,7 +259,7 @@ class BeanstalkCommander
   # Returns the connected beanstalk pool
   #
   def pool
-    @pool ||= Beanstalk::Pool.new(["#{@host}:#{@port}"])
+    @pool ||= Beaneater.new("#{@host}:#{@port}")
   end
 
   #