arborist 0.2.0.pre20170519125456 → 0.2.0

data/spec/arborist/node_subscription_spec.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env rspec -cfd
+
+require_relative '../spec_helper'
+
+require 'arborist/node_subscription'
+
+
+describe Arborist::NodeSubscription do
+
+
+	it "can be created with just a node" do
+		node = Arborist::Node.create( 'host', 'testy' )
+		expect( described_class.new(node) ).to be_a( described_class )
+	end
+
+
+	it "raises an error if called with no node" do
+		expect {
+			described_class.new
+		}.to raise_error( ArgumentError )
+	end
+
+
+	it "raises an error if called with something that doesn't handle events" do
+		expect {
+			described_class.new( "hi i'm a little teapot" )
+		}.to raise_error( NameError, /handle_event/ )
+	end
+
+
+	it "uses its node's identifier for its ID" do
+		node = Arborist::Node.create( 'host', 'testy' )
+		sub = described_class.new( node )
+
+		expect( sub.id ).to eq( 'testy-subscription' )
+	end
+
+
+	it "matches all events" do
+		node = Arborist::Node.create( 'host', 'testy' )
+		sub = described_class.new( node )
+		events = [
+			Arborist::Event.create( 'node_update', node ),
+			Arborist::Event.create( 'node_delta', node, status: ['up', 'down'] ),
+			Arborist::Event.create( 'node_update', node ),
+			Arborist::Event.create( 'node_quieted', node ),
+			Arborist::Event.create( 'node_acked', node )
+		]
+
+		expect( events ).to all( match sub )
+	end
+
+end
+

data/spec/arborist/observer/action_spec.rb

@@ -47,6 +47,12 @@ describe Arborist::Observer::Action do
 	end
 
 
+	it "continues through a misbehaving action" do
+		action = described_class.new { raise "boom" }
+		expect { action.handle_event(event) }.to_not raise_exception
+	end
+
+
 	context "without any other criteria" do
 
 		before( :each ) do

data/spec/arborist/observer_runner_spec.rb

@@ -14,9 +14,11 @@ describe Arborist::ObserverRunner do
 	before( :each ) do
 		$emails = []
 		$texts = []
+		Arborist::Node::Root.reset
 	end
 
 	after( :each ) do
+		Arborist::Node::Root.reset
 		$emails.clear
 		$texts.clear
 	end
@@ -105,7 +107,12 @@ describe Arborist::ObserverRunner do
 			thr = Thread.new { runner.run }
 			wait( 3 ).for { runner }.to be_running
 
-			expect( @manager.subscriptions.length ).to eq( runner.subscriptions.length )
+			# Count the manager's subs that have external (UUID) keys.
+			expected_sub_count = @manager.subscriptions.count do |key, sub|
+				Loggability[ Arborist ].debug "Counting %p: %p" % [ key, sub ]
+				key =~ /\A\p{XDigit}{8}-\p{XDigit}{4}-/
+			end
+			expect( runner.subscriptions.length ).to eq( expected_sub_count )
 
 			runner.simulate_signal( :TERM )
 			thr.join( 2 )

data/spec/arborist/tree_api_spec.rb

@@ -6,22 +6,125 @@ 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 encode a valid Tree API header and body into a message" do
+		result = described_class.encode( {version: 1}, foo: 'bar' )
+		expect( result ).to be_a( CZTop::Message )
 
-	it "can build a valid Tree API request message"
+		payload = result.frames.first.to_s
+		expect( payload ).to be_a_messagepacked( Array )
 
