teapot 2.2.0 → 3.2.0

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/{identity_set.rb → command/selection.rb}

@@ -1,15 +1,15 @@
-# Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
+# 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
@@ -18,61 +18,34 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'forwardable'
+require 'samovar'
 
 module Teapot
-	# Very similar to a set but uses a specific callback (defaults to &:name) for object identity.
-	class IdentitySet
-		include Enumerable
-		
-		def initialize(contents = [])
-			@table = {}
+	module Command
+		class Selection < Samovar::Command
+			options
 			
-			contents.each do |object|
-				add(object)
+			many :targets, "Only consider the specified targets, if any."
+			
+			def targets
+				if @targets and @targets.any?
+					Set.new(@targets)
+				end
 			end
-		end
-		
-		attr :table
-		
-		def freeze
-			@table.freeze
 			
-			super
-		end
-		
-		def initialize_dup(other)
-			@table = other.table.dup
-		end
-		
-		def identity(object)
-			object.name
-		end
-		
-		def add(object)
-			@table[identity(object)] = object
-		end
-		
-		alias << add
-		
-		def delete(object)
-			@table.delete(identity(object))
-		end
-		
-		def include?(object)
-			@table.include?(identity(object))
-		end
-		
-		def each(&block)
-			@table.each_value(&block)
-		end
-		
-		def slice(names)
-			names.collect{|name| @table[name]}
+			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
-		
-		extend Forwardable
-		
-		def_delegators :@table, :size, :empty?, :clear, :count, :[], :to_s, :inspect
 	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/configuration.rb

@@ -23,7 +23,7 @@ require 'set'
 
 require 'yaml/store'
 
-require_relative 'identity_set'
+require 'build/dependency/set'
 require_relative 'definition'
 
 module Teapot
@@ -40,8 +40,8 @@ module Teapot
 
 			@options = DEFAULT_OPTIONS.merge(options)
 
-			@packages = IdentitySet.new(packages)
-			@imports = IdentitySet.new
+			@packages = Build::Dependency::Set.new(packages)
+			@imports = Build::Dependency::Set.new
 
 			@visibility = :private
 
@@ -50,7 +50,7 @@ module Teapot
 		end
 
 		def freeze
-			return if frozen?
+			return self if frozen?
 			
 			@options.freeze
 			@packages.freeze
@@ -63,6 +63,15 @@ module Teapot
 			super
 		end
 
+		def environment
+			configuration = self
+			
+			Build::Environment.new(name: self.name) do
+				default build_path configuration.build_path
+				default platforms_path configuration.build_path
+			end
+		end
+
 		# Controls how the configuration is exposed in the context.
 		attr :visibility
 
@@ -128,11 +137,13 @@ module Teapot
 			context.root + "teapot/packages/#{name}"
 		end
 
-		# The path where built products will be installed.
-		def platforms_path
-			context.root + "teapot/platforms/#{name}"
+		# The path where built products will be placed.
+		def build_path
+			context.root + "teapot/build/#{name}"
 		end
 
+		alias platforms_path build_path
+
 		def lock_path
 			context.root + "#{@name}-lock.yml"
 		end
@@ -146,7 +157,7 @@ module Teapot
 		end
 
 		# Process all import directives and return a new configuration based on the current configuration. Import directives bring packages and other import directives from the specififed configuration definition.
-		def traverse(configurations, imported = IdentitySet.new, &block)
+		def traverse(configurations, imported = Build::Dependency::Set.new, &block)
 			yield self # Whatever happens here, should ensure that...
 			
 			@imports.each do |import|

data/lib/teapot/context.rb

@@ -18,135 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'loader'
-require_relative 'package'
-
-require 'build/rulebook'
-require 'build/text/substitutions'
-require 'build/text/merge'
+require_relative 'select'
 
 module Teapot
-	class AlreadyDefinedError < StandardError
-		def initialize(definition, previous)
-			super "Definition #{definition.name} in #{definition.path} has already been defined in #{previous.path}!"
-		end
-
-		def self.check(definition, definitions)
-			previous = definitions[definition.name]
-
-			raise self.new(definition, previous) if previous
-		end
-	end
-	
-	# A selection is a specific view of the data exposed by the context at a specific point in time.
-	class Select
-		def initialize(context, configuration, names = [])
-			@context = context
-			@configuration = Configuration.new(context, configuration.package, configuration.name, [], configuration.options)
-			
-			@targets = {}
-			@configurations = {}
-			@projects = {}
-			@rules = Build::Rulebook.new
-			
-			@dependencies = []
-			@selection = Set.new
-			@unresolved = Set.new
-			
-			load!(configuration, names)
-			
-			@chain = nil
-		end
-		
-		attr :context
-		attr :configuration
-		
-		attr :targets
-		attr :projects
-		
-		# Alises as defined by Configuration#targets
-		attr :aliases
-		
-		# All public configurations.
-		attr :configurations
-
-		attr :rules
-		
-		attr :dependencies
-		attr :selection
-		attr :unresolved
-		
-		def chain
-			@chain ||= Build::Dependency::Chain.expand(@dependencies, @targets.values, @selection)
-		end
-		
-		def direct_targets(ordered)
-			@dependencies.collect do |dependency|
-				ordered.find{|(package, _)| package.provides? dependency}
-			end.compact
-		end
-		
-		private
-		
-		# Add a definition to the current context.
-		def append definition
-			case definition
-			when Target
-				AlreadyDefinedError.check(definition, @targets)
-				@targets[definition.name] = definition
-			when Configuration
-				# We define configurations in two cases, if they are public, or if they are part of the root package of this context.
-				if definition.public? or definition.package == @context.root_package
-					AlreadyDefinedError.check(definition, @configurations)
-					@configurations[definition.name] = definition
-				end
-			when Project
-				AlreadyDefinedError.check(definition, @projects)
-				@projects[definition.name] = definition
-			when Rule
-				AlreadyDefinedError.check(definition, @rules)
-				@rules << definition
-			end
-		end
-		
-		def load_package!(package)
-			begin
-				script = @context.load(package)
-				
-				# Load the definitions into the current selection:
-				script.defined.each do |definition|
-					append(definition)
-				end
-			rescue NonexistantTeapotError, IncompatibleTeapotError
-				# If the package doesn't exist or the teapot version is too old, it failed:
-				@unresolved << package
-			end
-		end
-		
-		def load!(configuration, names)
-			# Load the root package which makes all the named configurations and targets available.
-			load_package!(@context.root_package)
-			
-			# Load all packages defined by this configuration.
-			configuration.traverse(@configurations) do |configuration|
-				@configuration.merge(configuration) do |package|
-					# puts "Load package: #{package} from #{configuration}"
-					load_package!(package)
-				end
-			end
-			
-			@configuration.freeze
-			
-			names.each do |name|
-				if @targets.key? name
-					@selection << name
-				else
-					@dependencies << name
-				end
-			end
-		end
-	end
-	
 	# A context represents a specific root package instance with a given configuration and all related definitions. A context is stateful in the sense that package selection is specialized based on #select and #dependency_chain. These parameters are usually set up initially as part of the context setup.
 	class Context
 		def initialize(root, **options)
@@ -158,7 +32,7 @@ module Teapot
 
 			@loaded = {}
 
-			load_root_package(options) unless options[:load_root] == false
+			load_root_package(**options)
 		end
 
 		attr :root
@@ -174,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
@@ -195,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
 			
@@ -228,13 +105,13 @@ module Teapot
 		
 		private
 		
-		def load_root_package(options)
+		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