arborist 0.0.1.pre20161005182540 → 0.1.0

data/spec/arborist/monitor_runner_spec.rb

@@ -19,9 +19,9 @@ describe Arborist::MonitorRunner do
 
 	let( :monitor_class ) { Class.new(Arborist::Monitor) }
 
-	let( :mon1 ) { monitor_class.new("testing monitor1") }
-	let( :mon2 ) { monitor_class.new("testing monitor2") { splay 10 } }
-	let( :mon3 ) { monitor_class.new("testing monitor3") }
+	let( :mon1 ) { monitor_class.new("testing monitor1", :testing) }
+	let( :mon2 ) { monitor_class.new("testing monitor2", :testing) { splay 10 } }
+	let( :mon3 ) { monitor_class.new("testing monitor3", :testing) }
 	let( :monitors ) {[ mon1, mon2, mon3 ]}
 
 
@@ -146,6 +146,35 @@ describe Arborist::MonitorRunner do
 
 		end
 
+
+		it "manages the communication between the monitor and the manager" do
+			monitor = Arborist::Monitor.new do
+				description 'test monitor'
+				key :test
+				every 20
+				match type: 'host'
+				use :addresses
+				exec 'fping', '-e', '-t', '150'
+			end
+			nodes = { 'test1' => {}, 'test2' => {} }
+			monitor_results = { 'test1' => {ping: {rtt: 1}}, 'test2' => {ping: {rtt: 8}} }
+
+			expect( handler ).to receive( :fetch ).
+				with( {type: 'host'}, false, [:addresses], {} ).
+				and_yield( nodes )
+
+			expect( monitor ).to receive( :run ).with( nodes ).
+				and_return( monitor_results )
+
+			expect( handler ).to receive( :update ).
+				with({
+					"test1"=>{:ping=>{:rtt=>1}, "_monitor_key"=>:test},
+					"test2"=>{:ping=>{:rtt=>8}, "_monitor_key"=>:test}
+				})
+
+			handler.run_monitor( monitor )
+		end
+
 	end
 
 end

data/spec/arborist/monitor_spec.rb

@@ -32,10 +32,11 @@ describe Arborist::Monitor do
 	}}
 
 
-	it "can be created with just a description" do
-		mon = described_class.new( "the description" )
+	it "can be created with just a description and key" do
+		mon = described_class.new( "the description", :key )
 		expect( mon ).to be_a( described_class )
 		expect( mon.description ).to eq( "the description" )
+		expect( mon.key ).to eq( :key )
 		expect( mon.include_down? ).to be_falsey
 		expect( mon.interval ).to eq( Arborist::Monitor::DEFAULT_INTERVAL )
 		expect( mon.splay ).to eq( 0 )
@@ -45,9 +46,75 @@ describe Arborist::Monitor do
 	end
 
 
+	it "can be created with just a description and key set in the block" do
+		mon = described_class.new do
+			description "the description"
+			key :key
+		end
+
+		expect( mon ).to be_a( described_class )
+		expect( mon.description ).to eq( "the description" )
+		expect( mon.key ).to eq( :key )
+		expect( mon.include_down? ).to be_falsey
+		expect( mon.interval ).to eq( Arborist::Monitor::DEFAULT_INTERVAL )
+		expect( mon.splay ).to eq( 0 )
+		expect( mon.positive_criteria ).to be_empty
+		expect( mon.negative_criteria ).to be_empty
+		expect( mon.node_properties ).to be_empty
+	end
+
+
+	it "can be created with description set in the constructor and key in the block" do
+		mon = described_class.new( "the description" ) do
+			key :key
+		end
+
+		expect( mon ).to be_a( described_class )
+		expect( mon.description ).to eq( "the description" )
+		expect( mon.key ).to eq( :key )
+		expect( mon.include_down? ).to be_falsey
+		expect( mon.interval ).to eq( Arborist::Monitor::DEFAULT_INTERVAL )
+		expect( mon.splay ).to eq( 0 )
+		expect( mon.positive_criteria ).to be_empty
+		expect( mon.negative_criteria ).to be_empty
+		expect( mon.node_properties ).to be_empty
+	end
+
+
+	it "can be created with a DSL function" do
+		mon = Arborist::Monitor( "the description", :the_key )
+
+		expect( mon ).to be_a( described_class )
+		expect( mon.description ).to eq( "the description" )
+		expect( mon.key ).to eq( :the_key )
+		expect( mon.include_down? ).to be_falsey
+		expect( mon.interval ).to eq( Arborist::Monitor::DEFAULT_INTERVAL )
+		expect( mon.splay ).to eq( 0 )
+		expect( mon.positive_criteria ).to be_empty
+		expect( mon.negative_criteria ).to be_empty
+		expect( mon.node_properties ).to be_empty
+	end
+
+
+	it "raises a ConfigError if constructed without a description" do
+		expect {
+			described_class.new do
+				key :key
+			end
+		}.to raise_error( Arborist::ConfigError, /no description/i )
+	end
+
+
+	it "raises a ConfigError if constructed without a key" do
+		expect {
+			described_class.new( "the description" )
+		}.to raise_error( Arborist::ConfigError, /no key/i )
+	end
+
+
 	it "yields itself to the provided block for the DSL" do
 		block_self = nil
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			block_self = self
 		end
 
