process_graph.rb in build-graph-1.2.1

- old
+ new
@@ -1,81 +1,76 @@
 
 require 'process/group'
 require 'build/files'
 require 'build/graph'
 
-module ProcessGraph
-	include Build::Graph
-	include Build::Files
-
-	class ProcessNode < Node
-		def initialize(inputs, outputs, block, title: nil)
-			super(inputs, outputs, block.source_location)
-			
-			if title
-				@title = title
-			else
-				@title = self.process
-			end
-			
-			@block = block
-		end
+class ProcessNode < Build::Graph::Node
+	def initialize(inputs, outputs, block, title: nil)
+		super(inputs, outputs, block.source_location)
 		
-		def evaluate(context)
-			context.instance_eval(&@block)
+		if title
+			@title = title
+		else
+			@title = self.process
 		end
 		
-		attr :title
+		@block = block
 	end
+	
+	def evaluate(context)
+		context.instance_eval(&@block)
+	end
+	
+	attr :title
+end
 
-	class ProcessTask < Task
-		def initialize(walker, node, group)
-			super(walker, node)
-			
-			@group = group
-		end
+class ProcessTask < Build::Graph::Task
+	def initialize(walker, node, group)
+		super(walker, node)
 		
-		def process(inputs, outputs = :inherit, **options, &block)
-			inputs = Build::Files::List.coerce(inputs)
-			outputs = Build::Files::List.coerce(outputs) unless outputs.kind_of? Symbol
-			
-			node = ProcessNode.new(inputs, outputs, block, **options)
-			
-			self.invoke(node)
-		end
+		@group = group
+	end
+	
+	def process(inputs, outputs = :inherit, **options, &block)
+		inputs = Build::Files::List.coerce(inputs)
+		outputs = Build::Files::List.coerce(outputs) unless outputs.kind_of? Symbol
 		
-		def wet?
-			@node.dirty?
-		end
+		node = ProcessNode.new(inputs, outputs, block, **options)
 		
-		def run(*arguments)
-			if wet?
-				puts "\t[run] #{arguments.join(' ')}"
-				status = @group.spawn(*arguments)
-				
-				if status != 0
-					raise CommandError.new(status)
-				end
+		self.invoke(node)
+	end
+	
+	def wet?
+		@node.dirty?
+	end
+	
+	def run(*arguments)
+		if wet?
+			puts "\t[run] #{arguments.join(' ')}"
+			status = @group.spawn(*arguments)
+			
+			if status != 0
+				raise CommandError.new(status)
 			end
 		end
+	end
+	
+	def mkpath(*args)
+		return unless wet?
 		
-		def mkpath(*args)
-			return unless wet?
-			
-			FileUtils.mkpath(*args)
-		end
+		FileUtils.mkpath(*args)
+	end
+	
+	def install(*args)
+		return unless wet?
 		
-		def install(*args)
-			return unless wet?
-			
-			FileUtils.install(*args)
-		end
-		
-		# This function is called to finish the invocation of the task within the graph.
-		# There are two possible ways this function can generally proceed.
-		# 1/ The node this task is running for is clean, and thus no actual processing needs to take place, but children should probably be executed.
-		# 2/ The node this task is running for is dirty, and the execution of commands should work as expected.
-		def update
-			@node.evaluate(self)
-		end
+		FileUtils.install(*args)
+	end
+	
+	# This function is called to finish the invocation of the task within the graph.
+	# There are two possible ways this function can generally proceed.
+	# 1/ The node this task is running for is clean, and thus no actual processing needs to take place, but children should probably be executed.
+	# 2/ The node this task is running for is dirty, and the execution of commands should work as expected.
+	def update
+		@node.evaluate(self)
 	end
 end