redis-ick 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d2e7517bc9eba00b0c5744984d90717b87979b0
-  data.tar.gz: 9879cc1f153d6a9d8ec52a2604a50b13178453cf
+  metadata.gz: 985bcc31664985af1016a12b0b45e015f6307b4c
+  data.tar.gz: f45617138cd637aeeafac5e6cc31fe3e103dc814
 SHA512:
-  metadata.gz: 636ea109ba2dbcc8691ab1de0250c5487c13523fd1963698742a664f5e367a23757cdaa55d38614f15b0909425984cffc8db44bfd2cad35b2813e4ae5312938a
-  data.tar.gz: f5f1c137aaa9f4663aeb9c844f6d39d50fb97ad1ed75e4850a10f43bcc43fce39630ff33ee922e18c1cc20fb6a50e8f1246fd1dfd4ee6647da958d409a00cda4
+  metadata.gz: ed52b22601623951ad500d91680910db9411829cf3792cbff8f435bd17536c2d5324285159f262b926f9d3be719b33d9293ed675f6ee10219a4d522d731356be
+  data.tar.gz: 6950898f2e07b6e678b1add4238cb66264c1f11740707fcd1dc0065b76d9e89a758c7c1eab36c2c31f7ae3dd5cf7ff2d8c2a37596136433be8e6b3ab8cf13575

data/.rubocop.yml

@@ -0,0 +1,6 @@
+inherit_from: .rubocop_todo.yml
+AllCops:
+  Include:
+    - Rakefile
+    - Gemfile
+    - '*.gemspec'

data/.rubocop_todo.yml

@@ -0,0 +1,296 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-08-29 15:15:59 -0700 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'redis-ick.gemspec'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'redis-ick.gemspec'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/redis/ick.rb'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/LeadingCommentSpace:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 276
+# Cop supports --auto-correct.
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'lib/redis/ick.rb'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/SpaceAfterNot:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleInsidePipes, SupportedStylesInsidePipes.
+# SupportedStylesInsidePipes: space, no_space
+Layout/SpaceAroundBlockParameters:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
+Layout/SpaceBeforeBlockBraces:
+  Exclude:
+    - 'lib/redis/ick.rb'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceBeforeFirstArg:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'Gemfile'
+    - 'lib/redis/ick.rb'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Layout/SpaceInsideBrackets:
+  Exclude:
+    - 'lib/redis/ick.rb'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 1
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 18
+Metrics/AbcSize:
+  Max: 318
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 609
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 3
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 81
+
+# Offense count: 19
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 175
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/TimesMap:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 2
+Style/ClassVars:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 1
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/redis/ick.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 6
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Style/MethodName:
+  EnforcedStyle: snake_case
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/redis/ick/version.rb'
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: both, prefix, postfix
+Style/NegatedIf:
+  Exclude:
+    - 'lib/redis/ick.rb'
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'test/redis/ick_test.rb'
+
+# Offense count: 28
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'bin/console'
+    - 'lib/redis/ick.rb'
+    - 'redis-ick.gemspec'
+    - 'test/redis/ick_test.rb'
+    - 'test/test_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize, SupportedStyles.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
+Style/TernaryParentheses:
+  Exclude:
+    - 'lib/redis/ick.rb'
+
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Exclude:
+    - 'test/redis/ick_test.rb'

data/.travis.yml

@@ -1,10 +1,12 @@
-sudo:     false
+sudo: false
 language: ruby
-rvm:
-  - 2.1.6
 before_install:
   - gem install bundler -v 1.14.6
+  - gem install rubocop
 services:
   - redis-server
+rvm:
+  - 2.1.6
 script:
+  - rubocop
   - bundle exec env REDIS_URL=redis://localhost:6379 rake test

data/lib/redis/ick/version.rb

@@ -1,17 +1,21 @@
 class Redis
   class Ick
     #
-    # Version plan:
+    # Version plan/history:
     #
-    # 0.0.1 - still in Prosperworks/ALI/vendor/gems/redis-ick
+    # 0.0.1 - Still in Prosperworks/ALI/vendor/gems/redis-ick.
     #
-    # 0.0.2 - broke out into Prosperworks/redis-ick
+    # 0.0.2 - Broke out into Prosperworks/redis-ick, make public.
     #
-    # 0.1.0 - big README.md and Rdoc update, open repo
+    # 0.0.3 - Got .travis.yml working with a live redis-server, some
+    #         cleanup, runtime dependency on redis-script_manager for
+    #         Ick._eval, added Rubocop.
     #
-    # 0.2.0 - solicit and incorporate initial feedback from select
-    #         beta external users
+    # 0.1.0 - (future) Big README.md and Rdoc update, solicit feedback
+    #         from select external beta users.
     #
-    VERSION = "0.0.2" # broken into standalone repo, not polished
+    # 0.2.0 - (future) Incorporate feedback, announce.
+    #
+    VERSION = '0.0.3'
   end
 end

data/lib/redis/ick.rb

@@ -1,10 +1,9 @@
 require 'redis/ick/version'
+require 'redis/script_manager'
 
 class Redis
   class Ick
 
-    # TODO: test *everything* in pipelines
-    # TODO: redis-script_manager for eval
     # TODO: rubocop
     # TODO: rdoc
 
@@ -86,7 +85,7 @@ class Redis
       end
       _statsd_increment('profile.ick.ickdel.calls')
       _statsd_time('profile.ick.ickdel.time') do
-        Ick._eval(redis,LUA_ICKDEL,ick_key)
+        _eval(LUA_ICKDEL,ick_key)
       end
     end
 
@@ -106,7 +105,7 @@ class Redis
       _statsd_increment('profile.ick.ickstats.calls')
       raw_ickstats_results = nil
       _statsd_time('profile.ick.time.ickstats') do
-        raw_ickstats_results = Ick._eval(redis,LUA_ICKSTATS,ick_key)
+        raw_ickstats_results = _eval(LUA_ICKSTATS,ick_key)
       end
       if raw_ickstats_results.is_a?(Redis::Future)
         #
@@ -195,7 +194,7 @@ class Redis
       _statsd_increment('profile.ick.ickadd.calls')
       _statsd_timing('profile.ick.ickadd.pairs',score_member_pairs.size / 2)
       _statsd_time('profile.ick.time.ickadd') do
-        Ick._eval(redis,LUA_ICKADD,ick_key,*score_member_pairs)
+        _eval(LUA_ICKADD,ick_key,*score_member_pairs)
       end
     end
 
@@ -242,20 +241,36 @@ class Redis
       end
       _statsd_increment('profile.ick.ickreserve.calls')
       _statsd_timing('profile.ick.ickreserve.max_size',max_size)
-      results = nil
+      raw_ickreserve_results = nil
       _statsd_time('profile.ick.time.ickreserve') do
-        results =
-          Ick._eval(
-            redis,
+        raw_ickreserve_results =
+          _eval(
             LUA_ICKRESERVE,
             ick_key,
             max_size
-          ).each_slice(2).map { |p|
-          [ p[0], Ick._floatify(p[1]) ]
+          )
+      end
+      if raw_ickreserve_results.is_a?(Redis::Future)
+        #
+        # We extend the Redis::Future with a continuation so we can
+        # add our own post-processing.
+        #
+        class << raw_ickreserve_results
+          alias_method :original_value, :value
+          def value
+            original_value.each_slice(2).map { |p|
+              [ p[0], ::Redis::Ick._floatify(p[1]) ]
+            }
+          end
+        end
+        raw_ickreserve_results
+      else
+        results = raw_ickreserve_results.each_slice(2).map { |p|
+          [ p[0], ::Redis::Ick._floatify(p[1]) ]
         }
+        _statsd_timing('profile.ick.ickreserve.num_results',results.size)
+        results
       end
-      _statsd_timing('profile.ick.ickreserve.num_results',results.size)
-      results
     end
 
     # Removes the indicated members from the producer set, if present.
@@ -283,7 +298,7 @@ class Redis
       _statsd_increment('profile.ick.ickcommit.calls')
       _statsd_timing('profile.ick.ickcommit.members',members.size)
       _statsd_time('profile.ick.time.ickcommit') do
-        Ick._eval(redis,LUA_ICKCOMMIT,ick_key,*members)
+        _eval(LUA_ICKCOMMIT,ick_key,*members)
       end
     end
 
@@ -304,14 +319,14 @@ class Redis
 
     # Runs the specified lua in the redis against the specifified Ick.
     #
-    def self._eval(redis,lua,ick_key,*args)
+    def _eval(lua,ick_key,*args)
       if !lua.is_a?(String)
         raise ArgumentError, "bogus non-String lua #{lua}"
       end
       if !ick_key.is_a?(String)
         raise ArgumentError, "bogus non-String ick_key #{ick_key}"
       end
-      redis.eval(lua,[ick_key],args)
+      Redis::ScriptManager.eval_gently(redis,lua,[ick_key],args)
     end
 
     #######################################################################

data/redis-ick.gemspec

@@ -22,9 +22,11 @@ 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.14'
-  spec.add_development_dependency 'rake',     '~> 10.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'redis',    '~> 3.2'
+  spec.add_development_dependency 'bundler',              '~> 1.14'
+  spec.add_development_dependency 'rake',                 '~> 10.0'
+  spec.add_development_dependency 'minitest',             '~> 5.0'
+  spec.add_development_dependency 'redis',                '~> 3.2'
+
+  spec.add_runtime_dependency     'redis-script_manager', '~> 0.0.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-ick
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jhwillett
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: redis-script_manager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: 
 email:
 - jhw@prosperworks.com
@@ -74,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE