em-beanstalk 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bin/beanstalk-shell

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby -rubygems
+# Beanstalk shell
+# Run <tt>beanstalk-shell</tt>.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'em-beanstalk'))
+
+EM::Beanstalk::Shell.new.start
+

data/lib/em-beanstalk.rb

@@ -25,7 +25,7 @@ module EM
     def initialize(opts = nil)
       @host                   = opts && opts[:host] || 'localhost'
       @port                   = opts && opts[:port] || 11300
-      @tube                   = opts && opts[:tube]
+      @tube                   = opts && opts[:tube] || 'default'
       @retry_count            = opts && opts[:retry_count] || 5
       @default_priority       = opts && opts[:default_priority] || 65536
       @default_delay          = opts && opts[:default_delay] || 0
@@ -34,8 +34,7 @@ module EM
       @default_error_callback = opts && opts[:default_error_callback] || Proc.new{ |error| puts "ERROR: #{error.inspect}" }
       @raise_on_disconnect    = opts && opts.key?(:raise_on_disconnect) ? opts[:raise_on_disconnect] : true
       
-      @used_tube = 'default'
-      @watched_tubes = [@used_tube]
+      @watched_tubes          = []
     
       @data = ""
       @retries = 0
@@ -48,7 +47,7 @@ module EM
         conn.pending_connect_timeout = @default_timeout
       end
     
-      unless @tube.nil?
+      if @tube
         use(@tube)
         watch(@tube)
       end
@@ -177,9 +176,9 @@ module EM
       add_deferrable(&block)
     end
 
-    def release(val, &block)
+    def release(val, opts = nil, &block)
       return if val.nil?
-      @conn.send(:release, job_id(val), 0, 0)
+      @conn.send(:release, job_id(val), priority.to_i, delay.to_i)
       add_deferrable(&block)
     end
 
@@ -263,6 +262,7 @@ module EM
           end
         # error state
         when /^(OUT_OF_MEMORY|INTERNAL_ERROR|DRAINING|BAD_FORMAT|UNKNOWN_COMMAND|EXPECTED_CRLF|JOB_TOO_BIG|DEADLINE_SOON|TIMED_OUT|NOT_FOUND)/
+          puts "... got error, calling df."
           df = @deferrables.shift
           df.fail($1.downcase.to_sym)
           @data = @data[($1.length + 2)..-1]

data/lib/em-beanstalk/shell.rb

@@ -0,0 +1,128 @@
+module EM
+  class Beanstalk
+    class Shell
+      class KeyboardHandler < EM::Connection
+        include EM::Protocols::LineText2
+
+        def post_init
+          @jack = EM::Beanstalk.new
+
+          print "> "
+        end
+
+        def receive_line(line)
+          line.chomp!
+          line.gsub!(/^\s+/, '')
+
+          df = case(line)
+          when /^\s*$/ then
+            # noop
+            nil
+
+          when /^use / then
+            tube = line.gsub(/use /, '')
+            df = @jack.use(tube)
+            df.callback { |tube| puts "Using #{tube}" } unless df.nil?
+            df
+
+          when /^watch / then
+            tube = line.gsub(/watch /, '')
+            df = @jack.watch(tube)
+            df.callback { |tube| puts "Watching #{tube}" } unless df.nil?
+            df
+
+          when /^put / then
+            msg = line.gsub(/put /, '')
+            df = @jack.put(msg)
+            df.callback { |id| puts "Inserted job #{id}" }
+            df
+
+          when /^delete / then
+            id = line.gsub(/delete /, '').to_i
+            job = EM::Beanstalk::Job.new(@jack, id, "asdf")
+            df = job.delete
+            df.callback { puts "Deleted" }
+            df
+
+          when 'reserve' then
+            df = @jack.reserve
+            df.callback { |job| puts "Reserved #{job}" }
+            df
+
+          when 'list-tubes' then
+            df = @jack.list
+            df.callback { |tubes| pp tubes }
+            df
+
+          when 'list-watched' then
+            df = @jack.list(:watched)
+            df.callback { |tubes| pp tubes }
+            df
+
+          when 'list-used' then
+            df = @jack.list(:used)
+            df.callback { |tube| puts "Using #{tube}" }
+            df
+
+          when 'stats' then
+            df = @jack.stats
+            df.callback { |stats| pp stats }
+            df
+
+          when /^stats-tube\s+(.*)$/ then
+            df = @jack.stats(:tube, $1)
+            df.callback { |stats| pp stats }
+            df
+
+          when /^stats-job\s+(\d+)/ then
+            j = EM::Beanstalk::Job.new(@jack, $1, "blah")
+            df = j.stats
+            df.callback { |stats| pp stats }
+            df
+
+          when 'help' then
+            msg = "COMMANDS:\n"
+            msg << "  put <msg>    - put message onto beanstalk\n"
+            msg << "  reserve      - reserve a job on beanstalk\n"
+            msg << "  delete <id>  - delete message with ID <id>\n"
+            msg << "\n"
+            msg << "  use <tube>   - use tube for messages\n"
+            msg << "  watch <tube> - add <tube to watch list for messages\n"
+            msg << "\n"
+            msg << "  stats        - display beanstalk stats\n"
+            msg << "  stats-tube <tube> - display tube stats\n"
+            msg << "  stats-job <id> - display job stats\n"
+            msg << "\n"
+            msg << "  list-tubes   - display beanstalk tubes\n"
+            msg << "  list-used    - display the currently used tube\n"
+            msg << "  list-watched - display the currently watched tubes\n"
+            msg << "\n"
+            msg << "  help         - this help text\n"
+            msg << "  quit         - quit application\n"
+
+            puts msg
+            nil
+
+          when 'quit' then
+            EM.stop_event_loop
+            nil
+          end
+
+          unless df.nil?
+            df.callback { print "> " }
+            df.errback { print "> " }
+          end
+
+          print "> "
+        end
+      end
+
+      def start
+        $stdout.sync = true
+        EM.run do
+          EM.open_keyboard(KeyboardHandler)
+        end
+      end
+    end
+  end
+end

