sidekiq-benchmark 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 4c14f4a4df0d3176c7471258d3a7c40eb89bcd98
-  data.tar.gz: 892130faabd2c956cf6727d1c17a760169da3ce3
+SHA1:
+  metadata.gz: 2b2583957b88fb1d556a08a53abe16bc823914ec
+  data.tar.gz: d084d3be5a35c882326c9d3f8df418c0a9c2bca6
 SHA512:
-  metadata.gz: a6d232bd0fa047ba153567e2fcee693a0ce3cb5916b73db8bae107502f65605e8d6a3fa222a96ef9d14c2a5f4e3625495aea55a92d89db0793eb1703c8335e60
-  data.tar.gz: 31231c0ee739b0380359a4d58b5a9e9a4cf2c46fa32095f1d33f46c80b6ec9056d1072ea69b71b5e0e329a5e2e057e7217988a3116cd6e3df0f042f9e3027eb2
+  metadata.gz: b0662eec56c195a7077a263c10926e6b7484fde4fb54b7f0d45db8b70e61e74847bf2f35b9c1c9d1a60671362f6ee6970306358af0381e79073013facc47db05
+  data.tar.gz: 1e7042f4b933e3776cbeaea2cf682a86a69ffc1416f4da4784110036439e0ad9d85f98dc24d5b043e0f1eec7c3f67a5587a20dae443d2e019b576fbb46000ca0

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1.1
+  - 2.2.2
+  - 2.3.1
 services:
   - redis-server

data/lib/sidekiq-benchmark.rb

@@ -6,6 +6,10 @@ Sidekiq::Web.tabs["Benchmarks"] = "benchmarks"
 
 module Sidekiq
   module Benchmark
+    REDIS_NAMESPACE = :benchmark
+    TYPES_KEY = "#{REDIS_NAMESPACE}:types".freeze
+    REDIS_KEYS_TTL = 3600 * 24 * 30
+
     autoload :Worker, 'sidekiq-benchmark/worker'
   end
 end

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/lib/sidekiq-benchmark/web.rb

@@ -1,41 +1,43 @@
-require 'sinatra/assetpack'
 require 'chartkick'
 
 module Sidekiq
   module Benchmark
     module Web
-      def self.registered(app)
-        web_dir = File.expand_path("../../../web", __FILE__)
-        js_dir = File.join(web_dir, "assets", "javascripts")
+      WEB_DIR = File.expand_path("../../../web", __FILE__).freeze
+      JS_DIR = File.join(WEB_DIR, "assets", "javascripts").freeze
+      VIEW_PATH = File.join(WEB_DIR, "views", "benchmarks.erb").freeze
 
+      def self.registered(app)
         app.helpers Chartkick::Helper
-        app.register Sinatra::AssetPack
 
-        app.assets {
-          serve '/js', from: js_dir
-
-          js 'chartkick', ['/js/chartkick.js']
-        }
+        app.get '/benchmarks/javascripts/chartkick.js' do
+          body = File.read File.join(JS_DIR, 'chartkick.js')
+          headers = {
+            'Content-Type' => 'application/javascript',
+            'Cache-Control' => 'public, max-age=84600'
+          }
+          [200, headers, [body]]
+        end
 
         app.get "/benchmarks" do
           @charts = {}
 
           Sidekiq.redis do |conn|
-            @types = conn.smembers "benchmark:types"
+            @types = conn.smembers Sidekiq::Benchmark::TYPES_KEY
             @types.each do |type|
               @charts[type] = { total: [], stats: [] }
 
-              total_keys = conn.hkeys("benchmark:#{type}:total") -
-                ['start_time', 'job_time', 'finish_time']
+              total_key = "#{Sidekiq::Benchmark::REDIS_NAMESPACE}:#{type}:total"
+              total_keys = conn.hkeys(total_key) - %w(start_time job_time finish_time)
 
-              total_time = conn.hget "benchmark:#{type}:total", :job_time
+              total_time = conn.hget total_key, :job_time
               total_time = total_time.to_f
               total_keys.each do |key|
-                value = conn.hget "benchmark:#{type}:total", key
+                value = conn.hget total_key, key
                 @charts[type][:total] << [key, value.to_f.round(2)]
               end
 
-              stats = conn.hgetall "benchmark:#{type}:stats"
+              stats = conn.hgetall "#{Sidekiq::Benchmark::REDIS_NAMESPACE}:#{type}:stats"
               stats.each do |key, value|
                 @charts[type][:stats] << [key.to_f, value.to_i]
               end
@@ -45,9 +47,7 @@ module Sidekiq
             end
           end
 
-          view_path = File.join(web_dir, "views", "benchmarks.erb")
-          template = File.read view_path
-          render :erb, template
+          erb File.read(VIEW_PATH)
         end
 
         app.post "/benchmarks/remove" do

data/lib/sidekiq-benchmark/worker.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Benchmark
     module Worker
-
       def benchmark(options = {})
         @benchmark ||= Benchmark.new self, benchmark_redis_type_key, options
 
@@ -18,9 +19,7 @@ module Sidekiq
       end
 
       class Benchmark
-        REDIS_NAMESPACE = :benchmark
-
-        attr_reader :metrics, :start_time, :finish_time, :redis_key
+        attr_reader :metrics, :start_time, :finish_time, :redis_keys
 
         def initialize(worker, redis_key, options)
           @metrics = {}
@@ -28,7 +27,12 @@ module Sidekiq
           @options = options
           @start_time = Time.now
 
-          @redis_key = "#{REDIS_NAMESPACE}:#{redis_key}"
+          @redis_keys =
+            %i[total stats].reduce({}) do |m, e|
+              m[e] = "#{REDIS_NAMESPACE}:#{redis_key}:#{e}"
+              m
+            end
+
           set_redis_key redis_key
         end
 
@@ -62,18 +66,10 @@ module Sidekiq
           @metrics[name]
         end
 
-        def method_missing(name, *args, &block)
-          if block_given?
-            measure(name, &block)
-            self[name]
-          else
-            self[name] = args[0]
-          end
-        end
-
         def set_redis_key(key)
           Sidekiq.redis do |conn|
-            conn.sadd "#{REDIS_NAMESPACE}:types", key
+            conn.sadd Sidekiq::Benchmark::TYPES_KEY, key
+            conn.expire Sidekiq::Benchmark::TYPES_KEY, REDIS_KEYS_TTL
           end
         end
 
@@ -83,17 +79,29 @@ module Sidekiq
           Sidekiq.redis do |conn|
             conn.multi do
               @metrics.each do |key, value|
-                conn.hincrbyfloat "#{redis_key}:total", key, value
+                conn.hincrbyfloat redis_keys[:total], key, value
               end
 
-              conn.hincrby "#{redis_key}:stats", job_time_key, 1
+              conn.hincrby redis_keys[:stats], job_time_key, 1
+
+              conn.hsetnx redis_keys[:total], "start_time", start_time
+              conn.hset redis_keys[:total], "finish_time", finish_time
 
-              conn.hsetnx "#{redis_key}:total", "start_time", start_time
-              conn.hset "#{redis_key}:total", "finish_time", finish_time
+              conn.expire redis_keys[:stats], REDIS_KEYS_TTL
+              conn.expire redis_keys[:total], REDIS_KEYS_TTL
             end
           end
         end
 
+        def method_missing(name, *args, &block)
+          if block_given?
+            measure(name, &block)
+            self[name]
+          else
+            self[name] = args[0]
+          end
+        end
+
       end
     end
   end

data/sidekiq-benchmark.gemspec

@@ -19,13 +19,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "chartkick", '>= 1.1.1'
-  gem.add_dependency "sinatra-assetpack", '>= 0.2.5'
 
   gem.add_development_dependency "sidekiq"
-  gem.add_development_dependency "sinatra"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"
   gem.add_development_dependency "minitest", "~> 5"
   gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "pry"
   gem.add_development_dependency 'delorean', '~> 2.1'
 end

data/test/lib/testing.rb

@@ -1,7 +1,8 @@
 require 'test_helper'
-require 'sidekiq-benchmark/testing'
 
 class Sidekiq::Benchmark::TestingTest < Minitest::Spec
+  require 'sidekiq-benchmark/testing'
+
   describe 'Testing' do
     before do
       Sidekiq::Benchmark::Test.flush_db
@@ -10,7 +11,7 @@ class Sidekiq::Benchmark::TestingTest < Minitest::Spec
 
     it "save nothing to redis" do
       Sidekiq.redis do |conn|
-        total_time = conn.hget("#{@worker.benchmark.redis_key}:total", :job_time)
+        total_time = conn.hget(@worker.benchmark.redis_keys[:total], :job_time)
         total_time.must_be_nil
       end
     end

data/test/lib/worker_test.rb

@@ -33,10 +33,10 @@ module Sidekiq
 
         it "should save metrics to redis" do
           Sidekiq.redis do |conn|
-            total_time = conn.hget("#{@worker.benchmark.redis_key}:total", :job_time)
+            total_time = conn.hget(@worker.benchmark.redis_keys[:total], :job_time)
             total_time.wont_be_nil
 
-            metrics = conn.hkeys("#{@worker.benchmark.redis_key}:stats")
+            metrics = conn.hkeys(@worker.benchmark.redis_keys[:stats])
             metrics.wont_be_empty
           end
         end
@@ -46,7 +46,7 @@ module Sidekiq
           metrics = worker.benchmark.metrics
 
           Sidekiq.redis do |conn|
-            metric_set = conn.hkeys("#{worker.benchmark.redis_key}:stats")
+            metric_set = conn.hkeys(worker.benchmark.redis_keys[:stats])
             metric_set.must_be_empty
           end
 
@@ -55,13 +55,11 @@ module Sidekiq
           end
 
           worker.benchmark.finish_time.must_be_nil
-
           worker.finish
-
           worker.benchmark.finish_time.wont_be_nil
 
           Sidekiq.redis do |conn|
-            metric_set = conn.hkeys("#{worker.benchmark.redis_key}:stats")
+            metric_set = conn.hkeys(worker.benchmark.redis_keys[:stats])
             metric_set.wont_be_empty
           end
         end

data/test/test_helper.rb

@@ -6,6 +6,8 @@ Coveralls.wear! do
   add_filter '/test/'
 end
 
+ENV['RACK_ENV'] = 'test'
+
 require 'bundler/setup'
 require 'rack/test'
 
@@ -14,9 +16,9 @@ require 'sidekiq/util'
 require 'sidekiq-benchmark'
 
 require 'delorean'
+require 'pry'
 
-REDIS = Sidekiq::RedisConnection.create url: "redis://localhost/15", namespace: "testy"
-
+REDIS = Sidekiq::RedisConnection.create url: "redis://localhost/15"
 Bundler.require
 
 module Sidekiq

data/web/views/benchmarks.erb

@@ -1,5 +1,5 @@
 <script type="text/javascript" src="//www.google.com/jsapi"></script>
-<%= js :chartkick %>
+<script type="text/javascript" src="<%= root_path %>benchmarks/javascripts/chartkick.js"></script>
 
 <header class="row">
   <div class="col-md-6">

metadata

@@ -1,139 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: sinatra-assetpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: sidekiq
   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: sinatra
+  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: rake
+  name: rack-test
   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: rack-test
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: pry
   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: delorean
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 description: Benchmarks for Sidekiq
@@ -143,8 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -171,17 +157,17 @@ 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.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds benchmarking methods to Sidekiq workers, keeps metrics and adds tab
@@ -191,4 +177,3 @@ test_files:
 - test/lib/web_test.rb
 - test/lib/worker_test.rb
 - test/test_helper.rb
-has_rdoc: