beaneater 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 454588f4369a9102f949a43c73d7fe8d06de5191
+  data.tar.gz: e7655c12db30696d1feb41b1f3c6de9c4100115c
+SHA512:
+  metadata.gz: e523bcdfeb277ed363335be20de8d7114680fe7fa98a7b8a3f7e341547dd0b41290fba35fece3615bd6839ef9381ee8312aac003662e5b2afc4accfdbfa00fbd
+  data.tar.gz: 0e0d48e4514d953d2acc4bce929a08201912c8f04dc14b0f70bd2ccaa7f7ca2dfbd91ac73156a8542c374fed1b963bd910abe65cfd561d7ff24b7323f1875ff6

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG for Beaneater
 
-## 0.3.1 (Unreleased)
+## 0.3.2 (Unreleased)
+
+## 0.3.1 (Jun 28 2013)
+
+* Fixes issue with "chomp" nil exception when losing connection (Thanks @simao)
+* Better handling of unknown or invalid commands during transmit
+* Raise proper CRLF exception (Thanks @carlosmoutinho)
 
 ## 0.3.0 (Jan 23 2013)
 

data/README.md

@@ -264,7 +264,7 @@ In order to process jobs, the client should first specify the intended tubes to
 this will default to watching just the `default` tube.
 
 ```ruby
-@beanstalk = Beaneater::Connection.new(['10.0.1.5:11300'])
+@beanstalk = Beaneater::Pool.new(['10.0.1.5:11300'])
 @beanstalk.tubes.watch!('tube-name', 'other-tube')
 ```
 
@@ -390,7 +390,9 @@ Processing runs the following steps:
  1. If other exception occurs, call 'bury' (error)
  1. Repeat steps 2-5
 
-The `process` command is ideally suited for a beanstalk job processing daemon.
+The `process!` command is ideally suited for a beanstalk job processing daemon. 
+Even though `process!` is intended to be a long-running process, you can stop the loop at any time
+by raising `AbortProcessingError` while processing is running.
 
 ### Handling Errors
 
@@ -459,4 +461,5 @@ There are other resources helpful when learning about beanstalk:
 
  - [Nico Taing](https://github.com/Nico-Taing) - Creator and co-maintainer
  - [Nathan Esquenazi](https://github.com/nesquena) - Contributor and co-maintainer
- - [Keith Rarick](https://github.com/kr) - Much code inspired and adapted from beanstalk-client
+ - [Keith Rarick](https://github.com/kr) - Much code inspired and adapted from beanstalk-client
+ - [Vidar Hokstad](https://github.com/vidarh) - Replaced telnet with correct TCP socket handling

data/beaneater.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'minitest', "~> 4.1.0"
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'fakeweb'
   gem.add_development_dependency 'term-ansicolor'
   gem.add_development_dependency 'json'
 end

data/lib/beaneater/connection.rb

@@ -46,16 +46,17 @@ module Beaneater
     #   @conn.transmit('bury 123')
     #
     def transmit(command, options={})
-      @mutex.lock
-      if connection
-        command = command.force_encoding('ASCII-8BIT') if command.respond_to?(:force_encoding)
-        connection.write(command+"\r\n")
-        parse_response(command, connection.gets)
-      else # no connection
-        raise NotConnected, "Connection to beanstalk '#{@host}:#{@port}' is closed!" unless connection
+      @mutex.synchronize do
+        if connection
+          command = command.force_encoding('ASCII-8BIT') if command.respond_to?(:force_encoding)
+          connection.write(command.to_s + "\r\n")
+          res = connection.gets
+          raise_not_connected! unless res
+          parse_response(command, res)
+        else # no connection
+          raise_not_connected!
+        end
       end
-    ensure
-      @mutex.unlock
     end
 
     # Close connection with beanstalkd server.
@@ -135,5 +136,10 @@ module Beaneater
       Beaneater.configuration
     end
 
+    # Raises an error to be triggered when the connection has failed
+    # @raise [Beaneater::NotConnected] Beanstalkd is no longer connected
+    def raise_not_connected!
+      raise NotConnected, "Connection to beanstalk '#{@host}:#{@port}' is closed!"
+    end
   end # Connection
 end # Beaneater

data/lib/beaneater/errors.rb

@@ -66,11 +66,11 @@ module Beaneater
   # Raises when a command was sent that is unknown.
   class UnknownCommandError < UnexpectedResponse; end
   # Raises when command does not have proper CRLF suffix.
-  class ExpectedCRLFError < UnexpectedResponse; end
+  class ExpectedCrlfError < UnexpectedResponse; end
   # Raises when the body of a job was too large.
   class JobTooBigError < UnexpectedResponse; end
   # Raises when a job was attempted to be reserved but the timeout occured.
   class TimedOutError < UnexpectedResponse; end
   # Raises when a tube could not be ignored because it is the last watched tube.
   class NotIgnoredError < UnexpectedResponse; end
-end
+end

data/lib/beaneater/version.rb

@@ -1,4 +1,4 @@
 module Beaneater
   # Current version of gem.
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/errors_test.rb

@@ -23,4 +23,11 @@ describe "Beaneater::Errors" do
     assert_equal 'reserve 0', @klazz.cmd
     assert_equal 'DEADLINE_SOON', @klazz.status
   end
-end
+
+  it 'should raise proper exception for invalid status EXPECTED_CRLF' do
+    @klazz = Beaneater::UnexpectedResponse.from_status("EXPECTED_CRLF", "reserve 0")
+    assert_kind_of(Beaneater::ExpectedCrlfError, @klazz)
+    assert_equal 'reserve 0', @klazz.cmd
+    assert_equal 'EXPECTED_CRLF', @klazz.status
+  end
+end

data/test/pool_test.rb

@@ -38,6 +38,11 @@ describe Beaneater::Pool do
       end
     end
 
+    it "raises UnexpectedException when any Exception occurs inside the block" do
+      invalid_command = nil
+      assert_raises(Beaneater::UnknownCommandError) { @bp.transmit_to_rand(invalid_command) }
+    end
+
     describe "for clearing watch list" do
       it "should clear connections of tube watches" do
         @bp.tubes.watch!('foo', 'bar')

data/test/test_helper.rb

@@ -3,12 +3,10 @@ require 'rubygems'
 require 'minitest/autorun'
 $:.unshift File.expand_path("../../lib")
 require 'beaneater'
-require 'fakeweb'
+require 'timeout'
 require 'mocha'
 require 'json'
 
-FakeWeb.allow_net_connect = false
-
 class MiniTest::Unit::TestCase
 
   # Cleans up all jobs from tubes

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: beaneater
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Nico Taing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,81 +27,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple beanstalkd client for ruby
@@ -155,33 +128,26 @@ files:
 - test/tubes_test.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -394754542791428871
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -394754542791428871
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple beanstalkd client for ruby.
 test_files:
 - test/beaneater_test.rb