+		decoded = MessagePack.unpack( payload )
+		expect( decoded.first ).to eq({ 'version' => 1 })
+		expect( decoded.last ).to eq({ 'foo' => 'bar' })
+	end
+
+
+	it "can encode a valid Tree API header and a nil body into a message" do
+		result = described_class.encode( {version: 1}, nil )
+		expect( result ).to be_a( CZTop::Message )
+
+		payload = result.frames.first.to_s
+		expect( payload ).to be_a_messagepacked( Array )
+
+		decoded = MessagePack.unpack( payload )
+		expect( decoded.first ).to eq({ 'version' => 1 })
+		expect( decoded.last ).to be_nil
+	end
+
+
+	it "raises an exception if the header to encode isn't a Hash" do
+		expect {
+			described_class.encode( 1 )
+		}.to raise_error( Arborist::MessageError, /header is not a Map/i )
+	end
+
+
+	it "raises an exception if the body is invalid" do
+		expect {
+			described_class.encode( {version: 1}, ['foo'] )
+		}.to raise_error( Arborist::MessageError, /invalid message.*body must be/i )
+	end
+
+
+	it "can build a valid Tree API request message" do
+		result = described_class.request( :status )
+		expect( result ).to be_a( CZTop::Message )
+
+		payload = result.frames.first.to_s
+		expect( payload ).to be_a_messagepacked( Array )
+
+		decoded = MessagePack.unpack( payload )
+		expect( decoded.first ).to eq({
+			'version' => described_class::PROTOCOL_VERSION,
+			'action' => 'status'
+		})
+		expect( decoded.last ).to be_nil
+	end
 
-	it "can build a valid success response message"
-	it "can build a valid error response message"
 
+	it "can build a valid success response message" do
+		result = described_class.successful_response( foo: 'bar' )
+		expect( result ).to be_a( CZTop::Message )
+
+		payload = result.frames.first.to_s
+		expect( payload ).to be_a_messagepacked( Array )
+
+		decoded = MessagePack.unpack( payload )
+		expect( decoded.first ).to include( 'success' => true )
+		expect( decoded.last ).to eq({ 'foo' => 'bar' })
+	end
+
+
+	it "can build a valid error response message" do
+		result = described_class.error_response( 'category', 'reason' )
+		expect( result ).to be_a( CZTop::Message )
+
+		payload = result.frames.first.to_s
+		expect( payload ).to be_a_messagepacked( Array )
+
+		decoded = MessagePack.unpack( payload )
+		expect( decoded.first['success'] ).to eq( false )
+		expect( decoded.first['category'] ).to eq( 'category' )
+		expect( decoded.first['reason'] ).to eq( 'reason' )
+	end
+
+
+	it "can decode a header and payload from a valid request message" do
+		payload = [
+			{ 'version' => described_class::PROTOCOL_VERSION },
+			{ 'foo' => 'bar' }
+		]
+		msg = CZTop::Message.new( MessagePack.pack(payload) )
+
+		header, body = described_class.decode( msg )
+
+		expect( header ).to eq( payload.first )
+		expect( body ).to eq( payload.last )
+	end
 
-	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'"
+		it "from a different protocol version" do
+			payload = [
+				{ 'version' => described_class::PROTOCOL_VERSION.succ },
+				{ 'foo' => 'bar' }
+			]
+			msg = CZTop::Message.new( MessagePack.pack(payload) )
+
+			expect {
+				described_class.decode( msg )
+			}.to raise_error( Arborist::MessageError, /unknown protocol version/i )
+		end
+
+
+		it "that doesn't contain a valid MessagePack payload'" do
+			msg = CZTop::Message.new( 'some random junk' )
+
+			expect {
+				described_class.decode( msg )
+			}.to raise_error( Arborist::MessageError, /invalid message/i )
+		end
 
 	end
 

data/spec/data/monitors/pings.rb

@@ -59,17 +59,6 @@ Arborist::Monitor 'ping check' do
 	exec_callbacks( FPingWrapper )
 end
 
-Arborist::Monitor 'ping check downed hosts' do
-	every 40.seconds
-	splay 15.seconds
-	match type: 'host', status: 'down'
-	include_down true
-	use :addresses
-
-	exec 'fping', '-e', '-t', '150'
-	exec_callbacks( FPingWrapper )
-end
-
 Arborist::Monitor 'transient host pings' do
 	every 5.minutes
 	match type: 'host', tag: 'laptop'

data/spec/data/monitors/port_checks.rb

@@ -13,12 +13,3 @@ Arborist::Monitor 'port checks on all tcp services' do
 	exec( Arborist::Monitor::Socket::TCP )
 end
 
-Arborist::Monitor 'port checks on downed tcp services' do
-	every 10.seconds
-	match type: 'service', protocol: 'tcp', status: 'down'
-	include_down true
-	use :addresses, :port
-	exec( Arborist::Monitor::Socket::TCP )
-end
-
-

data/spec/data/nodes/sidonie.rb

@@ -17,6 +17,7 @@ Arborist::Host 'sidonie' do
 	service 'ssh'
 	service 'demon-http', port: 6666, protocol: 'http'
 	service 'postgresql'
+	service 'iscsi', port: 860, protocol: 'udp'
 
 	service 'smtp'
 

data/spec/data/nodes/vhosts.rb

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'arborist'
+
+Arborist::Host 'vhost01' do
+	parent 'duir'
+	description "Virtual Host server"
+	address '192.168.16.75'
+
+	tags :infrastructure
+
+	depends_on 'sidonie-iscsi'
+end
+
+
+Arborist::Host 'sandbox01' do
+	parent 'vhost01'
+	description "Scratch copy-on-write server for experiments"
+
+	service 'canary', port: 12131, protocol: 'udp'
+end
+

data/spec/data/nodes/yevaud.rb

@@ -13,11 +13,13 @@ Arborist::Host 'yevaud' do
 	tags :laptop,
 	     :developer
 
+	service 'ntp'
 	service 'ssh'
 	service 'rabbitmq', app_protocol: 'amqp'
-	service 'postgresql'
 
-	service 'cozy_frontend',       port: 3000, app_protocol: 'http'
+	service 'cozy_frontend',       port: 3000, app_protocol: 'http' do
+		depends_on 'sidonie-postgresql', 'yevaud-rabbitmq'
+	end
 	service 'cozy_admin_frontend', port: 4331, app_protocol: 'http'
 	service 'cozy_services',       port: 8888, app_protocol: 'http'
 	service 'cozy_admin_services', port: 8889, app_protocol: 'http'

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@
 require 'pathname'
 require 'simplecov' if ENV['COVERAGE']
 require 'rspec'
+require 'rspec/wait'
 require 'loggability/spechelpers'
 require 'msgpack'
 
@@ -30,6 +31,52 @@ RSpec::Matchers.define( :match_criteria ) do |criteria|
 end
 
 
+class BeMessagepacked
+
+	def initialize( expected_type )
+		@expected_type = expected_type
+		@actual_value = nil
+		@decoded = nil
+		@exception = nil
+	end
+
+
+	def matches?( actual_value )
+		@actual_value = actual_value
+		@decoded = MessagePack.unpack( actual_value )
+		return @decoded.is_a?( @expected_type )
+	rescue => err
+		@exception = err
+		return false
+	end
+
+
+	def failure_reason
+		if @exception && @exception.is_a?( MessagePack::MalformedFormatError )
+			return "it was not formatted correctly: %s" % [ @exception.message ]
+		elsif @exception
+			return "there was a %p when trying to decode it: %s" %
+				[ @exception.class, @exception.message ]
+		elsif @decoded && !@decoded.is_a?( @expected_type )
+			return "it was a msgpacked %p" % [ @decoded.class ]
+		else
+			return 'there was an unknown problem'
+		end
+	end
+
+
+	def failure_message
+		"expected %p to be a msgpacked %p but %s" % [ @actual_value, @expected_type, self.failure_reason ]
+	end
+
+
+	def failure_message_when_negated
+		"expected %p not to be a msgpacked %p, but it was" % [ @actual_value, @actual_value ]
+	end
+
+end
+
+
 module Arborist::TestConstants
 	SPEC_DIR = Pathname( __FILE__ ).dirname
 	SPEC_DATA_DIR = SPEC_DIR + 'data'
@@ -79,7 +126,7 @@ module Arborist::TestHelpers
 	#
 
 	def node_subclass
-		@node_subclass ||= Class.new( Arborist::Node )
+		return TestNode
 	end
 
 
@@ -89,6 +136,29 @@ module Arborist::TestHelpers
 		return node
 	end
 
