arborist 0.1.0 → 0.2.0.pre20170519125456

data/spec/arborist/monitor_runner_spec.rb

@@ -7,15 +7,10 @@ require 'arborist/monitor_runner'
 
 describe Arborist::MonitorRunner do
 
-	let( :zmq_loop ) { instance_double(ZMQ::Loop) }
 	let( :req_socket ) { instance_double(ZMQ::Socket::Req) }
-	let( :pollitem ) { instance_double(ZMQ::Pollitem) }
 
-	let( :runner ) do
-		obj = described_class.new
-		obj.reactor = zmq_loop
-		obj
-	end
+	let( :reactor ) { instance_double(CZTop::Reactor) }
+	let( :runner ) { described_class.new }
 
 	let( :monitor_class ) { Class.new(Arborist::Monitor) }
 
@@ -24,6 +19,26 @@ describe Arborist::MonitorRunner do
 	let( :mon3 ) { monitor_class.new("testing monitor3", :testing) }
 	let( :monitors ) {[ mon1, mon2, mon3 ]}
 
+		let( :node_tree ) {{
+			'router' => {
+				'addresses' => ['10.2.1.2', '1.2.3.4']
+			},
+			'server' => {
+				'addresses' => ['10.2.1.118']
+			}
+		}}
+		let( :ping_monitor_data ) {{
+			'router' => {'ping' => { 'rtt' => 22 }},
+			'server' => {'ping' => { 'rtt' => 8 }},
+		}}
+
+
+	before( :each ) do
+		allow( CZTop::Reactor ).to receive( :new ).and_return( reactor )
+		allow( reactor ).to receive( :register )
+		allow( reactor ).to receive( :unregister )
+	end
+
 
 	it "can load monitors from an enumerator that yields Arborist::Monitors" do
 		runner.load_monitors([ mon1, mon2, mon3 ])
@@ -33,27 +48,11 @@ describe Arborist::MonitorRunner do
 
 	describe "a runner with loaded monitors" do
 
-		before( :each ) do
-			allow( zmq_loop ).to receive( :register ).with( an_instance_of(ZMQ::Pollitem) )
-		end
-
-
 		it "registers its monitors to run on an interval and starts the ZMQ loop when run" do
 			runner.monitors.replace([ mon1 ])
 
-			interval_timer = instance_double( ZMQ::Timer )
-			expect( ZMQ::Timer ).to receive( :new ) do |i_delay, i_repeat, &i_block|
-				expect( i_delay ).to eq( mon1.interval )
-				expect( i_repeat ).to eq( 0 )
-
-				expect( runner.handler ).to receive( :run_monitor ).with( mon1 )
-
-				i_block.call
-				interval_timer
-			end
-
-			expect( zmq_loop ).to receive( :register_timer ).with( interval_timer )
-			expect( zmq_loop ).to receive( :start )
+			expect( reactor ).to receive( :add_periodic_timer ).with( mon1.interval )
+			expect( reactor ).to receive( :start_polling )
 
 			runner.run
 		end
@@ -62,87 +61,46 @@ describe Arborist::MonitorRunner do
 		it "delays registration of its interval timer if a monitor has a splay" do
 			runner.monitors.replace([ mon2 ])
 
-			interval_timer = instance_double( ZMQ::Timer )
-			expect( ZMQ::Timer ).to receive( :new ).with( mon2.interval, 0 ).
-				and_return( interval_timer )
-
-			timer = instance_double( ZMQ::Timer )
-			expect( ZMQ::Timer ).to receive( :new ) do |delay, repeat, &block|
-				expect( delay ).to be >= 0
-				expect( delay ).to be <= mon2.splay
-				expect( repeat ).to eq( 1 )
-
-				block.call
-				timer
-			end
-
-			expect( zmq_loop ).to receive( :register_timer ).with( interval_timer )
-			expect( zmq_loop ).to receive( :register_timer ).with( timer )
-			expect( zmq_loop ).to receive( :start )
+			expect( reactor ).to receive( :add_oneshot_timer ).
+				with( a_value_between(0, mon2.splay) ).and_yield
+			expect( reactor ).to receive( :add_periodic_timer ).with( mon2.interval )
+			expect( reactor ).to receive( :start_polling )
 
 			runner.run
 		end
 
-	end
-
-
-	describe Arborist::MonitorRunner::Handler do
-
-		let( :tree_api_handler ) { Arborist::Manager::TreeAPI.new(:pollable, :manager) }
-
-		let( :handler ) { described_class.new( zmq_loop ) }
-
-		let( :node_tree ) {{
-			'router' => {
-				'addresses' => ['10.2.1.2', '1.2.3.4']
-			},
-			'server' => {
-				'addresses' => ['10.2.1.118']
-			}
-		}}
-		let( :ping_monitor_data ) {{
-			'router' => {'ping' => { 'rtt' => 22 }},
-			'server' => {'ping' => { 'rtt' => 8 }},
-		}}
-
 
 		it "can run a monitor using async ZMQ IO" do
-			expect( zmq_loop ).to receive( :register ).with( handler.pollitem )
 
 			# Queue up the monitor requests and register the socket as wanting to write
 			mon1.exec do |nodes|
 				ping_monitor_data
 			end
-			expect {
-				handler.run_monitor( mon1 )
-			}.to change { handler.registered? }.from( false ).to( true )
 
 			# Fetch
-			request = handler.client.make_fetch_request(
+			request = runner.client.make_fetch_request(
 				mon1.positive_criteria,
 				include_down: false,
 				properties: mon1.node_properties
 			)
-			response = tree_api_handler.successful_response( node_tree )
+			response = Arborist::TreeAPI.successful_response( node_tree )
 
-			expect( handler.client.tree_api ).to receive( :send ).with( request )
-			expect( handler.client.tree_api ).to receive( :recv ).and_return( response )
+			expect( runner.client.tree_api ).to receive( :send ).with( request )
+			expect( runner.client.tree_api ).to receive( :recv ).and_return( response )
 
-			expect {
-				handler.on_writable
-			}.to_not change { handler.registered? }
+			runner.reactor.poll_once
 
 			# Update
-			request = handler.client.make_update_request( ping_monitor_data )
-			response = tree_api_handler.successful_response( nil )
-			expect( handler.client.tree_api ).to receive( :send ).with( request )
-			expect( handler.client.tree_api ).to receive( :recv ).and_return( response )
+			request = runner.client.make_update_request( ping_monitor_data )
+			response = Arborist::TreeAPI.successful_response( nil )
+			expect( runner.client.tree_api ).to receive( :send ).with( request )
+			expect( runner.client.tree_api ).to receive( :recv ).and_return( response )
 
 			# Unregister
-			expect( zmq_loop ).to receive( :remove ).with( handler.pollitem )
+			expect( zmq_loop ).to receive( :remove ).with( runner.pollitem )
 			expect {
-				handler.on_writable
-			}.to change { handler.registered? }.from( true ).to( false )
+				runner.on_writable
+			}.to change { runner.registered? }.from( true ).to( false )
 
 		end
 
@@ -159,23 +117,25 @@ describe Arborist::MonitorRunner do
 			nodes = { 'test1' => {}, 'test2' => {} }
 			monitor_results = { 'test1' => {ping: {rtt: 1}}, 'test2' => {ping: {rtt: 8}} }
 
-			expect( handler ).to receive( :fetch ).
+			expect( runner ).to receive( :fetch ).
 				with( {type: 'host'}, false, [:addresses], {} ).
 				and_yield( nodes )
 
 			expect( monitor ).to receive( :run ).with( nodes ).
 				and_return( monitor_results )
 
-			expect( handler ).to receive( :update ).
+			expect( runner ).to receive( :update ).
 				with({
 					"test1"=>{:ping=>{:rtt=>1}, "_monitor_key"=>:test},
 					"test2"=>{:ping=>{:rtt=>8}, "_monitor_key"=>:test}
 				})
 
-			handler.run_monitor( monitor )
+			runner.run_monitor( monitor )
 		end
 
 	end
 
+
+
 end
 

data/spec/arborist/observer_runner_spec.rb

@@ -2,57 +2,120 @@
 
 require_relative '../spec_helper'
 
