build-graph 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ca9917fd8c609a63c0608a797010e9df257a64709c0129c91a49847759cc35
-  data.tar.gz: e1f7c0aa6231782ad4767a982c657323f128455200dd324a1ce4149fdf912563
+  metadata.gz: d4245e7fa0dd8f7cd2de6ef69631c4aa879579d0508bae3227dae10cd7d6a4d6
+  data.tar.gz: 662bcc629c6826483d2fc0807ae0e50da02fd30e920e1f89c3b2d6d02e2e16e0
 SHA512:
-  metadata.gz: 75a5812081eda17786f4a8c3abbda92b187f4b57ccbd130c6a76a8ea034836f22e5bb42d15f8e6634d4e1a5449953eaa144cc69add30889658b97bd7c0b45958
-  data.tar.gz: ccdee7f9215f75f6489455bad14ab71644030a622047fedafcaf55c76c712cb587ef5c44aee322f51b1c49703aef22be93083f1caf66d874cb2f794c6ede5e04
+  metadata.gz: 526776e467bf78940a9369ff6f4c1c6f8ebc43999180039b59b2a0046f3598f2291d48f9d3eb2939d8cb5552b719d55510267c1ebac498d6e3e6b6f05afd8bb0
+  data.tar.gz: 922671aa30935391f4d6ba21c01e1e8776835438769a81f5f9f67e0ab486f0a427f9ead2b06f0c0bf42281fd75120d605cc4798b1d2ad14009f7f0a7e77b49c6

data/Gemfile

@@ -7,9 +7,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-	
 	gem 'rb-fsevent'
 	gem 'rb-inotify'
 	

data/build-graph.gemspec

@@ -24,11 +24,10 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "process-group", "~> 1.1"
 	spec.add_dependency "build-files", "~> 1.0"
+	spec.add_dependency "event", "~> 1.0"
 	
 	spec.add_development_dependency "build-makefile", "~> 1.0"
 	
-	spec.add_dependency "rainbow", "~> 2.0"
-	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.4"

data/lib/build/graph/task.rb

@@ -180,10 +180,7 @@ module Build
 			def fail!(error)
 				@annotation = "failed"
 				
-				if logger = @walker.logger
-					logger.error("Task #{self} failed: #{error}")
-					logger.debug(error) if error.kind_of?(Exception)
-				end
+				@walker.logger&.error(self) {error}
 				
 				@error = error
 				@state = :failed

data/lib/build/graph/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Graph
-		VERSION = "1.2.1"
+		VERSION = "1.3.0"
 	end
 end

data/lib/build/graph/walker.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'set'
-require 'logger'
+require 'event/console'
 
 require_relative 'task'
 require_relative 'node'
@@ -39,7 +39,7 @@ module Build
 				end
 			end
 			
-			def initialize(logger: nil, &block)
+			def initialize(logger: Event::Console.logger, &block)
 				# Node -> Task mapping.
 				@tasks = {}
 				
@@ -54,7 +54,7 @@ module Build
 				@failed_tasks = []
 				@failed_outputs = Set.new
 				
-				@logger = logger || Logger.new(nil)
+				@logger = logger
 				@monitor = Files::Monitor.new(logger: @logger)
 			end
 			
@@ -86,7 +86,7 @@ module Build
 			def call(node, parent_task = nil)
 				# We try to fetch the task if it has already been invoked, otherwise we create a new task.
 				@tasks.fetch(node) do
-					@logger.debug{"Update: #{node} #{parent_task.class}"}
+					@logger&.debug(self) {"Update: #{node} #{parent_task.class}"}
 					
 					# This method should add the node
 					@update.call(self, node, parent_task)
@@ -112,7 +112,7 @@ module Build
 				paths.each do |path|
 					# Is there a task generating this output?
 					if outputs = @outputs[path]
-						@logger.debug{"Task #{task} is waiting on path #{path}"}
+						@logger&.debug(self) {"Task #{task} is waiting on path #{path}"}
 						
 						# When the output is ready, trigger this edge:
 						outputs << edge
@@ -139,7 +139,7 @@ module Build
 				# If there are no children like this, then done:
 				return true if children.size == 0
 				
-				@logger.debug{"Task #{parent} is waiting on #{children.count} children"}
+				@logger&.debug(self) {"Task #{parent} is waiting on #{children.count} children"}
 				
 				# Otherwise, construct an edge to track state changes:
 				edge = Edge.new
@@ -159,14 +159,19 @@ module Build
 			end
 			
 			def enter(task)
-				@logger.debug{"Walker entering: #{task.node.process}"}
+				@logger&.info(self) {"Walker entering: #{task.node.process}"}
 				
 				@tasks[task.node] = task
 				
 				# In order to wait on outputs, they must be known before entering the task. This might seem odd, but unless we know outputs are being generated, waiting for them to complete is impossible - unless this was somehow specified ahead of time. The implications of this logic is that all tasks must be sequential in terms of output -> input chaning. This is by design and is not a problem in practice.
 				
 				if outputs = task.outputs
