teapot 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea31b9a04e7f8aa8b31fe1bb85aa765ae2c7087f
-  data.tar.gz: a800948d556c67c80f44c627fc02414b9abcddf6
+  metadata.gz: 82c11fa3631f5f64272f82742fc2e2a605915050
+  data.tar.gz: 482fc59f950b17490993fa10561290beb0963369
 SHA512:
-  metadata.gz: afc9d164e71e5a45f807e0ae63f318b083a728eeecc8976860f1e34d5638d9e0081031ec37fc4b70ca15bed49698ba60becf6f12d680683428dce2d7ee598290
-  data.tar.gz: f93f47ecd26ab2e4f8d8e78ea1260fe187e66358929c1cd23452fcbcd82216e93773ce48097b61147553958ac8126ab68d0802e284dcbf6e654bbac22eb95666
+  metadata.gz: c817753effc821940fc78ec441d4534414392e59c34f6d1ce3c8ad28d64941ca25bd257d1095545a965b37b7a8f7b6f470ce8fcaa59e2adcf674a41bd6ec9e8e
+  data.tar.gz: 4fc45e4498e1ac51e42cc9bed6fca53c6629af3dac8c3edb537d8a62faa425a0f9b91030020e76b0347fd16424e2e94aafb4ade7759c3cd57b909f556aa7223f

data/lib/teapot/context.rb

@@ -101,9 +101,9 @@ module Teapot
 
 		def dependency_chain(dependency_names, configuration = @configuration)
 			configuration.load_all
-		
+			
 			select(dependency_names)
-		
+			
 			Dependency::chain(@selection, @dependencies, @targets.values)
 		end
 

data/lib/teapot/controller/build.rb

@@ -21,18 +21,49 @@
 require 'teapot/controller'
 require 'build/controller'
 
-$TEAPOT_DEBUG_GRAPH = false
 
 module Teapot
 	class Controller
 		class BuildFailedError < StandardError
 		end
 		
+		def show_dependencies(walker)
+			outputs = {}
+			
+			walker.tasks.each do |node, task|
+				# puts "Task #{task} (#{node}) outputs:"
+				
+				task.outputs.each do |path|
+					path = path.to_s
+					
+					# puts "\t#{path}"
+					
+					outputs[path] = task
+				end
+			end
+			
+			walker.tasks.each do |node, task|
+				dependencies = {}
+				task.inputs.each do |path|
+					path = path.to_s
+					
+					if generating_task = outputs[path]
+						dependencies[path] = generating_task
+					end
+				end
+				
+				puts "Task #{task.inspect} has #{dependencies.count} dependencies."
+				dependencies.each do |path, task|
+					puts "\t#{task.inspect}: #{path}"
+				end
+			end
+		end
+		
 		def build(dependency_names)
 			chain = context.dependency_chain(dependency_names, context.configuration)
-		
+			
 			ordered = chain.ordered
-		
+			
 			if @options[:only]
 				ordered = context.direct_targets(ordered)
 			end
@@ -54,11 +85,7 @@ module Teapot
 			# We need to catch interrupt here, and exit with the correct exit code:
 			begin
 				controller.run do |walker|
-					if $TEAPOT_DEBUG_GRAPH
-						controller.nodes.each do |key, node|
-							puts "#{node.status} #{node.inspect}" unless node.clean?
-						end
-					end
+					show_dependencies(walker)
 					
 					# Only run once is asked:
 					unless @options[:continuous]

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "1.0.1"
+	VERSION = "1.0.2"
 end

data/spec/teapot/target_spec.rb

@@ -19,7 +19,6 @@
 # THE SOFTWARE.
 
 require 'teapot/context'
-require 'pry'
 
 module Teapot::TargetSpec
 	ROOT = Build::Files::Path.new(__dir__) + "target_spec"
@@ -29,7 +28,7 @@ module Teapot::TargetSpec
 			context = Teapot::Context.new(ROOT)
 			
 			target = context.targets['target_spec']
-			expect(target).to_not be nil
+			expect(target).to_not be == nil
 			
 			chain = context.dependency_chain(["Test/TargetSpec"])
 			expect(chain.providers.size).to be == 4

data/spec/teapot/wait_spec.rb

@@ -0,0 +1,55 @@
+# 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 'teapot/context'
+require 'build/controller'
+
+module Teapot::WaitSpec
+	ROOT = Build::Files::Path.join(__dir__, "wait_spec")
+		
+	describe Teapot::Target do
+		let(:logger) {Logger.new($stdout).tap{|logger| logger.level = Logger::DEBUG; logger.formatter = Build::CompactFormatter.new}}
+		
+		it "should wait on completion of dependent targets" do
+			context = Teapot::Context.new(ROOT)
+			
+			a, b, c = context.targets.values_at('A', 'B', 'C')
+			
+			chain = context.dependency_chain(["Teapot/C"])
+			ordered = chain.ordered
+			
+			controller = Build::Controller.new(logger: logger) do |controller|
+				ordered.each do |resolution|
+					target = resolution.provider
+					
+					environment = target.environment(context.configuration)
+					
+					if target.build
+						controller.add_target(target, environment.flatten)
+					end
+				end
+			end
+			
+			controller.update
+			
+			puts $log
+		end
+	end
+end

data/spec/teapot/wait_spec/teapot.rb

@@ -0,0 +1,41 @@
+
+teapot_version "1.0"
+
+$log = []
+
+define_target "A" do |target|
+	target.build do
+		$log << :a_enter
+		run! "sleep 1"
+		$log << :a_exit
+	end
+	
+	target.provides "Teapot/A"
+end
+
+define_target "B" do |target|
+	target.build do
+		$log << :b_enter
+		run! "sleep 1"
+		$log << :b_exit
+	end
+	
+	target.provides "Teapot/B"
+end
+
+define_target "C" do |target|
+	target.build do
+		$log << :c_enter
+		# This should not execute until A and B have completed.
+		run! "sleep 1"
+		$log << :c_exit
+	end
+	
+	target.depends "Teapot/A"
+	target.depends "Teapot/B"
+	
+	target.provides "Teapot/C"
+end
+
+define_configuration "wait_spec" do |configuration|
+end

data/teapot.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "graphviz", "~> 0.2.0"
 	
-	spec.add_dependency "build", "~> 1.0.4"
+	spec.add_dependency "build", "~> 1.0.6"
 	
 	# This could be a good option in the future for teapot fetch:
 	#spec.add_dependency "rugged"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,8 @@ files:
 - spec/teapot/substitutions_spec.rb
 - spec/teapot/target_spec.rb
 - spec/teapot/target_spec/teapot.rb
+- spec/teapot/wait_spec.rb
+- spec/teapot/wait_spec/teapot.rb
 - teapot.gemspec
 homepage: http://www.teapot.nz
 licenses:
@@ -203,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
@@ -220,3 +222,5 @@ test_files:
 - spec/teapot/substitutions_spec.rb
 - spec/teapot/target_spec.rb
 - spec/teapot/target_spec/teapot.rb
+- spec/teapot/wait_spec.rb
+- spec/teapot/wait_spec/teapot.rb