sidekiq-benchmark 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90aa6b3895541db3454bfac34902d919c5f9c5e8f6640085690af9530fe9995
-  data.tar.gz: 7a88366e826fc84954c47296294d4685cf5887bfa2bbea0fe4f966e917d28f95
+  metadata.gz: 05ca155712f4d25af211627b1d7676b41ddff6c34e29d2c396607508d7959aa7
+  data.tar.gz: 8d458d2b8642b44e45aea45ecca27dd5136f0436c43e3ce9097d705b6fd54254
 SHA512:
-  metadata.gz: a7f05db5120b717567fc6f2c110ed5d1c4873ff35989f2c5a61c9c6317068c3e5a195ece0c504581c8d33a90f0aad5fc3e0e685265d10cffb9c61e037428e592
-  data.tar.gz: 690b2c9f0786eb23b0a6288d4f68008085e4917a205cccf016218cdb5a080cfbc94808403bb37d34f1d46c34107e1ec67c1103c190690272dc7f45b0eae4036d
+  metadata.gz: aabb9212f2477a564a59b45eb73d4c8d59de726db640118615d99d6f30269e14912d55b7cb5d6890d3e16fadb8ceca675f568574d8f1c8c3e0d4dc37b259e0f3
+  data.tar.gz: 9b16419856878d0377e97413e0fdb18642c23fcdb84eaf35a081fe9b7a1e36535a69a99cc6102639ecf1dc457dc9d3e81e4fd8ec7365dea0eaaece158fbd695d

data/.github/workflows/ruby.yml

@@ -0,0 +1,71 @@
+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-latest-sidekiq-6:
+    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: appraisal install
+        run: bundle exec appraisal install
+      - name: run tests
+        run: bundle exec appraisal sidekiq-6 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,4 +1,5 @@
 vendor/
 Gemfile.lock
 coverage/
+gemfiles
 *.gem

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'sidekiq-7' do
+  gem 'sidekiq', '> 7'
+end
+
+appraise 'sidekiq-6' do
+  gem 'sidekiq', '~> 6'
+end

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sidekiq-benchmark.gemspec
 gemspec
+
+gem "sidekiq", "> 5"

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.
@@ -15,11 +13,9 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    $ bundle
-
-## Requirements
-
-From version 0.5.0 works with Sidekiq 4.2 or newer
+```shell
+bundle
+```
 
 ## Usage
 
@@ -71,10 +67,6 @@ end
 
 ![Web UI](https://github.com/kosmatov/sidekiq-benchmark/raw/master/examples/web-ui.png)
 
-### Sample Apps
-
-[Heroku App](http://sidekiq-benchmark.herokuapp.com/benchmarks/generate)
-
 ## Testing sidekiq workers
 
 When you use [Sidekiq::Testing](https://github.com/mperham/sidekiq/wiki/Testing) you

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.7.1"
+    VERSION = "0.7.3"
   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.to_s
+              transaction.hset redis_keys[:total], "finish_time", finish_time.to_s
 
-              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

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "coveralls"
   gem.add_development_dependency "pry"
   gem.add_development_dependency 'delorean', '~> 2.1'
+  gem.add_development_dependency 'appraisal'
 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,6 +13,8 @@ module Sidekiq
         end
 
         before do
+          env 'rack.session', { csrf: TOKEN }
+          env 'HTTP_X_CSRF_TOKEN', TOKEN
           Test.flush_db
         end
 

data/test/test_helper.rb

@@ -1,26 +1,28 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 
-require 'coveralls'
-Coveralls.wear! do
-  add_filter '/test/'
-end
-
 ENV['RACK_ENV'] = 'test'
+$TESTING = true
 
 require 'bundler/setup'
 require 'rack/test'
 
 require 'sidekiq'
-require 'sidekiq/util'
 require 'sidekiq-benchmark'
 
 require 'delorean'
 require 'pry'
 
-REDIS = Sidekiq::RedisConnection.create url: "redis://#{ENV['REDIS_HOST'] || 'localhost'}/15"
 Bundler.require
 
+Sidekiq.configure_server do |cfg|
+  cfg.redis = {url: "redis://#{ENV['REDIS_HOST'] || 'localhost'}/15"}
+end
+
+Sidekiq.configure_client do |cfg|
+  cfg.redis = {url: "redis://#{ENV['REDIS_HOST'] || 'localhost'}/15"}
+end
+
 module Sidekiq
   module Benchmark
     module Test
@@ -89,7 +91,6 @@ module Sidekiq
       end
 
       def self.flush_db
-        Sidekiq.redis = REDIS
         Sidekiq.redis do |conn|
           conn.flushdb
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: Benchmarks for Sidekiq
 email:
 - key@kosmatov.ru
@@ -129,7 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -165,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Adds benchmarking methods to Sidekiq workers, keeps metrics and adds tab