arborist 0.0.1.pre20160106113421 → 0.0.1.pre20160128152542

data/lib/arborist/node.rb

@@ -29,10 +29,6 @@ class Arborist::Node
 	# loaded.
 	LOADED_INSTANCE_KEY = :loaded_node_instances
 
-	##
-	# The glob pattern to use for searching for node
-	NODE_FILE_PATTERN = '**/*.rb'
-
 
 	##
 	# The struct for the 'ack' operational property
@@ -57,18 +53,25 @@ class Arborist::Node
 		state :unknown,
 			:up,
 			:down,
-			:acked
+			:acked,
+			:disabled
 
 		event :update do
-			transition any - [:acked] => :acked, if: :ack_set?
-			transition any - [:up] => :up, if: :last_contact_successful?
-			transition any - [:down, :acked] => :down, unless: :last_contact_successful?
+			transition [:down, :unknown, :acked] => :up, if: :last_contact_successful?
+			transition [:up, :unknown] => :down, unless: :last_contact_successful?
+			transition :down => :acked, if: :ack_set?
+			transition [:unknown, :up] => :disabled, if: :ack_set?
+			transition :disabled => :unknown, unless: :ack_set?
 		end
 
 		after_transition any => :acked, do: :on_ack
 		after_transition :acked => :up, do: :on_ack_cleared
 		after_transition :down => :up, do: :on_node_up
 		after_transition [:unknown, :up] => :down, do: :on_node_down
+		after_transition [:unknown, :up] => :disabled, do: :on_node_disabled
+		after_transition :disabled => :unknown, do: :on_node_enabled
+
+		after_transition any => any, do: :log_transition
 
 		after_transition do: :add_status_to_update_delta
 	end
@@ -100,6 +103,8 @@ class Arborist::Node
 	### them.
 	def self::add_loaded_instance( new_instance )
 		instances = Thread.current[ LOADED_INSTANCE_KEY ] or return
+		self.log.debug "Adding new instance %p to loaded instances %p" %
+			[ new_instance, instances ]
 		instances << new_instance
 	end
 
@@ -137,24 +142,9 @@ class Arborist::Node
 	end
 
 
-	### Return an iterator for all the node files in the specified +directory+.
-	def self::each_in( directory )
-		path = Pathname( directory )
-		paths = if path.directory?
-				Pathname.glob( directory + NODE_FILE_PATTERN )
-			else
-				[ path ]
-			end
-
-		return paths.flat_map do |file|
-			file_url = "file://%s" % [ file.expand_path ]
-			nodes = self.load( file )
-			self.log.debug "Loaded nodes %p..." % [ nodes ]
-			nodes.each do |node|
-				node.source = file_url
-			end
-			nodes
-		end
+	### Return an iterator for all the nodes supplied by the specified +loader+.
+	def self::each_in( loader )
+		return loader.nodes
 	end
 
 
@@ -323,8 +313,11 @@ class Arborist::Node
 		self.log.debug "Updated: %p" % [ new_properties ]
 
 		self.last_contacted = Time.now
-		self.error          = new_properties.delete( 'error' )
-		self.ack            = new_properties.delete( 'ack' ) if new_properties.key?( 'ack' )
+		if new_properties.key?( 'ack' )
+			self.ack = new_properties.delete( 'ack' )
+		else
+			self.error = new_properties.delete( 'error' )
+		end
 
 		self.properties.merge!( new_properties, &self.method(:merge_and_record_delta) )
 		compact_hash( self.properties )
@@ -504,6 +497,8 @@ class Arborist::Node
 			return "%s as of %s" % [ self.status.upcase, self.last_contacted ]
 		when 'acked'
 			return "ACKed by %s %s" % [ self.ack.sender, self.ack.time.as_delta ]
+		when 'disabled'
+			return "disabled by %s %s" % [ self.ack.sender, self.ack.time.as_delta ]
 		else
 			return "in an unknown state"
 		end
@@ -607,17 +602,21 @@ class Arborist::Node
 
 	### Ack the node with the specified +ack_data+, which should contain
 	def ack=( ack_data )
-		self.log.debug "ACKed with data: %p" % [ ack_data ]
-
-		ack_data['time'] ||= Time.now
-		ack_values = ack_data.values_at( *Arborist::Node::ACK.members.map(&:to_s) )
-		new_ack = Arborist::Node::ACK.new( *ack_values )
+		if ack_data
+			self.log.info "Node %s ACKed with data: %p" % [ self.identifier, ack_data ]
+			ack_data['time'] ||= Time.now
+			ack_values = ack_data.values_at( *Arborist::Node::ACK.members.map(&:to_s) )
+			new_ack = Arborist::Node::ACK.new( *ack_values )
+
+			if missing = ACK_REQUIRED_PROPERTIES.find {|prop| new_ack[prop].nil? }
+				raise "Missing required ACK attribute %s" % [ missing ]
+			end
 
-		if missing = ACK_REQUIRED_PROPERTIES.find {|prop| new_ack[prop].nil? }
-			raise "Missing required ACK attribute %s" % [ missing ]
+			@ack = new_ack
+		else
+			self.log.info "Node %s ACK cleared explicitly" % [ self.identifier ]
+			@ack = nil
 		end
-
-		@ack = new_ack
 	end
 
 
@@ -642,6 +641,13 @@ class Arborist::Node
 	# :section: State Callbacks
 	#
 
+	### Log every status transition
+	def log_transition( transition )
+		self.log.debug "Transitioned %s from %s to %s" %
+			[ self.identifier, transition.from, transition.to ]
+	end
+
+
 	### Callback for when an acknowledgement is set.
 	def on_ack( transition )
 		self.log.warn "ACKed: %s" % [ self.status_description ]
@@ -652,12 +658,14 @@ class Arborist::Node
 
 	### Callback for when an acknowledgement is cleared.
 	def on_ack_cleared( transition )
+		self.error = nil
 		self.log.warn "ACK cleared for %s" % [ self.identifier ]
 	end
 
 
 	### Callback for when a node goes from down to up
 	def on_node_up( transition )
+		self.error = nil
 		self.log.warn "%s is %s" % [ self.identifier, self.status_description ]
 	end
 
@@ -669,6 +677,18 @@ class Arborist::Node
 	end
 
 
+	### Callback for when a node goes from up to disabled
+	def on_node_disabled( transition )
+		self.log.warn "%s is %s" % [ self.identifier, self.status_description ]
+	end
+
+
+	### Callback for when a node goes from disabled to unknown
+	def on_node_enabled( transition )
+		self.log.warn "%s is %s" % [ self.identifier, self.status_description ]
+	end
+
+
 	### Add the transition from one state to another to the data used to build
 	### deltas for the #update event.
 	def add_status_to_update_delta( transition )

data/lib/arborist/observer.rb

@@ -61,27 +61,13 @@ class Arborist::Observer
 	end
 
 
-	### Return an iterator for all the observer files in the specified +directory+.
-	def self::each_in( directory )
-		path = Pathname( directory )
-		paths = if path.directory?
-				Pathname.glob( directory + OBSERVER_FILE_PATTERN )
-			else
-				[ path ]
-			end
-
-		return paths.flat_map do |file|
-			file_url = "file://%s" % [ file.expand_path ]
-			observers = self.load( file )
-			self.log.debug "Loaded observers %p..." % [ observers ]
-			observers.each do |observer|
-				observer.source = file_url
-			end
-			observers
-		end
+	### Return an iterator for all the observers supplied by the specified +loader+.
+	def self::each_in( loader )
+		return loader.observers
 	end
 
 
+
 	### Create a new Observer with the specified +description+.
 	def initialize( description, &block )
 		@description = description

data/spec/arborist/client_spec.rb

@@ -109,7 +109,7 @@ describe Arborist::Client do
 		end
 
 
-		it "can update the properties of managed nodes" do
+		it "can update the properties of managed nodes", :no_ci do
 			client.update( duir: { ping: {rtt: 24} } )
 
 			expect( manager.nodes['duir'].properties ).to include( 'ping' )

data/spec/arborist/manager/tree_api_spec.rb

@@ -424,6 +424,7 @@ describe Arborist::Manager::TreeAPI, :testing_manager do
 			manager.create_subscription( nil, 'node.delta', {type: 'host'} )
 		end
 
+
 		it "removes the subscription with the specified ID" do
 			msg = pack_message( :unsubscribe, {subscription_id: subscription.id}, nil )
 

data/spec/arborist/manager_spec.rb

@@ -239,21 +239,32 @@ describe Arborist::Manager do
 			expect( manager.nodes[ 'host_a' ] ).to be_down
 			manager.nodes[ 'host_c' ].update( error: "gamma rays" )
 			expect( manager.nodes[ 'host_c' ] ).to be_down
+			manager.nodes[ 'host_b_nfs' ].
+				update( ack: {sender: 'nancy_kerrigan', message: 'bad case of disk rot'} )
+			expect( manager.nodes[ 'host_b_nfs' ] ).to be_disabled
+			expect( manager.nodes[ 'host_b_nfs' ] ).to_not be_down
 
 			iter = manager.reachable_nodes
 
 			expect( iter ).to be_a( Enumerator )
 
-			nodes = iter.to_a
-			expect( nodes.size ).to eq( 6 )
-			expect( nodes.map(&:identifier) ).to include(
+			nodes = iter.map( &:identifier )
+			expect( nodes ).to include(
 				"_",
 				"router",
 				"host_b",
 				"host_b_www",
-				"host_b_nfs",
 				"host_b_ssh"
 			)
+			expect( nodes ).to_not include(
+				"host_b_nfs",
+				"host_c",
+				"host_c_www",
+				"host_a",
+				'host_a_www',
+				'host_a_smtp',
+				'host_a_imap'
+			)
 		end
 
 

data/spec/arborist/monitor_spec.rb

@@ -25,7 +25,11 @@ describe Arborist::Monitor do
 	end
 
 
-	let( :testing_nodes ) {[ trunk_node, branch_node, leaf_node ]}
+	let( :testing_nodes ) {{
+		'trunk' => trunk_node.to_hash,
+		'branch' => branch_node.to_hash,
+		'leaf' => leaf_node.to_hash
+	}}
 
 
 	it "can be created with just a description" do
@@ -112,7 +116,7 @@ describe Arborist::Monitor do
 
 		output = mon.run( testing_nodes )
 		expect( output ).to be_a( Hash )
-		expect( output ).to include( *(testing_nodes.map(&:identifier)) )
+		expect( output ).to include( *(testing_nodes.keys) )
 	end
 
 
@@ -159,7 +163,7 @@ describe Arborist::Monitor do
 			exec_input {|*| }
 			exec_arguments do |nodes|
 				Loggability[ Arborist ].debug "In the argument-builder."
-				nodes.map {|n| n.identifier }
+				nodes.keys
 			end
 		end
 
@@ -183,7 +187,7 @@ describe Arborist::Monitor do
 			exec 'cat'
 
 			exec_input do |nodes, writer|
-				writer.puts( nodes.map(&:identifier) )
+				writer.puts( nodes.keys )
 			end
 			handle_results do |pid, out, err|
 				return out.readlines.map( &:chomp )
@@ -192,7 +196,7 @@ describe Arborist::Monitor do
 
 		results = mon.run( testing_nodes )
 
-		expect( results ).to eq( testing_nodes.map(&:identifier) )
+		expect( results ).to eq( testing_nodes.keys )
 	end
 
 
@@ -203,7 +207,7 @@ describe Arborist::Monitor do
 
 			exec_arguments {|*| }
 			exec_input do |nodes, writer|
-				writer.puts( nodes.map(&:identifier) )
+				writer.puts( nodes.keys )
 			end
 			handle_results do |pid, out, err|
 				out.readlines.map( &:chomp ).map( &:upcase )
@@ -212,7 +216,7 @@ describe Arborist::Monitor do
 
 		results = mon.run( testing_nodes )
 
-		expect( results ).to eq( testing_nodes.map(&:identifier).map(&:upcase) )
+		expect( results ).to eq( testing_nodes.keys.map(&:upcase) )
 	end
 
 
@@ -220,7 +224,7 @@ describe Arborist::Monitor do
 		the_module = Module.new do
 
 			def exec_input( nodes, writer )
-				writer.puts( nodes.map {|n| n.identifier } )
+				writer.puts( nodes.keys )
 			end
 
 			def handle_results( pid, out, err )
@@ -241,7 +245,7 @@ describe Arborist::Monitor do
 
 		expect( results ).to be_a( Hash )
 		expect( results.size ).to eq( 3 )
-		expect( results ).to include( *testing_nodes.map(&:identifier) )
+		expect( results ).to include( *testing_nodes.keys )
 		expect( results['trunk'] ).to eq({ echoed: 'yep' })
 		expect( results['branch'] ).to eq({ echoed: 'yep' })
 		expect( results['leaf'] ).to eq({ echoed: 'yep' })

data/spec/arborist/node_spec.rb

@@ -145,11 +145,39 @@ describe Arborist::Node do
 				expect( node ).to be_acked
 			end
 
-			it "transitions to `up` from `acked` status if it's updated with an `ack` property" do
-				node.update( ack: {message: "Maintenance", sender: 'mahlon'}, error: "Offlined"  )
-				node.update( ping_time: 0.02 )
+			it "transitions to `disabled` from `up` status if it's updated with an `ack` property" do
+				node.status = 'up'
+				node.update( ack: {message: "Maintenance", sender: 'mahlon'} )
 
-				expect( node ).to be_up
+				expect( node ).to be_disabled
+			end
+
+			it "stays `disabled` if it gets an error" do
+				node.status = 'up'
+				node.update( ack: {message: "Maintenance", sender: 'mahlon'} )
+				node.update( error: "take me to the virus hospital" )
+
+				expect( node ).to be_disabled
+				expect( node.ack ).to_not be_nil
+			end
+
+			it "stays `disabled` if it gets a successful update" do
+				node.status = 'up'
+				node.update( ack: {message: "Maintenance", sender: 'mahlon'} )
+				node.update( ping: {time: 0.02} )
+
+				expect( node ).to be_disabled
+				expect( node.ack ).to_not be_nil
+			end
+
+			it "transitions to `unknown` from `disabled` status if its ack is cleared" do
+				node.status = 'up'
+				node.update( ack: {message: "Maintenance", sender: 'mahlon'} )
+				node.update( ack: nil )
+
+				expect( node ).to_not be_disabled
+				expect( node ).to be_unknown
+				expect( node.ack ).to be_nil
 			end
 
 		end
@@ -307,8 +335,9 @@ describe Arborist::Node do
 
 
 			it "an ACKed node stays ACKed when reconstituted" do
-				node.update(ack: {
-					message: 'We know about the fire.  It rages on.',
+				node.update( error: "there's a fire" )
+				node.update( ack: {
+					message: 'We know about the fire. It rages on.',
 					sender: '1986 Labyrinth David Bowie'
 				})
 				cloned_node = concrete_class.from_hash( node.to_hash )
@@ -409,6 +438,7 @@ describe Arborist::Node do
 
 
 		it "generates a node.acked event when a node is acked" do
+			node.update( error: 'ping failed ')
 			events = node.update(ack: {
 				message: "I have a poisonous friend. She's living in the house.",
 				sender: 'Seabound'

data/spec/arborist_spec.rb

@@ -10,14 +10,16 @@ describe Arborist do
 
 	before( :all ) do
 		@original_config_env = ENV[Arborist::CONFIG_ENV]
-		@data_dir = Pathname( __FILE__ ).dirname + 'data'
-		@nodes_dir = @data_dir + 'nodes'
 	end
 
 	before( :each ) do
 		ENV.delete(Arborist::CONFIG_ENV)
 	end
 
+	after( :each ) do
+		Arborist::Node::Root.reset
+	end
+
 	after( :all ) do
 		ENV[Arborist::CONFIG_ENV] = @original_config_env
 	end
@@ -28,7 +30,7 @@ describe Arborist do
 	end
 
 
-	describe "configurability" do
+	describe "configurability", log: :fatal do
 
 		before( :each ) do
 			Configurability.configure_objects( Configurability.default_config )
@@ -133,8 +135,37 @@ describe Arborist do
 	end
 
 
-	it "can load all nodes in a directory and return a manager for them" do
-		expect( described_class.manager_for(@nodes_dir) ).to be_a( Arborist::Manager )
+	it "can construct a Manager for all nodes provided by a Loader" do
+		loader = instance_double( Arborist::Loader )
+		expect( loader ).to receive( :nodes ).and_return([
+			testing_node('trunk'),
+			testing_node('branch', 'trunk'),
+			testing_node('leaf', 'branch')
+		])
+
+		expect( described_class.manager_for(loader) ).to be_a( Arborist::Manager )
+	end
+
+
+	it "can construct a MonitorRunner for all monitors provided by a Loader" do
+		loader = instance_double( Arborist::Loader )
+		expect( loader ).to receive( :monitors ).and_return([
+			:a_monitor,
+			:another_monitor
+		])
+
+		expect( described_class.monitor_runner_for(loader) ).to be_a( Arborist::MonitorRunner )
+	end
+
+
+	it "can construct an ObserverRunner for all observers provided by a Loader" do
+		loader = instance_double( Arborist::Loader )
+		expect( loader ).to receive( :observers ).and_return([
+			:an_observer,
+			:another_observer
+		])
+
+		expect( described_class.observer_runner_for(loader) ).to be_a( Arborist::ObserverRunner )
 	end