teapot 0.7.2 → 0.7.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTQyYjk5NWYwZDFhYTJiMmZjOWEzYmE3MGY2ODM2YTBhM2I5NTU2Ng==
+    ZTYzMjgzYTc0NDJhNWYyMmVjMWM4ZTBkMWUxM2Y4MDgyNmU1OTI4OA==
   data.tar.gz: !binary |-
-    N2NhM2YzMWViNGNjMGVkNWZlMjZmNDMxNzM2NDNhMWU0N2Y5ZmQ4ZQ==
+    ZDExZGU3NmRmMWMxYjE3MmFlNjY1ZTJkZWUzMmVmZjdlNmRlNjlmYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTRmYmYzN2M4YzRhYmJmMGE5MTY0ZDdlYmI1MGQyMjRhZWYxMzQ2OTg3ODQx
-    ODg3ZTFhYWE2NDBkNzcwYTYzNzlmODRlNGQ2ZTZkYWJiZGE5OTc0ZWQ4N2Yz
-    Njk0YjYzNzliMjkyZDdmNDE1NGZjZmM1MThmNWZjZmQ3OWRlMjk=
+    NWRlNzAwY2Y4YjUwYjY5YmFjOTExNmIzN2RlNjFlOWRkNGQ2MzUxZmQ4OWMx
+    MTFmYzcwODUxZTBlNTI2MDkzMDYzZjEwNWYwMjY0NDFjOWY4MDFjMjcyNjNh
+    NjZlOGQ0NzdlYjBjMWIxZTU3MzM4MDdkYzVhNWU0NDZmNDY4ZTc=
   data.tar.gz: !binary |-
-    NmNjMGYyNjlkNTY4YmI5YmI5YmI3YmIzYWJiNTRiODFlMzc2M2U0MmYwOWQ2
-    MmI0ZTM2N2M3NTE2ZjFiYWE1NWJmYTlkMzdlZTIyNDUxYTM2MzIwYmFlMThk
-    MzUwYjU0ZDBjMTdkZjMwNDhiMzdmM2E1NzAyNzA1YmJiODAxNmE=
+    NGQxYzFiZGVlNDk1NmZhYTI5NWVlNmFjMjczYjlkYTEyM2VmNGE3YjQ4ZjEx
+    Y2UwM2QwYjMzZWExM2JiY2RiNDIzN2VmNTljZGQyMDUxY2Y3NmZiZDVhODlh
+    YjY0MGM0Y2E0NmZkMzg4ODdhYmYxODlkZjMxNjFmNjk2NGUwNGY=

data/bin/teapot

@@ -35,7 +35,7 @@ OPTIONS = Trollop::options do
 	opt :only, "Only compiled direct dependencies."
 	opt :in, "Work in the given directory.", :type => :string
 	
-	opt :configuration, "Specify a specific build configuration.", :type => :string, :default => Teapot::DEFAULT_CONFIGURATION_NAME
+	opt :configuration, "Specify a specific build configuration.", :type => :string
 end
 
 def make_controller(root = nil)
@@ -109,6 +109,22 @@ time = Benchmark.measure do
 		$stderr.puts error.message.color(:red)
 	rescue Teapot::Commands::CommandError => error
 		$stderr.puts error.message.color(:red)
+	rescue Teapot::Dependency::UnresolvedDependencyError => error
+		$stderr.puts "Unresolved dependencies:"
+
+		error.chain.unresolved.each do |(name, parent)|
+			$stderr.puts "#{parent} depends on #{name.inspect}".color(:red)
+		
+			conflicts = error.chain.conflicts[name]
+		
+			if conflicts
+				conflicts.each do |conflict|
+					$stderr.puts " - provided by #{conflict.inspect}".color(:red)
+				end
+			end
+		end
+	
+		$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
 	end
 end
 

data/lib/teapot/configuration.rb

@@ -144,10 +144,10 @@ module Teapot
 			
 			# Enumerate all imports and attempt to resolve the packages:
 			@imports.each do |import|
-				resolved_configuration = @context.configuration_named(import.name)
+				named_configuration = @context.configurations[import.name]
 				
-				if resolved_configuration
-					configuration.append(resolved_configuration, import.options)
+				if named_configuration
+					configuration.append(named_configuration.materialize, import.options)
 				else
 					# It couldn't be resolved...
 					configuration.imports << import

data/lib/teapot/context.rb

@@ -55,7 +55,17 @@ module Teapot
 			defined = load(root_package)
 
 			# Find the default configuration, if it exists:
+
 			@default_configuration = defined.default_configuration
+
+			if options[:configuration]
+				@configuration = @configurations[options[:configuration]]
+			else
+				@configuration = @default_configuration
+			end
+
+			# Materialize the configuration:
+			@configuration = @configuration.materialize if @configuration
 		end
 
 		attr :root
@@ -63,8 +73,16 @@ module Teapot
 
 		attr :targets
 		attr :generators
+
+		# All public configurations.
 		attr :configurations
 
+		# The context's primary configuration.
+		attr :configuration
+
+		attr :dependencies
+		attr :selection
+
 		def select(names)
 			names.each do |name|
 				if @targets.key? name
@@ -75,8 +93,13 @@ module Teapot
 			end
 		end
 
-		attr :dependencies
-		attr :selection
+		def dependency_chain(dependency_names, configuration = @configuration)
+			configuration.load_all
+		
+			select(dependency_names)
+		
+			Dependency::chain(@selection, @dependencies, @targets.values)
+		end
 
 		def direct_targets(ordered)
 			@dependencies.collect do |dependency|
@@ -125,20 +148,6 @@ module Teapot
 			end
 		end
 
-		attr :default_configuration
-
-		def configuration_named(name)
-			if name == DEFAULT_CONFIGURATION_NAME
-				configuration = @default_configuration
-			else
-				configuration = @configurations[name]
-			end
-			
-			if configuration
-				configuration.materialize
-			end
-		end
-
 		def unresolved(packages)
 			failed_to_load = Set.new
 			

data/lib/teapot/controller/build.rb

@@ -22,35 +22,9 @@ require 'teapot/controller'
 
 module Teapot
 	class Controller
-		def build(package_names)
-			context, configuration = load_teapot
+		def build(dependency_names)
+			chain = context.dependency_chain(dependency_names, context.configuration)
 		
-			configuration.load_all
-		
-			context.select(package_names)
-		
-			chain = Dependency::chain(context.selection, context.dependencies, context.targets.values)
-		
-			if chain.unresolved.size > 0
-				log "Unresolved dependencies:"
-		
-				chain.unresolved.each do |(name, parent)|
-					log "#{parent} depends on #{name.inspect}".color(:red)
-				
-					conflicts = chain.conflicts[name]
-				
-					if conflicts
-						conflicts.each do |conflict|
-							log " - provided by #{conflict.inspect}".color(:red)
-						end
-					end
-				end
-			
-				abort "Cannot continue build due to unresolved dependencies!".color(:red)
-			end
-	
-			log "Resolved: #{chain.resolved.inspect}".color(:magenta)
-	
 			ordered = chain.ordered
 		
 			if @options[:only]
@@ -61,7 +35,7 @@ module Teapot
 				log "Building #{target.name} for dependency #{dependency}...".color(:cyan)
 		
 				if target.respond_to?(:build!) and !@options[:dry]
-					target.build!(configuration)
+					target.build!(context.configuration)
 				end
 			end
 	

data/lib/teapot/controller/clean.rb

@@ -23,13 +23,11 @@ require 'teapot/controller'
 module Teapot
 	class Controller
 		def clean
-			context, configuration = load_teapot
-
 			log "Removing #{configuration.platforms_path}...".color(:cyan)
-			FileUtils.rm_rf configuration.platforms_path
+			FileUtils.rm_rf context.configuration.platforms_path
 		
 			log "Removing #{configuration.packages_path}...".color(:cyan)
-			FileUtils.rm_rf configuration.packages_path
+			FileUtils.rm_rf context.configuration.packages_path
 		end
 	end
 end

data/lib/teapot/controller/create.rb

@@ -56,8 +56,6 @@ module Teapot
 		private
 		
 		def generate_project(project_name)
-			context, configuration = load_teapot
-
 			if context.generators.key? 'project'
 				generate('project', [project_name])
 			end

data/lib/teapot/controller/fetch.rb

@@ -23,9 +23,8 @@ require 'teapot/controller'
 module Teapot
 	class Controller
 		def fetch
-			context, configuration = load_teapot
-
 			resolved = Set.new
+			configuration = context.configuration
 			unresolved = context.unresolved(configuration.packages)
 			tries = 0
 

data/lib/teapot/controller/generate.rb

@@ -23,9 +23,7 @@ require 'teapot/controller'
 module Teapot
 	class Controller
 		def generate(name, arguments)
-			context, configuration = load_teapot
-
-			configuration.load_all
+			context.configuration.load_all
 
 			generator = context.generators[name]
 

data/lib/teapot/controller/list.rb

@@ -23,10 +23,8 @@ require 'teapot/controller'
 module Teapot
 	class Controller
 		def list
-			context, configuration = load_teapot
-		
 			# Should this somehow consider context.root_package?
-			configuration.packages.each do |package|
+			context.configuration.packages.each do |package|
 				log "Package #{package.name} (from #{package.path}):".bright
 			
 				begin

data/lib/teapot/controller.rb

@@ -42,15 +42,10 @@ module Teapot
 			@log_output.puts *args
 		end
 		
-		private
-	
-		def load_teapot
-			configuration_name = @options[:configuration] || DEFAULT_CONFIGURATION_NAME
-		
-			context = Context.new(@root)
-			configuration = context.configuration_named(configuration_name)
-		
-			return context, configuration
+		def context
+			@context ||= Context.new(@root,
+				:configuration => @options[:configuration]
+			)
 		end
 	end
 end

