teapot 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fb639fe5cc1f9596048d3a55255d8b9ed534114bb7ac4ce0a337274a93b7ec
-  data.tar.gz: ee891bde08844f98b972f76a77ee6427996b5b05de39ac8a0f2ca3891310ee09
+  metadata.gz: decb98e7874aae571e257044efad1fc480cdb9f0e7ee1f9fc780d9a8d5995b7f
+  data.tar.gz: 63ec173747e3992349864d3342b1a6cf91c4d9a95a98237f2f26100a4e85e64c
 SHA512:
-  metadata.gz: 5061e625c2c4ccdd3a698a829699a62170e0753d95bdeff9ab87790795aa960974fd0955cf4c68df815cbf5e201ac9492b6f9b11e4e2516d64385a34399bb479
-  data.tar.gz: 331cd7ab35e021d1720a9426332583bd8141cf79f4a5e63da90bf8d19ef2583eb1afb6338e11242ad7da64241c2c8e265ff2be8fed1c28be9e49d3ac5da60762
+  metadata.gz: 1d0bf01d50bfe4bb0c87dae6ed592cda4507bb7fe59fc12020736ca0d3fb24b21d69d2e654029c7e5d6c1b273939fc0b1d9a92f2d22f03a115df388925080274
+  data.tar.gz: fe1e2de8b7b34b04d632058e5d8ad304696f7767772e50e3460280c97adfaaa7f5bec5854b6c74bb14c6b81eb84f39c8db072230d7d3e621e076c642086531d0

data/.travis.yml

@@ -16,7 +16,7 @@ matrix:
     - rvm: 2.6
       os: osx
       before_install: brew install pkgconfig zlib curl openssl libssh2 libgit2
-      env: RUGGED_USE_SYSTEM_LIBRARIES=y
+      # env: RUGGED_USE_SYSTEM_LIBRARIES=y
     - rvm: 2.6
       env: COVERAGE=BriefSummary,Coveralls
 
@@ -29,5 +29,5 @@ addons:
       - clang-4.0
       - libc++-dev
       - libc++abi-dev
-env:
-  - CC=clang-4.0 CXX=clang++-4.0
+# env:
+#   - CC=clang-4.0 CXX=clang++-4.0

data/bin/teapot

@@ -20,40 +20,42 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/command'
+require_relative '../lib/teapot/command'
 
-options = Teapot::Command.parse(ARGV)
+if command = Teapot::Command.parse(ARGV)
+	logger = command.logger
 
-begin
-	options.invoke
-rescue Teapot::IncompatibleTeapotError => error
-	$stderr.puts error.message.color(:red)
-	$stderr.puts "Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
-	
-	exit 1
-rescue Build::Dependency::UnresolvedDependencyError => error
-	$stderr.puts "Unresolved dependencies:"
+	begin
+		command.invoke
+	rescue Teapot::IncompatibleTeapotError => error
+		logger.error(command, error) do
+			"Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
+		end
+		
+		exit 1
+	rescue Build::Dependency::UnresolvedDependencyError => error
+		logger.error(command, error) do |buffer|
+			buffer.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.name}".color(:red)
+			error.chain.unresolved.each do |name, parent|
+				buffer.puts "#{parent} depends on #{name.inspect}"
+			
+				conflicts = error.chain.conflicts[name]
+			
+				if conflicts
+					conflicts.each do |conflict|
+						buffer.puts " - provided by #{conflict.name}"
+					end
+				end
 			end
+
+			buffer.puts "Cannot continue due to unresolved dependencies!".color(:red)
 		end
+		
+		exit 2
+	rescue StandardError => error
+		logger.error(command, error)
+		
+		exit 3
 	end
-
-	$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
-	
-	exit 2
-rescue StandardError => error
-	$stderr.puts error.message.color(:red)
-	
-	# Could be nice to have some improved error reporting.
-	$stderr.puts error.backtrace
-	
-	exit 3
 end

data/lib/teapot/command.rb

@@ -33,12 +33,9 @@ require_relative 'context'
 require_relative 'configuration'
 require_relative 'version'
 
-require 'uri'
-require 'rainbow'
-require 'rainbow/ext/string'
 require 'fileutils'
 
-require 'build/logger'
+require 'console'
 
 module Teapot
 	module Command
@@ -57,7 +54,7 @@ module Teapot
 				option '-v/--version', "Print out the application version."
 			end
 			
-			nested '<command>', {
+			nested :command, {
 				"create" => Create,
 				"clone" => Clone,
 				"fetch" => Fetch,
@@ -81,15 +78,13 @@ module Teapot
 			end
 			
 			def logger
-				@logger ||= Logger.new($stderr).tap do |logger|
-					logger.formatter = ::Build::CompactFormatter.new(verbose: verbose?)
-					
+				@logger ||= Console::Logger.new(Console.logger, verbose: self.verbose?).tap do |logger|
 					if verbose?
-						logger.level = Logger::DEBUG
+						logger.debug!
 					elsif quiet?
-						logger.level = Logger::WARN
+						logger.warn!
 					else
-						logger.level = Logger::INFO
+						logger.info!
 					end
 				end
 			end
@@ -102,15 +97,13 @@ module Teapot
 				Context.new(root, configuration: configuration)
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def invoke
 				if @options[:version]
 					puts "teapot v#{Teapot::VERSION}"
-				elsif @options[:help] or @command.nil?
-					print_usage(program_name)
+				elsif @options[:help]
+					print_usage(output: $stdout)
 				else
-					track_time do
-						@command.invoke(self)
-					end
+					@command.invoke
 				end
 			end
 		end

data/lib/teapot/command/build.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'samovar'
+require_relative 'selection'
 
 require 'build/controller'
 
@@ -27,7 +27,7 @@ module Teapot
 		class BuildFailedError < StandardError
 		end
 		
-		class Build < Samovar::Command
+		class Build < Selection
 			self.description = "Build the specified target."
 			
 			options do
@@ -38,7 +38,7 @@ module Teapot
 			many :targets, "Build these targets, or use them to help the dependency resolution process."
 			split :argv, "Arguments passed to child process(es) of build if any."
 			
-			def invoke(parent)
+			def invoke
 				context = parent.context
 				
 				# The targets to build:

data/lib/teapot/command/clean.rb

@@ -25,15 +25,15 @@ module Teapot
 		class Clean < Samovar::Command
 			self.description = "Delete everything in the teapot directory."
 			
-			def invoke(parent)
+			def invoke
 				context = parent.context
 				logger = parent.logger
 				configuration = context.configuration
 				
-				logger.info "Removing #{configuration.platforms_path}...".color(:cyan)
-				FileUtils.rm_rf configuration.platforms_path
+				logger.info "Removing #{configuration.build_path}..."
+				FileUtils.rm_rf configuration.build_path
 			
-				logger.info "Removing #{configuration.packages_path}...".color(:cyan)
+				logger.info "Removing #{configuration.packages_path}..."
 				FileUtils.rm_rf configuration.packages_path
 			end
 		end

data/lib/teapot/command/clone.rb

@@ -31,11 +31,9 @@ module Teapot
 		class Clone < Samovar::Command
 			self.description = "Clone a remote repository and fetch all dependencies."
 			
-			one :source, "The source repository to clone."
+			one :source, "The source repository to clone.", required: true
 			
-			def invoke(parent)
-				raise ArgumentError, "source is required" unless @source
-				
+			def invoke
 				logger = parent.logger
 				
 				name = File.basename(::Build::URI[@source].path, ".git")
@@ -47,11 +45,11 @@ module Teapot
 					raise ArgumentError.new("#{root} already exists!")
 				end
 				
-				logger.info "Cloning #{@source} to #{root}...".color(:cyan)
+				logger.info "Cloning #{@source} to #{root}..."
 				_repository = Rugged::Repository.clone_at(@source, root.to_s, credentials: self.method(:credentials))
 				
 				# Fetch the initial packages:
-				Fetch[].invoke(nested)
+				Fetch[parent: nested].invoke
 			end
 			
 			def credentials(url, username, types)

data/lib/teapot/command/create.rb

@@ -29,17 +29,14 @@ module Teapot
 		class Create < Samovar::Command
 			self.description = "Create a new teapot package using the specified repository."
 			
-			one :project_name, "The name of the new project in title-case, e.g. 'My Project'."
-			one :source, "The source repository to use for fetching packages, e.g. https://github.com/kurocha."
-			many :packages, "Any additional packages you'd like to include in the project."
+			one :name, "The name of the new project in title-case, e.g. 'My Project'.", required: true
+			one :source, "The source repository to use for fetching packages, e.g. https://github.com/kurocha.", required: true
+			many :packages, "Any packages you'd like to include in the project.", default: ["generate-project"]
 			
-			def invoke(parent)
-				raise ArgumentError, "project_name is required" unless @project_name
-				raise ArgumentError, "source is required" unless @source
-				
+			def invoke
 				logger = parent.logger
 				
-				nested = parent['--root', parent.options[:root] || project_name.gsub(/\s+/, '-').downcase]
+				nested = parent['--root', parent.options[:root] || name.gsub(/\s+/, '-').downcase]
 				root = nested.root
 				
 				if root.exist?
@@ -51,11 +48,11 @@ module Teapot
 				
 				repository = Rugged::Repository.init_at(root.to_s)
 				
-				logger.info "Creating project named #{project_name} at path #{root}...".color(:cyan)
-				generate_project(root, @project_name, @source, @packages)
+				logger.info "Creating project named #{name} at path #{root}..."
+				generate_project(root, @name, @source, @packages)
 				
 				# Fetch the initial packages:
-				Fetch[].invoke(nested)
+				Fetch[parent: nested].invoke
 				
 				context = nested.context
 				selection = context.select
@@ -63,10 +60,10 @@ module Teapot
 				
 				if target_names.any?
 					# Generate the initial project files:
-					Build[*target_names].invoke(nested)
+					Build[*target_names, parent: nested].invoke
 					
 					# Fetch any additional packages:
-					Fetch[].invoke(nested)
+					Fetch[parent: nested].invoke
 				end
 				
 				# Stage all files:
@@ -82,8 +79,8 @@ module Teapot
 				)
 			end
 			
-			def generate_project(root, project_name, source, packages)
-				name = ::Build::Name.new(project_name)
+			def generate_project(root, name, source, packages)
+				name = ::Build::Name.new(name)
 				
 				# Otherwise the initial commit will try to include teapot/
 				File.open(root + ".gitignore", "w") do |output|

data/lib/teapot/command/fetch.rb

@@ -18,8 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'samovar'
-
+require_relative 'selection'
 require 'rugged'
 
 module Teapot
@@ -48,18 +47,21 @@ module Teapot
 			
 			many :packages, "Only update the specified packages, or all packages if none specified."
 			
-			def invoke(parent)
-				logger = parent.logger
-				context = parent.context
-				
+			def context
+				parent.context
+			end
+			
+			def invoke
 				selection = context.select
 				
 				packages = selection.configuration.packages
 				
-				if @packages.any?
-					packages = packages.slice(@packages)
+				if specified_packages = self.packages
+					packages = packages.slice(specified_packages)
 				end
 				
+				logger = parent.logger
+				
 				# If no additional packages were resolved, we have reached a fixed point:
 				while packages.any?
 					packages.each do |package|
@@ -77,12 +79,15 @@ module Teapot
 				end
 			
 				if selection.unresolved.count > 0
-					logger.error "Could not fetch all packages!".color(:red)
-					selection.unresolved.each do |package|
-						logger.error "\t#{package}".color(:red)
+					logger.error(self) do |buffer|
+						buffer.puts "Could not fetch all packages!"
+						
+						selection.unresolved.each do |package|
+							buffer.puts "\t#{package}"
+						end
 					end
 				else
-					logger.info "Completed fetch successfully.".color(:green)
+					logger.info "Completed fetch successfully."
 				end
 			end
 			
@@ -98,7 +103,7 @@ module Teapot
 			end
 			
 			def link_local_package(context, configuration, package, logger)
-				logger.info "Linking local #{package}...".color(:cyan)
+				logger.info "Linking local #{package}..." #.color(:cyan)
 		
 				local_path = context.root + package.options[:local]
 
@@ -119,7 +124,7 @@ module Teapot
 			end
 
 			def clone_or_pull_package(context, configuration, package, package_lock, logger)
-				logger.info "Processing #{package}...".color(:cyan)
+				logger.info "Processing #{package}..." #.color(:cyan)
 
 				# Where we are going to put the package:
 				destination_path = package.path
@@ -140,7 +145,7 @@ module Teapot
 				end
 
 				if destination_path.exist?
-					logger.info "Updating package at path #{destination_path}...".color(:cyan)
+					logger.info "Updating package at path #{destination_path}..." #.color(:cyan)
 
 					repository = Rugged::Repository.new(destination_path.to_s)
 
@@ -165,7 +170,7 @@ module Teapot
 					# Reset it to the requested commit if required:
 					repository.reset(commit_id, :hard)
 				else
-					logger.info "Cloning package at path #{destination_path}...".color(:cyan)
+					logger.info "Cloning package at path #{destination_path}..." #.color(:cyan)
 					
 					external_url = package.external_url(context.root)
 					

data/lib/teapot/command/list.rb

@@ -19,75 +19,77 @@
 # THE SOFTWARE.
 
 require 'samovar'
+require 'console/terminal'
+
+require_relative 'selection'
 
 module Teapot
 	module Command
-		class List < Samovar::Command
+		class List < Selection
 			self.description = "List provisions and dependencies of the specified package."
 			
-			many :packages, "Limit the listing to only these packages, or all packages if none specified."
-			
-			def only
-				if @packages.any?
-					Set.new(@packages)
+			def terminal(output = $stdout)
+				Console::Terminal.for(output).tap do |terminal|
+					terminal[:definition] = terminal.style(nil, nil, :bright)
+					terminal[:dependency] = terminal.style(:blue)
+					terminal[:provision] = terminal.style(:green)
+					terminal[:package] = terminal.style(:yellow)
+					terminal[:import] = terminal.style(:cyan)
+					terminal[:error] = terminal.style(:red)
 				end
 			end
 			
-			def invoke(parent)
-				context = parent.context
+			def process(selection)
+				context = selection.context
+				terminal = self.terminal
 				
-				logger = parent.logger
-				
-				context.configuration.packages.each do |package|
-					# The root package is the local package for this context:
-					next unless only == nil or only.include?(package.name)
+				selection.resolved.each do |package|
+					terminal.puts "Package #{package.name} (from #{package.path}):"
 					
-					logger.info "Package #{package.name} (from #{package.path}):".bright
-				
 					begin
 						script = context.load(package)
 						definitions = script.defined
 					
 						definitions.each do |definition|
-							logger.info "\t#{definition}"
+							terminal.puts "\t#{definition}", style: :definition
 					
 							definition.description.each_line do |line|
-								logger.info "\t\t#{line.chomp}".color(:cyan)
+								terminal.puts "\t\t#{line.chomp}", style: :description
 							end if definition.description
 					
 							case definition
 							when Project
-								logger.info "\t\t- Summary: #{definition.summary}" if definition.summary
-								logger.info "\t\t- License: #{definition.license}" if definition.license
-								logger.info "\t\t- Website: #{definition.website}" if definition.website
-								logger.info "\t\t- Version: #{definition.version}" if definition.version
+								terminal.puts "\t\t- Summary: #{definition.summary}" if definition.summary
+								terminal.puts "\t\t- License: #{definition.license}" if definition.license
+								terminal.puts "\t\t- Website: #{definition.website}" if definition.website
+								terminal.puts "\t\t- Version: #{definition.version}" if definition.version
 								
 								definition.authors.each do |author|
-									contact_text = [author.email, author.website].compact.collect{|text|" <#{text}>"}.join
-									logger.info "\t\t- Author: #{author.name}" + contact_text
+									contact_text = [author.email, author.website].compact.collect{|text| " <#{text}>"}.join
+									terminal.puts "\t\t- Author: #{author.name}" + contact_text
 								end
 							when Target
 								definition.dependencies.each do |dependency|
-									logger.info "\t\t- #{dependency}".color(:red)
+									terminal.puts "\t\t- #{dependency}", style: :dependency
 								end
 				
 								definition.provisions.each do |name, provision|
-									logger.info "\t\t- #{provision}".color(:green)
+									terminal.puts "\t\t- #{provision}", style: :provision
 								end
 							when Configuration
 								definition.packages.each do |package|
-									logger.info "\t\t- #{package}".color(:green)
+									terminal.puts "\t\t- #{package}", style: :package
 								end
 							
 								definition.imports.select(&:explicit).each do |import|
-									logger.info "\t\t- import #{import.name}".color(:red)
+									terminal.puts "\t\t- import #{import.name}", style: :import
 								end
 							end
 						end
-					rescue NonexistantTeapotError => error
-						logger.info "\t#{error.message}".color(:red)
+					rescue MissingTeapotError => error
+						terminal.puts "\t#{error.message}", style: :error
 					rescue IncompatibleTeapotError => error
-						logger.info "\t#{error.message}".color(:red)
+						terminal.puts "\t#{error.message}", style: :error
 					end
 				end
 			end

data/lib/teapot/command/selection.rb

@@ -0,0 +1,51 @@
+# 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 'samovar'
+
+module Teapot
+	module Command
+		class Selection < Samovar::Command
+			options
+			
+			many :targets, "Only consider the specified targets, if any."
+			
+			def targets
+				if @targets and @targets.any?
+					Set.new(@targets)
+				end
+			end
+			
+			def selection(context)
+				if targets = self.targets
+					context.select(targets)
+				else
+					context.select(context.configuration[:build])
+				end
+			end
+			
+			def invoke
+				context = parent.context
+				
+				self.process(selection(parent.context))
+			end
+		end
+	end
+end

data/lib/teapot/command/status.rb

@@ -18,30 +18,28 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'samovar'
+require_relative 'selection'
 require 'rugged'
+require 'console/terminal'
 
 module Teapot
 	module Command
-		class Status < Samovar::Command
+		class Status < Selection
 			self.description = "List the git status of the specified package(s)."
 			
-			many :packages, "Limit the listing to only these packages, or all packages if none specified."
-			
-			def only
-				if @packages.any?
-					Set.new(@packages)
+			def terminal(output = $stdout)
+				Console::Terminal.for(output).tap do |terminal|
+					terminal[:worktree_new] = terminal.style(:green)
+					terminal[:worktree_modified] = terminal.style(:yellow)
+					terminal[:worktree_deleted] = terminal.style(:red)
 				end
 			end
 			
-			def invoke(parent)
-				context = parent.context
-				logger = parent.logger
+			def process(selection)
+				context = selection.context
+				terminal = self.terminal
 				
-				context.configuration.packages.each do |package|
-					# The root package is the local package for this context:
-					next unless only == nil or only.include?(package.name)
-					
+				selection.resolved.each do |package|
 					repository = Rugged::Repository.new(package.path.to_s)
 					
 					changes = {}
@@ -53,18 +51,10 @@ module Teapot
 					
 					next if changes.empty?
 					
-					logger.info "Package #{package.name} (from #{package.path}):".bright
+					terminal.puts "Package #{package.name} (from #{package.path}):"
 					
-					changes.each do |file, status|
-						if status == [:worktree_new]
-							logger.info "\t#{file}".color(:blue)
-						elsif status == [:worktree_modified]
-							logger.info "\t#{file}".color(:orange)
-						elsif status == [:worktree_deleted]
-							logger.info "\t#{file}".color(:red)
-						else
-							logger.info "\t#{file} #{status.inspect}"
-						end
+					changes.each do |file, statuses|
+						terminal.puts "\t#{file} (#{statuses})", style: statuses.last
 					end
 				end
 			end

data/lib/teapot/command/visualize.rb

@@ -18,12 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'samovar'
+require_relative 'selection'
 require 'graphviz'
 
 module Teapot
 	module Command
-		class Visualize < Samovar::Command
+		class Visualize < Selection
 			self.description = "Generate a picture of the dependency graph."
 			
 			options do
@@ -31,8 +31,6 @@ module Teapot
 				option '-d/--dependency-name <name>', "Show the partial chain for the given named dependency."
 			end
 			
-			many :targets, "Visualize these targets, or use them to help the dependency resolution process."
-			
 			def dependency_names
 				@targets || []
 			end
@@ -41,15 +39,13 @@ module Teapot
 				@options[:dependency_name]
 			end
 			
-			def invoke(parent)
-				context = parent.context
-				selection = context.select(dependency_names)
+			def process(selection)
+				context = selection.context
 				chain = selection.chain
 
 				if dependency_name
 					provider = selection.dependencies[dependency_name]
 					
-					# TODO The visualisation generated isn't quite right. It's introspecting too much from the packages and not reflecting #ordered and #provisions.
 					chain = chain.partial(provider)
 				end
 
@@ -58,7 +54,9 @@ module Teapot
 				graph = visualization.generate(chain)
 
 				if output_path = @options[:output_path]
-					Graphviz::output(graph, :path => output_path)
+					Graphviz.output(graph, path: output_path, format: :svg)
+				else
+					$stdout.puts graph.to_dot
 				end
 
 				return graph

data/lib/teapot/context.rb

@@ -48,8 +48,8 @@ module Teapot
 			@repository ||= Rugged::Repository.new(@root.to_s)
 		end
 		
-		def select(names = [], configuration = @configuration)
-			Select.new(self, configuration, names)
+		def select(names = nil, configuration = @configuration)
+			Select.new(self, configuration, names || [])
 		end
 
 		def substitutions
@@ -69,6 +69,9 @@ module Teapot
 				# e.g. foo-bar, typically used for targets, executables
 				substitutions['PROJECT_TARGET_NAME'] = name.target
 				
+				# e.g. foo_bar, typically used for variables.
+				substitutions['PROJECT_VARIABLE_NAME'] = name.key
+				
 				substitutions['LICENSE'] = @project.license
 			end
 			
@@ -105,10 +108,10 @@ module Teapot
 		def load_root_package(**options)
 			# Load the root package:
 			script = load(root_package)
-
+			
 			# Find the default configuration, if it exists:
 			if configuration_name = options[:configuration]
-				@configuration = @configurations[configuration_name]
+				@configuration = script.configurations[configuration_name]
 			else
 				@configuration = script.default_configuration
 			end

data/lib/teapot/loader.rb

@@ -47,7 +47,7 @@ module Teapot
 		attr :version
 	end
 	
-	class NonexistantTeapotError < StandardError
+	class MissingTeapotError < StandardError
 		def initialize(path)
 			super "Could not read file at #{path}!"
 		end
@@ -67,6 +67,8 @@ module Teapot
 			@defined = []
 			@version = nil
 			
+			@configurations = Build::Dependency::Set.new
+			
 			@default_project = nil
 			@default_configuration = nil
 			
@@ -78,6 +80,8 @@ module Teapot
 		attr :defined
 		attr :version
 		
+		attr :configurations
+		
 		attr :default_project
 		attr :default_configuration
 		
@@ -119,6 +123,7 @@ module Teapot
 
 			@default_configuration ||= configuration
 			@defined << configuration
+			@configurations << configuration
 		end
 		
 		# Checks the host patterns and executes the block if they match.
@@ -165,7 +170,7 @@ module Teapot
 		
 		# Load a teapot.rb file relative to the root of the @package.
 		def load!(path = teapot_path)
-			raise NonexistantTeapotError.new(path) unless File.exist?(path)
+			raise MissingTeapotError.new(path) unless File.exist?(path)
 			
 			script = Script.new(@context, @package)
 			

data/lib/teapot/select.rb

@@ -47,11 +47,11 @@ module Teapot
 			@targets = {}
 			@configurations = {}
 			@projects = {}
-			@rules = Build::Rulebook.new
 			
 			@dependencies = []
 			@selection = Set.new
-			@unresolved = Set.new
+			@resolved = Build::Dependency::Set.new
+			@unresolved = Build::Dependency::Set.new
 			
 			load!(configuration, names)
 			
@@ -69,11 +69,11 @@ module Teapot
 		
 		# All public configurations.
 		attr :configurations
-
-		attr :rules
 		
 		attr :dependencies
 		attr :selection
+		
+		attr :resolved
 		attr :unresolved
 		
 		def chain
@@ -103,9 +103,6 @@ module Teapot
 			when Project
 				AlreadyDefinedError.check(definition, @projects)
 				@projects[definition.name] = definition
-			when Rule
-				AlreadyDefinedError.check(definition, @rules)
-				@rules << definition
 			end
 		end
 		
@@ -117,7 +114,9 @@ module Teapot
 				script.defined.each do |definition|
 					append(definition)
 				end
-			rescue NonexistantTeapotError, IncompatibleTeapotError
+				
+				@resolved << package
+			rescue MissingTeapotError, IncompatibleTeapotError
 				# If the package doesn't exist or the teapot version is too old, it failed:
 				@unresolved << package
 			end

data/lib/teapot/version.rb

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

data/spec/teapot/context_spec.rb

@@ -27,14 +27,32 @@ RSpec.describe Teapot::Context do
 	it "should specify correct number of packages" do
 		default_configuration = context.configuration
 		
-		expect(default_configuration.packages.count).to be == 13
+		expect(default_configuration.packages.count).to be == 0
 	end
 	
-	it "should load teapot.rb file" do
+	it "should select configuration" do
+		expect(context.configuration.name).to be == 'development'
+	end
+	
+	context "with specific configuration" do
+		let(:context) {Teapot::Context.new(root, configuration: 'context_spec')}
+		
+		it "should select configuration" do
+			expect(context.configuration.name).to be == 'context_spec'
+		end
+		
+		it "should specify correct number of packages" do
+			default_configuration = context.configuration
+			
+			expect(default_configuration.packages.count).to be == 13
+		end
+	end
+	
+	it "should load teapot script" do
 		selection = context.select
 		
 		# There is one configuration:
-		expect(selection.configurations.count).to be == 1
+		expect(selection.configurations.count).to be == 2
 		expect(selection.targets.count).to be == 1
 		
 		# We didn't expect any of them to actually load...

data/spec/teapot/context_spec/teapot.rb

@@ -3,9 +3,16 @@
 #  This file is part of the "Teapot" project, and is released under the MIT license.
 #
 
-teapot_version "1.0.0"
+teapot_version "3.0.0"
 
-define_configuration 'test' do |configuration|
+define_target "context_spec" do |target|
+end
+
+define_configuration 'development' do |configuration|
+	configuration.import 'context_spec'
+end
+
+define_configuration 'context_spec' do |configuration|
 	configuration.public!
 	
 	configuration[:source] = "../kurocha"
@@ -31,6 +38,3 @@ define_configuration 'test' do |configuration|
 
 	configuration.require "opencv"
 end
-
-define_target "context_spec" do |target|
-end

data/teapot.gemspec

@@ -24,19 +24,18 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '>= 2.1.0'
 	
-	spec.add_dependency "rainbow", "~> 2.0"
-	
 	spec.add_dependency "graphviz", "~> 1.0"
-	
 	spec.add_dependency "rugged"
 	
-	spec.add_dependency "build", "~> 2.0"
+	spec.add_dependency "build", "~> 2.4"
+	spec.add_dependency "build-environment", "~> 1.10.0"
 	spec.add_dependency "build-files", "~> 1.4"
 	spec.add_dependency "build-dependency", "~> 1.4"
 	spec.add_dependency "build-uri", "~> 1.0"
 	spec.add_dependency "build-text", "~> 1.0"
 	
-	spec.add_dependency "samovar", "~> 1.7"
+	spec.add_dependency "console", "~> 1.0"
+	spec.add_dependency "samovar", "~> 2.0"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: graphviz
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: build-environment
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: build-files
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +233,7 @@ files:
 - lib/teapot/command/create.rb
 - lib/teapot/command/fetch.rb
 - lib/teapot/command/list.rb
+- lib/teapot/command/selection.rb
 - lib/teapot/command/status.rb
 - lib/teapot/command/visualize.rb
 - lib/teapot/configuration.rb
@@ -267,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.