cellect-client 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3b68af5fa2b3851d89d2bc21e70f31bc347f66
-  data.tar.gz: abf13231be9912d9670501efa6aea0a643768fdd
+  metadata.gz: 55796663bf6f9d0a6914ea5cea9d27b44c543f45
+  data.tar.gz: 6bcaa3bf6b074d180785048ee9374e8df94e34dc
 SHA512:
-  metadata.gz: 48f93ad1c08845034ce367a69ac017e56edf6f1d3e87800bad19d447dcd1a385bef1ccfa12500a2743023e7f3d92449964bbd1f25b8dcd8169e2ea35c8678421
-  data.tar.gz: 860f858c07cc5dd1f17f9d580fa3c0192d01b4f3a6d8b6af84d275cf2f37dcfef62a00608415a78ee1de51a41e80cbbd39b2b07dccbaf810ded152f0f0a7155b
+  metadata.gz: 0094ba6437ef8eeacf8c03afec45054525af2cf2d9c12ec282a77bdae0bf2ed775f46f777000687303efe63ddf4aeadd3e45221d552d4997bbbc2c685ed84265
+  data.tar.gz: 127d912972a1907377f3ef281d989a55f2446cbfce6166f22991fff966fd11344e7b8468cf4ce0969a8e9bde21d4c8749144d8f64852ecb7e4849450613d08cf

data/lib/cellect/node_set.rb

@@ -16,10 +16,8 @@ module Cellect
 
     # Connect to ZooKeeper, setup this node, and change state
     def initialize_zk
-      begin
-        Timeout::timeout(timeout_duration) do
-          self.zk = ZK.new zk_url, chroot: '/cellect'
-        end
+      Timeout::timeout(timeout_duration) do
+        self.zk = ZK.new zk_url, chroot: '/cellect'
       end
       setup
       self.state = :ready

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/client/node_set_spec.rb

@@ -10,7 +10,7 @@ module Cellect::Client
     # see Cellect::Client / Cellect::Server
     it 'should update the node list when changing' do
       begin
-        pass_until node_set, is: :ready
+        pass_until_state_of node_set, is: :ready
         node_set.zk.create '/nodes/node', data: 'foo', mode: :ephemeral_sequential
         100.times do |i|
           break if node_set.nodes['node0000000001']

data/spec/support/cellect_helper.rb

@@ -1,7 +1,16 @@
 require 'timeout'
 
 module CellectHelper
-  def pass_until(obj, is:)
+  def pass_until(&block)
+    Timeout::timeout(1) do
+      Thread.pass until block.call
+    end
+  rescue => e
+    puts "Timeout waiting for condition #{ block.inspect }"
+    raise e
+  end
+
+  def pass_until_state_of(obj, is:)
     Timeout::timeout(1) do
       Thread.pass until obj.state == is
     end

data/spec/support/shared_examples_for_node_set.rb

@@ -3,20 +3,20 @@ shared_examples_for 'node set' do
 
   it 'should connect to zoo keeper' do
     expect(node_set.zk).to be_nil
-    pass_until node_set, is: :ready
+    pass_until_state_of node_set, is: :ready
     expect(node_set.zk).to be_connected
   end
 
   it 'should know the connection state' do
     expect(node_set.state).to be :initializing
-    pass_until node_set, is: :ready
+    pass_until_state_of node_set, is: :ready
     expect(node_set).to be_ready
   end
 
   it 'should accept a connection string' do
     url_before = ENV['ZK_URL']
     begin
-      pass_until node_set, is: :ready
+      pass_until_state_of node_set, is: :ready
       ENV['ZK_URL'] = 'foobar'
       expect(node_set.send(:zk_url)).to eq 'foobar'
       ENV.delete 'ZK_URL'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler