arborist 0.2.0.pre20170519125456 → 0.2.0

data/lib/arborist/node/ack.rb

@@ -51,7 +51,7 @@ class Arborist::Node::Ack
 
 
 	### Return the Ack as a Hash.
-	def to_h
+	def to_h( * )
 		return {
 			message: self.message,
 			sender: self.sender,

data/lib/arborist/node/host.rb

@@ -48,6 +48,10 @@ class Arborist::Node::Host < Arborist::Node
 	# The network address(es) of this Host as an Array of IPAddr objects
 	attr_reader :addresses
 
+	##
+	# An optional hostname.
+	dsl_accessor :hostname
+
 
 	### Set one or more node +attributes+. Supported attributes (in addition to
 	### those supported by Node) are: +addresses+.
@@ -56,7 +60,8 @@ class Arborist::Node::Host < Arborist::Node
 
 		super
 
-		if attributes['addresses']
+		self.hostname( attributes['hostname'] ) if attributes[ 'hostname' ]
+		if attributes[ 'addresses' ]
 			self.addresses.clear
 			Array( attributes['addresses'] ).each do |addr|
 				self.address( addr )
@@ -68,20 +73,30 @@ class Arborist::Node::Host < Arborist::Node
 	### Return the host's operational attributes.
 	def operational_values
 		properties = super
-		return properties.merge( addresses: self.addresses.map(&:to_s) )
+		return properties.merge(
+			hostname: @hostname,
+			addresses: self.addresses.map(&:to_s)
+		)
 	end
 
 
 	### Set an IP address of the host.
 	def address( new_address )
 		self.log.debug "Adding address %p to %p" % [ new_address, self ]
+
+		if new_address =~ /^[[:alnum:]][a-z0-9\-]+/i && ! @hostname
+			@hostname = new_address
+		end
+
 		@addresses += normalize_address( new_address )
+		@addresses.uniq!
 	end
 
 
 	### Returns +true+ if the node matches the specified +key+ and +val+ criteria.
 	def match_criteria?( key, val )
 		return case key
+			when 'hostname' then @hostname == val
 			when 'address'
 				search_addr = IPAddr.new( val )
 				@addresses.any? {|a| search_addr.include?(a) }
@@ -103,8 +118,11 @@ class Arborist::Node::Host < Arborist::Node
 	#
 
 	### Return a Hash of the host node's state.
-	def to_h
-		return super.merge( addresses: self.addresses.map(&:to_s) )
+	def to_h( * )
+		return super.merge(
+			hostname:  @hostname,
+			addresses: self.addresses.map(&:to_s)
+		)
 	end
 
 
@@ -113,13 +131,16 @@ class Arborist::Node::Host < Arborist::Node
 	def marshal_load( hash )
 		super
 		@addresses = hash[:addresses].map {|addr| IPAddr.new(addr) }
+		@hostname = hash[:hostname]
 	end
 
 
 	### Equality operator -- returns +true+ if +other_node+ is equal to the
 	### receiver. Overridden to also compare addresses.
 	def ==( other_host )
-		return super && other_host.addresses == self.addresses
+		return super &&
+			other_host.addresses == self.addresses &&
+			other_host.hostname == @hostname
 	end
 
 end # class Arborist::Node::Host

data/lib/arborist/node/resource.rb

@@ -27,7 +27,7 @@ class Arborist::Node::Resource < Arborist::Node
 	### Set service +attributes+.
 	def modify( attributes )
 		attributes = stringify_keys( attributes )
-				super
+		super
 		self.category( attributes['category'] )
 	end
 
@@ -36,7 +36,9 @@ class Arborist::Node::Resource < Arborist::Node
 	### monitor state.
 	def operational_values
 		return super.merge(
-			addresses: self.addresses.map( &:to_s )
+			addresses: self.addresses.map( &:to_s ),
+			hostname: self.hostname,
+			category: self.category
 		)
 	end
 
@@ -54,6 +56,12 @@ class Arborist::Node::Resource < Arborist::Node
 	end
 
 
+	### Delegate the resource's hostname to it's parent host.
+	def hostname
+		return @host.hostname
+	end
+
+
 	### Overridden to disallow modification of a Resource parent, as it needs a
 	### reference to the Host node for delegation.
 	def parent( new_parent=nil )
@@ -63,9 +71,10 @@ class Arborist::Node::Resource < Arborist::Node
 
 
 	### Serialize the resource node.  Return a Hash of the host node's state.
-	def to_h
+	def to_h( * )
 		return super.merge(
-			addresses: self.addresses.map( &:to_s )
+			addresses: self.addresses.map( &:to_s ),
+			category: self.category
 		)
 	end
 
@@ -78,7 +87,7 @@ class Arborist::Node::Resource < Arborist::Node
 				search_addr = IPAddr.new( val )
 				self.addresses.any? {|a| search_addr.include?(a) }
 			when 'category'
-				self.category == val
+				Array( val ).include?( self.category )
 			else
 				super
 			end

data/lib/arborist/node/root.rb

@@ -51,9 +51,18 @@ class Arborist::Node::Root < Arborist::Node
 	end
 
 
-	### Ignore updates to the root node.
-	def update( properties )
-		self.log.warn "Update to the root node ignored."
+	### Don't allow properties to be set on the root node.
+	def update( properties, monitor_key='_' )
+		return super( {} )
+	end
+
+
+	### Callback for when a node goes from disabled to unknown.
+	### Override, so we immediately transition from unknown to up.
+	def on_node_enabled( transition )
+		super
+		events = self.update( {} ) # up!
+		self.publish_events( events )
 	end
 
 

data/lib/arborist/node/service.rb

@@ -54,6 +54,19 @@ class Arborist::Node::Service < Arborist::Node
 	public
 	######
 
+	##
+	# Get/set the port the service binds to
+	dsl_accessor :port
+
+	##
+	# Get/set the application protocol the service uses
+	dsl_accessor :app_protocol
+
+	##
+	# Get/set the network protocol the service uses
+	dsl_accessor :protocol
+
+
 	### Set service +attributes+.
 	def modify( attributes )
 		attributes = stringify_keys( attributes )
@@ -66,27 +79,6 @@ class Arborist::Node::Service < Arborist::Node
 	end
 
 
-	### Get/set the port the service is bound to.
-	def port( new_port=nil )
-		return @port unless new_port
-		@port = new_port
-	end
-
-
-	### Get/set the (layer 7) protocol used by the service
-	def app_protocol( new_proto=nil )
-		return @app_protocol unless new_proto
-		@app_protocol = new_proto
-	end
-
-
-	### Get/set the transport layer protocol the service uses
-	def protocol( new_proto=nil )
-		return @protocol unless new_proto
-		@protocol = new_proto
-	end
-
-
 	### Set an IP address of the service. This must be one of the addresses of its
 	### containing host.
 	def address( new_address )
@@ -109,18 +101,28 @@ class Arborist::Node::Service < Arborist::Node
 	end
 
 
+	### Delegate the service's hostname to it's parent host.
+	def hostname
+		return @host.hostname
+	end
+
+
 	### Returns +true+ if the node matches the specified +key+ and +val+ criteria.
 	def match_criteria?( key, val )
 		self.log.debug "Matching %p: %p against %p" % [ key, val, self ]
+		array_val = Array( val )
 		return case key
 			when 'port'
-				val = default_port_for( val, @protocol ) unless val.is_a?( Fixnum )
-				self.port == val.to_i
+				vals = array_val.collect do |port|
+					port = default_port_for( port, @protocol ) unless port.is_a?( Integer )
+					port.to_i
+				end
+				vals.include?( self.port )
 			when 'address'
 				search_addr = IPAddr.new( val )
 				self.addresses.any? {|a| search_addr.include?(a) }
-			when 'protocol' then self.protocol == val.downcase
-			when 'app', 'app_protocol' then self.app_protocol == val
+			when 'protocol' then array_val.include?( self.protocol )
+			when 'app', 'app_protocol' then array_val.include?( self.app_protocol )
 			else
 				super
 			end
@@ -132,6 +134,7 @@ class Arborist::Node::Service < Arborist::Node
 	def operational_values
 		return super.merge(
 			addresses: self.addresses.map( &:to_s ),
+			hostname: self.hostname,
 			port: self.port,
 			protocol: self.protocol,
 			app_protocol: self.app_protocol,
@@ -161,7 +164,7 @@ class Arborist::Node::Service < Arborist::Node
 	#
 
 	### Return a Hash of the host node's state.
-	def to_h
+	def to_h( * )
 		return super.merge(
 			addresses: self.addresses.map(&:to_s),
 			protocol: self.protocol,

data/lib/arborist/node_subscription.rb

@@ -0,0 +1,65 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'arborist' unless defined?( Arborist )
+require 'arborist/subscription'
+
+
+# An inter-node event subscription
+class Arborist::NodeSubscription < Arborist::Subscription
+
+	### Create a new subscription object that will send events to the given
+	### +node+.
+	def initialize( node )
+		@node = node
+		super()
+	end
+
+
+	######
+	public
+	######
+
+	##
+	# The target node
+	attr_reader :node
+
+
+	### Return the identifier of the subscribed node.
+	def node_identifier
+		return self.node.identifier
+	end
+
+
+	### Return an ID derived from the node's identifier.
+	def generate_id
+		return "%s-subscription" % [ self.node_identifier ]
+	end
+
+
+	### Check the node to make sure it can handle published events.
+	def check_callback
+		raise NameError, "node doesn't implement handle_event" unless
+			self.node.respond_to?( :handle_event )
+	end
+
+
+	### Publish any of the specified +events+ which match the subscription.
+	def on_events( *events )
+		events.flatten.each do |event|
+			self.node.handle_event( event )
+		end
+	end
+
+
+	### Return a String representation of the object suitable for debugging.
+	def inspect
+		return "#<%p:%#x for the %s node>" % [
+			self.class,
+			self.object_id * 2,
+			self.node.identifier,
+		]
+	end
+
+
+end # class Arborist::NodeSubscription

data/lib/arborist/observer.rb

@@ -2,6 +2,7 @@
 #encoding: utf-8
 
 require 'arborist' unless defined?( Arborist )
+require 'arborist/client'
 
 
 # The Arborist entity responsible for observing changes to the tree and
@@ -124,6 +125,13 @@ class Arborist::Observer
 	end
 
 
+	### Return a client singleton for optional observer callbacks to the
+	### manager.
+	def client
+		return Arborist::Client.instance
+	end
+
+
 	#
 	# Observe Methods
 	#

data/lib/arborist/observer/action.rb

@@ -78,6 +78,12 @@ class Arborist::Observer::Action
 		else
 			self.block.call( event.dup )
 		end
+	rescue => err
+		self.log.error "Exception while running observer: %s: %s\n%s" % [
+			err.class.name,
+			err.message,
+			err.backtrace.join("\n  ")
+		]
 	ensure
 		self.event_history.clear
 	end

data/lib/arborist/subscription.rb

@@ -21,13 +21,13 @@ class Arborist::Subscription
 	### Instantiate a new Subscription object given an +event+ pattern
 	### and event +criteria+.
 	def initialize( event_type=nil, criteria={}, negative_criteria={}, &callback )
-		raise LocalJumpError, "requires a callback block" unless callback
-
 		@callback   = callback
 		@event_type = event_type
 		@criteria   = stringify_keys( criteria )
 		@negative_criteria = stringify_keys( negative_criteria )
 
+		self.check_callback
+
 		@id         = self.generate_id
 	end
 
@@ -59,9 +59,9 @@ class Arborist::Subscription
 	end
 
 
-	### Create an identifier for this subscription object.
-	def generate_id
-		return SecureRandom.uuid
+	### Check to make sure the subscription will function as it's set up.
+	def check_callback
+		raise LocalJumpError, "requires a callback block" unless self.callback
 	end
 
 
@@ -76,17 +76,6 @@ class Arborist::Subscription
 	end
 
 
-	### Returns +true+ if the receiver is interested in publishing the specified +event+.
-	def interested_in?( event )
-		self.log.debug "Testing %p against type = %p and criteria = %p but not %p" %
-			[ event, self.event_type, self.criteria, self.negative_criteria ]
-		rval = event.match( self )
-		self.log.debug "  event %s match." % [ rval ? "did" : "did NOT" ]
-		return rval
-	end
-	alias_method :is_interested_in?, :interested_in?
-
-
 	### Return a String representation of the object suitable for debugging.
 	def inspect
 		return "#<%p:%#x [%s] for %s events matching: %p %s-> %p>" % [
@@ -100,4 +89,21 @@ class Arborist::Subscription
 		]
 	end
 
+
+	### Create an identifier for this subscription object.
+	def generate_id
+		return SecureRandom.uuid
+	end
+
+
+	### Returns +true+ if the receiver is interested in publishing the specified +event+.
+	def interested_in?( event )
+		self.log.debug "Testing %p against type = %p and criteria = %p but not %p" %
+			[ event, self.event_type, self.criteria, self.negative_criteria ]
+		rval = event.match( self )
+		self.log.debug "  event %s match." % [ rval ? "did" : "did NOT" ]
+		return rval
+	end
+	alias_method :is_interested_in?, :interested_in?
+
 end # class Arborist::Subscription

data/lib/arborist/tree_api.rb

@@ -23,6 +23,10 @@ module Arborist::TreeAPI
 
 	### Return a CZTop::Message with a payload containing the specified +header+ and +body+.
 	def self::encode( header, body=nil )
+		raise Arborist::MessageError, "header is not a Map" unless
+			header.is_a?( Hash )
+
+		self.log.debug "Encoding header: %p with body: %p" % [ header, body ]
 		header = stringify_keys( header )
 		header['version'] = PROTOCOL_VERSION
 
@@ -31,6 +35,7 @@ module Arborist::TreeAPI
 
 		payload = MessagePack.pack([ header, body ])
 
+		self.log.debug "Making zmq message with payload: %p" % [ payload ]
 		return CZTop::Message.new( payload )
 	end
 
@@ -65,8 +70,8 @@ module Arborist::TreeAPI
 	### Return a CZTop::Message containing a TreeAPI request with the specified
 	### +verb+ and +data+.
 	def self::request( verb, *data )
-		header = data.shift || {}
-		body   = data.shift
+		body   = data.pop
+		header = data.pop || {}
 
 		header.merge!( action: verb )