redis-ick 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d1648e28624b1ed5c0a9f475412deb102f2b5b
-  data.tar.gz: 97754295aead271f4748adef41f93eee3e081b11
+  metadata.gz: 1c22eec5b65c61b1bc5ec5c19a88d21da264df33
+  data.tar.gz: 0e7e7f500fc89fa0fb3394a8df7d4e8784c8e202
 SHA512:
-  metadata.gz: 020f83530d8dc2579d4343d32fdceec98dc1575f9137d2e0678ec0484a36fbfad14c3222cc1bddffa3548e8aa20bcffb0dd25b6ffc2b47c90bf76428c7405e70
-  data.tar.gz: e000d81edb08fefa4204c167d0adb3aae8f773892222681de2498e947e41a1af57370c83d3c29e2b5be504b3d2541c69836c8f1dc41b43c5d2301dabd1eb3b81
+  metadata.gz: 1f9e5dda5e632a926420c6ce7c5483edf53f757718622d2ae2d151c7c46105c5a46e1c7f77ce06804a56ee60703e4b151a616c36dab5cf634569e9c789a1c4f7
+  data.tar.gz: d65b846e08e4c4ca477770c09ce9331fc6ed293971fb4b0bd5ef1139c6020e36515a10bcd4971c633f47b438489199d1fb2e3329b112f102f127528d71f6700c

data/.rubocop.yml

@@ -12,6 +12,9 @@ AllCops:
 # with minimal friction, not forced to make a hard choice between
 # cutting tests or splitting up my test suites.
 #
+Metrics/BlockLength:
+  Exclude:
+    - 'test/**/*.rb'
 Metrics/ClassLength:
   Max: 400
   Exclude:
@@ -141,7 +144,9 @@ Style/TernaryParentheses:
 # I am a huge fan of using trailing commas when I break an argument
 # list down one-per line.
 #
-# As such, I reject this test.
+# As such, I reject these tests.
 #
+Style/TrailingCommaInArguments:
+  Enabled: false
 Style/TrailingCommaInLiteral:
   Enabled: false

data/.travis/nutcracker.yml

@@ -0,0 +1,6 @@
+test:
+  redis:            true
+  auto_eject_hosts: false
+  listen:           127.0.0.1:22121
+  servers:
+   - 127.0.0.1:6379:1

data/.travis.yml

@@ -1,14 +1,30 @@
-sudo: false
+#
+# There is no good way to mock Redis's Lua processor, so we test with
+# some infrastructure in place.
+#
+# Also, https://github.com/ProsperWorks/redis-ick/issues/3 revealed issues
+# with running over Twemproxy.
+#
+# We repeat all tests, both connecting directly to Redis and via Twemproxy.
+#
+sudo: true
 language: ruby
 before_install:
   - gem install bundler -v 1.14.6
-  - gem install rubocop
+  - sudo add-apt-repository -y ppa:twemproxy/stable
+  - sudo apt-get update -y
+  - sudo apt-get install -y twemproxy
 services:
   - redis-server
 rvm:
   - 2.1.6
-script:
-  - rubocop --version
+before_script:
   - bundle exec rubocop --version
+  - nutcracker --version
+  - nutcracker --test-conf --conf-file=.travis/nutcracker.yml
+  - nutcracker             --conf-file=.travis/nutcracker.yml &
+  - sleep 0.3
+script:
   - bundle exec rubocop
   - bundle exec env REDIS_URL=redis://localhost:6379 rake test
+  - bundle exec env REDIS_URL=redis://localhost:22121 rake test

data/lib/redis/ick/version.rb

@@ -24,11 +24,15 @@ class Redis
     #         prescriptive hash claims.  Identified limits of
     #         prescriptive hash robustness.
     #
+    # 0.0.5 - Rework ickstats so it no longer angers Twemproxy, per
+    #         https://github.com/ProsperWorks/redis-ick/issues/3,
+    #         by producing a nested Array response.
+    #
     # 0.1.0 - (future) Big README.md and Rdoc update, solicit feedback
     #         from select external beta users.
     #
     # 0.2.0 - (future) Incorporate feedback, announce.
     #
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
   end
 end

data/lib/redis/ick.rb

@@ -476,7 +476,8 @@ class Redis
       local ick_cset_size = redis.call('ZCARD',ick_cset_key)
       local ick_stats     = {
         'key',        ick_key,
-        'keys',       { ick_key, ick_pset_key, ick_cset_key },
+        'pset_key',   ick_pset_key,
+        'cset_key',   ick_cset_key,
         'ver',        ick_ver,
         'cset_size',  ick_cset_size,
         'pset_size',  ick_pset_size,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-ick
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - jhwillett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- ".travis/nutcracker.yml"
 - Gemfile
 - LICENSE
 - README.md