beaneater 0.3.0 → 1.1.0

metadata

@@ -1,110 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: beaneater
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Nico Taing
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-23 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
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !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
@@ -114,8 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -131,8 +105,6 @@ files:
 - lib/beaneater/job.rb
 - lib/beaneater/job/collection.rb
 - lib/beaneater/job/record.rb
-- lib/beaneater/pool.rb
-- lib/beaneater/pool_command.rb
 - lib/beaneater/stats.rb
 - lib/beaneater/stats/fast_struct.rb
 - lib/beaneater/stats/stat_struct.rb
@@ -145,8 +117,6 @@ files:
 - test/errors_test.rb
 - test/job_test.rb
 - test/jobs_test.rb
-- test/pool_command_test.rb
-- test/pool_test.rb
 - test/prompt_regexp_test.rb
 - test/stat_struct_test.rb
 - test/stats_test.rb
@@ -154,34 +124,27 @@ files:
 - test/tube_test.rb
 - test/tubes_test.rb
 homepage: ''
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+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
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.8
+signing_key:
+specification_version: 4
 summary: Simple beanstalkd client for ruby.
 test_files:
 - test/beaneater_test.rb
@@ -189,12 +152,9 @@ test_files:
 - test/errors_test.rb
 - test/job_test.rb
 - test/jobs_test.rb
-- test/pool_command_test.rb
-- test/pool_test.rb
 - test/prompt_regexp_test.rb
 - test/stat_struct_test.rb
 - test/stats_test.rb
 - test/test_helper.rb
 - test/tube_test.rb
 - test/tubes_test.rb
-has_rdoc: 

data/lib/beaneater/pool.rb

@@ -1,166 +0,0 @@
-# Simple ruby client for interacting with beanstalkd.
-module Beaneater
-  # Represents collection of beanstalkd connections.
-  class Pool
-    # Default number of retries to send a command to a connection
-    MAX_RETRIES = 3
-
-    # @!attribute connections
-    #   @return [Array<Beaneater::Connection>] returns Collection of connections
-    attr_reader :connections
-
-    # Initialize new connection
-    #
-    # @param [Array<String>] addresses Array of beanstalkd server addresses
-    # @example
-    #   Beaneater::Pool.new(['localhost:11300', '127.0.0.1:11300'])
-    #
-    #   ENV['BEANSTALKD_URL'] = 'localhost:11300,127.0.0.1:11300'
-    #   @bp = Beaneater::Pool.new
-    #   @bp.connections.first.host # => 'localhost'
-    #   @bp.connections.last.host # => '127.0.0.1'
-    #
-    def initialize(addresses=nil)
-      addresses = addresses || host_from_env || Beaneater.configuration.beanstalkd_url
-      @connections = Array(addresses).map { |a| Connection.new(a) }
-    end
-
-    # Returns Beaneater::Stats object for accessing beanstalk stats.
-    #
-    # @return [Beaneater::Stats] stats object
-    # @api public
-    def stats
-      @stats ||= Stats.new(self)
-    end
-
-    # Returns Beaneater::Jobs object for accessing job related functions.
-    #
-    # @return [Beaneater::Jobs] jobs object
-    # @api public
-    def jobs
-      @jobs ||= Jobs.new(self)
-    end
-
-    # Returns Beaneater::Tubes object for accessing tube related functions.
-    #
-    # @return [Beaneater::Tubes] tubes object
-    # @api public
-    def tubes
-      @tubes ||= Tubes.new(self)
-    end
-
-    # Sends command to every beanstalkd server set in the pool.
-    #
-    # @param [String] command Beanstalkd command
-    # @param [Hash{String => String, Boolean}] options socket connections options
-    # @param [Proc] block Block passed to socket connection during transmit
-    # @return [Array<Hash{String => String, Number}>] Beanstalkd command response from each instance
-    # @example
-    #   @pool.transmit_to_all("stats")
-    #
-    def transmit_to_all(command, options={}, &block)
-      res_exception = nil
-      res = connections.map { |conn|
-        begin
-          safe_transmit { conn.transmit(command, options, &block) }
-        rescue UnexpectedResponse => ex # not the correct status
-          res_exception = ex
-          nil
-        end
-      }.compact
-      raise res_exception if res.none? && res_exception
-      res
-    end
-
-    # Send command to each beanstalkd servers until getting response expected
-    #
-    # @param [String] command Beanstalkd command
-    # @param [Hash{String => String, Boolean}] options socket connections options
-    # @param [Proc] block Block passed in socket connection object
-    # @return [Array<Hash{String => String, Number}>] Beanstalkd command response from the instance
-    # @example
-    #   @pool.transmit_until_res('peek-ready', :status => "FOUND", &block)
-    #
-    def transmit_until_res(command, options={}, &block)
-      status_expected  = options.delete(:status)
-      res_exception = nil
-      connections.each do |conn|
-        begin
-          res = safe_transmit { conn.transmit(command, options, &block) }
-          return res if res[:status] == status_expected
-        rescue UnexpectedResponse => ex # not the correct status
-          res_exception = ex
-          next
-        end
-      end
-      raise res_exception if res_exception
-    end
-
-    # Sends command to a random beanstalkd server in the pool.
-    #
-    # @param [String] command Beanstalkd command
-    # @param [Hash{String => String,Boolean}] options socket connections options
-    # @param [Proc] block Block passed in socket connection object
-    # @return [Array<Hash{String => String, Number}>] Beanstalkd command response from the instance
-    # @example
-    #   @pool.transmit_to_rand("stats", :match => /\n/)
-    #
-    def transmit_to_rand(command, options={}, &block)
-      safe_transmit do
-        conn = connections.respond_to?(:sample) ? connections.sample : connections.choice
-        conn.transmit(command, options, &block)
-      end
-    end
-
-    # Closes all connections within the pool.
-    #
-    # @example
-    #  @pool.close
-    #
-    def close
-      while @connections.any?
-        conn = @connections.pop
-        conn.close
-      end
-    end
-
-    protected
-
-    # Transmit command to beanstalk connections safely handling failed connections
-    #
-    # @param [Proc] block The command to execute.
-    # @return [Object] Result of the block passed
-    # @raise [Beaneater::DrainingError,Beaneater::NotConnected] Could not connect to Beanstalk client
-    # @example
-    #  safe_transmit { conn.transmit('foo') }
-    #   # => "result of foo command from beanstalk"
-    #
-    def safe_transmit(&block)
-      retries = 1
-      begin
-        yield
-      rescue DrainingError, EOFError, Errno::ECONNRESET, Errno::EPIPE => ex
-        # TODO remove faulty connections from pool?
-        # https://github.com/kr/beanstalk-client-ruby/blob/master/lib/beanstalk-client/connection.rb#L405-410
-        if retries < MAX_RETRIES
-          retries += 1
-          retry
-        else # finished retrying, fail out
-          ex.is_a?(DrainingError) ? raise(ex) : raise(NotConnected, "Could not connect!")
-        end
-      end
-    end # transmit_call
-
-    # The hosts provided by BEANSTALKD_URL environment variable, if available.
-    #
-    # @return [Array] Set of beanstalkd host addresses
-    # @example
-    #  ENV['BEANSTALKD_URL'] = "localhost:1212,localhost:2424"
-    #   # => ['localhost:1212', 'localhost:2424']
-    #
-    def host_from_env
-      ENV['BEANSTALKD_URL'].respond_to?(:length) && ENV['BEANSTALKD_URL'].length > 0 && ENV['BEANSTALKD_URL'].split(',').map(&:strip)
-    end
-
-  end # Pool
-end # Beaneater