data/spec/connection_spec.rb

@@ -7,11 +7,15 @@ describe EM::Beanstalk do
   end
 
   it 'should use a default host of "localhost"' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.host.should == 'localhost'
   end
 
   it 'should use a default port of 11300' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.port.should == 11300    
   end
@@ -24,12 +28,16 @@ describe EM::Beanstalk do
 
   it 'should send the "use" command' do
     @connection_mock.should_receive(:send).once.with(:use, "mytube")
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.use("mytube")
   end
 
   it 'should not send the use command to the currently used tube' do
     @connection_mock.should_receive(:send).once.with(:use, "mytube")
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.use("mytube")
     conn.use("mytube")
@@ -37,12 +45,16 @@ describe EM::Beanstalk do
 
   it 'should send the "watch" command' do
     @connection_mock.should_receive(:send).once.with(:watch, "mytube")
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.watch("mytube")
   end
 
   it 'should not send the watch command for a tube currently watched' do
     @connection_mock.should_receive(:send).once.with(:watch, "mytube")
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.watch("mytube")
     conn.watch("mytube")
@@ -52,6 +64,8 @@ describe EM::Beanstalk do
     msg = "my message"
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, msg, anything, anything, anything, msg.length)
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.put(msg)
   end
@@ -59,6 +73,8 @@ describe EM::Beanstalk do
   it 'should default the delay, priority and ttr settings' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 65536, 0, 300, anything)
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.put("msg")
   end
@@ -66,6 +82,8 @@ describe EM::Beanstalk do
   it 'should accept a delay setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, 42, anything, anything)
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.put("msg", :delay => 42)
   end
@@ -73,6 +91,8 @@ describe EM::Beanstalk do
   it 'should accept a ttr setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, anything, 999, anything)
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.put("msg", :ttr => 999)
   end
@@ -80,6 +100,8 @@ describe EM::Beanstalk do
   it 'should accept a priority setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 233, anything, anything, anything)
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.put("msg", :priority => 233)
   end
@@ -87,11 +109,15 @@ describe EM::Beanstalk do
   it 'shoudl accept a priority, delay and ttr setting' do
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 99, 42, 2000, anything)
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     conn.put("msg", :priority => 99, :delay => 42, :ttr => 2000)
   end
 
   it 'should force delay to be >= 0' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, 0, anything, anything)
     conn = EM::Beanstalk.new
@@ -99,6 +125,8 @@ describe EM::Beanstalk do
   end
 
   it 'should force ttr to be >= 0' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, anything, anything, 300, anything)
     conn = EM::Beanstalk.new
@@ -106,6 +134,8 @@ describe EM::Beanstalk do
   end
 
   it 'should force priority to be >= 0' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, 65536, anything, anything, anything)
     conn = EM::Beanstalk.new
@@ -113,6 +143,8 @@ describe EM::Beanstalk do
   end
 
   it 'should force priority to be < 2**32' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, anything, (2 ** 32), anything, anything, anything)
     conn = EM::Beanstalk.new
@@ -121,6 +153,8 @@ describe EM::Beanstalk do
 
   it 'should handle a non-string provided as the put message' do
     msg = 22
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send_with_data).once.
                       with(:put, msg.to_s, anything, anything, anything, msg.to_s.length)
     conn = EM::Beanstalk.new
@@ -128,6 +162,8 @@ describe EM::Beanstalk do
   end
 
   it 'should send the "delete" command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:delete, 1)
     job = EM::Beanstalk::Job.new(nil, 1, "body")
     conn = EM::Beanstalk.new
