arborist 0.0.1.pre20160106113421 → 0.0.1.pre20160128152542

data/lib/arborist/client.rb

@@ -117,6 +117,22 @@ class Arborist::Client
 	end
 
 
+	### Remove a subscription
+	def unsubscribe( *args )
+		request = self.make_unsubscribe_request( *args )
+		response = self.send_tree_api_request( request )
+		return response
+	end
+
+
+	### Remove the subscription with the specified +subid+.
+	def make_unsubscribe_request( subid )
+		self.log.debug "Making unsubscribe request for subid: %s" % [ subid ]
+
+		return self.pack_message( :unsubscribe, subscription_id: subid )
+	end
+
+
 	### Send the packed +request+ via the Tree API socket, raise an error on
 	### unsuccessful response, and return the response body.
 	def send_tree_api_request( request )

data/lib/arborist/command/client.rb

@@ -0,0 +1,30 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'arborist/cli' unless defined?( Arborist::CLI )
+require 'arborist/client'
+
+# Command to start an interactive client session.
+module Arborist::CLI::Client
+	extend Arborist::CLI::Subcommand
+
+	desc 'Start an interactive client session'
+	long_desc <<-EOF
+	Starts a pry session in an Arborist::Client context.
+	EOF
+
+	command :client do |cmd|
+		cmd.action do |globals, options, args|
+			begin
+				require 'pry'
+			rescue LoadError
+				exit_now! "This command requires the 'pry' gem."
+			end
+
+			client = Arborist::Client.new
+			Pry.pry( client )
+		end
+	end
+
+end # module Arborist::CLI::Client
+

data/lib/arborist/command/config.rb

@@ -0,0 +1,20 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'arborist/cli' unless defined?( Arborist::CLI )
+
+
+# Command to dump a basic Arborist config file
+module Arborist::CLI::Config
+	extend Arborist::CLI::Subcommand
+
+	desc 'Dump a default Arborist config file'
+	command :config do |cmd|
+
+		cmd.action do |globals, options, args|
+			$stdout.puts Configurability.default_config.dump
+		end
+	end
+
+end # module Arborist::CLI::Clone
+

data/lib/arborist/command/start.rb

@@ -0,0 +1,60 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'arborist/cli' unless defined?( Arborist::CLI )
+
+
+# Command to start a Arborist daemon
+module Arborist::CLI::Start
+	extend Arborist::CLI::Subcommand
+
+	desc 'Start an Arborist daemon'
+	long_desc <<-EOF
+	Start the Arborist manager, observers, or monitors. The SOURCE is
+	passed to the loader to tell it where to load things from.
+	EOF
+
+	arg :DAEMON
+	arg :SOURCE
+
+	command :start do |cmd|
+
+		cmd.flag :loader, desc: "Specify a loader type to use.",
+			default_value: 'file'
+
+		cmd.action do |globals, options, args|
+			appname = args.shift
+			source  = args.shift
+
+			loader = Arborist::Loader.create( options.loader, source )
+			runner = case appname
+				when 'manager'
+					Arborist.manager_for( loader )
+				when 'monitors'
+					Arborist.monitor_runner_for( loader )
+				when 'observers'
+					Arborist.observer_runner_for( loader )
+				else
+					raise "Don't know how to start %p" % [ appname ]
+				end
+
+			unless_dryrun( "starting #{appname}" ) do
+				start( runner )
+			end
+		end
+	end
+
+
+	###############
+	module_function
+	###############
+
+	### Start the specified +runner+ instance after setting up the environment for
+	### it.
+	def start( runner )
+		$0 = runner.class.name
+		runner.run
+	end
+
+end # module Arborist::CLI::Start
+

data/lib/arborist/command/watch.rb

@@ -0,0 +1,88 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'msgpack'
+
+require 'arborist/cli' unless defined?( Arborist::CLI )
+require 'arborist/client'
+
+# Command to watch events in an Arborist manager.
+module Arborist::CLI::Watch
+	extend Arborist::CLI::Subcommand
+
+	desc 'Watch events in an Arborist manager'
+
+	command :watch do |cmd|
+		cmd.action do |globals, options, args|
+			client = Arborist::Client.new
+			subid  = client.subscribe( identifier: '_' )
+
+			sock = client.event_api
+			sock.subscribe( subid )
+			prompt.say "Subscription %p" % [ subid ]
+
+			begin
+				prompt.say "Watching for events on manager at %s" % [ client.event_api_url ]
+				loop do
+					msgsubid = sock.recv
+					raise "Partial write?!" unless sock.rcvmore?
+					raw_event = sock.recv
+
+					event = MessagePack.unpack( raw_event )
+					prompt.say "[%s] %s\n" % [
+						hl(Time.now.strftime('%Y-%m-%d %H:%M:%S %Z')).color(:dark, :white),
+						hl(dump_event( event )).color( :dark, :white )
+					]
+				end
+			ensure
+				client.unsubscribe( subid )
+			end
+		end
+	end
+
+
+	###############
+	module_function
+	###############
+
+	### Return a String representation of the specified +event+.
+	def dump_event( event )
+		event_type = event['type']
+		id = event['identifier']
+
+		case event_type
+		when 'node.update'
+			type, status, error = event['data'].values_at( *%w'type status error' )
+			return "%s updated: %s is %s%s" % [
+				hl( id ).color( :cyan ),
+				type,
+				hl( status ).color( status.to_sym ),
+				error ? " (#{error})" : ''
+			]
+		when 'node.delta'
+			pairs = diff_pairs( event['data'] )
+			return "%s delta, changes: %s" % [ hl( id ).color( :cyan ), pairs ]
+		else
+			return "%s event: %p" % [ hl(event_type).color(:dark, :white), event ]
+		end
+	end
+
+
+	### Return a string showing the differences in a delta event's change +data+.
+	def diff_pairs( data )
+		return data.collect do |key, pairs|
+			if pairs.is_a?( Hash )
+				diff_pairs( pairs )
+			else
+				val1, val2 = *pairs
+				"%s: %s -> %s" % [
+					hl( key ).color( :dark, :white ),
+					hl( val1 ).color( :yellow ),
+					hl( val2 ).color( :bold, :yellow )
+				]
+			end
+		end.join( hl(", ").color(:dark, :white) )
+	end
+
+end # module Arborist::CLI::Watch
+

data/lib/arborist/event/node_matching.rb

@@ -30,5 +30,10 @@ module Arborist::Event::NodeMatching
 	end
 
 
+	### Inject the node identifier into the generated hash.
+	def to_hash
+		return super.merge( identifier: self.node.identifier )
+	end
+
 end # module Arborist::Event::NodeMatching
 

data/lib/arborist/loader.rb

@@ -0,0 +1,43 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'pluggability'
+require 'arborist' unless defined?( Arborist )
+
+
+# Abstract base class for Arborist loader strategies
+class Arborist::Loader
+	extend Loggability,
+	       Pluggability
+
+
+	# Loggability API -- use the Arborist logger
+	log_to :arborist
+
+	# Pluggability API -- search for loaders under the specified path
+	plugin_prefixes 'arborist/loader'
+
+
+	### Return an Enumerator that yields Arborist::Nodes loaded from the target
+	### directory.
+	def nodes
+		raise NotImplementedError, "%p needs to implement #nodes"
+	end
+
+
+	### Return an Enumerator that yields Arborist::Monitors loaded from the target
+	### directory.
+	def monitors
+		raise NotImplementedError, "%p needs to implement #monitors"
+	end
+
+
+	### Return an Enumerator that yields Arborist::Observers loaded from the target
+	### directory.
+	def observers
+		raise NotImplementedError, "%p needs to implement #observers"
+	end
+
+
+end # class Arborist::Loader
+

data/lib/arborist/loader/file.rb

@@ -0,0 +1,72 @@
+# -*- ruby -*-
+#encoding: utf-8
+
+require 'arborist/loader' unless defined?( Arborist::Loader )
+
+
+# A loader for Arborist that knows how to load stuff from files on disk.
+class Arborist::Loader::File < Arborist::Loader
+
+	##
+	# The glob pattern to use for searching for files
+	FILE_PATTERN = '**/*.rb'
+
+
+	### Create a new loader that will read nodes from the specified +directory+.
+	def initialize( directory )
+		Arborist.load_all
+		@directory = directory
+	end
+
+
+	# The directory to load files from
+	attr_reader :directory
+
+
+	### Return an Enumerator
+	def paths
+		path = Pathname( self.directory )
+		if path.directory?
+			return Pathname.glob( directory + FILE_PATTERN ).each
+		else
+			return [ path ].each
+		end
+	end
+
+
+	### Return an Enumerator that yields Arborist::Nodes loaded from the target
+	### directory.
+	def nodes
+		return self.enumerator_for( Arborist::Node )
+	end
+
+
+	### Return an Enumerator that yields Arborist::Monitors loaded from the target
+	### directory.
+	def monitors
+		return self.enumerator_for( Arborist::Monitor )
+	end
+
+
+	### Return an Enumerator that yields Arborist::Observers loaded from the target
+	### directory.
+	def observers
+		return self.enumerator_for( Arborist::Observer )
+	end
+
+
+	### Return an Enumerator that will instantiate and yield instances of the specified
+	### +arborist_class+ for each file path in the loader's directory.
+	def enumerator_for( arborist_class )
+		return Enumerator.new do |yielder|
+			self.paths.each do |file|
+				objects = arborist_class.load( file )
+				objects.each do |object|
+					object.source = "file://%s" % [ file.expand_path ]
+					yielder.yield( object )
+				end
+			end
+		end
+	end
+
+end # class Arborist::Loader::File

