upperkut 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c18a5b6516fc334c80ee3ccc35f1dab755490799581ff3bf50c6c3bcb45188c
-  data.tar.gz: d7b6ed2df27d4275666043cd9692cac287a0d62f5a5ca16216ebeba093838a29
+  metadata.gz: f8a422257ff9efd3c1cc0f5cc8ca940c31b77df381a549ca1ad9e0fd59919eba
+  data.tar.gz: 3e6bfc18b1c2890a033dc5b301e4009eeeccdd026ae6c040be5f8d7f551bd8b5
 SHA512:
-  metadata.gz: '09eacd8265373fd91432a997ac41e3b6ff120203476b3912d5bc7ccaa24dfb779d3f0817c10d4769782df1c7f563b2371eb6dfeab155a2c7442f9c3c51a75e2b'
-  data.tar.gz: 51dde9c9d81ddd79e81e220d2f4f38443778fd5026223b5330da74fde567b2310d67f3cdacf1dedd489730ab664fcb030a8404122f70be62f0a17ef108d4167a
+  metadata.gz: 1d8b525f86a878faae9cd8297c75120c1a883b9b6652f6f39669fa6c428055966ae151b1de7115d5e54c5e593fe5e15df499985757e1ea619298aa3098dd71b7
+  data.tar.gz: 403e4c6cdd0da351bedbd0daeddf96ab8f06269ce3d09a4468c0c996a6a22b55a9af7d3f75fd7aafdca9e867b4ddffc83e0bb55cd24b05519e654421c2df7f8c

data/.circleci/config.yml

@@ -10,6 +10,8 @@ jobs:
         environment:
           CC_TEST_REPORTER_ID: 03ab83a772148a577d29d4acf438d7ebdc95c632224122d0ba8dbb291eedebe6
           COVERAGE: true
+          REDIS_URL: redis://localhost:6379
+      - image: redis:5.0
     steps:
       - checkout
 

data/.codeclimate.yml

@@ -0,0 +1,15 @@
+version: "2"
+plugins:
+  brakeman:
+    enabled: false
+  eslint:
+    enabled: false
+  csslint:
+    enabled: false
+  rubocop:
+    enabled: true
+    channel: rubocop-0-63
+  reek:
+    enabled: true
+  bundler-audit:
+    enabled: true

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 0.7.x
 ---------
+- Added Datahog middleware #42 by @gabriel-augusto
+- Added redis to CI #40 by #henrich-m
+- Specs improvements #34 and #35, #37 by @gabriel-augusto
+- Enable Rubocop #32 by @henrich-m
+- Added codeclimate #31 by @henrich-m
+
+
 - Extract Buffered Queue behavior to its own strategy #29
 
 0.6.x

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upperkut (0.7.0)
+    upperkut (0.7.1)
       connection_pool (~> 2.2, >= 2.2.2)
       redis (>= 3.3.3, < 5)
 

data/README.md

@@ -68,7 +68,7 @@ Examples:
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec rspec` to run the tests.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/examples/basic.rb

@@ -5,7 +5,7 @@ class MyWorker
 
   def perform(items)
     puts 'starting performing'
-    exec_time = rand(9000..50000)
+    exec_time = rand(9000..50_000)
     sleep (exec_time.to_f / 1000.to_f)
     puts "performed #{items.size} items in #{exec_time.to_f / 1000.to_f} ms"
   end

data/examples/with_middlewares.rb

@@ -34,8 +34,8 @@ class WithMiddlewares
     end
   end
 
-  def perform(items)
-    puts "executing........."
+  def perform(_items)
+    puts 'executing.........'
     exec_time = rand(80..200)
     sleep (exec_time.to_f / 1000.to_f)
   end

data/lib/upperkut.rb

@@ -89,9 +89,13 @@ module Upperkut
         chain.add(Upperkut::Middlewares::Rollbar)
       end
 
+      if defined?(Datadog)
+        require_relative 'upperkut/middlewares/datadog'
+        chain.add(Upperkut::Middlewares::Datadog)
+      end
+
       chain
     end
-
   end
 
   # Error class responsible to signal the shutdown process

data/lib/upperkut/batch_execution.rb

@@ -20,7 +20,6 @@ module Upperkut
       @worker.server_middlewares.invoke(@worker, items) do
         worker_instance.perform(items_body.dup)
       end
-
     rescue Exception => ex
       @worker.push_items(items_body)
 

data/lib/upperkut/cli.rb

@@ -18,7 +18,7 @@ module Upperkut
           require 'rails'
           if ::Rails::VERSION::MAJOR == 4
             require File.expand_path("#{@options[:require]}/config/application.rb")
-            ::Rails::Application.initializer "upperkut.eager_load" do
+            ::Rails::Application.initializer 'upperkut.eager_load' do
               ::Rails.application.config.eager_load = true
             end
 

data/lib/upperkut/logging.rb

@@ -4,9 +4,8 @@ require 'socket'
 
 module Upperkut
   module Logging
-
     class DefaultFormatter < Logger::Formatter
-      def call(severity, time, program_name, message)
+      def call(severity, time, _program_name, message)
         "upperkut: #{time.utc.iso8601(3)} hostname=#{Socket.gethostname} "\
         "pid=#{::Process.pid} severity=#{severity} #{format_message(message)}\n"
       end
@@ -16,11 +15,10 @@ module Upperkut
       def format_message(message)
         return "msg=#{message} " unless message.is_a?(Hash)
 
-        message.each_with_object('') do |(k,v), memo|
+        message.each_with_object('') do |(k, v), memo|
           memo << "#{k}=#{v}\s"
           memo
         end
-
       end
     end
 

data/lib/upperkut/middleware.rb

@@ -9,6 +9,7 @@ module Upperkut
 
       def add(item)
         return @items if @items.include?(item)
+
         @items << item
       end
 

data/lib/upperkut/middlewares/datadog.rb

@@ -0,0 +1,11 @@
+module Upperkut
+  module Middlewares
+    class Datadog
+      def call(worker, _items)
+        ::Datadog.tracer.trace(worker.name) do
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/upperkut/middlewares/rollbar.rb

@@ -14,13 +14,12 @@ module Upperkut
       def handle_exception(e, worker, items)
         scope = {
           framework: "Upperkut #{::Upperkut::VERSION}",
-          request:   { params: { items_size: items.size } },
-          context:   worker.name
+          request: { params: { items_size: items.size } },
+          context: worker.name
         }
 
-        ::Rollbar.scope(scope).error(e, :use_exception_level_filters => true)
+        ::Rollbar.scope(scope).error(e, use_exception_level_filters: true)
       end
     end
   end
 end
-

data/lib/upperkut/processor.rb

@@ -28,6 +28,7 @@ module Upperkut
 
     def kill
       return unless @thread
+
       @thread.raise Upperkut::Shutdown
       @thread.value # wait
     end

data/lib/upperkut/redis_pool.rb

@@ -3,14 +3,13 @@ require 'redis'
 
 module Upperkut
   class RedisPool
-
     DEFAULT_OPTIONS = {
-      pool_timeout:     1,    # pool related option
-      size:             2,    # pool related option
-      connect_timeout:  0.2,
-      read_timeout:     5.0,
-      write_timeout:    0.5,
-      url:              ENV['REDIS_URL'],
+      pool_timeout: 1, # pool related option
+      size: 2, # pool related option
+      connect_timeout: 0.2,
+      read_timeout: 5.0,
+      write_timeout: 0.5,
+      url: ENV['REDIS_URL']
     }.freeze
 
     def initialize(options)
@@ -22,7 +21,7 @@ module Upperkut
     end
 
     def create
-      ConnectionPool.new(:timeout => @pool_timeout, :size => @size) do
+      ConnectionPool.new(timeout: @pool_timeout, size: @size) do
         Redis.new(@options)
       end
     end

data/lib/upperkut/strategies/base.rb

@@ -6,7 +6,7 @@ module Upperkut
       # items - The Array of items do be inserted.
       #
       # Returns true when success, raise when error.
-      def push_items(items = [])
+      def push_items(_items = [])
         raise NotImplementedError
       end
 
@@ -15,7 +15,7 @@ module Upperkut
       # batch_size: # of items to be retrieved.
       #
       # Returns an Array containing events as hash.
-      def fetch_items(batch_size)
+      def fetch_items(_batch_size)
         raise NotImplementedError
       end
 

data/lib/upperkut/strategies/buffered_queue.rb

@@ -10,7 +10,7 @@ module Upperkut
       attr_reader :options
 
       def initialize(worker, options = {})
-        @options    = options
+        @options = options
         @redis_options = options.fetch(:redis, {})
         @redis_pool = setup_redis_pool
         @worker     = worker
@@ -30,6 +30,7 @@ module Upperkut
       def push_items(items = [])
         items = [items] if items.is_a?(Hash)
         return false if items.empty?
+
         redis do |conn|
           conn.rpush(key, encode_json_items(items))
         end
@@ -56,7 +57,7 @@ module Upperkut
       def metrics
         {
           'latency' => latency,
-          'size'    => size
+          'size' => size
         }
       end
 
@@ -76,6 +77,7 @@ module Upperkut
 
       def fulfill_condition?(buff_size)
         return false if buff_size.zero?
+
         buff_size >= @batch_size || @waiting_time >= @max_wait
       end
 
@@ -89,19 +91,20 @@ module Upperkut
         item = redis { |conn| conn.lrange(key, 0, 0) }
         item = decode_json_items(item).first
         return 0 unless item
+
         now = Time.now.to_f
         now - item.fetch('enqueued_at', Time.now).to_f
       end
 
-
-
       def setup_redis_pool
         return @redis_options if @redis_options.is_a?(ConnectionPool)
+
         RedisPool.new(options.fetch(:redis, {})).create
       end
 
       def redis
-        raise ArgumentError, "requires a block" unless block_given?
+        raise ArgumentError, 'requires a block' unless block_given?
+
         @redis_pool.with do |conn|
           yield conn
         end

data/lib/upperkut/util.rb

@@ -16,7 +16,7 @@ module Upperkut
       items = items.collect do |i|
         JSON.generate(
           'enqueued_at' => Time.now.to_i,
-          'body'        => i
+          'body' => i
         )
       end
     end

data/lib/upperkut/version.rb

@@ -1,3 +1,3 @@
 module Upperkut
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/upperkut.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'upperkut/version'
@@ -22,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.2'
 
-  spec.add_dependency 'redis',           '>= 3.3.3', '< 5'
   spec.add_dependency 'connection_pool', '~> 2.2', '>= 2.2.2'
+  spec.add_dependency 'redis',           '>= 3.3.3', '< 5'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: upperkut
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nando Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
-    - - "<"
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
-    - - "<"
+        version: '2.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -120,6 +121,7 @@ files:
 - lib/upperkut/logging.rb
 - lib/upperkut/manager.rb
 - lib/upperkut/middleware.rb
+- lib/upperkut/middlewares/datadog.rb
 - lib/upperkut/middlewares/new_relic.rb
 - lib/upperkut/middlewares/rollbar.rb
 - lib/upperkut/processor.rb