@@ -135,18 +171,24 @@ describe EM::Beanstalk do
   end
 
   it 'should handle a nil job sent to the "delete" command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_not_receive(:send).with(:delete, nil)
     conn = EM::Beanstalk.new
     conn.delete(nil)
   end
 
   it 'should send the "reserve" command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).with(:reserve)
     conn = EM::Beanstalk.new
     conn.reserve
   end
 
   it 'should raise exception if reconnect fails more then RETRY_COUNT times' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     EM.should_receive(:add_timer).exactly(5).times
 
     conn = EM::Beanstalk.new
@@ -155,6 +197,8 @@ describe EM::Beanstalk do
   end
 
   it 'should reset the retry count on connection' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     EM.should_receive(:add_timer).at_least(1).times
 
     conn = EM::Beanstalk.new
@@ -167,16 +211,20 @@ describe EM::Beanstalk do
      UNKNOWN_COMMAND EXPECTED_CRLF JOB_TOO_BIG DEADLINE_SOON
      TIMED_OUT NOT_FOUND).each do |cmd|
     it "should handle #{cmd} messages" do
-       conn = EM::Beanstalk.new
+      @connection_mock.should_receive(:send).once.with(:use, "default")
+      @connection_mock.should_receive(:send).once.with(:watch, "default")
+      conn = EM::Beanstalk.new
 
-       df = conn.add_deferrable
-       df.should_receive(:fail).with(cmd.downcase.to_sym)
+      df = conn.add_deferrable
+      df.should_receive(:fail).with(cmd.downcase.to_sym)
 
-       conn.received("#{cmd}\r\n")
-     end
+      conn.received("#{cmd}\r\n")
+    end
   end
 
   it 'should handle deleted messages' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
@@ -186,6 +234,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle inserted messages' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
@@ -195,6 +245,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle buried messages' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
@@ -204,6 +256,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle using messages' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
@@ -213,6 +267,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle watching messages' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
@@ -222,6 +278,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle reserved messages' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     msg = "This is my message"
@@ -237,6 +295,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle receiving multiple replies in one packet' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     df = conn.add_deferrable
@@ -249,6 +309,8 @@ describe EM::Beanstalk do
   end
 
   it 'should handle receiving data in chunks' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
     
     msg1 = "First half of the message\r\n"
@@ -264,12 +326,16 @@ describe EM::Beanstalk do
   end
   
   it 'should send the stat command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:stats)
     conn = EM::Beanstalk.new
     conn.stats
   end
 
   it 'should handle receiving the OK command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     conn = EM::Beanstalk.new
 
     msg =<<-HERE
@@ -300,42 +366,56 @@ HERE
   it 'should support job stats' do
     job = EM::Beanstalk::Job.new(nil, 42, "blah")
 
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:'stats-job', 42)
     conn = EM::Beanstalk.new
     conn.stats(:job, job)
   end
 
   it 'should support tube stats' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:'stats-tube', "mytube")
     conn = EM::Beanstalk.new
     conn.stats(:tube, "mytube")
   end
 
   it 'should throw exception on invalid stats command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_not_receive(:send)
     conn = EM::Beanstalk.new
     lambda { conn.stats(:blah) }.should raise_error(EM::Beanstalk::InvalidCommand)
   end
 
   it 'should support listing tubes' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:'list-tubes')
     conn = EM::Beanstalk.new
     conn.list
   end
 
   it 'should support listing tube used' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:'list-tube-used')
     conn = EM::Beanstalk.new
     conn.list(:used)
   end
 
   it 'should support listing tubes watched' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_receive(:send).once.with(:'list-tubes-watched')
     conn = EM::Beanstalk.new
     conn.list(:watched)
   end
 
   it 'should throw exception on invalid list command' do
+    @connection_mock.should_receive(:send).once.with(:use, "default")
+    @connection_mock.should_receive(:send).once.with(:watch, "default")
     @connection_mock.should_not_receive(:send)
     conn = EM::Beanstalk.new
     lambda { conn.list(:blah) }.should raise_error(EM::Beanstalk::InvalidCommand)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-beanstalk
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dan
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
-default_executable: 
+date: 2010-02-28 00:00:00 -05:00
+default_executable: beanstalk-shell
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -24,8 +24,8 @@ dependencies:
     version: 
 description: EventMachine client for Beanstalkd
 email: dan@postrank.com
-executables: []
-
+executables: 
+- beanstalk-shell
 extensions: []
 
 extra_rdoc_files: 
@@ -39,6 +39,7 @@ files:
 - lib/em-beanstalk/connection.rb
 - lib/em-beanstalk/defer.rb
 - lib/em-beanstalk/job.rb
+- lib/em-beanstalk/shell.rb
 - spec/connection_spec.rb
 - spec/integration_spec.rb
 - spec/job_spec.rb