sidekiq-benchmark 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c898838a3feaf17b7341bddb15518de139bd15c
-  data.tar.gz: 4dc7b3cf64d00f464cd201c63bd1c36fe238c0d7
+SHA256:
+  metadata.gz: 902591a0561ae44fdb12cd92c03fccf1777efc778e40a03a3886c7ed6775b9dd
+  data.tar.gz: 1b4af01f66959214362dc300fa17bfa4280e9a4d587e389738e77812efe46a76
 SHA512:
-  metadata.gz: d15d44a724dbe9d1506fce8ef67407e76edefef1824df968d0a0aa15a86a9959cba9341103baa386de62849fe2bcd54ff6260df77c71174b134d252c3e473c09
-  data.tar.gz: f3115064a2db5bf22b09f42131b97e92ddbacfdfd6011805eef4b3ab783a21e05bd6d255fc9fd757071e597f580769f8f0e14b5e850d24914d677d7fde8637fa
+  metadata.gz: 5c3d5ea526654c822157e9a1a6cafc1c81d04066ba66454bbee9f408706dcb32bdc7246e52b8fb3741afc01985e774b633b9c808745b4427524757752a7ba33f
+  data.tar.gz: d2c362f685871a55ca3bae38014f74bc75bbdcc1f0b33a462692e0e1c40dc807743a3f6efe74ed2ecb6faca88e3efb55901f0407e611f248d281be838b2cb010

data/.github/workflows/ruby.yml

@@ -0,0 +1,50 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  ruby-latest:
+    runs-on: ubuntu-latest
+    container: ruby:latest
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v3
+      - name: bundle install
+        run: bundle install
+      - name: run tests
+        run: bundle exec rake test
+        env:
+          REDIS_HOST: redis
+  ruby-2:
+    runs-on: ubuntu-latest
+    container: ruby:2
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v3
+      - name: bundle install
+        run: bundle install
+      - name: run tests
+        run: bundle exec rake test
+        env:
+          REDIS_HOST: redis

data/.gitignore

@@ -1,20 +1,5 @@
-*.swp
-*.swo
-*.gem
-*.rbc
-.ruby-version
-.bundle
-.config
-.yardoc
+vendor/
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+coverage/
+*.gem
+.gemkey

data/README.md

@@ -1,8 +1,6 @@
 # Sidekiq::Benchmark
-[![Gem Version](https://badge.fury.io/rb/sidekiq-benchmark.png)](https://rubygems.org/gems/sidekiq-benchmark)
-[![Code Climate](https://codeclimate.com/github/kosmatov/sidekiq-benchmark.png)](https://codeclimate.com/github/kosmatov/sidekiq-benchmark)
-[![Build Status](https://travis-ci.org/kosmatov/sidekiq-benchmark.png)](https://travis-ci.org/kosmatov/sidekiq-benchmark)
-[![Coverage Status](https://coveralls.io/repos/kosmatov/sidekiq-benchmark/badge.png?branch=master)](https://coveralls.io/r/kosmatov/sidekiq-benchmark)
+[![Gem Version](https://badge.fury.io/rb/sidekiq-benchmark.svg)](https://badge.fury.io/rb/sidekiq-benchmark)
+[![Ruby](https://github.com/kosmatov/sidekiq-benchmark/actions/workflows/ruby.yml/badge.svg)](https://github.com/kosmatov/sidekiq-benchmark/actions/workflows/ruby.yml)
 
 Adds benchmarking methods to
 [Sidekiq](https://github.com/mperham/sidekiq) workers, keeps metrics and adds tab to Web UI to let you browse them.
@@ -73,7 +71,7 @@ end
 
 ### Sample Apps
 
-[Heroku App](http://sidekiq-benchmark.herokuapp.com/benchmarks)
+[Heroku App](http://sidekiq-benchmark.herokuapp.com/benchmarks/generate)
 
 ## Testing sidekiq workers
 

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.6.0"
+    VERSION = "0.7.2"
   end
 end

data/lib/sidekiq-benchmark/worker.rb

@@ -79,18 +79,18 @@ module Sidekiq
           job_time_key = @metrics[:job_time].round(1)
 
           Sidekiq.redis do |conn|
-            conn.multi do
+            conn.multi do |transaction|
               @metrics.each do |key, value|
-                conn.hincrbyfloat redis_keys[:total], key, value
+                transaction.hincrbyfloat redis_keys[:total], key, value
               end
 
-              conn.hincrby redis_keys[:stats], job_time_key, 1
+              transaction.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
+              transaction.hsetnx redis_keys[:total], "start_time", start_time
+              transaction.hset redis_keys[:total], "finish_time", finish_time
 
-              conn.expire redis_keys[:stats], REDIS_KEYS_TTL
-              conn.expire redis_keys[:total], REDIS_KEYS_TTL
+              transaction.expire redis_keys[:stats], REDIS_KEYS_TTL
+              transaction.expire redis_keys[:total], REDIS_KEYS_TTL
             end
           end
         end

data/sidekiq-benchmark.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/kosmatov/sidekiq-benchmark/"
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files | grep -Ev '^(examples)'`.split("\n")
+  gem.files         = `git ls-files | grep -Ev '^(examples|vendor|docker|.travis|Makefile)'`.split("\n")
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_dependency "chartkick", ">= 1.1.1"
-  gem.add_dependency "sidekiq", "~> 5"
+  gem.add_dependency "sidekiq", "> 5"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"

data/test/lib/testing.rb

@@ -12,12 +12,12 @@ class Sidekiq::Benchmark::TestingTest < Minitest::Spec
     it "save nothing to redis" do
       Sidekiq.redis do |conn|
         total_time = conn.hget(@worker.benchmark.redis_keys[:total], :job_time)
-        total_time.must_be_nil
+        _(total_time).must_be_nil
       end
     end
 
     it "run code in bm blocks" do
-      @worker.counter.wont_equal 0
+      _(@worker.counter).wont_equal 0
     end
   end
 end

data/test/lib/web_test.rb

@@ -3,6 +3,8 @@ require 'test_helper'
 module Sidekiq
   module Benchmark
     module Test
+      TOKEN = SecureRandom.base64(32).freeze
+
       describe "Web extention" do
         include Rack::Test::Methods
 
@@ -11,41 +13,43 @@ module Sidekiq
         end
 
         before do
+          env 'rack.session', { csrf: TOKEN }
+          env 'HTTP_X_CSRF_TOKEN', TOKEN
           Test.flush_db
         end
 
         it "display index without stats" do
           get '/benchmarks'
-          last_response.status.must_equal 200
+          _(last_response.status).must_equal 200
         end
 
         it "display index with stats" do
           WorkerMock.new
 
           get '/benchmarks'
-          last_response.status.must_equal 200
+          _(last_response.status).must_equal 200
         end
 
         it "remove all benchmarks data" do
           WorkerMock.new
 
-          Sidekiq.redis { |conn| conn.keys("benchmark:*").wont_be_empty }
+          Sidekiq.redis { |conn| _(conn.keys("benchmark:*")).wont_be_empty }
 
           post '/benchmarks/remove_all'
-          last_response.status.must_equal 302
+          _(last_response.status).must_equal 302
 
-          Sidekiq.redis { |conn| conn.keys("benchmark:*").must_be_empty }
+          Sidekiq.redis { |conn| _(conn.keys("benchmark:*")).must_be_empty }
         end
 
         it "remove benchmark data" do
           WorkerMock.new
 
-          Sidekiq.redis { |conn| conn.keys("benchmark:sidekiq_benchmark_test_workermock:*").wont_be_empty }
+          Sidekiq.redis { |conn| _(conn.keys("benchmark:sidekiq_benchmark_test_workermock:*")).wont_be_empty }
 
           post '/benchmarks/remove', type: :sidekiq_benchmark_test_workermock
-          last_response.status.must_equal 302
+          _(last_response.status).must_equal 302
 
-          Sidekiq.redis { |conn| conn.keys("benchmark:sidekiq_benchmark_test_workermock:*").must_be_empty }
+          Sidekiq.redis { |conn| _(conn.keys("benchmark:sidekiq_benchmark_test_workermock:*")).must_be_empty }
         end
       end
     end

data/test/lib/worker_test.rb

@@ -16,12 +16,12 @@ module Sidekiq
           metrics = @worker.benchmark.metrics
 
           @worker.metric_names.each do |metric_name|
-            metrics[metric_name].wont_be_nil
+            _(metrics[metric_name]).wont_be_nil
           end
 
-          @worker.benchmark.start_time.wont_be_nil
-          @worker.benchmark.finish_time.wont_be_nil
-          metrics[:assigned_metric].must_equal @worker.assigned_metric
+          _(@worker.benchmark.start_time).wont_be_nil
+          _(@worker.benchmark.finish_time).wont_be_nil
+          _(metrics[:assigned_metric]).must_equal @worker.assigned_metric
         end
 
         it 'should add up metrics' do
@@ -34,10 +34,10 @@ module Sidekiq
         it "should save metrics to redis" do
           Sidekiq.redis do |conn|
             total_time = conn.hget(@worker.benchmark.redis_keys[:total], :job_time)
-            total_time.wont_be_nil
+            _(total_time).wont_be_nil
 
             metrics = conn.hkeys(@worker.benchmark.redis_keys[:stats])
-            metrics.wont_be_empty
+            _(metrics).wont_be_empty
           end
         end
 
@@ -47,20 +47,20 @@ module Sidekiq
 
           Sidekiq.redis do |conn|
             metric_set = conn.hkeys(worker.benchmark.redis_keys[:stats])
-            metric_set.must_be_empty
+            _(metric_set).must_be_empty
           end
 
           worker.metric_names.each do |metric_name|
-            metrics[metric_name].wont_be_nil
+            _(metrics[metric_name]).wont_be_nil
           end
 
-          worker.benchmark.finish_time.must_be_nil
+          _(worker.benchmark.finish_time).must_be_nil
           worker.finish
-          worker.benchmark.finish_time.wont_be_nil
+          _(worker.benchmark.finish_time).wont_be_nil
 
           Sidekiq.redis do |conn|
             metric_set = conn.hkeys(worker.benchmark.redis_keys[:stats])
-            metric_set.wont_be_empty
+            _(metric_set).wont_be_empty
           end
         end
 
@@ -68,8 +68,8 @@ module Sidekiq
           worker = AlterWorkerMock.new
           value  = worker.benchmark.call(:multiply, 4, 4)
 
-          value.must_equal 16
-          worker.benchmark.metrics[:multiply].wont_be_nil
+          _(value).must_equal 16
+          _(worker.benchmark.metrics[:multiply]).wont_be_nil
         end
 
       end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ Coveralls.wear! do
 end
 
 ENV['RACK_ENV'] = 'test'
+$TESTING = true
 
 require 'bundler/setup'
 require 'rack/test'
@@ -18,7 +19,7 @@ require 'sidekiq-benchmark'
 require 'delorean'
 require 'pry'
 
-REDIS = Sidekiq::RedisConnection.create url: "redis://localhost/15"
+REDIS = Sidekiq::RedisConnection.create url: "redis://#{ENV['REDIS_HOST'] || 'localhost'}/15"
 Bundler.require
 
 module Sidekiq