data/lib/teapot/dependency.rb

@@ -24,6 +24,16 @@ require 'teapot/environment'
 
 module Teapot
 	module Dependency
+		class UnresolvedDependencyError < StandardError
+			def initialize(chain)
+				super "Unresolved dependency chain!"
+				
+				@chain = chain
+			end
+			
+			attr :chain
+		end
+		
 		Provision = Struct.new(:value)
 		Alias = Struct.new(:dependencies)
 		
@@ -149,10 +159,10 @@ module Teapot
 				
 				# We will now satisfy this dependency by satisfying any dependent dependencies, but we no longer need to revisit this one.
 				@resolved << dependency
-				
+
 				if Alias === provision
 					# puts "** Resolving alias #{provision}".color(:magenta)
-					
+
 					provision.dependencies.each do |dependency|
 						expand(dependency, provider)
 					end
@@ -160,23 +170,30 @@ module Teapot
 					# puts "** Appending #{dependency} -> provisions".color(:magenta)
 					@provisions << provision
 				end
-				
+
 				unless @resolved.include?(provider)
 					# We are now satisfying the provider by expanding all its own dependencies:
 					@resolved << provider
-					
+
 					provider.dependencies.each do |dependency|
 						expand(dependency, provider)
 					end
-					
+
 					# puts "** Appending #{dependency} -> ordered".color(:magenta)
 					@ordered << [provider, dependency]
 				end
 			end
 		end
 		
+		# An `UnresolvedDependencyError` will be thrown if there are any unresolved dependencies.
 		def self.chain(selection, dependencies, providers)
-			Chain.new(selection, dependencies, providers)
+			chain = Chain.new(selection, dependencies, providers)
+
+			if chain.unresolved.size > 0
+				raise UnresolvedDependencyError.new(chain)
+			end
+
+			return chain
 		end
 	end
 end

data/lib/teapot/substitutions.rb

@@ -76,7 +76,7 @@ module Teapot
 		end
 
 		def apply(text)
-			return text unless @ordered.count
+			return text unless @ordered.count > 0
 			
 			grouped = [[@ordered.first]]
 			

data/lib/teapot/target.rb

@@ -44,9 +44,7 @@ module Teapot
 			@build = Proc.new(&block)
 		end
 
-		def build!(configuration, config = {})
-			return unless @build
-			
+		def build_environment(configuration)
 			# Reduce the number of keystrokes for good health:
 			context = configuration.context
 			
@@ -54,9 +52,6 @@ module Teapot
 			
 			environments = []
 			
-			# The base configuration environment:
-			# environments << configuration.environment
-			
 			# Calculate the dependency chain's ordered environments:
 			environments += chain.provisions.collect do |provision|
 				Environment.new(&provision.value)
@@ -68,7 +63,7 @@ module Teapot
 			# Merge all the environments together:
 			environment = Environment.combine(*environments)
 				
-			local_build = environment.merge do
+			environment.merge do
 				default platforms_path configuration.platforms_path
 				default build_prefix {platforms_path + "cache/#{platform_name}-#{variant}"}
 				default install_prefix {platforms_path + "#{platform_name}-#{variant}"}
@@ -76,8 +71,14 @@ module Teapot
 				append buildflags {"-I#{install_prefix + "include"}"}
 				append linkflags {"-L#{install_prefix + "lib"}"}
 			end
+		end
+
+		def build!(configuration)
+			return unless @build
+			
+			local_environment = build_environment(configuration)
 			
-			@build.call(local_build)
+			@build.call(local_environment)
 		end
 	end
 end

data/lib/teapot/version.rb

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

data/test/test_dependency.rb

@@ -84,11 +84,11 @@ class TestDependency < Test::Unit::TestCase
 		salad.depends 'fruit'
 		salad.provides 'salad'
 		
-		chain = Teapot::Dependency::chain([], ['salad'], [apple, bananna, salad])
+		chain = Teapot::Dependency::Chain.new([], ['salad'], [apple, bananna, salad])
 		assert_equal ["fruit", salad], chain.unresolved.first
 		assert_equal({"fruit" => [apple, bananna]}, chain.conflicts)
 		
-		chain = Teapot::Dependency::chain(['apple'], ['salad'], [apple, bananna, salad])
+		chain = Teapot::Dependency::Chain.new(['apple'], ['salad'], [apple, bananna, salad])
 		assert_equal([], chain.unresolved)
 		assert_equal({}, chain.conflicts)
 	end

data/test/test_teapot.rb

@@ -36,7 +36,7 @@ class TestConfig < Test::Unit::TestCase
 		# No targets were defined:
 		assert_equal 0, context.targets.count
 		
-		default_configuration = context.default_configuration
+		default_configuration = context.configuration
 		
 		# 13 defined packages + 1 implicit package.
 		assert_equal 14, default_configuration.packages.count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow