cellect-server 1.3.3 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad603f50ab4f1cb53a8d2f67792f1acae0484d14
-  data.tar.gz: 8c9c4df72fbddd0e1ae3f357f14dc6c3bac2c384
+  metadata.gz: 4ef80181a6f62fe2ba4b39b0377cc8805377da52
+  data.tar.gz: 7a306ae04dbaa28fde48068f1d628dba47cb1c44
 SHA512:
-  metadata.gz: 49c3dbb9447b9f12920b49c8af8350e536b7318c2225228a8b1f64b8dc5e33fe6a2515d8dc8d0a2b2c63a39b2f16af844d2e1b94d5935c9c8abd978339a94dcd
-  data.tar.gz: 1e772e5a66f80a5557be992a73460e46b132c6bbe2ccca8786988f56db0467bb531f288bad6d1dfdde97b501c9d3d1a980236db78f406c927e607810c7ef9555
+  metadata.gz: 2caf888d305d48e668d094e1216a438f4c6247968fba2991f89c1625121fda77641022320f714deb01ae5b90fbd980cc5290706f3bd9060327b0d4e16010fff1
+  data.tar.gz: b3c37669fe2308f65b4b77957cd41fc72017763ba03a8d598afc00cb91b87ffcc13a80f98e48850eb7f23905234ee9d3579d0fdd3efcd2ec98338bb1178e17b8

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-server.gemspec

@@ -27,14 +27,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rack-test'
   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'
 
   spec.add_runtime_dependency 'diff_set', '~> 0.0.3'
   spec.add_runtime_dependency 'celluloid', '0.16.0'
-  spec.add_runtime_dependency 'celluloid-io', '0.16.0'
   spec.add_runtime_dependency 'http', '~> 0.6'
-  spec.add_runtime_dependency 'zk', '~> 1.9'
+  spec.add_runtime_dependency 'attention', '~> 0.0.4'
   spec.add_runtime_dependency 'grape', '~> 0.7'
 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.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/lib/cellect/server.rb

@@ -26,6 +26,6 @@ module Cellect
       false
     end
 
-    Server.node_set = NodeSet.supervise
+    Server.node_set = NodeSet.new
   end
 end

data/lib/cellect/server/api.rb

@@ -13,7 +13,7 @@ module Cellect
       # 
       # Provides system load information
       get :stats do
-        node_set = Cellect::Server.node_set.actors.first
+        instance = Attention.instance
         usage = ->(keyword) do
           `ps axo #{ keyword }`.chomp.split("\n")[1..-1].collect(&:to_f).inject :+
         end
@@ -21,7 +21,7 @@ module Cellect
         {
           memory: usage.call('%mem'),
           cpu: usage.call('%cpu'),
-          node_set: { id: node_set.id, ready: node_set.ready? },
+          instance: instance.id,
           status: Cellect::Server.adapter.status.merge({
             workflows_ready: Cellect::Server.ready?,
             workflows: Workflow.all.map(&:status)

data/lib/cellect/server/node_set.rb

@@ -1,22 +1,12 @@
-require 'cellect/node_set'
-require 'socket'
-
 module Cellect
   module Server
-    class NodeSet < Cellect::NodeSet
-      attr_accessor :id
-
-      protected
+    class NodeSet
+      attr_reader :instance
 
-      # Registers this server instance with ZooKeeper
-      def setup
-        zk.mkdir_p '/nodes'
-        # Find the local ipv4 address
-        address = Socket.ip_address_list.find{ |address| address.ipv4? && !address.ipv4_loopback? }
-        raise "Cannot identify IP address" unless address
-        # Register this instance with an autoincrementing id
-        path = zk.create '/nodes/node', data: address.ip_address, mode: :ephemeral_sequential
-        self.id = path.sub /^\/nodes\//, ''
+      # Registers this server instance
+      def initialize
+        Attention.activate
+        @instance = Attention.instance
       end
     end
   end

data/lib/cellect/version.rb

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

data/spec/cellect/server/node_set_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+module Cellect::Server
+  describe NodeSet do
+    describe '#setup' do
+      it 'should activate this node' do
+        expect(Attention).to receive :activate
+        subject
+      end
+
+      it 'should register this node' do
+        expect(subject.instance).to be_a Attention::Instance
+      end
+    end
+  end
+end

data/spec/{server → cellect/server}/server_spec.rb

@@ -42,16 +42,7 @@ module Cellect::Server
       end
 
       it 'should include information' do
-        expect(response.keys).to match_array %w(memory cpu node_set status)
-      end
-
-      context 'node_set' do
-        let(:node_set){ response['node_set'] }
-
-        it 'should include information' do
-          expect(node_set['id']).to eql 'node0000000000'
-          expect(node_set['ready']).to eql true
-        end
+        expect(response.keys).to match_array %w(memory cpu instance status)
       end
 
       context 'status' do

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-server
 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
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +192,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +207,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !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: grape
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +237,9 @@ dependencies:
 description: ''
 email:
 - michael@zooniverse.org
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -231,14 +247,16 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - cellect-server.gemspec
 - cellect.gemspec
 - data/.gitkeep
 - lib/cellect.rb
-- lib/cellect/node_set.rb
 - lib/cellect/server.rb
 - lib/cellect/server/adapters.rb
 - lib/cellect/server/adapters/default.rb
@@ -251,9 +269,18 @@ files:
 - lib/cellect/server/node_set.rb
 - lib/cellect/server/user.rb
 - lib/cellect/server/workflow.rb
-- lib/cellect/testing.rb
 - lib/cellect/version.rb
 - log/.gitkeep
+- spec/cellect/server/api/add_seen_spec.rb
+- spec/cellect/server/api/add_spec.rb
+- spec/cellect/server/api/remove_spec.rb
+- spec/cellect/server/api/sample_spec.rb
+- spec/cellect/server/api/user_load_spec.rb
+- spec/cellect/server/grouped_workflow_spec.rb
+- spec/cellect/server/node_set_spec.rb
+- spec/cellect/server/server_spec.rb
+- spec/cellect/server/user_spec.rb
+- spec/cellect/server/workflow_spec.rb
 - spec/fixtures/user_data/complete_user.json
 - spec/fixtures/user_data/new_user.json
 - spec/fixtures/user_data/partial_user.json
@@ -265,24 +292,12 @@ files:
 - spec/fixtures/workflow_data/pairwise_random.json
 - spec/fixtures/workflow_data/priority.json
 - spec/fixtures/workflow_data/random.json
-- spec/server/api/add_seen_spec.rb
-- spec/server/api/add_spec.rb
-- spec/server/api/remove_spec.rb
-- spec/server/api/sample_spec.rb
-- spec/server/api/user_load_spec.rb
-- spec/server/grouped_workflow_spec.rb
-- spec/server/node_set_spec.rb
-- spec/server/server_spec.rb
-- spec/server/user_spec.rb
-- spec/server/workflow_spec.rb
 - 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:
@@ -299,9 +314,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
@@ -309,6 +324,16 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
+- spec/cellect/server/api/add_seen_spec.rb
+- spec/cellect/server/api/add_spec.rb
+- spec/cellect/server/api/remove_spec.rb
+- spec/cellect/server/api/sample_spec.rb
+- spec/cellect/server/api/user_load_spec.rb
+- spec/cellect/server/grouped_workflow_spec.rb
+- spec/cellect/server/node_set_spec.rb
+- spec/cellect/server/server_spec.rb
+- spec/cellect/server/user_spec.rb
+- spec/cellect/server/workflow_spec.rb
 - spec/fixtures/user_data/complete_user.json
 - spec/fixtures/user_data/new_user.json
 - spec/fixtures/user_data/partial_user.json
@@ -320,21 +345,9 @@ test_files:
 - spec/fixtures/workflow_data/pairwise_random.json
 - spec/fixtures/workflow_data/priority.json
 - spec/fixtures/workflow_data/random.json
-- spec/server/api/add_seen_spec.rb
-- spec/server/api/add_spec.rb
-- spec/server/api/remove_spec.rb
-- spec/server/api/sample_spec.rb
-- spec/server/api/user_load_spec.rb
-- spec/server/grouped_workflow_spec.rb
-- spec/server/node_set_spec.rb
-- spec/server/server_spec.rb
-- spec/server/user_spec.rb
-- spec/server/workflow_spec.rb
 - 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/server/node_set_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-module Cellect::Server
-  describe NodeSet do
-    it_behaves_like 'node set'
-    let(:node_set){ Cellect::Server.node_set.actors.first }
-
-    it 'should register this node' do
-      expect(node_set.id).to eq 'node0000000000'
-      expect(node_set.zk.get('/nodes/node0000000000').first).to match /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
-    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