data/lib/beaneater/pool_command.rb

@@ -1,79 +0,0 @@
-require 'set'
-
-module Beaneater
-  # Represents collection of pool related commands.
-  class PoolCommand
-    # @!attribute pool
-    #   @return [Beaneater::Pool] returns Pool object
-    attr_reader :pool
-
-    # Initialize new connection
-    #
-    # @param [Beaneater::Pool] pool Pool object
-    def initialize(pool)
-      @pool = pool
-    end
-
-    # Delegate to Pool#transmit_to_all and if needed will merge responses from beanstalkd.
-    #
-    # @param [String] body Beanstalkd command
-    # @param [Hash{String => String, Boolean}] options socket connections options
-    # @option options [Boolean] merge Ask for merging responses or not
-    # @param [Proc] block Block passed in socket connection object
-    # @example
-    #   @pool.transmit_to_all("stats")
-    #
-    def transmit_to_all(body, options={}, &block)
-      merge = options.delete(:merge)
-      res = pool.transmit_to_all(body, options, &block)
-      first = res.find { |r| r && r[:status] }
-      if first && merge
-        res = { :status => first[:status], :body => sum_items(res.map { |r| r[:body] }) }
-      end
-      res
-    end
-
-    # Delegate missing methods to pool
-    # @api public
-    def method_missing(name, *args, &block)
-      if pool.respond_to?(name)
-        pool.send(name, *args, &block)
-      else # not a known pool command
-        super
-      end
-    end
-
-    protected
-
-    # Selects items from collection and then merges the individual values
-    # Supports array of hashes or array of arrays
-    #
-    # @param [Array<Hash, Array>] hs Collection of responses returned from beanstalkd
-    # @return [Hash{Symbol => String}] Merged responses combining values from all the hash bodies
-    # @example
-    #  self.sum_items([{ :foo => 1, :bar => 5 }, { :foo => 2, :bar => 3 }])
-    #    => { :foo => 3, :bar => 8 }
-    #  self.sum_items([['foo', 'bar'], ['foo', 'bar', 'baz']])
-    #    => ['foo', 'bar', 'baz']
-    #
-    def sum_items(items)
-      if items.first.is_a?(Hash)
-        items.select { |h| h.is_a?(Hash) }.
-          inject({}) { |a,b| a.merge(b) { |k,o,n| combine_stats(k, o, n) } }
-      elsif items.first.is_a?(Array)
-        items.flatten.uniq
-      end
-    end
-
-    # Combine two values for given key
-    #
-    # @param [String] k key name within response hash
-    # @return [Set,Integer] combined value for stat
-    # @example
-    #  self.combine_stats('total_connections', 4, 5) # => 9
-    #
-    def combine_stats(k, a, b)
-      ['name', 'version', 'pid'].include?(k) ? Set[a] + Set[b] : a + b
-    end
-  end # PoolCommand
-end # Beaneater