teapot 0.3.2 → 0.5.0

data/bin/teapot

@@ -23,195 +23,161 @@
 require 'teapot/config'
 
 require 'uri'
-require 'rake'
 require 'rainbow'
+require 'fileutils'
+require 'benchmark'
+require 'yaml'
 
-$app = Rake.application = Rake::Application.new
-$app.init('teapot')
+require 'trollop'
 
-# Fetch remote packages and link local packages based on the Teapot configuration:
-task :fetch do
-	config = Teapot::Config.load_default
-	context = Teapot::Context.new(config)
-	
-	base_uri = URI(config.options[:source].to_s)
-	
-	if base_uri.scheme == nil || base_uri.scheme == 'file'
-		base_uri = URI "file://" + File.expand_path(base_uri.path, config.root) + "/"
-	end
+OPTIONS = Trollop::options do
+	opt :only, "Only compiled direct dependencies."
+end
+
+module Application
+	def self.fetch
+		config = Teapot::Config.load_default
+		context = Teapot::Context.new(config)
 	
-	puts "Base URI: #{base_uri}".color(:cyan)
+		base_uri = URI(config.options[:source].to_s)
 	
-	config.records.each do |record|
-		next if record.transient?
+		if base_uri.scheme == nil || base_uri.scheme == 'file'
+			base_uri = URI "file://" + File.expand_path(base_uri.path, config.root) + "/"
+		end
 		
-		destination_path = record.destination_path
+		puts "Base URI: #{base_uri}".color(:cyan)
 		
-		if record.local?
-			puts "Linking local #{record}...".color(:cyan)
-			
-			local_path = config.root + record.options[:local]
+		config.packages.each do |package|
+			destination_path = package.path
+		
+			if package.local?
+				puts "Linking local #{package}...".color(:cyan)
 			
-			# Make the top level directory if required:
-			FileUtils.mkdir_p(destination_path.dirname.to_s)
+				local_path = config.root + package.options[:local]
 			
-			unless File.exist? destination_path
-				FileUtils.ln_s local_path, destination_path
-			end
-		else
-			puts "Fetching #{record}...".color(:cyan)
-		
-			branch = record.options.fetch(:version, 'master')
-		
-			unless File.exist? destination_path
-				puts "Cloning package at path #{destination_path} ...".color(:cyan)
-				FileUtils.mkdir_p(destination_path.to_s)
+				# Make the top level directory if required:
+				destination_path.dirname.mkpath
 			
-				source_uri = URI record.uri
-		
-				unless source_uri.absolute?
-					source_uri = base_uri + source_uri
+				unless destination_path.exist?
+					destination_path.make_symlink(local_path)
 				end
+			else
+				puts "Fetching #{package}...".color(:cyan)
 		
-				# Git can't handle the default formatting that Ruby uses for file URIs.
-				if source_uri.scheme == "file"
-					source_uri = "file://" + source_uri.path
-				end
+				branch = package.options.fetch(:version, 'master')
+		
+				unless destination_path.exist?
+					puts "Cloning package at path #{destination_path} ...".color(:cyan)
+					destination_path.mkpath
 			
-				Teapot::Commands.run("git", "clone", source_uri, destination_path, "--branch", branch)
+					Teapot::Commands.run("git", "clone", package.relative_url(base_uri), destination_path, "--branch", branch)
 			
-				Dir.chdir(destination_path) do
-					Teapot::Commands.run("git", "submodule", "update", "--init", "--recursive")
-				end
-			else
-				puts "Updating package at path #{destination_path} ...".color(:cyan)
+					Dir.chdir(destination_path) do
+						Teapot::Commands.run("git", "submodule", "update", "--init", "--recursive")
+					end
+				else
+					puts "Updating package at path #{destination_path} ...".color(:cyan)
 			
-				Dir.chdir(destination_path) do
-					Teapot::Commands.run("git", "fetch", "origin")
+					Dir.chdir(destination_path) do
+						Teapot::Commands.run("git", "fetch", "origin")
 				
-					Teapot::Commands.run("git", "checkout", branch)
+						Teapot::Commands.run("git", "checkout", branch)
 				
-					# Pull any changes, if you might get the error from above:
-					# Your branch is behind 'origin/0.1' by 1 commit, and can be fast-forwarded.
-					Teapot::Commands.run("git", "pull")
+						# Pull any changes, if you might get the error from above:
+						# Your branch is behind 'origin/0.1' by 1 commit, and can be fast-forwarded.
+						Teapot::Commands.run("git", "pull")
 				
-					Teapot::Commands.run("git", "submodule", "update", "--init", "--recursive")
+						Teapot::Commands.run("git", "submodule", "update", "--init", "--recursive")
+					end
 				end
 			end
 		end
-	end
-	
-	puts "Completed fetch successfully.".color(:green)
-end
-
-# Build packages based on the Teapot configuration:
-task :build do |task, arguments|
-	config = Teapot::Config.load_default
-	context = Teapot::Context.new(config)
 	
-	config.records.each do |record|
-		record.load(context)
+		puts "Completed fetch successfully.".color(:green)
 	end
 	
-	# Configure the packages and platforms based on the ENV provided by the user:
-	build_package = ENV['PACKAGE']
-	build_platform = ENV['PLATFORM']
+	def self.install(package_names = ARGV)
+		config = Teapot::Config.load_default
+		context = Teapot::Context.new(config)
 	
-	if build_package
-		package = context.packages[build_package]
-		
-		unless package
-			fail "Could not find package #{build_package}".color(:red)
+		config.packages.each do |package|
+			context.load(package)
 		end
 		
-		packages = [package]
-	else
-		packages = context.packages.values
-	end
-	
-	if build_platform
-		platform = context.platforms[build_platform]
+		context.select(package_names)
 		
-		unless platform
-			fail "Could not find platform #{build_platform}".color(:red)
-		end
+		chain = Teapot::Dependency::chain(context.selection, context.dependencies, context.targets.values)
 		
-		platforms = [platform]
-	else
-		platforms = context.platforms.values
-	end
-	
-	unless ENV['ONLY']
-		build_order = Teapot::Package.build_order(context.packages, packages)
-	else
-		build_order = {:ordered => packages, :unresolved => []}
-	end
-	
-	if build_order[:unresolved].size > 0
-		puts "Unresolved packages:"
-		build_order[:unresolved].each do |(name, from)|
-			puts "\tPackage: #{name} (from #{from})".color(:red)
-		end
+		if chain.unresolved.size > 0
+			puts "Unresolved dependencies:"
 		
-		fail "Cannot continue build due to unresolved dependencies!".color(:red)
-	else
-		ordered = build_order[:ordered]
-	end
+			chain.unresolved.each do |(name, parent)|
+				puts "#{parent} depends on #{name.inspect}".color(:red)
+				
+				conflicts = chain.conflicts[name]
+				
+				if conflicts
+					conflicts.each do |conflict|
+						puts " - provided by #{conflict.inspect}".color(:red)
+					end
+				end
+			end
+			
+			abort "Cannot continue build due to unresolved dependencies!"
+		end
 	
-	puts "Building #{ordered.join(', ')} for variant #{config.variant}".color(:cyan)
+		puts "Resolved: #{chain.resolved.inspect}".color(:magenta)
 	
-	platforms.each do |platform|
-		next unless platform.available?
+		ordered = chain.ordered
 		
-		puts "Building for #{platform}...".color(:cyan)
+		if OPTIONS[:only]
+			ordered = context.direct_targets(ordered)
+		end
 		
-		platform.prepare!
+		ordered.each do |(target, dependency)|
+			puts "Building #{target.name} for dependency #{dependency}...".color(:cyan)
 		
-		ordered.each do |package|
-			next if package.record.transient?
-			
-			puts "Building #{package}...".color(:cyan)
-			
-			package.build!(platform, :variant => config.variant)
+			if target.respond_to? :install! and !ENV['TEAPOT_DRY']
+				target.install!(context)
+			end
 		end
-	end
-	
-	puts "Completed build successfully.".color(:green)
-end
-
-# List available/installed packages based on the Teapot configuration:
-task :list do
-	config = Teapot::Config.load_default
-	context = Teapot::Context.new(config)
 	
-	config.records.each do |record|
-		record.load(context)
+		puts "Completed build successfully.".color(:green)
 	end
 	
-	build_order = Teapot::Package.build_order(context.packages, context.packages.values)
-	
-	if build_order[:unresolved].size > 0
-		puts "Unresolved packages:"
-		build_order[:unresolved].each do |(name, from)|
-			puts "\tPackage: #{name} (from #{from})".color(:red)
-		end
-	end
+	def self.list
+		config = Teapot::Config.load_default
+		context = Teapot::Context.new(config)
 	
-	puts "Ordered packages:"
-	build_order[:ordered].each do |package|
-		puts "\t#{package.class}: #{package.name}".color(:green)
+		config.packages.each do |package|
+			targets = context.load(package)
 		
-		if package.depends.size > 0
-			puts "\t\t(depends on #{package.depends.join(', ')})".color(:green)
+			targets.each do |target|
+				puts "Target #{target.name} from #{package.name}"
+			
+				target.dependencies.each do |name|
+					puts " - depends on #{name.inspect}".color(:red)
+				end
+			
+				target.provisions.each do |(name, provision)|
+					if Teapot::Dependency::Alias === provision
+						puts " - provides #{name.inspect} => #{provision.dependencies.inspect}".color(:green)
+					else
+						puts " - provides #{name.inspect}".color(:green)
+					end
+				end
+			end
 		end
 	end
 	
-	puts "Platforms:"
-	context.platforms.each do |name, platform|
-		puts "\t#{platform.class}: #{platform.name}".color(:green)
+	def self.debug
+		puts ARGV.inspect
 	end
 end
 
-task :default => [:fetch, :build, :list]
+time = Benchmark.measure do
+	action = ARGV.shift.to_sym
+	Application.send(action) if Application.methods.include?(action)
+end
 
-$app.top_level
+puts time.format("Elapsed Time: %r").color(:magenta)

data/lib/teapot/{platform.rb → build/component.rb}

@@ -19,62 +19,51 @@
 # THE SOFTWARE.
 
 require 'fileutils'
-require 'teapot/environment'
 
 module Teapot
-	class UnavailableError < StandardError
-	end
-	
-	class Platform
-		def initialize(context, record, name)
-			@context = context
-			@record = record
-
-			@name = name
-			@configure = nil
-
-			@available = false
-		end
-		
-		attr :name
+	module Build
+		class Component
+			def initialize(root, name, environment)
+				@root = root
+				@name = name
+				@environment = environment
 		
-		def prefix
-			@context.config.build_path + @name.to_s
-		end
+				@parts = [@name]
+			end
 	
-		def cmake_modules_path
-			prefix + "share/cmake/modules"
-		end
-		
-		def configure(&block)
-			@configure = Proc.new &block
-		end
-		
-		def environment
-			if @available
-				return Environment.combine(
-					Environment.new(&@configure),
-					@record.options[:environment],
-				)
-			else
-				raise UnavailableError.new("Platform is not available for configuration!")
+			attr :root
+			attr :name
+			attr :parts
+	
+			def add(path)
+				@parts << path
 			end
-		end
+	
+			def variant
+				@environment[:variant]
+			end
+	
+			def destination_path
+				@environment[:build_prefix] + "source"
+			end
+	
+			def prepare!
+				source_path = destination_path + @name
 		
-		def make_available!
-			@available = true
-		end
+				if source_path.exist?
+					source_path.rmtree
+				end
 		
-		def available?
-			@available
-		end
+				source_path.mkpath
 		