data/lib/arborist/manager.rb

@@ -243,6 +243,7 @@ class Arborist::Manager
 		end
 	end
 
+
 	### Handle any queued signals.
 	def process_signal_queue
 		# Look for any signals that arrived and handle them
@@ -288,7 +289,7 @@ class Arborist::Manager
 	end
 
 
-	### Handle a USR1 signal. Writes a message to the log by default.
+	### Handle a USR1 signal. Writes a message to the log.
 	def on_user1_signal( signo )
 		self.log.info "Checkpoint: User signal."
 	end
@@ -436,7 +437,7 @@ class Arborist::Manager
 	### an Enumerator if no block is given.
 	def reachable_nodes( &block )
 		iter = self.enumerator_for( self.root ) do |node|
-			!node.down?
+			!(node.down? || node.disabled?)
 		end
 		return iter.each( &block ) if block
 		return iter
@@ -491,7 +492,7 @@ class Arborist::Manager
 	### Propagate one or more +events+ to the specified +node+ and its ancestors in the tree,
 	### publishing them to matching subscriptions belonging to the nodes along the way.
 	def propagate_events( node, *events )
-		self.log.debug "Propagating %d events to node %s" % [ events.length, node.identifier ]
+		self.log.info "Propagating %d events to node %s" % [ events.length, node.identifier ]
 		node.publish_events( *events )
 
 		if node.parent

data/lib/arborist/monitor.rb

@@ -55,14 +55,14 @@ class Arborist::Monitor
 		def exec_input( nodes, io )
 			return if io.closed?
 
-			nodes.each do |node|
-				self.log.debug "Serializing node properties for %s" % [ node.identifier ]
-				prop_map = node.properties.collect do |key, val|
+			nodes.each do |(identifier, data)|
+				self.log.debug "Serializing node properties for %s" % [ identifier ]
+				prop_map = data.collect do |key, val|
 					"%s=%s" % [key, Shellwords.escape(val)]
 				end
 
 				self.log.debug "  writing %d properties to %p" % [ prop_map.size, io ]
-				io.puts "%s %s" % [ node.identifier, prop_map.join(' ') ]
+				io.puts "%s %s" % [ identifier, prop_map.join(' ') ]
 				self.log.debug "  wrote the node to FD %d" % [ io.fileno ]
 			end
 
@@ -134,24 +134,9 @@ class Arborist::Monitor
 	end
 
 
-	### Return an iterator for all the monitor files in the specified +directory+.
-	def self::each_in( directory )
-		path = Pathname( directory )
-		paths = if path.directory?
-				Pathname.glob( directory + MONITOR_FILE_PATTERN )
-			else
-				[ path ]
-			end
-
-		return paths.flat_map do |file|
-			file_url = "file://%s" % [ file.expand_path ]
-			monitors = self.load( file )
-			self.log.debug "Loaded monitors %p..." % [ monitors ]
-			monitors.each do |monitor|
-				monitor.source = file_url
-			end
-			monitors
-		end
+	### Return an iterator for all the monitors supplied by the specified +loader+.
+	def self::each_in( loader )
+		return loader.monitors
 	end
 
 
@@ -371,6 +356,7 @@ class Arborist::Monitor
 	### Set the module to use for the callbacks when interacting with the executed
 	### external command.
 	def exec_callbacks( mod )
+		self.log.info "Setting exec callbacks handler to: %p" % [ mod.name ]
 		self.exec_callbacks_mod = mod
 	end