build 2.4.5 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a7dc5ba6382c7406b79f7a5963fab483b90f7420cd337e3d3e5c912b6a8dc1e
-  data.tar.gz: 2667f5375ed38172f5abe47f595951c82b545d58b27cbcb449b5f1fd8b367ef8
+  metadata.gz: 187be1c77bccf22983d403cf42a37354afe68a658fd1c7114f0f7db9202e898c
+  data.tar.gz: 755feeca9f4d0b9a68c9ad66cb22dabca4e85e68c55323fa0057a667181c9c17
 SHA512:
-  metadata.gz: 0be1a4642c4b95e46abfc8d49f2a80c77acb819aa906e4912e1161f0422af22bd50056910b80f60e8475c27e28402f64aa15feed23bfc838704916341c0e7a5e
-  data.tar.gz: ab49021a6454da45bf8f299cf62b81aa44201e652bc2720d329b97189a5154485f20f064b42cc2bd9dd241adcda32fc36107d718d573a8e1e2513b4d188699fd
+  metadata.gz: 2f5949efc5f2a163c323c3b396c14b07af51dd7504484c01e7a09c3450a4312fd3011f2c5c189dfa800accfb1be6abb67ea68f74063d190226e97b1570077dc3
+  data.tar.gz: f19cca0cf2eeabadfba042ed91dd2498c508331b2ef3d391c27d46748c3aa92d93f6aa491bab4b96b957146facaeb2e0683c4311b8dba12ecb8a1d4ab789b69e

data/.gitignore

@@ -21,4 +21,3 @@ tmp
 *.a
 mkmf.log
 .rspec_status
-

data/build.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 	
-	spec.add_dependency "build-graph", "~> 1.3"
+	spec.add_dependency "build-graph", "~> 2.0"
 	spec.add_dependency "build-environment", "~> 1.3"
 	spec.add_dependency "build-dependency", "~> 1.4"
 	spec.add_dependency "build-makefile", "~> 1.0"

data/lib/build/build_node.rb

@@ -0,0 +1,186 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'fileutils'
+require 'build/graph'
+
+require 'console/event/spawn'
+
+module Build
+	class BuildNode < Graph::Node
+		def initialize(environment, dependency, provisions, arguments)
+			@environment = environment
+			@dependency = dependency
+			@provisions = provisions
+			@arguments = arguments
+			
+			super(Files::List::NONE, :inherit)
+		end
+		
+		attr :environment
+		attr :dependency
+		attr :provisions
+		attr :arguments
+		
+		def == other
+			super and
+				@environment == other.environment and
+				@dependency == other.dependency and
+				@provisions == other.provisions and
+				@arguments == other.arguments
+		end
+		
+		def hash
+			super ^ @environment.hash ^ @dependency.hash ^ @provisions.hash ^ @arguments.hash
+		end
+		
+		def task_class(parent_task)
+			task_class = Rulebook.for(@environment).with(BuildTask, environment: @environment)
+		end
+		
+		def initial_environment
+			Build::Environment.new(@environment, name: @dependency.name)
+		end
+		
+		def name
+			@dependency.name
+		end
+		
+		def apply!(task)
+			output_environment = self.initial_environment
+			
+			@provisions.each do |provision|
+				output_environment.construct!(task, *@arguments, &provision.value)
+			end
+			
+			task.output_environment = output_environment
+		end
+	end
+	
+	# This task class serves as the base class for the environment specific task classes genearted when adding targets.
+	class BuildTask < Task
+		class CommandFailure < Graph::TransientError
+			def initialize(task, arguments, status)
+				@task = task
+				@arguments = arguments
+				@status = status
+				
+				super "#{File.basename(executable_name).inspect} exited with status #{@status.to_i}"
+			end
+			
+			def executable_name
+				if @arguments[0].kind_of? Hash
+					@arguments[1]
+				else
+					@arguments[0]
+				end
+			end
+			
+			attr :task
+			attr :arguments
+			attr :status
+		end
+		
+		attr_accessor :output_environment
+		
+		def wet?
+			@node.dirty?
+		end
+		
+		def spawn(*arguments)
+			if wet?
+				@logger&.info(self) {Console::Event::Spawn.for(*arguments)}
+				status = @group.spawn(*arguments)
+				
+				if status != 0
+					raise CommandFailure.new(self, arguments, status)
+				end
+			end
+		end
+		
+		def shell_environment
+			@shell_environment ||= environment.flatten.export
+		end
+		
+		def run!(*arguments)
+			self.spawn(shell_environment, *arguments)
+		end
+		
+		def touch(path)
+			return unless wet?
+			
+			@logger&.info(self) {Console::Shell.for('touch', path)}
+			FileUtils.touch(path)
+		end
+		
+		def cp(source_path, destination_path)
+			return unless wet?
+			
+			@logger&.info(self) {Console::Shell.for('cp', source_path, destination_path)}
+			FileUtils.copy(source_path, destination_path)
+		end
+		
+		def rm(path)
+			return unless wet?
+			
+			@logger&.info(self) {Console::Shell.for('rm -rf', path)}
+			FileUtils.rm_rf(path)
+		end
+		
+		def mkpath(path)
+			return unless wet?
+			
+			unless File.exist?(path)
+				@logger&.info(self) {Console::Shell.for('mkpath', path)}
+				FileUtils.mkpath(path)
+			end
+		end
+		
+		def install(source_path, destination_path)
+			return unless wet?
+			
+			@logger&.info(self) {Console::Shell.for('install', source_path, destination_path)}
+			FileUtils.install(source_path, destination_path)
+		end
+		
+		def write(path, data, mode = "w")
+			return unless wet?
+			
+			@logger&.info(self) {Console::Shell.for("write", path, "#{data.size}bytes")}
+			File.open(path, mode) do |file|
+				file.write(data)
+			end
+		end
+		
+		def invoke_rule(rule, arguments, &block)
+			arguments = rule.normalize(arguments, self)
+			
+			@logger&.debug(self) {"-> #{rule}(#{arguments.inspect})"}
+			
+			invoke(
+				RuleNode.new(rule, arguments, &block)
+			)
+			
+			@logger&.debug(self) {"<- #{rule}(...) -> #{rule.result(arguments)}"}
+			
+			return rule.result(arguments)
+		end
+	end
+end

data/lib/build/chain_node.rb

@@ -22,91 +22,58 @@ require 'build/files'
 require 'build/graph'
 
 require_relative 'task'
+require_relative 'dependency_node'
 
 module Build
+	# Responsible for processing a chain into a series of dependency nodes.
 	class ChainNode < Graph::Node
+		# @param chain [Chain] the chain to build.
+		# @param arguments [Array] the arguments to pass to the output environment constructor.
+		# @param anvironment [Build::Environment] the root environment to prepend into the chain.
 		def initialize(chain, arguments, environment)
 			@chain = chain
 			@arguments = arguments
 			@environment = environment
 			
 			# Wait here, for all dependent targets, to be done:
-			super(Files::List::NONE, :inherit, chain)
+			super(Files::List::NONE, :inherit)
 		end
 		
-		def name
-			@environment.name
+		attr :chain
+		attr :arguments
+		attr :environment
+		
+		def == other
+			super and
+				@chain == other.chain and
+				@arguments == other.arguments and
+				@environment == other.environment
 		end
 		
-		def task_class
+		def hash
+			super ^ @chain.hash ^ @arguments.hash ^ @environment.hash
+		end
+		
+		def task_class(parent_task)
 			Task
 		end
 		
-		def apply_dependency(scope, dependency)
-			logger = scope.logger
-			
-			# logger.debug {"Traversing: #{dependency}..."}
-			
-			environments = [@environment]
-			public_environments = []
-			provisions = @chain.resolved[dependency]
-			public_alias = dependency.alias?
-			
-			provisions.each do |provision|
-				provision.each_dependency do |nested_dependency|
-					if environment = apply_dependency(scope, nested_dependency)
-						# logger.debug("Evaluating #{nested_dependency} -> #{provision} generated: #{environment}")
-						
-						environments << environment
-						
-						if public_alias || nested_dependency.public?
-							public_environments << environment
-						# else
-						# 	logger.debug("Skipping #{nested_dependency} in public environment.")
-						end
-					end
-				end
-			end
-			
-			unless dependency.alias?
-				logger.debug {"Building: #{dependency}"}
-				
-				# environments.each do |environment|
-				# 	logger.debug {"Using #{environment}"}
-				# end
-				
-				local_environment = Build::Environment.combine(*environments)&.evaluate || Build::Environment.new
-				
-				# logger.debug("Local Environment: #{local_environment}")
-				
-				task_class = Rulebook.for(local_environment).with(Task, environment: local_environment)
-				task = task_class.new(scope.walker, self, scope.group, logger: scope.logger)
-				
-				output_environment = nil
-				
-				task.visit do
-					output_environment = Build::Environment.new(local_environment, name: dependency.name)
-					
-					provisions.each do |provision|
-						# When executing the environment build steps, we create new build nodes. But those build nodes are not capturing the right task class.
-						output_environment.construct!(task, *@arguments, &provision.value)
-					end
-					
-					public_environments << output_environment.dup(parent: nil, name: dependency.name)
-				end
-			end
-			
-			return Build::Environment.combine(*public_environments)
+		def name
+			@environment.name
 		end
 		
-		def apply!(scope)
+		# This is the main entry point when invoking the node from `Build::Task`.
+		def apply!(task)
+			# Go through all the dependencies in order and apply them to the build graph:
 			@chain.dependencies.each do |dependency|
-				apply_dependency(scope, dependency)
+				node = DependencyNode.new(@chain, dependency, @environment, @arguments)
+				
+				task.invoke(node)
 			end
 		end
 		
-		def to_s
-			"#<#{self.class}>"
+		def inspect
+			"#<#{self.class} #{@environment.inspect}>"
 		end
 	end
 end

data/lib/build/controller.rb

@@ -57,8 +57,8 @@ module Build
 		attr :nodes
 		attr :walker
 		
-		private def step(walker, node, parent_task = nil)
-			task_class = parent_task&.class || Task
+		def step(walker, node, parent_task = nil)
+			task_class = node.task_class(parent_task) || Task
 			task = task_class.new(walker, node, @group, logger: @logger)
 			
 			task.visit do

data/lib/build/dependency_node.rb

@@ -0,0 +1,163 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'build/graph'
+
+require_relative 'build_node'
+
+module Build
+	class DependencyNode < Graph::Node
+		def initialize(chain, dependency, environment, arguments)
+			@chain = chain
+			@dependency = dependency
+			@environment = environment
+			@arguments = arguments
+			
+			# Wait here, for all dependent targets, to be done:
+			super(Files::List::NONE, :inherit)
+		end
+		
+		attr :chain
+		attr :dependency
+		attr :environment
+		attr :arguments
+		
+		def == other
+			super and
+				@chain == other.chain and
+				@dependency == other.dependency and
+				@environment == other.environment and
+				@arguments == other.arguments
+		end
+		
+		def hash
+			super ^ @chain.hash ^ @environment.hash ^ @arguments.hash
+		end
+		
+		def task_class(parent_task)
+			DependencyTask
+		end
+		
+		def name
+			@dependency.name
+		end
+		
+		def provisions
+			@chain.resolved[@dependency]
+		end
+		
+		def alias?
+			@dependency.alias?
+		end
+		
+		def public?
+			@dependency.public?
+		end
+		
+		# This is the main entry point when invoking the node from `Build::Task`.
+		def apply!(task)
+			# Go through all the dependencies in order and apply them to the build graph:
+			@chain.dependencies.each do |dependency|
+				node = DependencyNode.new(@chain, dependency, @environment, @arguments)
+				
+				task.invoke(node)
+			end
+		end
+		
+		def dependency_node_for(dependency)
+			DependencyNode.new(@chain, dependency, @environment, @arguments)
+		end
+	end
+	
+	class DependencyTask < Task
+		def initialize(*arguments, **options)
+			super
+			
+			@environment = nil
+			@tasks = []
+		end
+		
+		attr :group
+		attr :logger
+		
+		attr :environment
+		
+		def update
+			logger.debug(self) do |buffer|
+				buffer.puts "building #{@node} which #{@node.dependency}"
+				@node.provisions.each do |provision|
+					buffer.puts "\tbuilding #{provision.provider.name} which #{provision}"
+				end
+			end
+			
+			# Lookup what things this dependency provides:
+			@node.provisions.each do |provision|
+				provision.each_dependency do |nested_dependency|
+					@tasks << invoke(@node.dependency_node_for(nested_dependency))
+				end
+			end
+		end
+		
+		def update_outputs
+			dependency = @node.dependency
+			environments = [@node.environment]
+			
+			public_environments = []
+			public_alias = @node.alias?
+			
+			@tasks.each do |task|
+				if environment = task.environment
+					environments << environment
+					
+					if public_alias || task.node.public?
+						public_environments << environment
+					# else
+					# 	logger.debug("Skipping #{nested_dependency} in public environment.")
+					end
+				end
+			end
+			
+			unless public_alias
+				logger.debug(self) {"Building: #{dependency} <- #{@tasks.join}"}
+				
+				# environments.each do |environment|
+				# 	logger.debug {"Using #{environment}"}
+				# end
+				
+				local_environment = Build::Environment.combine(*environments)&.evaluate || Build::Environment.new
+				
+				# logger.debug("Local Environment: #{local_environment}")
+				
+				build_task = invoke(
+					BuildNode.new(local_environment, dependency, @node.provisions, @node.arguments)
+				)
+				
+				if wait_for_children?
+					output_environment = build_task.output_environment
+					public_environments << output_environment.dup(parent: nil, name: dependency.name)
+				end
+			end
+			
+			@environment = Build::Environment.combine(*public_environments)
+			
+			super
+		end
+	end
+end

data/lib/build/rule_node.rb

@@ -30,13 +30,28 @@ module Build
 			
 			inputs, outputs = @rule.files(@arguments)
 			
-			super(inputs, outputs, @rule)
+			super(inputs, outputs)
 		end
 		
 		attr :arguments
 		attr :rule
 		attr :callback
 		
+		def == other
+			super and
+				@arguments == other.arguments and
+				@rule == other.rule and
+				@callback == other.callback
+		end
+		
+		def hash
+			super ^ @arguments.hash ^ @rule.hash ^ @callback.hash
+		end
+		
+		def task_class(parent_task)
+			parent_task.class
+		end
+		
 		def name
 			@rule.name
 		end

data/lib/build/task.rb

@@ -26,127 +26,30 @@ require 'console/event/spawn'
 module Build
 	# This task class serves as the base class for the environment specific task classes genearted when adding targets.
 	class Task < Graph::Task
-		class CommandFailure < Graph::TransientError
-			def initialize(task, arguments, status)
-				@task = task
-				@arguments = arguments
-				@status = status
-				
-				super "#{File.basename(executable_name).inspect} exited with status #{@status.to_i}"
-			end
-			
-			def executable_name
-				if @arguments[0].kind_of? Hash
-					@arguments[1]
-				else
-					@arguments[0]
-				end
-			end
-			
-			attr :task
-			attr :arguments
-			attr :status
-		end
-		
-		def initialize(walker, node, group, logger: nil)
-			super(walker, node)
+		def initialize(walker, node, group, logger: nil, **options)
+			super(walker, node, **options)
 			
 			@group = group
 			@logger = logger
 		end
 		
-		def to_s
-			"\#<#{Task} #{node.name}>"
+		def task_class
+			self.class
 		end
 		
 		attr :group
 		attr :logger
 		
-		def wet?
-			@node.dirty?
-		end
-		
-		def spawn(*arguments)
-			if wet?
-				@logger&.info(self) {Console::Event::Spawn.for(*arguments)}
-				status = @group.spawn(*arguments)
-				
-				if status != 0
-					raise CommandFailure.new(self, arguments, status)
-				end
-			end
-		end
-		
-		def shell_environment
-			@shell_environment ||= environment.flatten.export
-		end
-		
-		def run!(*arguments)
-			self.spawn(shell_environment, *arguments)
-		end
-		
-		def touch(path)
-			return unless wet?
-			
-			@logger&.info(self) {Console::Shell.for('touch', path)}
-			FileUtils.touch(path)
-		end
-		
-		def cp(source_path, destination_path)
-			return unless wet?
-			
-			@logger&.info(self) {Console::Shell.for('cp', source_path, destination_path)}
-			FileUtils.copy(source_path, destination_path)
-		end
-		
-		def rm(path)
-			return unless wet?
-			
-			@logger&.info(self) {Console::Shell.for('rm -rf', path)}
-			FileUtils.rm_rf(path)
-		end
-		
-		def mkpath(path)
-			return unless wet?
-			
-			unless File.exist?(path)
-				@logger&.info(self) {Console::Shell.for('mkpath', path)}
-				FileUtils.mkpath(path)
-			end
-		end
-		
-		def install(source_path, destination_path)
-			return unless wet?
-			
-			@logger&.info(self) {Console::Shell.for('install', source_path, destination_path)}
-			FileUtils.install(source_path, destination_path)
-		end
-		
-		def write(path, data, mode = "w")
-			return unless wet?
-			
-			@logger&.info(self) {Console::Shell.for("write", path, "#{data.size}bytes")}
-			File.open(path, mode) do |file|
-				file.write(data)
-			end
-		end
-		
 		def update
 			@node.apply!(self)
 		end
 		
-		def invoke_rule(rule, arguments, &block)
-			arguments = rule.normalize(arguments, self)
-			
-			@logger&.debug(self) {"-> #{rule}(#{arguments.inspect})"}
-			
-			invoke(
-				RuleNode.new(rule, arguments, &block)
-			)
-			
-			@logger&.debug(self) {"<- #{rule}(...) -> #{rule.result(arguments)}"}
-			
-			return rule.result(arguments)
+		def name
+			self.to_s
+		end
+		
+		def node_string
+			@node.name
 		end
 	end
 end

data/lib/build/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Build
-	VERSION = "2.4.5"
+	VERSION = "2.5.0"
 end

data/spec/build/controller_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe Build::Controller do
 		let(:build_target) do
 			Target.new("foo") do |target|
 				target.depends "make"
-			
+				
 				target.provides "foo" do
 					foo_path = Build::Files::Path['foo']
 					

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-graph
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: build-environment
   requirement: !ruby/object:Gem::Requirement
@@ -166,8 +166,10 @@ files:
 - Rakefile
 - build.gemspec
 - lib/build.rb
+- lib/build/build_node.rb
 - lib/build/chain_node.rb
 - lib/build/controller.rb
+- lib/build/dependency_node.rb
 - lib/build/graphviz.rb
 - lib/build/name.rb
 - lib/build/rule.rb