redis-ick 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3406be565b9f93bea296e10d6cb1d34c48707a
-  data.tar.gz: 92f6dd755dad1165b41dd2050547712124b0cbea
+  metadata.gz: a8ee23db87a5631567762296b5acb79897623ffd
+  data.tar.gz: 7e90497774b30eda375d0e0f28ed9b4782c74c64
 SHA512:
-  metadata.gz: d811a5bc57c88d9833ca04c0e1715e1dbeb2a6be1de01bc6a41dec3a06d009a11a9e5884b0a8ec01b75c0e6cdaacdaeb284c5b3d678ebf071bc54812691a1935
-  data.tar.gz: 1bd851eadaff3a9fe3dc1996eb38654121dd4785857ea3fc14c9e2cabfe7b815273091f1b677ae9720e78265ee3a382534cf739c6666a3d34bcb86421bbeafbb
+  metadata.gz: 52c216162ffc916b83a89dfcf6bdd77103d9e6999dbecadce83d55af53beca49cf0bf7aa83bc24c2b10ae40346de385f0049b6522ffc9ce2926988ce7011090c
+  data.tar.gz: ab4f0601d1516bdb9c9e25f341b8e30837df58899f5a647ebfdf8576590ab12d1f805d4deacb7ff7de38b4d77be6925f6ff73a5487149ec0fe292bf6ce22da92

data/.rubocop.yml

@@ -3,6 +3,8 @@ AllCops:
     - Rakefile
     - Gemfile
     - '*.gemspec'
+  Exclude:
+    - 'gemfiles/vendor/**/*'
 
 # Broadly speaking, test code gets a pass for most of the Metrics family.
 #
@@ -62,3 +64,10 @@ Style:
 #
 Lint/AmbiguousBlockAssociation:           # obnoxiously rejects idiomatic Ruby
   Enabled: false
+
+# Naming/FileName is kind of cool but off-base w/r/t demanding that
+# Appraisals use snake_case.
+#
+Naming/FileName:
+  Exclude:
+    - Appraisals

data/.travis.yml

@@ -21,6 +21,11 @@ rvm:
   - 2.2.9
   - 2.4.3
   - 2.5.0
+gemfile:
+  - gemfiles/redis_3.0.gemfile
+  - gemfiles/redis_3.1.gemfile
+  - gemfiles/redis_3.2.gemfile
+  - gemfiles/redis_3.3.gemfile
 before_script:
   - bundle exec rubocop --version
   - nutcracker --version

data/Appraisals

@@ -0,0 +1,25 @@
+appraise 'redis-3.0' do
+  gem 'redis', '~> 3.0'
+end
+appraise 'redis-3.1' do
+  gem 'redis', '~> 3.1'
+end
+appraise 'redis-3.2' do
+  gem 'redis', '~> 3.2'
+end
+appraise 'redis-3.3' do
+  gem 'redis', '~> 3.3'
+end
+#
+# redis (>= 4.0) depends on ruby (>= 2.2.2).
+#
+# However, at present ALI is still on ruby (= 2.1.6), and I want
+# .travis.yml for this project to cover ALI's version of Ruby and
+# also the modern Rubies.
+#
+# Therefore, until ALI upgrades to at least ruby (>= 2.2.2), we
+# cannot test redis (>= 4.0) here.
+#
+#appraise 'redis-4.0' do
+#  gem 'redis', '~> 4.0'
+#end

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.1.1 (2018-06-18)
+
+- Fix bug in `backwash`: cset scores not converted to number
+  before comparison with pset scores.
+- redis-ick.gemspec reworked only to include runtime dependencies.
+- Gemfile, Appraisals, and .travis.yml set to test with redis-rb
+  gem 3.0 to 3.3.
+
 ## 0.1.0 (2018-03-20)
 
 - Added ickexchange which combines ickcommit+ickreserve.

data/Gemfile

@@ -1,6 +1,24 @@
+# Development dependencies are captured in Gemfile and in
+# gemfiles/*.gemfile, and managed with the gem 'approaisal', per the
+# pattern:
+#
+#   https://github.com/jollygoodcode/jollygoodcode.github.io/issues/21
+
 source 'https://rubygems.org'
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-# Specify your gem's dependencies in redis-ick.gemspec
 gemspec
+
+group :development do
+  gem 'appraisal',            '~> 2.2.0'
+  gem 'bundler',              '~> 1.16.1'
+  gem 'rake',                 '~> 12.3.1'
+end
+
+group :test do
+  gem 'minitest',             '~> 5.11.3'
+  gem 'redis-key_hash',       '~> 0.0.4'
+  gem 'redis-namespace',      '~> 1.5'
+  gem 'rubocop',              '~> 0.54.0'
+end

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/redis_3.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 3.0"
+
+group :development do
+  gem "appraisal", "~> 2.2.0"
+  gem "bundler", "~> 1.16.1"
+  gem "rake", "~> 12.3.1"
+end
+
+group :test do
+  gem "minitest", "~> 5.11.3"
+  gem "redis-key_hash", "~> 0.0.4"
+  gem "redis-namespace", "~> 1.5"
+  gem "rubocop", "~> 0.54.0"
+end
+
+gemspec path: "../"

data/gemfiles/redis_3.0.gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    redis-ick (0.1.1)
+      redis-script_manager (~> 0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    minitest (5.11.3)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    redis (3.3.5)
+    redis-key_hash (0.0.5)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    redis-script_manager (0.0.5)
+      redis (~> 3.2)
+    rubocop (0.54.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    thor (0.20.0)
+    unicode-display_width (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2.0)
+  bundler (~> 1.16.1)
+  minitest (~> 5.11.3)
+  rake (~> 12.3.1)
+  redis (~> 3.0)
+  redis-ick!
+  redis-key_hash (~> 0.0.4)
+  redis-namespace (~> 1.5)
+  rubocop (~> 0.54.0)
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/redis_3.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 3.1"
+
+group :development do
+  gem "appraisal", "~> 2.2.0"
+  gem "bundler", "~> 1.16.1"
+  gem "rake", "~> 12.3.1"
+end
+
+group :test do
+  gem "minitest", "~> 5.11.3"
+  gem "redis-key_hash", "~> 0.0.4"
+  gem "redis-namespace", "~> 1.5"
+  gem "rubocop", "~> 0.54.0"
+end
+
+gemspec path: "../"

data/gemfiles/redis_3.1.gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    redis-ick (0.1.1)
+      redis-script_manager (~> 0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    minitest (5.11.3)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    redis (3.3.5)
+    redis-key_hash (0.0.5)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    redis-script_manager (0.0.5)
+      redis (~> 3.2)
+    rubocop (0.54.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    thor (0.20.0)
+    unicode-display_width (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2.0)
+  bundler (~> 1.16.1)
+  minitest (~> 5.11.3)
+  rake (~> 12.3.1)
+  redis (~> 3.1)
+  redis-ick!
+  redis-key_hash (~> 0.0.4)
+  redis-namespace (~> 1.5)
+  rubocop (~> 0.54.0)
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/redis_3.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 3.2"
+
+group :development do
+  gem "appraisal", "~> 2.2.0"
+  gem "bundler", "~> 1.16.1"
+  gem "rake", "~> 12.3.1"
+end
+
+group :test do
+  gem "minitest", "~> 5.11.3"
+  gem "redis-key_hash", "~> 0.0.4"
+  gem "redis-namespace", "~> 1.5"
+  gem "rubocop", "~> 0.54.0"
+end
+
+gemspec path: "../"

data/gemfiles/redis_3.2.gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    redis-ick (0.1.1)
+      redis-script_manager (~> 0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    minitest (5.11.3)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    redis (3.3.5)
+    redis-key_hash (0.0.5)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    redis-script_manager (0.0.5)
+      redis (~> 3.2)
+    rubocop (0.54.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    thor (0.20.0)
+    unicode-display_width (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2.0)
+  bundler (~> 1.16.1)
+  minitest (~> 5.11.3)
+  rake (~> 12.3.1)
+  redis (~> 3.2)
+  redis-ick!
+  redis-key_hash (~> 0.0.4)
+  redis-namespace (~> 1.5)
+  rubocop (~> 0.54.0)
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/redis_3.3.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 3.3"
+
+group :development do
+  gem "appraisal", "~> 2.2.0"
+  gem "bundler", "~> 1.16.1"
+  gem "rake", "~> 12.3.1"
+end
+
+group :test do
+  gem "minitest", "~> 5.11.3"
+  gem "redis-key_hash", "~> 0.0.4"
+  gem "redis-namespace", "~> 1.5"
+  gem "rubocop", "~> 0.54.0"
+end
+
+gemspec path: "../"

data/gemfiles/redis_3.3.gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ..
+  specs:
+    redis-ick (0.1.1)
+      redis-script_manager (~> 0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    minitest (5.11.3)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    redis (3.3.5)
+    redis-key_hash (0.0.5)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    redis-script_manager (0.0.5)
+      redis (~> 3.2)
+    rubocop (0.54.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    thor (0.20.0)
+    unicode-display_width (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2.0)
+  bundler (~> 1.16.1)
+  minitest (~> 5.11.3)
+  rake (~> 12.3.1)
+  redis (~> 3.3)
+  redis-ick!
+  redis-key_hash (~> 0.0.4)
+  redis-namespace (~> 1.5)
+  rubocop (~> 0.54.0)
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/redis_4.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 4.0"
+
+group :development do
+  gem "appraisal"
+  gem "bundler"
+  gem "rake"
+end
+
+group :test do
+  gem "minitest", "~> 5.11.3"
+  gem "redis-key_hash", "~> 0.0.4"
+  gem "redis-namespace", "~> 1.5"
+  gem "rubocop", "~> 0.54.0"
+end
+
+gemspec path: "../"

data/lib/redis/ick/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Ick
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/lib/redis/ick.rb

@@ -763,7 +763,7 @@ class Redis
           local old_score  = redis.call('ZSCORE',ick_pset_key,member)
           if false == old_score then
             redis.call('ZADD',ick_pset_key,score,member)
-          elseif score < tonumber(old_score) then
+          elseif tonumber(score) < tonumber(old_score) then
             redis.call('ZADD',ick_pset_key,score,member)
           end
         end

data/redis-ick.gemspec

@@ -21,14 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',              '~> 1.16.1'
-  spec.add_development_dependency 'minitest',             '~> 5.11.3'
-  spec.add_development_dependency 'rake',                 '~> 12.3.1'
-  spec.add_development_dependency 'redis-key_hash',       '~> 0.0.4'
-  spec.add_development_dependency 'redis-namespace',      '~> 1.5'
-  spec.add_development_dependency 'rubocop',              '~> 0.54.0'
-
-  spec.add_runtime_dependency     'redis',                '~> 3.2'
   spec.add_runtime_dependency     'redis-script_manager', '~> 0.0.2'
 
+  # Development dependencies are captured in Gemfile, per the pattern:
+  #
+  #   https://github.com/jollygoodcode/jollygoodcode.github.io/issues/21
+  #
 end

metadata

@@ -1,113 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: redis-ick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jhwillett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.16.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.16.1
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.11.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.1
-- !ruby/object:Gem::Dependency
-  name: redis-key_hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.54.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.54.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: redis-script_manager
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +35,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".travis/nutcracker.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -140,6 +43,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/redis_3.0.gemfile
+- gemfiles/redis_3.0.gemfile.lock
+- gemfiles/redis_3.1.gemfile
+- gemfiles/redis_3.1.gemfile.lock
+- gemfiles/redis_3.2.gemfile
+- gemfiles/redis_3.2.gemfile.lock
+- gemfiles/redis_3.3.gemfile
+- gemfiles/redis_3.3.gemfile.lock
+- gemfiles/redis_4.0.gemfile
 - lib/redis/ick.rb
 - lib/redis/ick/version.rb
 - redis-ick.gemspec