@@ -56,7 +123,7 @@ describe Arborist::Monitor do
 
 
 	it "can specify an interval" do
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			every 30
 		end
 
@@ -65,7 +132,7 @@ describe Arborist::Monitor do
 
 
 	it "can specify a splay" do
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			splay 15
 		end
 
@@ -74,7 +141,7 @@ describe Arborist::Monitor do
 
 
 	it "can specify criteria for matching nodes to monitor" do
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			match type: 'host'
 		end
 
@@ -83,7 +150,7 @@ describe Arborist::Monitor do
 
 
 	it "can specify criteria for matching nodes not to monitor" do
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			exclude tag: 'laptop'
 		end
 
@@ -91,8 +158,17 @@ describe Arborist::Monitor do
 	end
 
 
+	it "automatically includes 'down' nodes if the matcher specifies an unreachable state" do
+		mon = described_class.new( "testing monitor", :testing ) do
+			match status: 'down'
+		end
+
+		expect( mon.include_down? ).to be_truthy
+	end
+
+
 	it "can specify that it will include hosts marked as 'down'" do
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			include_down true
 		end
 
@@ -101,7 +177,7 @@ describe Arborist::Monitor do
 
 
 	it "can specify one or more properties to include in the input to the monitor" do
-		mon = described_class.new( "testing monitor" ) do
+		mon = described_class.new( "testing monitor", :testing ) do
 			use :address, :tags
 		end
 
@@ -110,7 +186,7 @@ describe Arborist::Monitor do
 
 
 	it "can specify a command to exec to do the monitor's work" do
-		mon = described_class.new( "the description" ) do
+		mon = described_class.new( "the description", :testing ) do
 			exec 'cat'
 		end
 
@@ -123,7 +199,7 @@ describe Arborist::Monitor do
 	it "can specify a block to call to do the monitor's work" do
 		block_was_run = false
 
-		mon = described_class.new( "the description" )
+		mon = described_class.new( "the description", :testing )
 		mon.exec do |nodes|
 			block_was_run = true
 		end
@@ -145,7 +221,7 @@ describe Arborist::Monitor do
 		end
 
 
-		mon = described_class.new( "the description" )
+		mon = described_class.new( "the description", :testing )
 		mon.exec( mod )
 
 		mon.run( testing_nodes )
@@ -155,7 +231,7 @@ describe Arborist::Monitor do
 
 
 	it "can provide a function for building arguments for its command" do
-		mon = described_class.new( "the description" ) do
+		mon = described_class.new( "the description", :testing ) do
 
 			exec 'the_command'
 
@@ -182,7 +258,7 @@ describe Arborist::Monitor do
 
 
 	it "handles system call errors while running the monitor command" do
-		mon = described_class.new( "the description" ) do
+		mon = described_class.new( "the description", :testing ) do
 
 			exec 'the_command'
 
@@ -205,7 +281,7 @@ describe Arborist::Monitor do
 
 
 	it "can provide a function for providing input to its command" do
-		mon = described_class.new( "the description" ) do
+		mon = described_class.new( "the description", :testing ) do
 
 			exec 'cat'
 
@@ -224,7 +300,7 @@ describe Arborist::Monitor do
 
 
 	it "can provide a function for parsing its command's output" do
-		mon = described_class.new( "the description" ) do
+		mon = described_class.new( "the description", :testing ) do
 
 			exec 'cat'
 
@@ -259,7 +335,7 @@ describe Arborist::Monitor do
 
 		end
 
-		mon = described_class.new( "the description" ) do
+		mon = described_class.new( "the description", :testing ) do
 			exec 'cat'
 			exec_callbacks( the_module )
 		end

data/spec/arborist/node_spec.rb

@@ -156,7 +156,6 @@ describe Arborist::Node do
 			expect( node ).to_not have_children
 		end
 
-
 		describe "status" do
 
 			it "starts out in `unknown` status" do
@@ -177,7 +176,7 @@ describe Arborist::Node do
 
 			it "transitions from `down` to `acked` status if it's updated with an `ack` property" do
 				node.status = 'down'
-				node.error = 'Something is wrong | he falls | betraying the trust | "\
+				node.errors = 'Something is wrong | he falls | betraying the trust | "\
 					"there is a disaster in his life.'
 				node.update( ack: {message: "Leitmotiv", sender: 'ged'}  )
 				expect( node ).to be_acked
@@ -185,8 +184,8 @@ describe Arborist::Node do
 
 			it "transitions from `acked` to `up` status if its error is cleared" do
 				node.status = 'down'
-				node.error = 'Something is wrong | he falls | betraying the trust | "\
-					"there is a disaster in his life.'
+				node.errors = { '_' => 'Something is wrong | he falls | betraying the trust | "\
+					"there is a disaster in his life.' }
 				node.update( ack: {message: "Leitmotiv", sender: 'ged'}  )
 				node.update( error: nil )
 
@@ -195,7 +194,7 @@ describe Arborist::Node do
 
 			it "stays `up` if its error is cleared and stays cleared" do
 				node.status = 'down'
-				node.error = 'stay up damn you!'
+				node.errors = { '_' => 'stay up damn you!' }
 				node.update( ack: {message: "Leitmotiv", sender: 'ged'}  )
 				node.update( error: nil )
 				node.update( error: nil )
@@ -245,6 +244,40 @@ describe Arborist::Node do
 				expect( node.ack ).to be_nil
 			end
 
+			it "knows if it's status deems it 'reachable'" do
+				node.update( error: nil )
+				expect( node ).to be_reachable
+				expect( node ).to_not be_unreachable
+			end
+
+			it "knows if it's status deems it 'unreachable'" do
+				node.update( error: 'ded' )
+				expect( node ).to be_unreachable
+				expect( node ).to_not be_reachable
+			end
+
+			it "groups errors from separate monitor by their key" do
+				expect( node ).to be_unknown
+
+				node.update( _monitor_key: 'MonitorTron2000', error: 'ded' )
+				node.update( _monitor_key: 'MonitorTron5000', error: 'moar ded' )
+				expect( node ).to be_down
+
+				expect( node.errors.length ).to eq( 2 )
+				node.update( _monitor_key: 'MonitorTron5000' )
+
+				expect( node ).to be_down
+				expect( node.errors.length ).to eq( 1 )
+
+				node.update( _monitor_key: 'MonitorTron2000' )
+				expect( node ).to be_up
+			end
+
+			it "sets a default monitor key" do
+				node.update( error: 'ded' )
+				expect( node ).to be_down
+				expect( node.errors ).to eq({ '_' => 'ded' })
+			end
 		end
 
 
@@ -380,7 +413,7 @@ describe Arborist::Node do
 
 				old_node.status = 'down'
 				old_node.status_changed = Time.now - 400
-				old_node.error = "Host unreachable"
+				old_node.errors = "Host unreachable"
 				old_node.update(
 					ack: {
 						'time' => Time.now - 200,
@@ -400,7 +433,7 @@ describe Arborist::Node do
 
 				expect( node.status ).to eq( old_node.status )
 				expect( node.status_changed ).to eq( old_node.status_changed )
-				expect( node.error ).to eq( old_node.error )
+				expect( node.errors ).to eq( old_node.errors )
 				expect( node.ack ).to eq( old_node.ack )
 				expect( node.properties ).to include( old_node.properties )
 				expect( node.last_contacted ).to eq( old_node.last_contacted )
@@ -455,7 +488,7 @@ describe Arborist::Node do
 				expect( result ).to include(
 					:identifier,
 					:parent, :description, :tags, :properties, :ack, :status,
-					:last_contacted, :status_changed, :error, :quieted_reasons,
+					:last_contacted, :status_changed, :errors, :quieted_reasons,
 					:dependencies
 				)
 				expect( result[:identifier] ).to eq( 'foo' )
@@ -467,7 +500,8 @@ describe Arborist::Node do
 				expect( result[:ack] ).to be_nil
 				expect( result[:last_contacted] ).to eq( node.last_contacted.iso8601 )
 				expect( result[:status_changed] ).to eq( node.status_changed.iso8601 )
-				expect( result[:error] ).to be_nil
+				expect( result[:errors] ).to be_a( Hash )
+				expect( result[:errors] ).to be_empty
 				expect( result[:dependencies] ).to be_a( Hash )
 				expect( result[:quieted_reasons] ).to be_a( Hash )
 			end
@@ -690,6 +724,12 @@ describe Arborist::Node do
 		end
 
 
+		it "can be matched with its parent" do
+			expect( node ).to match_criteria( parent: 'bar' )
+			expect( node ).to_not match_criteria( parent: 'hooowat' )
+		end
+
+
 		it "can be matched with a single tag" do
 			expect( node ).to match_criteria( tag: 'hunky' )
 			expect( node ).to_not match_criteria( tag: 'plucky' )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre20161005182540
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schedulability
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: configurability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pluggability
   requirement: !ruby/object:Gem::Requirement
@@ -207,61 +207,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -408,12 +408,12 @@ 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.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Arborist is a monitoring toolkit that follows the UNIX philosophy of small