+require 'rspec/wait'
+require 'cztop'
+require 'cztop/reactor'
+
 require 'arborist/observer_runner'
 
 
 describe Arborist::ObserverRunner do
 
+	before( :each ) do
+		$emails = []
+		$texts = []
+	end
 
-	let( :zmq_loop ) { instance_double(ZMQ::Loop) }
-	let( :req_socket ) { instance_double(ZMQ::Socket::Req) }
-	let( :sub_socket ) { instance_double(ZMQ::Socket::Sub) }
-	let( :pollitem ) { instance_double(ZMQ::Pollitem) }
-
-	let( :runner ) do
-		obj = described_class.new
-		obj.reactor = zmq_loop
-		obj
+	after( :each ) do
+		$emails.clear
+		$texts.clear
 	end
 
-	let( :observer_class ) { Class.new(Arborist::Observer) }
 
-	let( :observer1 ) { observer_class.new("testing observer1") }
-	let( :observer2 ) { observer_class.new("testing observer2") }
-	let( :observer3 ) { observer_class.new("testing observer3") }
+	let( :observer1 ) do
+		Arborist::Observer "Email on ack/disabled/enabled" do
+			subscribe to: 'node.acked'
+			subscribe to: 'node.disabled'
+			subscribe to: 'node.enabled'
+
+			action do |event|
+				$emails << event
+			end
+
+		end
+	end
+	let( :observer2 ) do
+		Arborist::Observer "SMS on nodes down" do
+			subscribe to: 'node.down'
+			action do |event|
+				$texts << event
+			end
+		end
+	end
+	let( :observer3 ) do
+		Arborist::Observer 'Email on disk full' do
+			subscribe to: 'node.down',
+				where: { type: 'resource', category: 'disk' }
+			action do |event|
+				$emails << event
+			end
+		end
+	end
+
 	let( :observers ) {[ observer1, observer2, observer3 ]}
 
 
 	it "can load observers from an enumerator that yields Arborist::Observers" do
+		runner = described_class.new
 		runner.load_observers([ observer1, observer2, observer3 ])
 		expect( runner.observers ).to include( observer1, observer2, observer3 )
 	end
 
 
-	describe "a runner with loaded observers" do
+	describe "a runner with loaded observers", :testing_manager do
 
 		before( :each ) do
-			allow( zmq_loop ).to receive( :register ).with( an_instance_of(ZMQ::Pollitem) )
+			@manager_thread = Thread.new do
+				@manager = make_testing_manager()
+				Thread.current.abort_on_exception = true
+				@manager.run
+				Loggability[ Arborist ].info "Stopped the test manager"
+			end
+
+			count = 0
+			until (@manager && @manager.running?) || count > 30
+				sleep 0.1
+				count += 1
+			end
+			raise "Manager didn't start up" unless @manager.running?
 		end
 
+		after( :each ) do
+			@manager.simulate_signal( :TERM )
+			@manager_thread.join
+
+			count = 0
+			while @manager.running? || count > 30
+				sleep 0.1
+				Loggability[ Arborist ].info "Manager still running"
+				count += 1
+			end
+			raise "Manager didn't stop" if @manager.running?
+		end
 
-		xit "subscribes to events for each of its observers and starts the ZMQ loop when run" do
-			expect( Arborist.zmq_context ).to receive( :socket ).
-				with( :REQ ).and_return( req_socket )
-			expect( Arborist.zmq_context ).to receive( :socket ).
-				with( :SUB ).and_return( sub_socket )
 
-			expect( req_socket ).to receive( :subscribe ).with(  )
+		let( :runner ) do
+			runner = described_class.new
+			runner.load_observers( observers )
+			runner
 		end
 
-	end
 
+		it "subscribes for each of its observers and listens for events when run" do
+			thr = Thread.new { runner.run }
+			wait( 3 ).for { runner }.to be_running
+
+			expect( @manager.subscriptions.length ).to eq( runner.subscriptions.length )
 
-	describe Arborist::ObserverRunner::Handler
+			runner.simulate_signal( :TERM )
+			thr.join( 2 )
+			thr.kill
+		end
+
+
+		it "runs the observers when subscribed events are sent"
+
+	end
 
 end
 

