cellect-client 1.3.3 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c414f83a76934a80ce41a9b009cff485aa7f3cdc
-  data.tar.gz: 04721cdaa50af48bb7fdecaad358931dafecadec
+  metadata.gz: c1943ffc5eb994302c23d0a0029699596566f1f6
+  data.tar.gz: 7fefec91b8e36608d19a8f2c8d1f042643affb17
 SHA512:
-  metadata.gz: 12ad06c6fe0d0f84e8c852b77a1035292351eff79e3d88308f33de8f914a837a078f8fe3cddb5d9c4838e670c232dadd41f61840dd08b6528e4d57f01322775e
-  data.tar.gz: 735fcf22c87fe2e9e3fef69cff278e1b4aa8cfd3f1df45707059fdf0cbe7a51b632340565046f20b8fd5859c709aa57db65d05e48e15f9d87a27ee22615a1534
+  metadata.gz: 2a1f6cccf3a2100522114974045b2c2a1de9815ed00c70684fbd639a2cba3103d2755c860e5d9b4d03493c23943965c40d5b094d182c74fa17a3bd0aec21359b
+  data.tar.gz: a00b8b4bc3b8c63fac8cbf12ce42e62da0b02232ee0dc990d9bcde68334d7835da1aed816aa92bacd080b63f6f77593d35797f3606910b215ee2afaac20bf26d

data/.travis.yml

@@ -12,3 +12,5 @@ rvm:
   - 2.2.1
 
 script: bundle exec rake spec
+services:
+  - redis-server

data/Guardfile

@@ -0,0 +1,6 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$}){ |m| "spec/#{ m[1] }_spec.rb" }
+  watch('spec/spec_helper.rb'){ 'spec' }
+  watch(%r{^spec/support/(.+)\.rb$}){ 'spec' }
+end

data/README.md

@@ -14,7 +14,7 @@ Available as
 
 ## Cellect::Server
 
-An actor based system that provides an API around subject selection actions.  Server nodes are discovered via [ZooKeeper](http://zookeeper.apache.org/).
+An actor based system that provides an API around subject selection actions.  Server nodes are discovered via [Attention](https://github.com/parrish/attention).
 
 ### Cellect::Server::Adapters
 
@@ -25,7 +25,13 @@ We're overriding the default adapter with a customization in [cellect_panoptes](
 
 ## Cellect::Client
 
-Provides a mix of asynchronous and synchronous operations for server awareness and API communication.
+Provides operations for server awareness and API communication.
+
+API timeouts can be set with
+
+```ruby
+  Cellect::Client::Connection.timeout = 5 # seconds
+```
 
 
 ## Building
@@ -42,9 +48,7 @@ To install rice your Ruby must be compiled with shared libraries enabled, from t
 
 ## Testing
 
-* You'll need a local Zookeeper server to run the specs (they will auto start / stop the server for you).
-  * `brew install zookeeper`
-  * Note: this may require a Java Runtime (JRE) install, `brew cask install java`
+* You'll need a local Redis server to run the specs.
 
 Run the specs with `rake`
 

data/bin/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'cellect'
+require 'cellect/server'
+require 'cellect/client'
+require 'pry'
+
+Pry.start

data/bin/setup

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/cellect-client.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'oj'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'zk-server'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'celluloid', '0.16.0'
-  spec.add_runtime_dependency 'celluloid-io', '0.16.0'
   spec.add_runtime_dependency 'http', '~> 0.9'
-  spec.add_runtime_dependency 'zk', '~> 1.9'
+  spec.add_runtime_dependency 'attention', '~> 0.0.4'
   spec.add_runtime_dependency 'multi_json', '~> 1.11'
 end

data/cellect.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'oj'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'zk-server'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'puma', '~> 2.8'
   spec.add_development_dependency 'pg', '~> 0.17'
   spec.add_development_dependency 'connection_pool', '~> 2.0'

data/lib/cellect/client/connection.rb

@@ -5,8 +5,11 @@ module Cellect
   module Client
     class CellectServerError < StandardError; end
     class Connection
-      include Celluloid
-      include Celluloid::IO
+      class << self
+        attr_accessor :timeout
+      end
+
+      @timeout = 5
 
       # Reload the data for a workflow on all servers
       def reload_workflow(id)
@@ -49,17 +52,21 @@ module Cellect
 
       # Broadcast by iterating over each server
       def broadcast(action, path, query = '')
-        Cellect::Client.node_set.nodes.each_pair do |node, host|
-          send_http host, action, path, query
+        Cellect::Client.node_set.nodes.each do |node|
+          send_http node['ip'], action, path, query
         end
       end
 
-      # Makes an API call through an evented Celluloid Socket
+      # Makes an API call
       def send_http(host, action, path, query = '')
         params = { host: host, path: path }
         params[:query] = query if query && !query.empty?
         uri = URI::HTTP.build params
-        HTTP.send action, uri.to_s, socket_class: Celluloid::IO::TCPSocket
+        with_timeout.send action, uri.to_s
+      end
+
+      def with_timeout
+        HTTP.timeout :global, connect: self.class.timeout
       end
 
       # Builds a querystring from a hash

data/lib/cellect/client/node_set.rb

@@ -1,37 +1,13 @@
-require 'cellect/node_set'
-
 module Cellect
   module Client
-    class NodeSet < Cellect::NodeSet
+    class NodeSet
       attr_accessor :nodes
 
-      # Sets up an empty node set
-      def initialize(zk_url = nil)
-        self.nodes = { }
-        super
-      end
-
-      protected
-
-      # Respond to a node coming online or timing out
-      def nodes_changed(nodes)
-        self.nodes = { }
-        nodes.each do |node|
-          self.nodes[node] = zk.get("/nodes/#{ node }").first
-        end
-      end
-
-      # Register with ZooKeeper and get the list of nodes
-      def setup
-        watch_nodes
-        zk.mkdir_p '/nodes'
-        nodes_changed zk.children('/nodes', watch: true)
-      end
-
-      # Watch ZooKeeper for changes to the node set
-      def watch_nodes
-        zk.register('/nodes') do |event|
-          nodes_changed zk.children('/nodes', watch: true)
+      # Gets the current list of nodes and listens to changes
+      def initialize
+        self.nodes = Attention.instances
+        Attention.on_change do |change, instances|
+          self.nodes = instances
         end
       end
     end

data/lib/cellect/client.rb

@@ -5,36 +5,24 @@ module Cellect
     require 'cellect/client/node_set'
     require 'cellect/client/connection'
 
-    class << self
-      attr_accessor :connection, :_node_set
-    end
-
-    # Disabled with lib/cellect/testing.rb
-    def self.mock_zookeeper?
-      false
-    end
-
     # Sets up the set of server nodes
-    def self.node_set(zk_url=nil)
-      self._node_set ||= NodeSet.supervise(zk_url)
-      _node_set.actors.first
+    def self.node_set
+      @node_set ||= NodeSet.new
     end
 
-    def self.ready?
-      node_set.ready?
+    def self.connection
+      @connection ||= Connection.new
     end
 
     # Selects a server for a user
     def self.choose_host
-      node_set.nodes.values.sample
+      host = node_set.nodes.sample
+      host && host['ip']
     end
 
     # Ensure a previously selected server is still available
     def self.host_exists?(ip)
-      node_set.nodes.values.include? ip
+      node_set.nodes.select{ |node| node['ip'] == ip }.length > 0
     end
-
-    Client.node_set
-    Client.connection = Connection.pool size: ENV.fetch('CELLECT_POOL_SIZE', 100).to_i
   end
 end

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '1.3.3'
+  VERSION = '2.0.0.beta1'
 end

data/lib/cellect.rb

@@ -1,7 +1,10 @@
 require 'celluloid'
-require 'celluloid/io'
 require 'cellect/version'
+require 'attention'
 
 module Cellect
-
 end
+
+Attention.options[:namespace] = 'cellect'
+Attention.options[:redis_url] = ENV['REDIS_URL'] if ENV['REDIS_URL']
+Attention.options[:ttl] = 20

data/spec/{client → cellect/client}/connection_spec.rb

@@ -5,15 +5,20 @@ module Cellect::Client
     let(:connection){ Cellect::Client.connection }
 
     before(:each) do
-      allow(Cellect::Client.node_set).to receive(:nodes).and_return 'a' => '1', 'b' => '2'
+      allow(Cellect::Client.node_set).to receive(:nodes).and_return [
+        { 'id' => '1', 'ip' => '1.2.3.4' },
+        { 'id' => '2', 'ip' => '5.6.7.8' }
+      ]
     end
 
     def should_send(action:, url:, to:)
-      expect(HTTP).to receive(:send).with(action, "http://#{ to }/#{ url }", socket_class: Celluloid::IO::TCPSocket).and_return(HTTP::Response.new(200, nil, nil, "{ \"this response\": \"intentionally blank\" }"))
+      send_double = double
+      expect(HTTP).to receive(:timeout).with(:global, connect: Connection.timeout).and_return send_double
+      expect(send_double).to receive(:send).with(action, "http://#{ to }/#{ url }").and_return(HTTP::Response.new(200, nil, nil, "{ \"this response\": \"intentionally blank\" }"))
     end
 
     def should_broadcast(action:, url:)
-      [1, 2].each{ |i| should_send action: action, url: url, to: i }
+      ['1.2.3.4', '5.6.7.8'].each{ |ip| should_send action: action, url: url, to: ip }
     end
 
     it 'should reload workflows' do
@@ -52,40 +57,44 @@ module Cellect::Client
     end
 
     it 'should load users' do
-      should_send action: :post, url: 'workflows/random/users/123/load', to: 1
-      connection.load_user user_id: 123, host: '1', workflow_id: 'random'
+      should_send action: :post, url: 'workflows/random/users/123/load', to: '1.2.3.4'
+      connection.load_user user_id: 123, host: '1.2.3.4', workflow_id: 'random'
     end
 
     it 'should add seen subjects' do
-      should_send action: :put, url: 'workflows/random/users/123/add_seen?subject_id=456', to: 1
-      connection.add_seen subject_id: 456, host: '1', user_id: 123, workflow_id: 'random'
+      should_send action: :put, url: 'workflows/random/users/123/add_seen?subject_id=456', to: '1.2.3.4'
+      connection.add_seen subject_id: 456, host: '1.2.3.4', user_id: 123, workflow_id: 'random'
     end
 
     it 'should get subjects' do
-      should_send action: :get, url: 'workflows/random?user_id=1', to: 1
-      connection.get_subjects host: '1', workflow_id: 'random', user_id: 1
+      should_send action: :get, url: 'workflows/random?user_id=1', to: '1.2.3.4'
+      connection.get_subjects host: '1.2.3.4', workflow_id: 'random', user_id: 1
     end
 
     it 'should get grouped subjects' do
-      should_send action: :get, url: 'workflows/random?user_id=1&group_id=1&limit=10', to: 1
-      connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
+      should_send action: :get, url: 'workflows/random?user_id=1&group_id=1&limit=10', to: '1.2.3.4'
+      connection.get_subjects host: '1.2.3.4', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
     end
 
     context 'getting subjects' do
       def get_subjects
-        connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
+        connection.get_subjects host: '1.2.3.4', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
       end
 
       it 'should return subjects as an array' do
         response = HTTP::Response.new 200, '1.1', nil, '[1, 2, 3, 4, 5]'
-        allow(HTTP).to receive(:send).and_return response
+        send_double = double
+        expect(HTTP).to receive(:timeout).with(:global, connect: Connection.timeout).and_return send_double
+        expect(send_double).to receive(:send).and_return response
         expect(get_subjects).to eq [1, 2, 3, 4, 5]
       end
 
       it 'should raise an error for unexpected responses' do
         response = HTTP::Response.new 404, '1.1', nil, ''
-        allow(HTTP).to receive(:send).and_return response
-        expect{ get_subjects }.to raise_error Cellect::Client::CellectServerError, 'Server Responded 404'
+        send_double = double
+        expect(HTTP).to receive(:timeout).with(:global, connect: Connection.timeout).and_return send_double
+        expect(send_double).to receive(:send).and_return response
+        expect{ get_subjects }.to raise_error CellectServerError, 'Server Responded 404'
       end
     end
   end

data/spec/cellect/client/node_set_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+module Cellect::Client
+  describe NodeSet do
+    let!(:node_set){ Cellect::Client.node_set }
+
+    # Allow listener to subscribe to Redis
+    def wait_for_listener
+      pass_until(timeout: 3) do
+        _, listeners = Redis.new.pubsub 'numsub', 'cellect:instance'
+        listeners > 0
+      end
+    end
+
+    # Allow redis to publish to listener
+    def wait_for_nodes(count)
+      pass_until(timeout: 3) do
+        node_set.nodes.length == count
+      end
+    end
+
+    it 'should initialize without nodes' do
+      expect(node_set.nodes).to be_empty
+    end
+
+    it 'should update the node list when activating' do
+      wait_for_listener
+      Attention.activate
+      wait_for_nodes 1
+      expect(node_set.nodes).to_not be_empty
+    end
+
+    it 'should update the node list when deactivating' do
+      wait_for_listener
+      Attention.activate
+      wait_for_nodes 1
+      Attention.deactivate
+      wait_for_nodes 0
+      expect(node_set.nodes).to be_empty
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,11 +10,8 @@ end
 
 Bundler.require :test, :development
 
-ENV['CELLECT_POOL_SIZE'] = '3'
-SPAWN_ZK = !ENV['ZK_URL']
 require 'pry'
 require 'oj'
-require './spec/support/zk_setup.rb'
 require 'cellect/server'
 require 'cellect/client'
 require 'celluloid/rspec'
@@ -33,12 +30,11 @@ RSpec.configure do |config|
   config.include CellectHelper
 
   config.around(:each) do |example|
+    Redis.new.flushdb
     Celluloid.boot
+    Attention.deactivate
     example.run
     Celluloid.shutdown
-  end
-
-  config.after(:suite) do
-    ZK_Setup.stop_zk
+    Attention.deactivate
   end
 end

data/spec/support/cellect_helper.rb

@@ -1,8 +1,8 @@
 require 'timeout'
 
 module CellectHelper
-  def pass_until(&block)
-    Timeout::timeout(1) do
+  def pass_until(timeout: 1, &block)
+    Timeout::timeout(timeout) do
       Thread.pass until block.call
     end
   rescue => e
@@ -10,7 +10,7 @@ module CellectHelper
     raise e
   end
 
-  def pass_until_state_of(obj, is:)
+  def pass_until_state_of(obj, timeout: 1, is:)
     Timeout::timeout(1) do
       Thread.pass until obj.state == is
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zk-server
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: celluloid-io
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: zk
+  name: attention
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +181,9 @@ dependencies:
 description: ''
 email:
 - michael@zooniverse.org
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -189,9 +191,12 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - cellect-client.gemspec
 - cellect.gemspec
 - data/.gitkeep
@@ -199,12 +204,10 @@ files:
 - lib/cellect/client.rb
 - lib/cellect/client/connection.rb
 - lib/cellect/client/node_set.rb
-- lib/cellect/node_set.rb
-- lib/cellect/testing.rb
 - lib/cellect/version.rb
 - log/.gitkeep
-- spec/client/connection_spec.rb
-- spec/client/node_set_spec.rb
+- spec/cellect/client/connection_spec.rb
+- spec/cellect/client/node_set_spec.rb
 - spec/fixtures/user_data/complete_user.json
 - spec/fixtures/user_data/new_user.json
 - spec/fixtures/user_data/partial_user.json
@@ -219,11 +222,9 @@ files:
 - spec/spec_helper.rb
 - spec/support/cellect_helper.rb
 - spec/support/shared_api_context.rb
-- spec/support/shared_examples_for_node_set.rb
 - spec/support/shared_examples_for_set.rb
 - spec/support/shared_examples_for_workflow.rb
 - spec/support/spec_adapter.rb
-- spec/support/zk_setup.rb
 - tmp/.gitkeep
 homepage: https://github.com/parrish/Cellect
 licenses:
@@ -240,9 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2
@@ -250,8 +251,8 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
-- spec/client/connection_spec.rb
-- spec/client/node_set_spec.rb
+- spec/cellect/client/connection_spec.rb
+- spec/cellect/client/node_set_spec.rb
 - spec/fixtures/user_data/complete_user.json
 - spec/fixtures/user_data/new_user.json
 - spec/fixtures/user_data/partial_user.json
@@ -266,8 +267,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/cellect_helper.rb
 - spec/support/shared_api_context.rb
-- spec/support/shared_examples_for_node_set.rb
 - spec/support/shared_examples_for_set.rb
 - spec/support/shared_examples_for_workflow.rb
 - spec/support/spec_adapter.rb
-- spec/support/zk_setup.rb

data/lib/cellect/node_set.rb

@@ -1,44 +0,0 @@
-require 'zk'
-
-module Cellect
-  class NodeSet
-    include Celluloid
-    ConnectionError = Class.new(StandardError)
-
-    attr_accessor :zk, :state
-
-    # Sets up the node set and starts connecting to ZooKeeper
-    def initialize(zk_url = nil)
-      @zk_url = zk_url
-      self.state = :initializing
-      after(0.001){ async.initialize_zk } # don't block waiting for ZK to connect
-    end
-
-    # Connect to ZooKeeper, setup this node, and change state
-    def initialize_zk
-      Timeout::timeout(timeout_duration) do
-        self.zk = ZK.new zk_url, chroot: '/cellect'
-      end
-      setup
-      self.state = :ready
-    end
-
-    def ready?
-      state == :ready
-    end
-
-    protected
-
-    def timeout_duration
-      ENV.fetch('ZK_TIMEOUT', 5).to_i
-    end
-
-    def zk_url
-      @zk_url || ENV.fetch('ZK_URL', 'localhost:2181')
-    end
-
-    def setup
-      # Specialized in subclasses
-    end
-  end
-end

data/lib/cellect/testing.rb

@@ -1,7 +0,0 @@
-module Cellect
-  module Client
-    def self.mock_zookeeper?
-      true
-    end
-  end
-end

data/spec/client/node_set_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-module Cellect::Client
-  describe NodeSet do
-    it_behaves_like 'node set'
-    let(:node_set){ Cellect::Client.node_set }
-
-    #@note: node_set.nodes has state from intial code loading
-    # the above def which is really a cached celluloid actor from boot
-    # see Cellect::Client / Cellect::Server
-    it 'should update the node list when changing' do
-      begin
-        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']
-          Thread.pass
-        end
-        expect(node_set.nodes['node0000000001']).to eq 'foo'
-      ensure
-        node_set.zk.delete '/nodes/node0000000001'
-      end
-    end
-  end
-end

data/spec/support/shared_examples_for_node_set.rb

@@ -1,28 +0,0 @@
-shared_examples_for 'node set' do
-  let(:node_set){ Cellect::NodeSet.new }
-
-  it 'should connect to zoo keeper' do
-    expect(node_set.zk).to be_nil
-    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_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_state_of node_set, is: :ready
-      ENV['ZK_URL'] = 'foobar'
-      expect(node_set.send(:zk_url)).to eq 'foobar'
-      ENV.delete 'ZK_URL'
-      expect(node_set.send(:zk_url)).to eq 'localhost:2181'
-    ensure
-      ENV['ZK_URL'] = url_before
-    end
-  end
-end

data/spec/support/zk_setup.rb

@@ -1,51 +0,0 @@
-module ZK_Setup
-  def self.start_zk(port=21811)
-    @port = port
-    if SPAWN_ZK
-      kill_old_zk_servers
-      remove_zk_data
-      server = ZK::Server.new do |config|
-        config.client_port = port
-        config.client_port_address = 'localhost'
-        config.force_sync = false
-        config.tick_time = 2000
-        config.init_limit = 10
-        config.sync_limit = 5
-        config.snap_count = 1000000
-        config.base_dir = zk_dir
-      end
-      server.run
-      @zk_server = server
-      ENV['ZK_URL'] = "localhost:#{port}"
-    end
-  end
-
-  def self.stop_zk
-    if SPAWN_ZK
-      @zk_server.shutdown
-    end
-  end
-
-  def self.zk_dir
-    File.join CELLECT_ROOT, 'tmp/zookeeper'
-  end
-
-  def self.zk_ok?
-    `echo ruok | nc 127.0.0.1 #{@port}`.chomp == 'imok'
-  end
-
-  def self.kill_old_zk_servers
-    if zk_ok?
-      pid = `ps aux | grep -e 'Cellect[\/]tmp[\/]zookeeper'`.split[1]
-      puts "Killing rogue zookeeper process: #{ pid }..."
-      `kill -s TERM #{ pid }`
-      sleep 1
-    end
-  end
-
-  def self.remove_zk_data
-    `rm -rf #{ zk_dir }; mkdir -p #{ zk_dir }`
-  end
-end
-
-ZK_Setup.start_zk