+
+	def node_hierarchy( root, *children )
+		root = node_subclass.new( root ) unless root.is_a?( Arborist::Node )
+
+		children.each do |child|
+			child.parent( root.identifier )
+			root.add_child( child )
+		end
+
+		return root
+	end
+
+
+	#
+	# Expectations
+	#
+
+	### Set an expectation that the receiving value is an instance of the
+	### +expected_class+ that's been encoded with msgpack.
+	def be_a_messagepacked( expected_class )
+		return BeMessagepacked.new( expected_class )
+	end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre20170519125456
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Granger
@@ -9,8 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- certs/ged.pem
-date: 2017-05-19 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
+  HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+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
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+  vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+  dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+  DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+  MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+  7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+  st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+  X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+  OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
+  -----END CERTIFICATE-----
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schedulability
@@ -74,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -139,19 +165,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: tty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: tty-tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: pry
   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: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -256,14 +310,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: state_machines-graphviz
+  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: '4.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -282,8 +350,6 @@ description: |-
   Arborist is a monitoring toolkit that follows the UNIX philosophy
   of small parts and loose coupling for stability, reliability, and
   customizability.
-
-  [![Build Status](https://semaphoreci.com/api/v1/projects/13677b60-5f81-4e6e-a9c6-e21d30daa4ca/461532/badge.svg)](https://semaphoreci.com/ged/arborist)
 email:
 - ged@FaerieMUD.org
 - mahlon@martini.nu
@@ -291,38 +357,30 @@ executables:
 - arborist
 extensions: []
 extra_rdoc_files:
-- Events.md
 - History.md
 - Manifest.txt
-- Monitors.md
-- Nodes.md
-- Observers.md
-- Protocol.md
 - README.md
 - TODO.md
-- Tutorial.md
 files:
 - ".document"
 - ".simplecov"
 - ChangeLog
-- Events.md
 - History.md
 - Manifest.txt
-- Monitors.md
-- Nodes.md
-- Observers.md
-- Protocol.md
 - README.md
 - Rakefile
 - TODO.md
-- Tutorial.md
 - bin/arborist
 - lib/arborist.rb
 - lib/arborist/cli.rb
 - lib/arborist/client.rb
+- lib/arborist/command/ack.rb
 - lib/arborist/command/client.rb
 - lib/arborist/command/config.rb
+- lib/arborist/command/reset.rb
 - lib/arborist/command/start.rb
+- lib/arborist/command/summary.rb
+- lib/arborist/command/tree.rb
 - lib/arborist/command/watch.rb
 - lib/arborist/dependency.rb
 - lib/arborist/event.rb
@@ -335,6 +393,7 @@ files:
 - lib/arborist/event/node_unknown.rb
 - lib/arborist/event/node_up.rb
 - lib/arborist/event/node_update.rb
+- lib/arborist/event/node_warn.rb
 - lib/arborist/event_api.rb
 - lib/arborist/exceptions.rb
 - lib/arborist/loader.rb
@@ -342,6 +401,7 @@ files:
 - lib/arborist/manager.rb
 - lib/arborist/mixins.rb
 - lib/arborist/monitor.rb
+- lib/arborist/monitor/connection_batching.rb
 - lib/arborist/monitor/socket.rb
 - lib/arborist/monitor_runner.rb
 - lib/arborist/node.rb
@@ -350,6 +410,7 @@ files:
 - lib/arborist/node/resource.rb
 - lib/arborist/node/root.rb
 - lib/arborist/node/service.rb
+- lib/arborist/node_subscription.rb
 - lib/arborist/observer.rb
 - lib/arborist/observer/action.rb
 - lib/arborist/observer/summarize.rb
@@ -375,6 +436,7 @@ files:
 - spec/arborist/node/root_spec.rb
 - spec/arborist/node/service_spec.rb
 - spec/arborist/node_spec.rb
+- spec/arborist/node_subscription_spec.rb
 - spec/arborist/observer/action_spec.rb
 - spec/arborist/observer/summarize_spec.rb
 - spec/arborist/observer_runner_spec.rb
@@ -389,6 +451,7 @@ files:
 - spec/data/nodes/localhost.rb
 - spec/data/nodes/sidonie.rb
 - spec/data/nodes/sub/duir.rb
+- spec/data/nodes/vhosts.rb
 - spec/data/nodes/yevaud.rb
 - spec/data/observers/auditor.rb
 - spec/data/observers/webservices.rb
@@ -410,14 +473,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Arborist is a monitoring toolkit that follows the UNIX philosophy of small
-  parts and loose coupling for stability, reliability, and customizability
+  parts and loose coupling for stability, reliability, and customizability.
 test_files: []