arborist 0.0.1.pre20160128152542 → 0.0.1.pre20160606141735

data/spec/arborist/subscription_spec.rb

@@ -3,6 +3,8 @@
 require_relative '../spec_helper'
 
 require 'arborist/subscription'
+require 'arborist/node/host'
+require 'arborist/node/service'
 
 
 describe Arborist::Subscription do
@@ -16,11 +18,16 @@ describe Arborist::Subscription do
 	let( :service_node ) do
 		host_node.service( 'ssh' )
 	end
-	let( :publisher ) do
-		instance_double( Arborist::Manager::EventPublisher )
-	end
+	let( :published_events ) {[]}
 	let( :subscription ) do
-		described_class.new( publisher, 'node.delta', type: 'host' )
+		described_class.new( 'node.delta', type: 'host', &published_events.method(:push) )
+	end
+
+
+	it "raises an error if created without a callback block" do
+		expect {
+			described_class.new
+		}.to raise_error( LocalJumpError, /requires a callback block/i )
 	end
 
 
@@ -32,39 +39,41 @@ describe Arborist::Subscription do
 	it "publishes events which are of the desired type and have matching criteria" do
 		event = Arborist::Event.create( 'node_delta', host_node, status: ['up', 'down'] )
 
-		expect( publisher ).to receive( :publish ).with( subscription.id, event )
-
 		subscription.on_events( event )
+
+		expect( published_events ).to eq([ subscription.id, event ])
 	end
 
 
 	it "publishes events which are of any type if the specified type is `nil`" do
-		subscription = described_class.new( publisher )
+		subscription = described_class.new( &published_events.method(:push) )
 		event1 = Arborist::Event.create( 'node_delta', host_node, status: ['up', 'down'] )
 		event2 = Arborist::Event.create( 'sys_reloaded' )
 
-		expect( publisher ).to receive( :publish ).with( subscription.id, event1 )
-		expect( publisher ).to receive( :publish ).with( subscription.id, event2 )
-
 		subscription.on_events( event1, event2 )
+
+		expect( published_events ).to eq([
+			subscription.id, event1,
+			subscription.id, event2
+		])
 	end
 
 
 	it "doesn't publish events which are of the desired type but don't have matching criteria" do
 		event = Arborist::Event.create( 'node_delta', service_node, status: ['up', 'down'] )
 
-		expect( publisher ).to_not receive( :publish )
-
 		subscription.on_events( event )
+
+		expect( published_events ).to be_empty
 	end
 
 
 	it "doesn't publish events which have matching criteria but aren't of the desired type" do
 		event = Arborist::Event.create( 'node_update', host_node )
 
-		expect( publisher ).to_not receive( :publish )
-
 		subscription.on_events( event )
+
+		expect( published_events ).to be_empty
 	end
 
 end

data/spec/arborist_spec.rb

@@ -16,10 +16,6 @@ describe Arborist 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

data/spec/data/observers/webservices.rb

@@ -6,9 +6,17 @@ require 'arborist'
 
 Arborist::Observer "Webservers" do
 	subscribe to: 'node.delta',
-		where: { type: 'service', port: 80, status: ['up', 'down'] }
+		where: {
+			type: 'service',
+			port: 80,
+			delta: { status: ['up', 'down'] }
+		}
 	subscribe to: 'node.delta',
-		where: { type: 'service', port: 443, status: ['up', 'down'] }
+		where: {
+			type: 'service',
+			port: 443,
+			delta: { status: ['up', 'down'] }
+		}
 
 	action do |uuid, event|
 		$stderr.puts "Webserver %s is DOWN (%p)" % [ event['data']['identifier'], event['data'] ]

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ require 'arborist/mixins'
 
 class TestNode < Arborist::Node; end
 
+class TestSubNode < Arborist::Node
+	parent_type :test
+end
+
 class TestEvent < Arborist::Event; end
 
 
@@ -111,6 +115,10 @@ RSpec.configure do |config|
 		mock.syntax = :expect
 	end
 
+	config.after( :each ) do
+		Arborist::Node::Root.reset
+	end
+
 	config.filter_run_excluding( :no_ci ) if ENV['SEMAPHORE'] || ENV['CI']
 
 	config.include( Loggability::SpecHelpers )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arborist
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre20160128152542
+  version: 0.0.1.pre20160606141735
 platform: ruby
 authors:
 - Michael Granger
@@ -11,9 +11,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  MIIDMDCCAhigAwIBAgIBAjANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTYwNjAyMDE1NTQ2WhcNMTcwNjAyMDE1NTQ2WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -21,17 +21,16 @@ cert_chain:
   OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
   7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
   EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
-  BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
-  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
-  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
-  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
-  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
-  xn3DzOkDE6NYbk8gC9rTsA==
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
+  qoHr122fGKelqffzEQBhszANBgkqhkiG9w0BAQUFAAOCAQEAF2XCzjfTFxkcVvuj
+  hhBezFkZnMDYtWezg4QCkR0RHg4sl1LdXjpvvI59SIgD/evD1hOteGKsXqD8t0E4
+  OPAWWv/z+JRma72zeYsBZLSDRPIUvBoul6qCpvY0MiWTh496mFwOxT5lvSAUoh+U
+  pQ/MQeH/yC6hbGp7IYska6J8T4z5XkYqafYZ3eKQ8H+xPd/z+gYx+jd0PfkWf1Wk
+  QQdziL01SKBHf33OAH/p/puCpwS+ZDfgnNx5oMijWbc671UXkrt7zjD0kGakq+9I
+  hnfm736z8j1wvWddqf45++gwPpDr1E4zoAq2PgRl/WBNyR0hfoZLpi3TnHu3eC0x
+  uALKNA==
   -----END CERTIFICATE-----
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schedulability
@@ -131,6 +130,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +299,6 @@ files:
 - ChangeLog
 - Events.md
 - History.md
-- LICENSE
 - Manifest.txt
 - Monitors.md
 - Nodes.md
@@ -290,11 +316,19 @@ files:
 - lib/arborist/command/config.rb
 - lib/arborist/command/start.rb
 - lib/arborist/command/watch.rb
+- lib/arborist/dependency.rb
 - lib/arborist/event.rb
+- lib/arborist/event/node.rb
 - lib/arborist/event/node_acked.rb
 - lib/arborist/event/node_delta.rb
-- lib/arborist/event/node_matching.rb
+- lib/arborist/event/node_disabled.rb
+- lib/arborist/event/node_down.rb
+- lib/arborist/event/node_quieted.rb
+- lib/arborist/event/node_unknown.rb
+- lib/arborist/event/node_up.rb
 - lib/arborist/event/node_update.rb
+- lib/arborist/event/sys_node_added.rb
+- lib/arborist/event/sys_node_removed.rb
 - lib/arborist/event/sys_reloaded.rb
 - lib/arborist/exceptions.rb
 - lib/arborist/loader.rb
@@ -307,7 +341,9 @@ files:
 - lib/arborist/monitor/socket.rb
 - lib/arborist/monitor_runner.rb
 - lib/arborist/node.rb
+- lib/arborist/node/ack.rb
 - lib/arborist/node/host.rb
+- lib/arborist/node/resource.rb
 - lib/arborist/node/root.rb
 - lib/arborist/node/service.rb
 - lib/arborist/observer.rb
@@ -316,6 +352,10 @@ files:
 - lib/arborist/observer_runner.rb
 - lib/arborist/subscription.rb
 - spec/arborist/client_spec.rb
+- spec/arborist/dependency_spec.rb
+- spec/arborist/event/node_delta_spec.rb
+- spec/arborist/event/node_down_spec.rb
+- spec/arborist/event/node_spec.rb
 - spec/arborist/event/node_update_spec.rb
 - spec/arborist/event_spec.rb
 - spec/arborist/manager/event_publisher_spec.rb
@@ -325,7 +365,9 @@ files:
 - spec/arborist/monitor/socket_spec.rb
 - spec/arborist/monitor_runner_spec.rb
 - spec/arborist/monitor_spec.rb
+- spec/arborist/node/ack_spec.rb
 - spec/arborist/node/host_spec.rb
+- spec/arborist/node/resource_spec.rb
 - spec/arborist/node/root_spec.rb
 - spec/arborist/node/service_spec.rb
 - spec/arborist/node_spec.rb
@@ -373,3 +415,4 @@ specification_version: 4
 summary: Arborist is a monitoring toolkit that follows the UNIX philosophy of small
   parts and loose coupling for stability, reliability, and customizability
 test_files: []
+has_rdoc: 

data/LICENSE

@@ -1,29 +0,0 @@
-Copyright (c) 2015, Michael Granger and Mahlon E. Smith
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author/s, nor the names of the project's
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-