-		def to_s
-			"<Platform: #{@name} (#{@available ? 'available' : 'inactive'})>"
-		end
+				@parts.each do |path|
+					full_path = @root + path
+			
+					FileUtils.cp_r(full_path.children, source_path.to_s)
+				end
 		
-		def prepare!
-			FileUtils.mkdir_p cmake_modules_path
+				return source_path
+			end
 		end
 	end
 end

data/lib/teapot/build/file_list.rb

@@ -0,0 +1,67 @@
+# 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 'pathname'
+require 'fileutils'
+
+module Teapot
+	module Build
+		class FileList
+			include Enumerable
+			
+			def self.[] (root, pattern, prefix = nil)
+				self.new(root, pattern, prefix)
+			end
+			
+			def initialize(root, pattern, prefix = nil)
+				@root = root
+				@pattern = pattern
+				@prefix = Pathname.new(prefix || ".")
+			end
+
+			attr :root
+			attr :pattern
+			attr :prefix
+
+			def each(&block)
+				Pathname.glob(@root + @pattern).each &block
+			end
+			
+			def copy(destination)
+				self.each do |path|
+					# Compute the destination path, which is formed using the relative path:
+					relative_path = path.relative_path_from(@root)
+					destination_path = destination + @prefix + relative_path
+					
+					if path.directory?
+						# Make a directory at the destination:
+						destination_path.mkpath
+					else
+						# Make the path if it doesn't already exist:
+						destination_path.dirname.mkpath
+					
+						# Copy the file to the destination:
+						FileUtils.cp path, destination_path
+					end
+				end
+			end
+		end
+	end
+end

data/lib/teapot/build/linker.rb

@@ -18,12 +18,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'teapot/commands'
+
 module Teapot
 	module Build
 		module Linker
+			class UnsupportedPlatform < StandardError
+			end
+			
 			def self.link_static(environment, library_file, objects)
 				if RUBY_PLATFORM =~ /darwin/
-					Teapot::Commands.run(
+					Commands.run(
 						environment[:libtool] || "libtool",
 						"-static", "-o", library_file, objects,
 					)

data/lib/teapot/build/target.rb

@@ -0,0 +1,77 @@
+# 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 'teapot/commands'
+require 'teapot/environment'
+
+require 'pathname'
+require 'rainbow'
+require 'fileutils'
+
+require 'teapot/build/linker'
+require 'teapot/build/component'
+require 'teapot/build/file_list'
+
+module Teapot
+	module Build
+		class Target
+			def initialize(parent)
+				@parent = parent
+				@configure = nil
+			end
+		
+			attr :parent
+		
+			def root
+				@parent.root
+			end
+		
+			def configure(&block)
+				@configure = Proc.new &block
+			end
+		
+			def self.target(*args, &block)
+				instance = self.new(*args)
+			
+				if block_given?
+					instance.instance_eval(&block)
+				end
+			
+				return instance
+			end
+		
+			def execute(command, environment, *arguments)
+				if @configure
+					environment = environment.merge &@configure
+				end
+				
+				# Flatten the environment to a hash:
+				values = environment.flatten
+			
+				puts "Performing #{self.class}/#{command} for #{root}...".color(:cyan)
+			
+				# Show the environment to the user:
+				Environment::System::dump(values)
+				
+				self.send(command, values, *arguments)
+			end
+		end
+	end
+end

data/lib/teapot/build/targets/application.rb

@@ -0,0 +1,55 @@
+# 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 'teapot/build/targets/library'
+require 'teapot/build/targets/directory'
+
+module Teapot
+	module Build
+		module Targets
+			class Application < Directory
+				def initialize(parent, name, options = {})
+					super parent
+					
+					@name = name
+					@options = options
+				end
+				
+				def subdirectory
+					"apps/#{@name}"
+				end
+				
+				def << target
+					if target.respond_to? :subdirectory
+						target.options[:subdirectory] = subdirectory
+					end
+					
+					super
+				end
+			end
+			
+			class Directory
+				def add_application(*args, &block)
+					self << Application.target(self, *args, &block)
+				end
+			end
+		end
+	end
+end