barrage 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 247efe0edfb9aae9c762b6698e5c90816c95f781
-  data.tar.gz: 117e43352f37892a675334b48e2b398a90fe167b
+SHA256:
+  metadata.gz: 9f4e3f94545667fc55e7efb109d64c1e87f6a382d8ec7ced5f4076c7813f1ea7
+  data.tar.gz: e4e99afca1bf2b0c234349db437dc42fa439199ebce178053e86c9b512dd68bb
 SHA512:
-  metadata.gz: ef97bd700202ccdd92acb5a1c498d8ca1245fd6ac8a077acd8ce3f2f9e536de3f04989e77717128a956c30f5714f6c2947e3a3f115a19ec937a428d448ba16af
-  data.tar.gz: 27265f705dfb1d087a441c86747f70496a505346751a7bbf24c14ff9e9357ec8a91a680a901ff446f3fff52716332f09760c9407c423906bfbf0202eb29aecf3
+  metadata.gz: 6a538c813035749f2732aa3f445d24636af10980f99ebb6e3072de8a59b2ca194cdd58123e8704e85f78dd62eedefe073717fc324c8e5dbe53352ac536da2cda
+  data.tar.gz: f91dd3eed5970c31b19c42c24739aa396c0766349d25c090a8ee378e7914d2f4cab2ebf20f973376af191212ed250e6c61b772d6731f4b707cc8907d9ed22e87

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+bundler_args: --jobs=2
 services:
   - redis-server
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.2.0
+
+  * Compatible with Redis 5.0
+
+## 0.1.1
+
+  * Fix redis client disconnect
+
 ## 0.1.0
 
   * Fix RedisWorkerId's worker_id handling

data/Gemfile

@@ -2,3 +2,17 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in barrage.gemspec
 gemspec
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
+  gem "activesupport", "< 5.0.0"
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.3")
+  gem "listen", "< 3.1.0"
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.5")
+  gem "ruby_dep", "< 1.4.0"
+end
+
+gem "redis", ">= 4.0.0"

data/README.md

@@ -1,7 +1,10 @@
 # Barrage
 
 [![Gem Version](https://badge.fury.io/rb/barrage.svg)](http://badge.fury.io/rb/barrage)
+[![Dependency Status](https://gemnasium.com/drecom/barrage.svg)](https://gemnasium.com/drecom/barrage)
 [![Coverage Status](https://img.shields.io/coveralls/drecom/barrage.svg)](https://coveralls.io/r/drecom/barrage)
+[![Build Status](https://travis-ci.org/drecom/barrage.svg)](https://travis-ci.org/drecom/barrage)
+[![Code Climate](https://codeclimate.com/github/drecom/barrage.png)](https://codeclimate.com/github/drecom/barrage)
 
 Distributed ID generator(like twitter/snowflake)
 
@@ -44,6 +47,8 @@ barrage.next
 
 #### msec
 #### redis_worker_id
+requirement: redis 2.6+
+
 #### sequence
 
 ### Creating your own generator

data/barrage.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "guard-rspec"

data/lib/barrage/generators/redis_worker_id.rb

@@ -50,7 +50,20 @@ class Barrage
 
           if redis.is_a?(Redis) and redis.connected?
             redis.del("barrage:worker:#{worker_id}") if real_ttl > Time.now.to_i
-            redis.client.disconnect
+
+            close_redis_connection(redis)
+          end
+        end
+
+        private
+
+        def close_redis_connection(redis)
+          redis_version = Gem.loaded_specs["redis"]&.version
+
+          if redis_version && redis_version >= Gem::Version.new("5.0.0")
+            redis._client.close
+          else
+            redis._client.disconnect
           end
         end
       end
@@ -63,7 +76,7 @@ class Barrage
         end
         new_worker_id = redis.evalsha(
           script_sha,
-          argv: [2 ** length, rand(2 ** length), @worker_id, ttl, RACE_CONDITION_TTL]
+          argv: [2 ** length, rand(2 ** length), (@worker_id || 0), ttl, RACE_CONDITION_TTL]
         )
         new_worker_id or raise StandardError, "Renew redis worker id failed"
         return new_worker_id.to_i

data/lib/barrage/version.rb

@@ -1,3 +1,3 @@
 class Barrage
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/barrage/generators/redis_worker_id_spec.rb

@@ -30,7 +30,7 @@ describe Barrage::Generators::RedisWorkerId do
     it { is_expected.to be < 2 ** length }
 
     context "on many instances" do
-      subject { 64.times.map { described_class.new(options) } }
+      subject { 3.times.map { described_class.new(options) } }
       let(:length) { 8 }
 
       it "should generate unique numbers" do
@@ -43,4 +43,38 @@ describe Barrage::Generators::RedisWorkerId do
       end
     end
   end
+
+  describe "#Finalizer" do
+    subject { described_class::Finalizer.new(data).call(*args) }
+
+    let(:now) { Time.now.to_i }
+    let(:ttl) { 300 }
+    let(:redis) { Redis.new }
+    let(:worker_ttl) { now + ttl / 2 }
+    let(:real_ttl) { now + ttl }
+    let(:data) { [redis, worker_ttl, real_ttl] }
+    let(:args) { {} }
+
+    if Gem.loaded_specs["redis"]&.version >= Gem::Version.new("5.0.0")
+      before do
+        redis._client.send(:raw_connection)
+      end
+
+      it "redis client disconnect" do
+        subject
+
+        expect(redis.connected?).to be_nil
+      end
+    else
+      before do
+        redis._client.connect
+      end
+
+      it "redis client disconnect" do
+        subject
+
+        expect(redis.connected?).to eq false
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barrage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - gussan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,7 @@ homepage: http://github.com/drecom/barrage
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,9 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Distributed id generator
 test_files: