build 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b25bab5ea87cc44e752b996feef7556f532917a44b5c8a806abcaa835a5be46
-  data.tar.gz: 6994d82f7e62c9b1755f4bfc1cd2e4d59cab5bb635157c289cb7f66cbf17e183
+  metadata.gz: 0ad08615d58ed88206dd99c9a77400daf263343bf9e00d8c724cc73050abb702
+  data.tar.gz: 840fde0567eccfce19a4eb3b99219f8aec9d798ca6443a67dafa825bef8c01df
 SHA512:
-  metadata.gz: 5463598ea2a50099f0b7d5462fc231eb207009e2f75808da8dd99b976a5639ece50db6822dd36ed5c7674c4afae090098fc77a9d1e6da1c7893f77f3dae40ef2
-  data.tar.gz: 9efd1dc567f4532209c07eac0cb59bc7513bff228078563d58a0c052c29bda3a3eee9123bcc0a698973f5404281699824064ec81efcccb9ce84f1af9ad133d7c
+  metadata.gz: 86a6d619396f7215c3b816a12bfbfb4c6b3aecf57b83ae48a57549cddf94b4ee77d08a41ffcc222241c981d73fb3686b56b23f818044200512c0cfbda70fb61a
+  data.tar.gz: 99ff73db7486709ab8691d6243bffd28342bce8de5afc0783b90c72a396fccc15bd838e4ddfd8b3d25f212abdaa111d31ae5bf54402cd4a84306e1b7ed640794

data/build.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 	
-	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-graph", "~> 2.1"
+	spec.add_dependency "build-environment", "~> 1.12"
+	spec.add_dependency "build-dependency", "~> 1.5"
 	spec.add_dependency "build-makefile", "~> 1.0"
 	
 	spec.add_dependency "graphviz", "~> 1.0"

data/lib/build/build_node.rb

@@ -25,27 +25,27 @@ require 'console/event/spawn'
 
 module Build
 	class BuildNode < Graph::Node
-		def initialize(environment, provisions, arguments)
+		def initialize(environment, provision, arguments)
 			@environment = environment
-			@provisions = provisions
+			@provision = provision
 			@arguments = arguments
 			
 			super(Files::List::NONE, :inherit)
 		end
 		
 		attr :environment
-		attr :provisions
+		attr :provision
 		attr :arguments
 		
 		def == other
 			super and
 				@environment == other.environment and
-				@provisions == other.provisions and
+				@provision == other.provision and
 				@arguments == other.arguments
 		end
 		
 		def hash
-			super ^ @environment.hash ^ @provisions.hash ^ @arguments.hash
+			super ^ @environment.hash ^ @provision.hash ^ @arguments.hash
 		end
 		
 		def task_class(parent_task)
@@ -63,9 +63,7 @@ module Build
 		def apply!(task)
 			output_environment = self.initial_environment
 			
-			@provisions.each do |provision|
-				output_environment.construct!(task, *@arguments, &provision.value)
-			end
+			output_environment.construct!(task, *@arguments, &@provision.value)
 			
 			task.output_environment = output_environment
 		end

data/lib/build/chain_node.rb

@@ -66,9 +66,9 @@ module Build
 		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)
+				task.invoke(
+					DependencyNode.new(@chain, dependency, @environment, @arguments)
+				)
 			end
 		end
 		

data/lib/build/dependency_node.rb

@@ -20,7 +20,7 @@
 
 require 'build/graph'
 
-require_relative 'build_node'
+require_relative 'provision_node'
 
 module Build
 	class DependencyNode < Graph::Node
@@ -48,7 +48,7 @@ module Build
 		end
 		
 		def hash
-			super ^ @chain.hash ^ @environment.hash ^ @arguments.hash
+			super ^ @chain.hash ^ @dependency.hash ^ @environment.hash ^ @arguments.hash
 		end
 		
 		def task_class(parent_task)
@@ -63,40 +63,18 @@ module Build
 			@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)
+		def provision_node_for(provision)
+			ProvisionNode.new(@chain, provision, @environment, @arguments)
 		end
-		
-		def print_dependencies(buffer = $stderr, level = 0)
-			self.provisions.each do |provision|
-				buffer.puts "#{" " * indentation}building #{provision.provider.name} which #{provision} which depends on:"
-				
-				provision.each_dependency do |nested_dependency|
-					child = self.dependency_node_for(nested_dependency)
-					
-					child.print_dependencies(buffer, level + 1)
-				end
-			end
-			
-			return nil
+	end
+	
+	module ProvisionsFailed
+		def self.to_s
+			"Failed to build all provisions!"
 		end
 	end
 	
@@ -104,15 +82,18 @@ module Build
 		def initialize(*arguments, **options)
 			super
 			
+			@provisions = []
+			
+			@environments = nil
 			@environment = nil
-			@tasks = []
 		end
 		
-		attr :group
-		attr :logger
-		
 		attr :environment
 		
+		def dependency
+			@node.dependency
+		end
+		
 		def update
 			logger.debug(self) do |buffer|
 				buffer.puts "building #{@node} which #{@node.dependency}"
@@ -123,55 +104,24 @@ module Build
 			
 			# 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(name: dependency.name) || Build::Environment.new(name: dependency.name)
-				
-				# logger.debug("Local Environment: #{local_environment}")
-				
-				build_task = invoke(
-					BuildNode.new(local_environment, @node.provisions, @node.arguments)
+				@provisions << invoke(
+					@node.provision_node_for(provision)
 				)
-				
-				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)
+			if wait_for_children?
+				update_environments!
+			else
+				fail!(ProvisionsFailed)
+			end
+		end
+		
+		private
+		
+		def update_environments!
+			@environments = @provisions.flat_map(&:output_environments)
 			
-			super
+			@environment = Build::Environment.combine(*@environments)
 		end
 	end
 end

data/lib/build/provision_node.rb

@@ -0,0 +1,146 @@
+# 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 ProvisionNode < Graph::Node
+		def initialize(chain, provision, environment, arguments)
+			@chain = chain
+			@provision = provision
+			@environment = environment
+			@arguments = arguments
+			
+			# Wait here, for all dependent targets, to be done:
+			super(Files::List::NONE, :inherit)
+		end
+		
+		attr :chain
+		attr :provision
+		attr :environment
+		attr :arguments
+		
+		def == other
+			super and
+				@chain == other.chain and
+				@provision == other.provision and
+				@environment == other.environment and
+				@arguments == other.arguments
+		end
+		
+		def hash
+			super ^ @chain.hash ^ @provision.hash ^ @environment.hash ^ @arguments.hash
+		end
+		
+		def task_class(parent_task)
+			ProvisionTask
+		end
+		
+		def name
+			@provision.name
+		end
+		
+		def dependency_node_for(dependency)
+			DependencyNode.new(@chain, dependency, @environment, @arguments)
+		end
+	end
+	
+	module DependenciesFailed
+		def self.to_s
+			"Failed to build all dependencies!"
+		end
+	end
+	
+	class ProvisionTask < Task
+		def initialize(*arguments, **options)
+			super
+			
+			@dependencies = []
+			
+			@environments = []
+			@public_environments = []
+			
+			@build_task = nil
+		end
+		
+		attr :environments
+		attr :public_environments
+		
+		attr :build_task
+		
+		def provision
+			@node.provision
+		end
+		
+		def update
+			provision.each_dependency do |dependency|
+				@dependencies << invoke(@node.dependency_node_for(dependency))
+			end
+			
+			if wait_for_children?
+				update_environments!
+			else
+				fail!(DependenciesFailed)
+			end
+		end
+		
+		def local_environment
+			Build::Environment.combine(@node.environment, *@environments)&.evaluate(name: @node.name).freeze
+		end
+		
+		def output_environment
+			if @build_task
+				@build_task.output_environment.dup(parent: nil)
+			end
+		end
+		
+		def output_environments
+			environments = @public_environments.dup
+			
+			if environment = self.output_environment
+				environments << environment
+			end
+			
+			return environments
+		end
+		
+		private
+		
+		def update_environments!
+			@dependencies.each do |task|
+				if environment = task.environment
+					@environments << environment
+					
+					if task.dependency.public? || @node.provision.alias?
+						@public_environments << environment
+					end
+				end
+			end
+			
+			unless @node.provision.alias?
+				@build_task = invoke(
+					BuildNode.new(local_environment, @node.provision, @node.arguments)
+				)
+			end
+		end
+	end
+end

data/lib/build/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-graph
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: build-environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: build-dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: build-makefile
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - lib/build/dependency_node.rb
 - lib/build/graphviz.rb
 - lib/build/name.rb
+- lib/build/provision_node.rb
 - lib/build/rule.rb
 - lib/build/rule_node.rb
 - lib/build/rulebook.rb