arborist 0.0.1.pre20160829140603 → 0.0.1.pre20161005112841

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c13d6d8931471437945bbe16acd57fa7f17a01f8
-  data.tar.gz: 38d663d0f7fb9105727613bf61ff62a1496062f6
+SHA256:
+  metadata.gz: 6d6da185674a9541d85ebc47e6fdf1877a6b85930053cc655cff36cc5de74923
+  data.tar.gz: 15bccf69dd20c885fb1266ec75a1f0f8dfef122a174af87ab2018a0e24edc548
 SHA512:
-  metadata.gz: 49431289b8d44fc52f40cdf60062905666a6f9de12c7c6ff8bbfb04d62e2f782f084fd824df08271ed264b513953b23baae0ccf9b4fd36b390a5d4f072c5b07f
-  data.tar.gz: 436d3fadba15758c0e9bd12656ada1ef3b7c5471c4b8ccaba431e02e338cae3576e3acbd579ea5f440937ff1af7b4717f118b6d4723691913f320c05afb82565
+  metadata.gz: a5ecc7f5a93aba6b92b0e8b41cbdc206f1c3ddc54b01953174a125b22923222b95dcb9d14832cc4a9432ce4f92625b94e159ca3d5be15f120f18a22c66caadd2
+  data.tar.gz: 5dcd90e705e8aa8ad6992f6b5bfa625a45e6684d9b19bb7e5a13544a4e18ea40f0ff4eed478f8ad396d0902cbad09881d2d60de74bbb43fa28035be5fd398500

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+Lė�u��ֶ[��%��c�!&��X ��He���l�JJ�߂>-���	�K��(~2�<�T5l����w�����ݤW��t4�9��`A��c%����qfO-?�]-��`n�p��\�

data/ChangeLog

@@ -1,8 +1,105 @@
+2016-10-04  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/arborist/node.rb:
+	State transition cleanup: Only nodes in a 'down' state can
+	transition to 'acked'.
+	[eed40468bb5e] [tip]
+
+2016-10-03  Mahlon E. Smith  <mahlon@laika.com>
+
+	* lib/arborist/command/config.rb:
+	Require the manager when generating a default configuration file.
+	[d0c5ef20e6fd]
+
+2016-09-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* TODO.md, lib/arborist/node.rb, spec/arborist/node_spec.rb:
+	Fix the unknown => disabled transition when updating with an ACK
+	[30d2548e1308] [github/master]
+
+	* lib/arborist/manager.rb, spec/arborist/manager_spec.rb:
+	Flatten the config into one namespace
+
+	This fixes the manager's defaults, which were never actually used.
+	[ae18e761d06f]
+
+2016-09-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* TODO.md, lib/arborist/manager.rb, lib/arborist/node.rb,
+	spec/arborist/node_spec.rb:
+	Fix consequential event propagation/publication
+	[cdf3fb9d63c8]
+
+	* lib/arborist/dependency.rb, spec/arborist/dependency_spec.rb:
+	Clarify dependency "down reason" to not seem like a node state
+	[1f8f703940cb]
+
+	* lib/arborist/manager/tree_api.rb:
+	Stripped spammier debugging
+	[dc594799b7dc]
+
+	* Events.md:
+	Add description of event movement to Events.md
+	[bfee2016aa79]
+
+2016-09-21  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .rvmrc, lib/arborist/node.rb:
+	Add an event handler for disabled events, so nodes are properly
+	quieted when their secondary dependencies are disabled.
+	[d032e1820965]
+
+2016-09-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* arborist.gemspec, lib/arborist/monitor/socket.rb,
+	spec/arborist/monitor/socket_spec.rb:
+	Fix up the specs for getpeername socket monitor change
+	[f8c5bbc611b2]
+
+	* lib/arborist/monitor/socket.rb:
+	Make socket check use getpeername for testing non-blocking connect
+	[9715a6d9903f]
+
+2016-08-31  Michael Granger  <ged@FaerieMUD.org>
+
+	* Protocol.md, TODO.md, lib/arborist/client.rb, lib/arborist/event.rb,
+	lib/arborist/event/node.rb, lib/arborist/event/node_delta.rb,
+	lib/arborist/manager.rb, lib/arborist/manager/tree_api.rb,
+	lib/arborist/monitor.rb, lib/arborist/monitor/socket.rb,
+	lib/arborist/node.rb, lib/arborist/observer.rb,
+	lib/arborist/subscription.rb,
+	spec/arborist/event/node_delta_spec.rb,
+	spec/arborist/event/node_spec.rb,
+	spec/arborist/manager/tree_api_spec.rb,
+	spec/arborist/observer_spec.rb, spec/arborist/subscription_spec.rb:
+	Add exclusion to subscriptions
+	[23b84af1ebb4]
+
+	* arborist.gemspec, lib/arborist/manager/tree_api.rb,
+	lib/arborist/monitor/socket.rb, lib/arborist/node.rb,
+	spec/arborist/manager/tree_api_spec.rb:
+	Include all operational values in fetched nodes.
+
+	Also error more gracefully about non-eachable updates.
+	[a72fc8d43adc]
+
+	* lib/arborist/client.rb:
+	Rearrange some methods in the client
+	[106b17e27a3a]
+
 2016-08-29  Michael Granger  <ged@FaerieMUD.org>
 
+	* Rakefile, arborist.gemspec, certs/ged.pem:
+	Add public cert
+	[a7c6232586ad]
+
+	* Manifest.txt, arborist.gemspec:
+	Update the manifest with spec changes, rebuild gemspec.
+	[aec9f5ec88de]
+
 	* spec/data/nodes/duir.rb:
 	Merge with a5a6e5092024
-	[c961355d10c8] [tip]
+	[c961355d10c8]
 
 2016-08-29  Mahlon E. Smith  <mahlon@martini.nu>
 
@@ -33,7 +130,7 @@
 	- Restore ack+status of serialized nodes
 	- Allow services to set their own address when not bound to INADDR_ANY
 	- Finish separating node events from system events
-	[f853508dba8c] [github/master]
+	[f853508dba8c]
 
 	* lib/arborist/monitor/socket.rb:
 	Fix race to calculate select timeout in socket monitor

data/Events.md

@@ -18,3 +18,18 @@
     sys.hearbeat
 
 
+## Event Movement
+
+Propagation
+
+	events being sent up the tree to the root node
+
+Broadcast
+
+	events being sent down to node children
+
+Publishing
+
+	events being sent to subscriptions, including dependent nodes
+	triggered via propagation and broadcasting
+

data/Protocol.md

@@ -127,6 +127,9 @@ Fetch the `address`, `description`, and `status` of all nodes.
             include_down: true,
             return: [address, description, status]
         },
+
+Response
+
         {
             'theon' => {
                 address: '10.2.10.4',

data/Rakefile

@@ -1,5 +1,7 @@
 #!/usr/bin/env rake
 
+require 'rake/clean'
+
 begin
 	require 'hoe'
 rescue LoadError
@@ -89,10 +91,12 @@ file GEMSPEC => __FILE__ do |task|
 	spec.files.delete( 'LICENSE' )
 	spec.signing_key = nil
 	spec.version = "#{spec.version}.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	spec.cert_chain = [ 'certs/ged.pem' ]
 	File.open( task.name, 'w' ) do |fh|
 		fh.write( spec.to_ruby )
 	end
 end
+CLOBBER.include( GEMSPEC )
 
 task :default => :gemspec
 

data/TODO.md

@@ -3,18 +3,9 @@
 ## First Release (0.1)
 
 * README, Tutorial, Setup docs
-
 * Performance/profiling examination
 
 
-### Observers
-
-* Add `exclude` to observers DSL
-  * modify tree api to accept negative criteria to subscribe
-	* pass to manager's create_subscription()
-	* alter subscription to no-op if event matches negative stuff
-
-
 ### Monitor
 
 * Add some default monitor types and utilities
@@ -25,6 +16,8 @@
 
 * Write a gem for `fping` monitor 
 
+* Redo the select loop of the UDP socket monitor to wait for them in parallel instead of in series.
+
 
 ## Second Release (0.2)
 

data/lib/arborist/client.rb

@@ -37,6 +37,47 @@ class Arborist::Client
 	attr_accessor :event_api_url
 
 
+	#
+	# High-level methods
+	#
+
+	### Mark a node as 'acknowledged' if it's down, or 'disabled' if
+	### it's up.  (A pre-emptive acknowledgement.)  Requires the node
+	### +identifier+, an acknowledgement +message+, and +sender+.  You
+	### can optionally include a +via+ (source), and override the default
+	### +time+ of now.
+	def acknowledge( node, message, sender, via=nil, time=Time.now )
+		data = {
+			node => {
+				ack: {
+					message: message,
+					sender:  sender,
+					via:     via,
+					time:    time.to_s
+				}
+			}
+		}
+
+		return self.update( data )
+	end
+	alias_method :ack, :acknowledge
+
+
+	### Clear an acknowledged/disabled +node+.
+	def clear_acknowledgement( node )
+		data = { node => { ack: nil } }
+		request = self.make_update_request( data )
+		self.send_tree_api_request( request )
+		return true
+	end
+	alias_method :clear_ack, :clear_acknowledgement
+
+
+
+	#
+	# Protocol methods
+	#
+
 	### Return the manager's current status as a hash.
 	def status
 		request = self.make_status_request
@@ -85,40 +126,6 @@ class Arborist::Client
 	end
 
 
-	### Mark a node as 'acknowledged' if it's down, or 'disabled' if
-	### it's up.  (A pre-emptive acknowledgement.)  Requires the node
-	### +identifier+, an acknowledgement +message+, and +sender+.  You
-	### can optionally include a +via+ (source), and override the default
-	### +time+ of now.
-	def acknowledge( node, message, sender, via=nil, time=Time.now )
-		data = {
-			node => {
-				ack: {
-					message: message,
-					sender:  sender,
-					via:     via,
-					time:    time.to_s
-				}
-			}
-		}
-
-		request = self.make_update_request( data )
-		self.send_tree_api_request( request )
-		return true
-	end
-	alias_method :ack, :acknowledge
-
-
-	### Clear an acknowledged/disabled +node+.
-	def clear_acknowledgement( node )
-		data = { node => { ack: nil } }
-		request = self.make_update_request( data )
-		self.send_tree_api_request( request )
-		return true
-	end
-	alias_method :clear_ack, :clear_acknowledgement
-
-
 	### Update the identified nodes in the manager with the specified data.
 	def update( *args )
 		request = self.make_update_request( *args )
@@ -142,14 +149,14 @@ class Arborist::Client
 
 
 	### Make a subscription request for the specified +criteria+, +identifier+, and +event_type+.
-	def make_subscribe_request( criteria: {}, identifier: nil, event_type: nil )
+	def make_subscribe_request( criteria: {}, identifier: nil, event_type: nil, exclude: {} )
 		self.log.debug "Making subscription request for identifier: %p, event_type: %p, criteria: %p" %
 			[ identifier, event_type, criteria ]
 		header = {}
 		header[ :identifier ] = identifier if identifier
 		header[ :event_type ] = event_type
 
-		return self.pack_message( :subscribe, header, criteria )
+		return self.pack_message( :subscribe, header, [ criteria, exclude ] )
 	end
 
 
@@ -244,6 +251,9 @@ class Arborist::Client
 	end
 
 
+	#
+	# Utility methods
+	#
 
 	### Format ruby +data+ for communicating with the Arborist manager.
 	def pack_message( verb, *data )

data/lib/arborist/command/config.rb

@@ -12,6 +12,7 @@ module Arborist::CLI::Config
 	command :config do |cmd|
 
 		cmd.action do |globals, options, args|
+			require 'arborist/manager'
 			$stdout.puts Configurability.default_config.dump
 		end
 	end

data/lib/arborist/dependency.rb

@@ -231,15 +231,15 @@ class Arborist::Dependency
 		when :all
 			msg = ids.first.dup
 			if ids.size == 1
-				msg << " is down"
+				msg << " is unavailable"
 			else
-				msg << " (and %d other%s) are down" % [ ids.size - 1, ids.size == 2 ? '' : 's' ]
+				msg << " (and %d other%s) are unavailable" % [ ids.size - 1, ids.size == 2 ? '' : 's' ]
 			end
 
 			msg << " as of %s" % [ self.earliest_down_time ]
 
 		when :any
-			msg = "%s are all down" % [ ids.to_a.join(', ') ]
+			msg = "%s are all unavailable" % [ ids.to_a.join(', ') ]
 			msg << " as of %s" % [ self.latest_down_time ]
 
 		else

data/lib/arborist/event.rb

@@ -47,8 +47,10 @@ class Arborist::Event
 
 	### Match operator -- returns +true+ if the other object matches this event.
 	def match( object )
-		return object.respond_to?( :event_type ) &&
+		rval = object.respond_to?( :event_type ) &&
 		   ( object.event_type.nil? || object.event_type == self.type )
+		self.log.debug "Base node #match: %p" % [ rval ]
+		return rval
 	end
 	alias_method :=~, :match
 

data/lib/arborist/event/node.rb

@@ -24,9 +24,11 @@ class Arborist::Event::Node < Arborist::Event
 
 	### Returns +true+ if the specified +object+ matches this event.
 	def match( object )
-		return super &&
-			object.respond_to?( :criteria ) && self.node.matches?( object.criteria ) &&
-			( !object.respond_to?(:negative_criteria) || !self.node.matches?(object.negative_criteria) )
+		rval = super &&
+			self.node.matches?( object.criteria ) &&
+			!self.node.matches?( object.negative_criteria, if_empty: false )
+		self.log.debug "Node event #match: %p" % [ rval ]
+		return rval
 	end
 
 

data/lib/arborist/event/node_delta.rb

@@ -27,15 +27,22 @@ class Arborist::Event::NodeDelta < Arborist::Event::Node
 
 	### Returns +true+ if the specified +object+ matches this event.
 	def match( object )
-		return super &&
-			object.respond_to?( :criteria ) && self.delta_matches?( object.criteria )
+		rval = super &&
+			self.delta_matches?( object.criteria ) &&
+			!self.delta_matches?( object.negative_criteria, if_empty: false )
+		self.log.debug "Delta event #match: %p" % [ rval ]
+		return rval
 	end
 
 
 	### Returns +true+ if the 'delta' value of the specified +criteria+ (which
-	### must respond to .all?) matches the delta this event represents.
-	def delta_matches?( criteria )
-		delta_criteria = criteria['delta'] || {}
+	### must respond to .all?) matches the delta this event represents. If the specified
+	### criteria doesn't contain any `delta` criteria, the +default+ value is used instead.
+	def delta_matches?( criteria, if_empty: true )
+		self.log.debug "Delta matching %p (%p if empty)" % [ criteria, if_empty ]
+		delta_criteria = criteria['delta']
+		return if_empty if !delta_criteria || delta_criteria.empty?
+
 		self.log.debug "Matching event against delta criteria: %p" % [ delta_criteria ]
 
 		return delta_criteria.all? do |key, val|

data/lib/arborist/manager.rb

@@ -64,9 +64,7 @@ class Arborist::Manager
 
 	### Configurability API -- configure the manager
 	def self::configure( config=nil )
-		config ||= {}
-		config = self.defaults.merge( config[:manager] || {} )
-
+		config = self.defaults.merge( config || {} )
 		self.log.debug "Config is: %p" % [ config ]
 
 		self.state_file = config[:state_file] && Pathname( config[:state_file] )
@@ -731,8 +729,8 @@ class Arborist::Manager
 	### Create a subscription that publishes to the Manager's event publisher for
 	### the node with the specified +identifier+ and +event_pattern+, using the
 	### given +criteria+ when considering an event.
-	def create_subscription( identifier, event_pattern, criteria )
-		sub = Arborist::Subscription.new( event_pattern, criteria ) do |*args|
+	def create_subscription( identifier, event_pattern, criteria, negative_criteria={} )
+		sub = Arborist::Subscription.new( event_pattern, criteria, negative_criteria ) do |*args|
 			self.event_publisher.publish( *args )
 		end
 		self.subscribe( identifier, sub )
@@ -755,6 +753,11 @@ class Arborist::Manager
 		node.publish_events( *events )
 
 		if node.parent
+			self.log.debug "Propagating %d events from %s -> %s" % [
+				events.length,
+				node.identifier,
+				node.parent
+			]
 			parent = self.nodes[ node.parent ] or raise "couldn't find parent %p of node %p!" %
 				[ node.parent, node.identifier ]
 			self.propagate_events( parent, *events )