redlock 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3820d9812a87989c395ff8b4856a4cea7801d84b
-  data.tar.gz: 7cc006346948cf1132be55de820949f37cb9f07d
+  metadata.gz: 8e34b717846f5f8faa005ab9a8d5cac3c3ea865e
+  data.tar.gz: f7a615768b2fc2746d16128122a69259c252b78f
 SHA512:
-  metadata.gz: ba94bdcbdd4f659a6564baad82a3f022ea64f541789579803f33bfd0981ee6a3df53b6887a05791f3794202c85748ae85bdd357d1703d690464e6f0844b3e899
-  data.tar.gz: c36ec9b01716486eeacdd9a82f27cbaa8d6b3165da1e17e11196ac4d700dfe82acf439e6b027b8852f5f33241af08927fea6c2d2f379ffca8392b1ac69a69c1d
+  metadata.gz: ced9a5040b0fe2b0d2ea947732495c06a647b8df04cb5cda89b3f82731d76f79446afda7dd86d21b6705c67f6ccfc42f5c44fa16b753d09abd242d590172fe63
+  data.tar.gz: 0ce3c67e5f9b81d2f8381daf9708c728f8ceaa6a3367e3153586c4621748ffcef717595333b184e7da08932be7e023dfab549b78040d064b079d762a173e800b

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    redlock (0.2.0)
-      redis (~> 3, >= 3.0.0)
+    redlock (0.2.1)
+      redis (>= 3.0.0, < 5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -17,7 +17,7 @@ GEM
     docile (1.1.5)
     json (2.0.3)
     rake (11.3.0)
-    redis (3.3.3)
+    redis (4.0.1)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -51,4 +51,4 @@ DEPENDENCIES
   rspec (~> 3, >= 3.0.0)
 
 BUNDLED WITH
-   1.12.5
+   1.16.0

data/Makefile

@@ -0,0 +1,4 @@
+default: test
+test:
+	docker-compose run --rm test
+

data/README.md

@@ -129,22 +129,22 @@ It's possible to customize the retry logic providing the following options:
                   retry_count:   3,
                   retry_delay:   200, # milliseconds
                   retry_jitter:  50,  # milliseconds
-                  retry_timeout: 0.1  # seconds
+                  redis_timeout: 0.1  # seconds
                  })
 ```
 
-For more information you can check [documentation](https://github.com/leandromoreira/redlock-rb/blob/master/lib/redlock/client.rb#L13-L20)
+For more information you can check [documentation](http://www.rubydoc.info/gems/redlock/Redlock%2FClient:initialize).
 
 
 ## Run tests
 
-Make sure you have at least 1 redis instances up.
+Make sure you have [docker installed](https://docs.docker.com/engine/installation/).
 
-    $ rspec
+    $ make
 
 ## Disclaimer
 
-This code implements an algorithm which is currently a proposal, it was not formally analyzed. Make sure to understand how it works before using it in your production environments. You can see discussion about this approach at [reddit](http://www.reddit.com/r/programming/comments/2nt0nq/distributed_lock_using_redis_implemented_in_ruby/).
+This code implements an algorithm which is currently a proposal, it was not formally analyzed. Make sure to understand how it works before using it in your production environments. You can see discussion about this approach at [reddit](http://www.reddit.com/r/programming/comments/2nt0nq/distributed_lock_using_redis_implemented_in_ruby/) and also the [Antirez answers](http://antirez.com/news/101) for some critics.
 
 ## Contributing
 

data/clean_docker.sh

@@ -0,0 +1,26 @@
+EXITED=$(docker ps -q -f status=exited)
+DANGLING=$(docker images -q -f "dangling=true")
+DANGLING_VOLUME=$(docker volume ls -qf "dangling=true")
+
+if [ "$1" == "--dry-run" ]; then
+  echo "==> Would stop containers:"
+  echo $EXITED
+  echo "==> And images:"
+  echo $DANGLING
+else
+  if [ -n "$EXITED" ]; then
+    docker rm $EXITED
+  else
+    echo "No containers to remove."
+  fi
+  if [ -n "$DANGLING" ]; then
+    docker rmi $DANGLING
+  else
+    echo "No images to remove."
+  fi
+  if [ -n "$DANGLING_VOLUME" ]; then
+    docker volume rm $DANGLING_VOLUME
+  else
+    echo "No volumes to remove."
+  fi
+fi

data/docker-compose.yml

@@ -0,0 +1,27 @@
+version: '2'
+services:
+  test:
+    image: ruby
+    volumes:
+      - .:/redlock
+    working_dir: /redlock
+    command: bash -c "bundle install && rspec"
+    environment:
+      - REDIS1_HOST=redis1.local.com
+      - REDIS1_PORT=6379
+      - REDIS2_HOST=redis2.local.com
+      - REDIS2_PORT=6379
+      - DEFAULT_REDIS_HOST=redis1.local.com
+      - DEFAULT_REDIS_PORT=6379
+    links:
+      - redis1:redis1.local.com
+      - redis2:redis2.local.com
+    depends_on:
+      - redis1
+      - redis2
+
+  redis1:
+    image: redis
+  redis2:
+    image: redis
+

data/lib/redlock/client.rb

@@ -3,7 +3,9 @@ require 'securerandom'
 
 module Redlock
   class Client
-    DEFAULT_REDIS_URLS    = ['redis://localhost:6379']
+    DEFAULT_REDIS_HOST    = ENV["DEFAULT_REDIS_HOST"] || "localhost"
+    DEFAULT_REDIS_PORT    = ENV["DEFAULT_REDIS_PORT"] || "6379"
+    DEFAULT_REDIS_URLS    = ["redis://#{DEFAULT_REDIS_HOST}:#{DEFAULT_REDIS_PORT}"]
     DEFAULT_REDIS_TIMEOUT = 0.1
     DEFAULT_RETRY_COUNT   = 3
     DEFAULT_RETRY_DELAY   = 200
@@ -27,7 +29,7 @@ module Redlock
           RedisInstance.new(server)
         end
       end
-      @quorum = servers.length / 2 + 1
+      @quorum = (servers.length / 2).to_i + 1
       @retry_count = options[:retry_count] || DEFAULT_RETRY_COUNT
       @retry_delay = options[:retry_delay] || DEFAULT_RETRY_DELAY
       @retry_jitter = options[:retry_jitter] || DEFAULT_RETRY_JITTER

data/lib/redlock/version.rb

@@ -1,3 +1,3 @@
 module Redlock
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/redlock.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'redis', '~> 3', '>= 3.0.0'
+  spec.add_dependency 'redis', '>= 3.0.0', '< 5.0'
 
   spec.add_development_dependency "coveralls", "~> 0.8.13"
   spec.add_development_dependency 'rake', '~> 11.1', '>= 11.1.2'

data/spec/client_spec.rb

@@ -7,17 +7,22 @@ RSpec.describe Redlock::Client do
   let(:lock_manager) { Redlock::Client.new(Redlock::Client::DEFAULT_REDIS_URLS, lock_manager_opts) }
   let(:resource_key) { SecureRandom.hex(3)  }
   let(:ttl) { 1000 }
+  let(:redis1_host) { ENV["REDIS1_HOST"] || "localhost" }
+  let(:redis1_port) { ENV["REDIS1_PORT"] || "6379" }
+  let(:redis2_host) { ENV["REDIS2_HOST"] || "127.0.0.1" }
+  let(:redis2_port) { ENV["REDIS2_PORT"] || "6379" }
 
   describe 'initialize' do
     it 'accepts both redis URLs and Redis objects' do
-      servers = [ 'redis://localhost:6379', Redis.new(url: 'redis://127.0.0.1:6379') ]
+      print redis1_host
+      servers = [ "redis://#{redis1_host}:#{redis1_port}", Redis.new(url: "redis://#{redis2_host}:#{redis2_port}") ]
       redlock = Redlock::Client.new(servers)
 
       redlock_servers = redlock.instance_variable_get(:@servers).map do |s|
-        s.instance_variable_get(:@redis).client.host
+        s.instance_variable_get(:@redis).connection[:host]
       end
 
-      expect(redlock_servers).to match_array(%w{ localhost 127.0.0.1 })
+      expect(redlock_servers).to match_array([redis1_host, redis2_host])
     end
   end
 

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: redlock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Leandro Moreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -98,8 +98,11 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
+- clean_docker.sh
+- docker-compose.yml
 - lib/redlock.rb
 - lib/redlock/client.rb
 - lib/redlock/testing.rb
@@ -128,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Distributed lock using Redis written in Ruby.