build 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cc4f25b15c353f405140484002cf0106fa5cdfc115269ff256d92fcc86be47f
-  data.tar.gz: d92ce080796f19b6a1a3ff80acbd51b43f97845ac201c7ea295da464e64daf34
+  metadata.gz: aacb41a16bc0e414fd04e7aecfb8d3647e2b8c5925c35ba44991cee5f7108022
+  data.tar.gz: 3d81a66f4f9d669d1040c3a0677e78fef4af0aae522540b3c2c023dab8efcd56
 SHA512:
-  metadata.gz: a0924bb939bbb829cd707df95fe25b0ed21965dd1d0a87509f1adeb9bb4f9a16df2e35dedeed89ffc68a31763d3db3a8766b7b60b4338f4996b87c135357f1cf
-  data.tar.gz: 58b0a8611fa3549816e8ecc837876fd33be5b3c6eae51fc868ad8063f1e0810fdb948ea4a80864123c73077308f47ccde5f35ea50665a89f0c74d7c0c2c8a805
+  metadata.gz: 182f4ee1649e5f69cc60f6af4f32e11e4f8960bf14feb9cc096aef136a12c3b49efd92f42ca1991b24afbed51e81509c502cff4b295c77a4da876691987c5686
+  data.tar.gz: 509fc310c4be7c16281753748b1625d8fde8085babc4f8bf71840da9867bf50dddd313e848be8c4e99e3c9312a4c853466c7bfeef418d660415228317ecb886c

data/build.gemspec

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

data/lib/build/chain_node.rb

@@ -39,29 +39,42 @@ module Build
 		end
 		
 		def apply_dependency(scope, dependency)
-			# puts "Traversing #{dependency.name}..."
+			logger = scope.logger
 			
-			# Not sure why need first
-			provision = @chain.resolved[dependency].first
+			# logger.debug {"Traversing: #{dependency}..."}
 			
 			environments = [@environment]
 			public_environments = []
+			provisions = @chain.resolved[dependency]
+			public_alias = dependency.alias?
 			
-			provision.each_dependency do |dependency|
-				if environment = apply_dependency(scope, dependency)
-					environments << environment
-					
-					unless dependency.private?
-						public_environments << environment
+			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?
-				# puts "Building #{dependency.name}: #{provision.value}..."
+				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)
@@ -70,11 +83,13 @@ module Build
 				
 				scope.walker.with(task_class: task_class) do
 					task.visit do
-						output_environment = Build::Environment.new(local_environment)
+						output_environment = Build::Environment.new(local_environment, name: dependency.name)
 						
-						output_environment.construct!(task, *@arguments, &provision.value)
+						provisions.each do |provision|
+							output_environment.construct!(task, *@arguments, &provision.value)
+						end
 						
-						public_environments << output_environment.dup(parent: nil)
+						public_environments << output_environment.dup(parent: nil, name: dependency.name)
 					end
 				end
 			end

data/lib/build/rulebook.rb

@@ -22,7 +22,8 @@ require_relative 'rule'
 
 module Build
 	class Rulebook
-		def initialize
+		def initialize(name = nil)
+			@name = name
 			@rules = {}
 			@processes = {}
 		end
@@ -44,6 +45,11 @@ module Build
 		def with(superclass, **state)
 			task_class = Class.new(superclass)
 			
+			# name = @name
+			# task_class.send(:define_method, :to_s) do
+			# 	"name"
+			# end
+			
 			# Define methods for all processes, e.g. task_class#compile
 			@processes.each do |key, rules|
 				# Define general rules, which use rule applicability for disambiguation:
@@ -72,16 +78,11 @@ module Build
 				end
 			end
 			
-			rulebook = self
-			task_class.send(:define_method, :rulebook) do
-				rulebook
-			end
-			
 			return task_class
 		end
 		
 		def self.for(environment)
-			rulebook = self.new
+			rulebook = self.new(environment.name)
 			
 			environment.defined.each do |name, define|
 				rulebook << define.klass.build(name, &define.block)

data/lib/build/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-graph
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: build-dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: build-makefile
   requirement: !ruby/object:Gem::Requirement