data/spec/arborist/tree_api_spec.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../spec_helper'
+
+require 'arborist/tree_api'
+
+describe Arborist::TreeAPI, :testing_manager do
+
+	it "can encode a valid Tree API header and body into a message"
+	it "raises an exception if the header to encode isn't a Hash"
+
+	it "can build a valid Tree API request message"
+
+
+	it "can build a valid success response message"
+	it "can build a valid error response message"
+
+
+	it "can decode a header and payload from a valid request message"
+
+	describe "raises an exception when decoding a request message" do
+
+		it "from a different protocol version"
+		it "that doesn't contain a valid MessagePack payload'"
+
+	end
+
+
+end
+

data/spec/arborist_spec.rb

@@ -164,10 +164,5 @@ describe Arborist do
 		expect( described_class.observer_runner_for(loader) ).to be_a( Arborist::ObserverRunner )
 	end
 
-
-	it "has a ZMQ context" do
-		expect( described_class.zmq_context ).to be_a( ZMQ::Context )
-	end
-
 end
 

data/spec/spec_helper.rb

@@ -73,19 +73,6 @@ module Arborist::TestHelpers
 	end
 
 
-	def pack_message( verb, *data )
-		body = data.pop
-		header = data.pop || {}
-		header.merge!( action: verb, version: 1 )
-
-		return MessagePack.pack([ header, body ])
-	end
-
-
-	def unpack_message( msg )
-		return MessagePack.unpack( msg )
-	end
-
 
 	#
 	# Fixture Functions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre20170519125456
 platform: ruby
 authors:
 - Michael Granger
@@ -9,34 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
-  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
-  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
-  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
-  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
-  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
-  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
-  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
-  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
-  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
-  -----END CERTIFICATE-----
-date: 2017-01-02 00:00:00.000000000 Z
+- certs/ged.pem
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schedulability
@@ -114,28 +88,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rbczmq
+  name: cztop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: cztop-reactor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +172,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +208,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-wait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +270,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   Arborist is a monitoring toolkit that follows the UNIX philosophy
   of small parts and loose coupling for stability, reliability, and
@@ -333,12 +335,11 @@ files:
 - lib/arborist/event/node_unknown.rb
 - lib/arborist/event/node_up.rb
 - lib/arborist/event/node_update.rb
+- lib/arborist/event_api.rb
 - lib/arborist/exceptions.rb
 - lib/arborist/loader.rb
 - lib/arborist/loader/file.rb
 - lib/arborist/manager.rb
-- lib/arborist/manager/event_publisher.rb
-- lib/arborist/manager/tree_api.rb
 - lib/arborist/mixins.rb
 - lib/arborist/monitor.rb
 - lib/arborist/monitor/socket.rb
@@ -354,15 +355,15 @@ files:
 - lib/arborist/observer/summarize.rb
 - lib/arborist/observer_runner.rb
 - lib/arborist/subscription.rb
+- lib/arborist/tree_api.rb
 - spec/arborist/client_spec.rb
 - spec/arborist/dependency_spec.rb
 - spec/arborist/event/node_delta_spec.rb
 - spec/arborist/event/node_down_spec.rb
 - spec/arborist/event/node_spec.rb
 - spec/arborist/event/node_update_spec.rb
+- spec/arborist/event_api_spec.rb
 - spec/arborist/event_spec.rb
-- spec/arborist/manager/event_publisher_spec.rb
-- spec/arborist/manager/tree_api_spec.rb
 - spec/arborist/manager_spec.rb
 - spec/arborist/mixins_spec.rb
 - spec/arborist/monitor/socket_spec.rb
@@ -379,6 +380,7 @@ files:
 - spec/arborist/observer_runner_spec.rb
 - spec/arborist/observer_spec.rb
 - spec/arborist/subscription_spec.rb
+- spec/arborist/tree_api_spec.rb
 - spec/arborist_spec.rb
 - spec/data/monitors/pings.rb
 - spec/data/monitors/port_checks.rb
@@ -408,12 +410,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Arborist is a monitoring toolkit that follows the UNIX philosophy of small