cellect-server 0.1.3 → 1.0.0

data/spec/server/server_spec.rb

@@ -4,13 +4,13 @@ module Cellect::Server
   describe Cellect do
     context 'default adapter' do
       let(:default){ Cellect::Server::Adapters::Default.new }
-      
+
       it 'should raise a NotImplementedError when using the default adapter' do
         expect{ default.workflow_list }.to raise_error NotImplementedError
         expect{ default.load_data_for(Workflow.new('test')) }.to raise_error NotImplementedError
         expect{ default.load_user 'random', 123 }.to raise_error NotImplementedError
       end
-      
+
       it 'should return a workflow given a set of options' do
         expect(default.workflow_for('name' => 'a')).to be_an_instance_of Workflow
         expect(default.workflow_for('name' => 'b', 'grouped' => true)).to be_an_instance_of GroupedWorkflow

data/spec/server/user_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 module Cellect::Server
   describe User do
     let(:user){ User.new 1, workflow_name: 'random' }
-    
+
     it 'should store seen ids' do
       expect(user.seen).to be_a DiffSet::RandomSet
     end
-    
+
     it 'should have a default ttl of 15 minutes' do
       expect(user.ttl).to eq 900 # seconds
     end
-    
+
     it 'should allow custom ttl' do
       expect(User.new(2, workflow_name: 'random', ttl: 123).ttl).to eq 123
     end
-    
+
     it 'should reset the ttl timer on activity' do
       expect(user.bare_object).to receive(:restart_ttl_timer).at_least :once
       user.seen
     end
-    
+
     it 'should terminate on ttl expiry' do
       async_workflow = double
       expect(Workflow[user.workflow_name]).to receive(:async).and_return async_workflow

data/spec/server/workflow_spec.rb

@@ -6,29 +6,29 @@ module Cellect::Server
       expect(Cellect::Server.adapter).to receive(:load_workflows).with('random').and_call_original
       Workflow['random']
     end
-    
+
     SET_TYPES.each do |workflow_type|
       context workflow_type do
         it_behaves_like 'workflow', :workflow
         let(:workflow){ Workflow[workflow_type] }
         let(:user){ workflow.user 123 }
         before(:each){ pass_until workflow, is: :ready }
-        
+
         it 'should provide unseen for users' do
           expect(workflow.subjects).to receive(:subtract).with user.seen, 3
           workflow.unseen_for 123, limit: 3
         end
-        
+
         it 'should sample subjects without a user' do
           expect(workflow.subjects).to receive(:sample).with 3
           workflow.sample limit: 3
         end
-        
+
         it 'should sample subjects with a user' do
           expect(workflow.subjects).to receive(:subtract).with user.seen, 3
           workflow.sample user_id: 123, limit: 3
         end
-        
+
         it 'should add subjects' do
           if workflow.prioritized?
             expect(workflow.subjects).to receive(:add).with 123, 456
@@ -38,26 +38,26 @@ module Cellect::Server
             workflow.add subject_id: 123
           end
         end
-        
+
         it 'should remove subjects' do
           expect(workflow.subjects).to receive(:remove).with 123
           workflow.remove subject_id: 123
         end
-        
+
         it 'should be notified of a user ttl expiry' do
           async_workflow = double
           expect(workflow).to receive(:async).and_return async_workflow
           expect(async_workflow).to receive(:remove_user).with user.id
           user.ttl_expired!
         end
-        
+
         it 'should remove users when their ttl expires' do
           id = user.id
           workflow.remove_user id
           expect(workflow.users).to_not have_key id
           expect{ user.id }.to raise_error Celluloid::DeadActorError
         end
-        
+
         it 'should not be grouped' do
           expect(workflow).to_not be_grouped
         end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ Bundler.require :test, :development
 
 ENV['CELLECT_POOL_SIZE'] = '3'
 SPAWN_ZK = !ENV['ZK_URL']
-
 require 'pry'
 require 'oj'
 require './spec/support/zk_setup.rb'
@@ -32,14 +31,14 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.order = 'random'
   config.include CellectHelper
-  
+
   config.around(:each) do |example|
     Celluloid.boot
     example.run
     Celluloid.shutdown
   end
-  
+
   config.after(:suite) do
-    `zkServer stop #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1` if SPAWN_ZK
+    ZK_Setup.stop_zk
   end
 end

data/spec/support/shared_api_context.rb

@@ -1,10 +1,10 @@
 shared_context 'API' do
   include Rack::Test::Methods
-  
+
   def app
     $app ||= Cellect::Server::API.new
   end
-  
+
   def json
     Oj.strict_load last_response.body
   end