-					@logger.debug{"Task will generate outputs: #{outputs.to_a.collect(&:to_s).inspect}"}
+					@logger&.debug(self) do |buffer|
+						buffer.puts "Task will generate outputs:"
+						Array(outputs).each do |output|
+							buffer.puts output.inspect
+						end
+					end
 					
 					outputs.each do |path|
 						# Tasks which have children tasks may list the same output twice. This is not a bug.
@@ -176,7 +181,7 @@ module Build
 			end
 			
 			def exit(task)
-				@logger.debug{"Walker exiting: #{task.node.process}, task #{task.failed? ? 'failed' : 'succeeded'}"}
+				@logger&.info(self) {"Walker exiting: #{task.node.process}, task #{task.failed? ? 'failed' : 'succeeded'}"}
 				
 				# Fail outputs if the node failed:
 				if task.failed?
@@ -191,16 +196,10 @@ module Build
 				task.outputs.each do |path|
 					path = path.to_s
 					
-					if logger.debug?
-						if task.failed?
-							@logger.debug "\tFile failed: #{path}"
-						else
-							@logger.debug "\tFile available: #{path}"
-						end
-					end
+					@logger&.debug(self) {"File #{task.failed? ? 'failed' : 'available'}: #{path}"}
 					
 					if edges = @outputs.delete(path)
-						# @logger.debug "\tUpdating #{edges.count} edges..."
+						# @logger&.debug "\tUpdating #{edges.count} edges..."
 						edges.each{|edge| edge.traverse(task)}
 					end
 				end
@@ -214,7 +213,7 @@ module Build
 			end
 			
 			def delete(node)
-				@logger.debug{"Delete #{node}"}
+				@logger&.debug(self) {"Delete #{node}"}
 
 				if task = @tasks.delete(node)
 					@monitor.delete(task)

data/spec/build/graph/build_test.rb

@@ -12,7 +12,6 @@ code_glob = Glob.new(program_root, "*.cpp")
 program_path = Path.join(program_root, "dictionary-sort")
 
 group = Process::Group.new
-logger = Logger.new($stderr)
 walker = Walker.for(ProcessTask, group)
 
 top = ProcessNode.top code_glob, title: 'top' do

data/spec/build/graph/graph_spec.rb

@@ -24,8 +24,6 @@ require_relative 'process_graph'
 RSpec.describe Build::Graph do
 	let(:group) {Process::Group.new}
 	
-	let(:logger) {Logger.new($stderr).tap{|logger| logger.level = Logger::DEBUG}}
-	
 	it "shouldn't update mtime" do
 		test_glob = Build::Files::Glob.new(__dir__, "*.rb")
 		listing_output = Build::Files::Paths.directory(__dir__, ["listing.txt"])

data/spec/build/graph/process_graph.rb

@@ -3,6 +3,8 @@ require 'process/group'
 require 'build/files'
 require 'build/graph'
 
+require 'event/shell'
+
 class ProcessNode < Build::Graph::Node
 	def initialize(inputs, outputs, block, title: nil)
 		super(inputs, outputs, block.source_location)
@@ -45,7 +47,8 @@ class ProcessTask < Build::Graph::Task
 	
 	def run(*arguments)
 		if wet?
-			puts "\t[run] #{arguments.join(' ')}"
+			@walker.logger.debug(self) {Event::Shell.for(*arguments)}
+			
 			status = @group.spawn(*arguments)
 			
 			if status != 0

data/spec/build/graph/walker_spec.rb

@@ -25,8 +25,6 @@ require 'build/graph/task'
 require 'build/files/glob'
 
 RSpec.describe Build::Graph::Walker do
-	let(:logger) {Logger.new($stderr).tap{|logger| logger.level = Logger::DEBUG}}
-	
 	it "can generate the same output from multiple tasks" do
 		test_glob = Build::Files::Glob.new(__dir__, "*.rb")
 		listing_output = Build::Files::Paths.directory(__dir__, ["listing.txt"])
@@ -37,7 +35,7 @@ RSpec.describe Build::Graph::Walker do
 		sequence = []
 		
 		# A walker runs repeatedly, updating tasks which have been marked as dirty.
-		walker = Build::Graph::Walker.new(logger: logger) do |walker, node|
+		walker = Build::Graph::Walker.new do |walker, node|
 			task = Build::Graph::Task.new(walker, node)
 			
 			task.visit do
@@ -73,7 +71,7 @@ RSpec.describe Build::Graph::Walker do
 		sequence = []
 		
 		# A walker runs repeatedly, updating tasks which have been marked as dirty.
-		walker = Build::Graph::Walker.new(logger: logger) do |walker, node|
+		walker = Build::Graph::Walker.new do |walker, node|
 			task = Build::Graph::Task.new(walker, node)
 			
 			task.visit do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-graph
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process-group
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: build-makefile
+  name: event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: build-makefile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement