renoir 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf83e530a5859d415a1bbe367fcb3505f5ec96e
-  data.tar.gz: c06b4040a3d4639547d5ee7d9570b8009dd2babd
+  metadata.gz: 4944888a4695a079b88e05e371c5726c7809497b
+  data.tar.gz: 88f714be276f8c402ff055af2a55e005334b22bc
 SHA512:
-  metadata.gz: 4cf573b2c5af35650da61f303f77e6b95d6aa42c29c547d4c5122123cbe4c1aad38c7f730d2e598b7e2c5130cc885b5033fddda5e77363cdf938ad2d943b3db1
-  data.tar.gz: a85045df90e31e5bab6e5685b231ae7d5e726b69ab788f08aa1c034308024064b49f32b4b0dfa4840f0175e8f52c3de35439dbe579bacbe25fb0bc731faf393d
+  metadata.gz: 179d1128dc5eed63fc8bedd8186d43b58f8393ca6523d3d050781ab2246590d5efb17500a9bddd1444667fe953a6bcbdb8c892ab1c556ba88a84b309a0eec884
+  data.tar.gz: f9524ebc34a8fb2fd66b6af7d46abe1412606ecb9d8534b74605a051561be8ef77c825ed3b4762332e48f0b871003fea97d44f8f132dd8551a1a61834e393f24

data/.travis.yml

@@ -2,11 +2,11 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.0
+services:
+  - docker
 before_install:
   - gem install bundler -v 1.13.6
-  - git clone https://github.com/antirez/redis $TRAVIS_BUILD_DIR/redis && cd $TRAVIS_BUILD_DIR/redis && make
+  - cd $TRAVIS_BUILD_DIR/docker/redis_cluster && docker build -t redis-cluster .
 before_script:
-  - cd $TRAVIS_BUILD_DIR/redis/utils/create-cluster && ./create-cluster start && yes yes | ./create-cluster create
-  - cd $TRAVIS_BUILD_DIR
-after_script:
-  - cd $TRAVIS_BUILD_DIR/redis/utils/create-cluster && ./create-cluster stop && ./create-cluster clean
+  - docker run -d -p 30001:30001 -p 30002:30002 -p 30003:30003 -p 30004:30004 -p 30005:30005 -p 30006:30006 -t redis-cluster
+  - sleep 2

data/docker/redis_cluster/Dockerfile

@@ -0,0 +1,17 @@
+FROM debian:jessie
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends curl ca-certificates gcc libc6-dev make ruby && \
+    mkdir /redis && \
+    curl -L https://github.com/antirez/redis/archive/unstable.tar.gz | tar xfz - -C /redis && \
+    mv /redis/*/* /redis/ && \
+    grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /redis/src/server.h && \
+    sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /redis/src/server.h && \
+    grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /redis/src/server.h && \
+    make -C /redis && \
+    gem install redis && \
+    apt-get purge -y --auto-remove curl gcc libc6-dev make
+
+COPY docker-entrypoint.sh /redis/docker-entrypoint.sh
+
+ENTRYPOINT /redis/docker-entrypoint.sh

data/docker/redis_cluster/docker-entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd /redis/utils/create-cluster
+./create-cluster start
+yes yes | ./create-cluster create
+./create-cluster watch

data/lib/renoir/client.rb

@@ -129,6 +129,7 @@ module Renoir
     def each_node
       return enum_for(:each_node) unless block_given?
 
+      @refresh_slots = true
       refresh_slots
       @cluster_info.nodes.each do |node|
         fetch_connection(node).with_raw_connection do |conn|

data/lib/renoir/cluster_info.rb

@@ -15,9 +15,9 @@ module Renoir
     def load_slots(slots)
       slots.each do |s, e, master, *slaves|
         ip, port, = master
-        name = add_node(ip, port)
+        node = add_node(ip, port)
         (s..e).each do |slot|
-          @slots[slot] = name
+          @slots[slot] = node[:name]
         end
       end
     end

data/lib/renoir/version.rb

@@ -1,3 +1,3 @@
 module Renoir
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renoir
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hiroshi Saito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -83,6 +83,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker/redis_cluster/Dockerfile
+- docker/redis_cluster/docker-entrypoint.sh
 - lib/renoir.rb
 - lib/renoir/client.rb
 - lib/renoir/cluster_info.rb