data/spec/support/shared_examples_for_node_set.rb

@@ -1,18 +1,18 @@
 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 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
     expect(node_set).to be_ready
   end
-  
+
   it 'should accept a connection string' do
     url_before = ENV['ZK_URL']
     begin

data/spec/support/shared_examples_for_set.rb

@@ -2,30 +2,30 @@ shared_examples_for 'a set' do
   it 'should convert to an Array' do
     expect(set.to_a).to eq (1..5).to_a
   end
-  
+
   it 'should add elements' do
     set.add 100
     expect(set.to_a).to include 100
   end
-  
+
   it 'should remove elements' do
     set.remove 1
     set.to_a.should_not include 1
   end
-  
+
   it 'should sample elements' do
     expect(set.sample(2).length).to eq 2
   end
-  
+
   it 'should not include removed elements in samples' do
     set.remove 5
     set.sample(5).should_not include 5
   end
-  
+
   it 'should know how many elements it contains' do
     expect{ set.add 100 }.to change{ set.size }.from(5).to 6
   end
-  
+
   it 'should know if it contains an element' do
     set.should_not include 100
     set.add 100

data/spec/support/shared_examples_for_workflow.rb

@@ -1,23 +1,23 @@
 shared_examples_for 'workflow' do |name|
   let(:obj){ send name }
-  
+
   before(:each) do
     Cellect::Server.adapter.load_workflow obj.name
   end
-  
+
   it 'should add singleton instances to the registry' do
     expect(obj.class[obj.name]).to be_a_kind_of Cellect::Server::Workflow
     expect(obj.class[obj.name].object_id).to eq obj.class[obj.name].object_id
   end
-  
+
   it 'should initialize empty' do
     expect(obj.name).to be_a String
     expect(obj.users).to be_a Hash
-    
+
     set_klass = obj.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet
     expect(obj.subjects).to be_a set_klass
   end
-  
+
   it 'should provide a user lookup' do
     expect(obj.user(1)).to be_a Cellect::Server::User
     expect(obj.user(1).object_id).to eq obj.user(1).object_id

data/spec/support/spec_adapter.rb

@@ -8,11 +8,11 @@ class SpecAdapter < Cellect::Server::Adapters::Default
       fixtures.values_at(*names)
     end
   end
-  
+
   def load_data_for(workflow_name)
     fixtures.fetch(workflow_name, { }).fetch 'entries', []
   end
-  
+
   def fixtures
     @fixtures ||= { }.tap do |fixtures|
       Dir["#{ _fixture_path }/workflow_data/*.json"].collect do |f|
@@ -22,7 +22,7 @@ class SpecAdapter < Cellect::Server::Adapters::Default
       end
     end
   end
-  
+
   def user_fixtures
     @user_fixtures ||= { }.tap do |user_fixtures|
       Dir["#{ _fixture_path }/user_data/*.json"].sort.collect.with_index do |f, i|
@@ -33,14 +33,14 @@ class SpecAdapter < Cellect::Server::Adapters::Default
       end
     end
   end
-  
+
   def load_user(workflow_name, id)
     user = user_fixtures[id]
     user ? user[workflow_name] : user_fixtures['new_user'][workflow_name]
   end
-  
+
   protected
-  
+
   def _fixture_path
     File.expand_path File.join(__FILE__, '../../fixtures')
   end

data/spec/support/zk_setup.rb

@@ -1,28 +1,51 @@
-if SPAWN_ZK
-  zk_dir = File.join CELLECT_ROOT, 'tmp/zookeeper'
-  CELLECT_ZK_CONFIG = "#{ zk_dir }/zoo.cfg"
-  
-  `rm -rf #{ zk_dir }; mkdir -p #{ zk_dir }`
-  
-  File.open(CELLECT_ZK_CONFIG, 'w') do |out|
-    out.puts <<-TEXT
-      tickTime=2000
-      initLimit=10
-      syncLimit=5
-      dataDir=#{ zk_dir }
-      clientPort=21811
-      forceSync=no
-      snapCount=1000000
-    TEXT
+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
-  
-  if `echo ruok | nc 127.0.0.1 21811`.chomp == 'imok'
-    pid = `ps aux | grep -e 'Cellect[\/]tmp[\/]zookeeper'`.split[1]
-    puts "Killing rogue zookeeper process: #{ pid }..."
-    `kill -s TERM #{ pid }`
-    sleep 1
+
+  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
-  
-  `zkServer start #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1`
-  ENV['ZK_URL'] = 'localhost:21811'
 end
+
+ZK_Setup.start_zk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ''