beaneater 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe3f3a885f7fd1d205f508d48e2ce588bb56d2e4
-  data.tar.gz: 0d5578662d16fa1ad5da7f48e85f1ebf2a13d66d
+SHA256:
+  metadata.gz: 83a6a5bc5d6a0e34828c5b011ca65b3bb99a296ab0d038b348279fd7b5bbf842
+  data.tar.gz: 30e307f3cb14d2d078cfc2eb23219add703535b2a2c9e8212b60dd54eb808bd9
 SHA512:
-  metadata.gz: 532de361e18a96f6acbbb152edc7ada7e83c2793fb494e03ea8e9f0064c6d81b20dfd296fbec26731d61a944cbdc43986492ce77f3c5e4fa30a7a3158e27a185
-  data.tar.gz: 1838fcddd8e169470a13dac5305ed0dec7b84a5fdd79289626f05a45862b4b7bce4e45cb82f455ea46ec0ed738e9003e6922b751c8f85f57aaa386e2e5b25c0f
+  metadata.gz: 820d14df0a37f2d3afd63db394a8d971a0e98436331a67b989e4c58335f1d3803f79b233b261c096069c511cba5ff77d7bf0eb887f14a9f61b39251d9ac8ea12
+  data.tar.gz: ed53e2479c36ce9e2af27f3e63a00c3540e935fcc822414649ae2135daa93d59cc14154f71c70e6d02a9f53a42d11b360fe01808350915a85b91abd8ffc95056

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.5
+  - 2.6
+  - 2.7
 before_install:
   - curl -L https://github.com/kr/beanstalkd/archive/v1.9.tar.gz | tar xz -C /tmp
   - cd /tmp/beanstalkd-1.9/

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG for Beaneater
 
+## 1.1.0 (April 25th 2021)
+
+* 'clear' behavior was failing unexpectedly, swallow issues during delete as well (@bfolkens)
+* Fix assigned but unused variables (@utilum)
+* Fix last_used tube not stored (@albb0920)
+* Fix deprecation warning in ruby 2.7 (@albb0920)
+* Fix watched tubes not restored after reconnect (@albb0920)
+* Fix keyword arguemnt warning (@albb0920)
+
 ## 1.0.0 (April 26th 2015)
 
 * Beginning from version 1.0.0 the support for `Beaneater::Pool` has been dropped (@alup)

data/README.md

@@ -6,7 +6,7 @@ Beaneater is the best way to interact with beanstalkd from within Ruby.
 [Beanstalkd](http://kr.github.com/beanstalkd/) is a simple, fast work queue. Its interface is generic, but was
 originally designed for reducing the latency of page views in high-volume web applications by
 running time-consuming tasks asynchronously. Read the [yardocs](http://rdoc.info/github/beanstalkd/beaneater) and/or the
-[beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.md) for more details.
+[beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.txt) for more details.
 
 **Important Note**: This README is **for branch 1.0.x which is under development**. Please switch to latest `0.x` branch for stable version.
 
@@ -147,7 +147,7 @@ To interact with a beanstalk queue, first establish a connection by providing an
 
 # Or if ENV['BEANSTALKD_URL'] == '127.0.0.1:11300'
 @beanstalk = Beaneater.new
-@beanstalk.connectiont # => localhost:11300
+@beanstalk.connection # => localhost:11300
 ```
 
 You can conversely close and dispose of a connection at any time with:
@@ -429,7 +429,7 @@ are listed below:
 There are other exceptions that are less common such as `OutOfMemoryError`, `DrainingError`,
 `DeadlineSoonError`, `InternalError`, `BadFormatError`, `UnknownCommandError`,
 `ExpectedCRLFError`, `JobTooBigError`, `NotIgnoredError`. Be sure to check the
-[beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.md) for more information.
+[beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.txt) for more information.
 
 
 ### Stats
@@ -462,7 +462,7 @@ print @beanstalk.jobs[some_job_id].stats
 # => {'age': 0, 'id': 2, 'state': 'reserved', 'tube': 'default', ... }
 ```
 
-Be sure to check the [beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.md) for
+Be sure to check the [beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.txt) for
 more details about the stats commands.
 
 ## Resources
@@ -473,7 +473,7 @@ There are other resources helpful when learning about beanstalk:
  * [Beaneater on Rubygems](https://rubygems.org/gems/beaneater)
  * [Beanstalkd homepage](http://kr.github.com/beanstalkd/)
  * [beanstalk on github](https://github.com/kr/beanstalkd)
- * [beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.md)
+ * [beanstalk protocol](https://github.com/kr/beanstalkd/blob/master/doc/protocol.txt)
  * [Backburner](https://github.com/nesquena/backburner) - Ruby job queue for Rails/Sinatra
  * [BeanCounter](https://github.com/gemeraldbeanstalk/bean_counter) - TestUnit/MiniTest assertions and RSpec matchers for testing code that relies on Beaneater
 

data/lib/beaneater.rb

@@ -21,7 +21,7 @@ class Beaneater
   #   @b.connection.host # => '127.0.0.1'
   #   @b.connection.port # => '11300'
   #
-  def initialize(address)
+  def initialize(address=nil)
     @connection =  Connection.new(address)
   end
 
@@ -82,4 +82,4 @@ class Beaneater
       @_configuration ||= Configuration.new
     end
   end
-end # Beaneater
+end # Beaneater

data/lib/beaneater/connection.rb

@@ -69,8 +69,8 @@ class Beaneater
     #   @conn.transmit('bury 123')
     #   @conn.transmit('stats')
     #
-    def transmit(command, options={})
-      _with_retry(options[:retry_interval], options[:init]) do
+    def transmit(command, **options)
+      _with_retry(**options.slice(:retry_interval, :init)) do
         @mutex.synchronize do
           _raise_not_connected! unless connection
 
@@ -175,6 +175,8 @@ class Beaneater
         tubes_watched.each do |t|
           transmit("watch #{t}", init: false)
         end
+
+        transmit("ignore default", init: false)
       end
 
       transmit("use #{tube_used}", init: false) if @tube_used != 'default'
@@ -187,7 +189,7 @@ class Beaneater
     # @param [Integer] tries The maximum number of tries in draining mode
     # @return [Object] Result of the block passed
     #
-    def _with_retry(retry_interval, init=true, tries=MAX_RETRIES, &block)
+    def _with_retry(retry_interval: DEFAULT_RETRY_INTERVAL, init: true, tries: MAX_RETRIES, &block)
       yield
     rescue EOFError, Errno::ECONNRESET, Errno::EPIPE,
       Errno::ECONNREFUSED => ex
@@ -200,7 +202,7 @@ class Beaneater
         close
         raise
       end
-      sleep(retry_interval || DEFAULT_RETRY_INTERVAL)
+      sleep(retry_interval)
       retry
     end
 

data/lib/beaneater/errors.rb

@@ -69,7 +69,7 @@ class Beaneater
   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.
+  # Raises when a job was attempted to be reserved but the timeout occurred.
   class TimedOutError < UnexpectedResponse; end
   # Raises when a tube could not be ignored because it is the last watched tube.
   class NotIgnoredError < UnexpectedResponse; end

data/lib/beaneater/tube/collection.rb

@@ -29,8 +29,8 @@ class Beaneater
     # Delegates transmit to the connection object.
     #
     # @see Beaneater::Connection#transmit
-    def transmit(command, options={})
-      client.connection.transmit(command, options)
+    def transmit(command, **options)
+      client.connection.transmit(command, **options)
     end
 
     # Finds the specified beanstalk tube.
@@ -88,8 +88,8 @@ class Beaneater
     #   @pool.tubes.each {|t| puts t.name}
     #
     # @api public
-    def each
-      block_given? ? all.each(&Proc.new) : all.each
+    def each(&block)
+      all.each(&block)
     end
 
     # List of watched beanstalk tubes.
@@ -175,7 +175,7 @@ class Beaneater
     def use(tube)
       return tube if last_used == tube
       transmit("use #{tube}")
-      last_used = tube
+      self.last_used = tube
     rescue BadFormatError
       raise InvalidTubeName, "Tube cannot be named '#{tube}'"
     end

data/lib/beaneater/tube/record.rb

@@ -133,11 +133,15 @@ class Beaneater
       client.tubes.watch!(self.name)
       %w(delayed buried ready).each do |state|
         while job = self.peek(state.to_sym)
-          job.delete
+          begin
+            job.delete
+          rescue Beaneater::UnexpectedResponse, Beaneater::NotFoundError
+            # swallow any issues
+          end
         end
       end
       client.tubes.ignore(name)
-    rescue Beaneater::UnexpectedResponse
+    rescue Beaneater::NotIgnoredError
       # swallow any issues
     end
 

data/lib/beaneater/version.rb

@@ -1,4 +1,4 @@
 class Beaneater
   # Current version of gem.
-  VERSION = "1.0.0"
-end
+  VERSION = "1.1.0"
+end

data/test/connection_test.rb

@@ -96,6 +96,24 @@ describe Beaneater::Connection do
 
       assert_raises(Beaneater::NotConnected) { @bc.transmit "delete 56\r\n" }
     end
+
+    it "tubes_watched are restored after reconnect" do
+      client = Beaneater.new('127.0.0.1:11300')
+      client.tubes.watch! "another"
+
+      TCPSocket.prepend Module.new {
+        def readline
+          if !$called
+            $called = true
+            raise EOFError
+          end
+
+          super
+        end
+      }
+
+      assert_equal %w[another], client.tubes.watched.map(&:name)
+    end
   end # transmit
 
   describe 'for #close' do

data/test/tube_test.rb

@@ -191,7 +191,7 @@ describe Beaneater::Tube do
       tube_counts = lambda { %w(ready buried delayed).map { |s| @tube.stats["current_jobs_#{s}"] } }
       assert_equal [2, 2, 2], tube_counts.call
       @tube.clear
-      stats = @tube.stats
+      @tube.stats
       assert_equal [0, 0, 0], tube_counts.call
     end
   end # clear

data/test/tubes_test.rb

@@ -20,7 +20,7 @@ describe Beaneater::Tubes do
     end
 
     it "should switch to used tube for valid name" do
-      tube = Beaneater::Tube.new(@beanstalk, 'some_name')
+      Beaneater::Tube.new(@beanstalk, 'some_name')
       @beanstalk.tubes.use('some_name')
       assert_equal 'some_name', @beanstalk.tubes.used.name
     end
@@ -141,7 +141,7 @@ describe Beaneater::Tubes do
     it("should reserve job with block and timeout") do
       @beanstalk.tubes.watch 'tube'
       job = nil
-      res = @beanstalk.tubes.reserve(0)  { |j| job = j; job.delete }
+      @beanstalk.tubes.reserve(0)  { |j| job = j; job.delete }
       assert_equal "foo reserve #{@time}", job.body
     end
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: beaneater
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nico Taing
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple beanstalkd client for ruby
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -127,24 +127,23 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Simple beanstalkd client for ruby.
 test_files:
@@ -159,4 +158,3 @@ test_files:
 - test/test_helper.rb
 - test/tube_test.rb
 - test/tubes_test.rb
-has_rdoc: