sidekiq-throttler 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e1d69fd9be458ce6356483854f19513b01e5e7
-  data.tar.gz: 1c0582120520cfa48ce066cf410f7d48c492a394
+  metadata.gz: 8510cc5fa63ec9ee28c5e6cac2f2adda038f754f
+  data.tar.gz: 9c31136eda0f75f97c71c70e9455066748c8f6d4
 SHA512:
-  metadata.gz: 35a019db24bfd3833fa22edfed15b00b144b9a73966de3b9c075f794b832ba7e4cf4791f633f8432cc35ad21e9ace738d94635268c5b0109b6c866dc1d68832f
-  data.tar.gz: 1d74ed077c71d2ff8630d0286958a2869ca3bb4a83e6f3b5fa74f967cfbf7312ae05150176b14f34883fb827ea7bad5438527f138afb8ee8a6530e3a0542406a
+  metadata.gz: 7fd700bebbd83427aa0cba1a33adb42dde2e33ecd012150e25e7e427e0fcc956e240f434a6e5aac0fd95de4d667e478a0402183a34d5b8eabdf12860654662a7
+  data.tar.gz: 91259a25d5a10ad998eb51bdfbe866e878a43f61d09b08ef0790625fdc68644b67ad6a4d6d8625645171af995e0349e520985f12242fad846b4a62e37bbb8ed7

data/.travis.yml

@@ -2,17 +2,18 @@ language: ruby
 services:
   - redis-server
 rvm:
-  - 2.1.1
-  - 2.1.0
+  - 2.3.0
+  - 2.2
+  - 2.1
   - 2.0.0
-  - 1.9.3
-branches:
-  only:
-    - master
 notifications:
   email:
     recipients:
       - gabe@ga.be
 gemfile:
+  - gemfiles/sidekiq_head.gemfile
+  - gemfiles/sidekiq_4.gemfile
+  - gemfiles/sidekiq_3.gemfile
   - gemfiles/sidekiq_2.gemfile
-  - gemfiles/sidekiq_master.gemfile
+before_install:
+  - gem update bundler

data/Appraisals

@@ -1,7 +1,15 @@
-appraise 'sidekiq-2' do
-  gem 'sidekiq', '2.17.7'
+appraise 'sidekiq-head' do
+  gem 'sidekiq', github: 'mperham/sidekiq'
 end
 
-appraise 'sidekiq-master' do
-  gem 'sidekiq', github: 'mperham/sidekiq'
+appraise 'sidekiq-4' do
+  gem 'sidekiq', '~> 4.0'
+end
+
+appraise 'sidekiq-3' do
+  gem 'sidekiq', '~> 3.0'
+end
+
+appraise 'sidekiq-2' do
+  gem 'sidekiq', '~> 2.0'
 end

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sidekiq-throttler.gemspec
 gemspec
 
-gem 'appraisal', '~> 1.0.0'
+gem 'appraisal', '~> 2.1.0'

data/README.md

@@ -9,8 +9,7 @@ limit job execution on a per-worker basis.
 
 ## Compatibility
 
-Sidekiq::Throttler is actively tested against MRI versions 2.1.1, 2.1.0, 2.0.0,
-and 1.9.3.
+Sidekiq::Throttler supports Sidekiq versions 2 and 3 and is actively tested against Ruby versions 2.0.0, 2.1, and 2.2.
 
 ## Installation
 

data/bin/appraisal

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("appraisal", "appraisal")

data/bin/guard

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'guard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("guard", "guard")

data/bin/pry

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/yard

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("yard", "yard")

data/gemfiles/sidekiq_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "~> 1.0.0"
-gem "sidekiq", "2.17.7"
+gem "appraisal", "~> 2.1.0"
+gem "sidekiq", "~> 2.0"
 
 gemspec :path => "../"

data/gemfiles/sidekiq_3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.1.0"
+gem "sidekiq", "~> 3.0"
+
+gemspec :path => "../"

data/gemfiles/sidekiq_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.1.0"
+gem "sidekiq", "~> 4.0"
+
+gemspec :path => "../"

data/gemfiles/{sidekiq_master.gemfile → sidekiq_head.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "~> 1.0.0"
+gem "appraisal", "~> 2.1.0"
 gem "sidekiq", :github => "mperham/sidekiq"
 
 gemspec :path => "../"

data/lib/sidekiq/throttler/rate_limit.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Sidekiq
   class Throttler
     ##
@@ -8,6 +10,8 @@ module Sidekiq
     # and 30 seconds"
     class RateLimit
 
+      LOCK = Mutex.new
+
       ##
       # @return [Sidekiq::Worker]
       #   The worker to rate limit.
@@ -174,7 +178,7 @@ module Sidekiq
       # @return [Integer]
       #   The current number of jobs executed.
       def self.count(limiter)
-        Thread.exclusive do
+        LOCK.synchronize do
           prune(limiter)
           limiter.executions.count(limiter.key)
         end
@@ -188,7 +192,7 @@ module Sidekiq
       # @return [Integer]
       #   The current number of jobs executed.
       def self.increment(limiter)
-        Thread.exclusive do
+        LOCK.synchronize do
           limiter.executions.append(limiter.key, Time.now)
         end
         count(limiter)

data/lib/sidekiq/throttler/storage/memory.rb

@@ -13,7 +13,7 @@ module Sidekiq
         ##
         # Number of executions for +key+.
         #
-        # @param [String]
+        # @param [String] key
         #   Key to fetch count for
         #
         # @return [Fixnum]
@@ -40,7 +40,7 @@ module Sidekiq
         # @param [String] key
         #   The key to append to
         #
-        # @param [Time]
+        # @param [Time] time
         #   The time to insert
         def append(key, time)
           @hash[key] << time

data/lib/sidekiq/throttler/storage/redis.rb

@@ -12,7 +12,7 @@ module Sidekiq
         ##
         # Number of executions for +key+.
         #
-        # @param [String]
+        # @param [String] key
         #   Key to fetch count for
         #
         # @return [Fixnum]
@@ -60,7 +60,7 @@ module Sidekiq
         # @param [String] key
         #   The key to append to
         #
-        # @param [Time]
+        # @param [Time] time
         #   The time to insert
         def append(key, time)
           Sidekiq.redis do |conn|

data/lib/sidekiq/throttler/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Throttler
-    VERSION = '0.4.1'
+    VERSION = '0.5.1'.freeze
   end
 end

data/sidekiq-throttler.gemspec

@@ -14,12 +14,11 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  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 = %w(lib)
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'sidekiq', '>= 2.5', '< 4.0'
+  gem.add_dependency 'sidekiq', '>= 2.5', '< 5.0'
 
   gem.add_development_dependency 'growl'
   gem.add_development_dependency 'guard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttler
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Gabe Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,7 +33,7 @@ dependencies:
         version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
@@ -273,8 +273,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/appraisal
+- bin/guard
+- bin/pry
+- bin/rake
+- bin/rspec
+- bin/yard
 - gemfiles/sidekiq_2.gemfile
-- gemfiles/sidekiq_master.gemfile
+- gemfiles/sidekiq_3.gemfile
+- gemfiles/sidekiq_4.gemfile
+- gemfiles/sidekiq_head.gemfile
 - lib/sidekiq-throttler.rb
 - lib/sidekiq/throttler.rb
 - lib/sidekiq/throttler/rate_limit.rb
@@ -313,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sidekiq::Throttler is a middleware for Sidekiq that adds the ability to rate