redis_failover 0.8.5 → 0.8.6

data/Changes.md

@@ -1,6 +1,12 @@
+0.8.6
+-----------
+- No longer buffer output (kyohsuke)
+- Update redis/zk gem versions to latest (rudionrails)
+
 0.8.5
 -----------
 - Lock-down gemspec to version 1.1.x of redis-namespace to play nicely with redis 2.2.x.
+- Fix RedisFailover::Client#manual_failover regression (oleriesenberg)
 
 0.8.4
 -----------

data/README.md

@@ -141,7 +141,7 @@ redis_failover uses YARD for its API documentation. Refer to the generated [API
 
 ## Requirements
 
-- redis_failover is actively tested against MRI 1.9.2/1.9.3 and JRuby 1.6.7 (1.9 mode only). Other rubies may work, although I don't actively test against them. 1.8 is not supported.
+- redis_failover is actively tested against MRI 1.9.2/1.9.3 and JRuby 1.6.7 (1.9 mode only). Other rubies may work, although I don't actively test against them.
 - redis_failover requires a ZooKeeper service cluster to ensure reliability and data consistency. ZooKeeper is very simple and easy to get up and running. Please refer to this [Quick ZooKeeper Guide](https://github.com/ryanlecompte/redis_failover/wiki/Quick-ZooKeeper-Guide) to get up and running quickly if you don't already have ZooKeeper as a part of your environment.
 
 ## Considerations

data/bin/redis_node_manager

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$stdout.sync = true
 require 'redis_failover'
 
 RedisFailover::Runner.run(ARGV)

data/lib/redis_failover/cli.rb

@@ -40,6 +40,10 @@ module RedisFailover
           options[:config_file] = file
         end
 
+        opts.on('--with-chroot ROOT', 'Path to ZooKeepers chroot') do |chroot|
+          options[:chroot] = chroot
+        end
+
         opts.on('-E', '--environment ENV', 'Config environment to use') do |config_env|
           options[:config_environment] = config_env
         end

data/lib/redis_failover/node_manager.rb

@@ -82,7 +82,7 @@ module RedisFailover
     # Configures the ZooKeeper client.
     def setup_zk
       @zk.close! if @zk
-      @zk = ZK.new(@options[:zkservers])
+      @zk = ZK.new("#{@options[:zkservers]}#{@options[:chroot] || ''}")
 
       @zk.register(@manual_znode) do |event|
         @mutex.synchronize do

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/redis_failover.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RedisFailover::VERSION
 
-  gem.add_dependency('redis', '~> 2.2')
-  gem.add_dependency('redis-namespace', '~> 1')
+  gem.add_dependency('redis', '~> 3')
+  gem.add_dependency('redis-namespace')
   gem.add_dependency('multi_json', '~> 1')
-  gem.add_dependency('zk', '~> 1.4')
+  gem.add_dependency('zk', '~> 1.6')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')

data/spec/cli_spec.rb

@@ -36,6 +36,16 @@ module RedisFailover
         opts[:max_failures].should == 1
       end
 
+      it 'properly parses a chroot' do
+        opts = CLI.parse(['-n host:port', '-z localhost:1111', '--with-chroot', '/with/chroot/from/command/line'])
+        opts[:nodes].should == [{
+          :host => 'host',
+          :port => 'port',
+        }]
+
+        opts[:chroot].should == '/with/chroot/from/command/line'
+      end
+
       it 'properly parses the config file' do
         opts = CLI.parse(['-C', "#{File.dirname(__FILE__)}/support/config/single_environment.yml"])
         opts[:zkservers].should == 'zk01:2181,zk02:2181,zk03:2181'
@@ -46,6 +56,20 @@ module RedisFailover
         opts = CLI.parse(['-C', "#{File.dirname(__FILE__)}/support/config/multiple_environments.yml", '-E', 'staging'])
         opts[:zkservers].should == 'zk01:2181,zk02:2181,zk03:2181'
       end
+
+      it 'properly parses the config file that include chroot' do
+        opts = CLI.parse(['-C', "#{File.dirname(__FILE__)}/support/config/single_environment_with_chroot.yml"])
+        opts[:zkservers].should == 'zk01:2181,zk02:2181,zk03:2181'
+        opts[:chroot].should == '/with/chroot'
+
+        opts = CLI.parse(['-C', "#{File.dirname(__FILE__)}/support/config/multiple_environments_with_chroot.yml", '-E', 'development'])
+        opts[:zkservers].should == 'localhost:2181'
+        opts[:chroot].should == '/with/chroot_development'
+
+        opts = CLI.parse(['-C', "#{File.dirname(__FILE__)}/support/config/multiple_environments_with_chroot.yml", '-E', 'staging'])
+        opts[:zkservers].should == 'zk01:2181,zk02:2181,zk03:2181'
+        opts[:chroot].should == '/with/chroot_staging'
+      end
     end
   end
 end

data/spec/support/config/multiple_environments_with_chroot.yml

@@ -0,0 +1,17 @@
+:development:
+  :nodes:
+    - localhost:6379
+    - localhost:6389
+  :zkservers:
+    - localhost:2181
+  :chroot: /with/chroot_development
+
+:staging:
+  :nodes:
+    - redis01:6379
+    - redis02:6379
+  :zkservers:
+    - zk01:2181
+    - zk02:2181
+    - zk03:2181
+  :chroot: /with/chroot_staging

data/spec/support/config/single_environment_with_chroot.yml

@@ -0,0 +1,8 @@
+:nodes:
+  - redis01:6379
+  - redis02:6379
+:zkservers:
+  - zk01:2181
+  - zk02:2181
+  - zk03:2181
+:chroot: /with/chroot

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_failover
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,9 @@ files:
 - spec/node_watcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/multiple_environments.yml
+- spec/support/config/multiple_environments_with_chroot.yml
 - spec/support/config/single_environment.yml
+- spec/support/config/single_environment_with_chroot.yml
 - spec/support/node_manager_stub.rb
 - spec/support/redis_stub.rb
 - spec/util_spec.rb
@@ -180,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3012770185643585343
+      hash: -645312591667792014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3012770185643585343
+      hash: -645312591667792014
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -205,7 +207,9 @@ test_files:
 - spec/node_watcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/multiple_environments.yml
+- spec/support/config/multiple_environments_with_chroot.yml
 - spec/support/config/single_environment.yml
+- spec/support/config/single_environment_with_chroot.yml
 - spec/support/node_manager_stub.rb
 - spec/support/redis_stub.rb
 - spec/util_spec.rb