teapot 0.0.1 → 0.0.3

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - rbx-19mode

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in teapot.gemspec
 gemspec
+
+group :test do
+	gem "rake"
+end

data/README.md

@@ -4,6 +4,8 @@ Teapot is a tool for managing complex cross-platform builds. It provides
 advanced dependency management via the Teapot file and is supported by
 the infusions ecosystem of packages and platform tooling.
 
+[![Build Status](https://secure.travis-ci.org/ioquatix/teapot.png)](http://travis-ci.org/ioquatix/teapot)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,7 +22,50 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Create a Teapot file in the root directory of your project:
+
+	source "https://github.com/infusions"
+
+	host /linux/ do
+		platform "linux"
+	end
+	
+	host /darwin/ do
+		platform "darwin-osx"
+	end
+
+	package "png"
+	package "freetype"
+	package "vorbis"
+	package "ogg"
+	package "jpeg"
+
+Then run
+
+	$ teapot install
+
+This will download and compile all the selected packages into the `build` directory.
+
+### CMake ###
+
+To use these packages in a CMake project, update your `CMakeLists.txt`:
+
+	list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/build/${TEAPOT_PLATFORM}/")
+
+Then configure like so:
+
+	cmake path/to/src -DTEAPOT_PLATFORM=linux
+
+### Xcode ###
+
+To use these packages in an Xcode project, creating a custom `teapot.xcconfig` is recommended:
+
+	TEAPOT_PLATFORM=darwin-osx
+	TEAPOT_PREFIX_PATH=$(SRCROOT)/build/$(TEAPOT_PLATFORM)
+	
+	// Search paths:
+	HEADER_SEARCH_PATHS=$(inherited) "$(TEAPOT_PREFIX_PATH)/include"
+	LIBRARY_SEARCH_PATHS=$(inherited) "$(TEAPOT_PREFIX_PATH)/lib"
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+	t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/bin/teapot

@@ -30,7 +30,7 @@ $app = Rake.application = Rake::Application.new
 $app.init('teapot')
 
 task :fetch do
-	config = Teapot::Config.load
+	config = Teapot::Config.load_default
 	context = Teapot::Context.new(config)
 	
 	base_uri = URI(config.options[:source].to_s + '/')
@@ -38,10 +38,10 @@ task :fetch do
 	config.records.each do |record|
 		destination_path = record.destination_path
 		
-		$stderr.puts "Fetching #{record}...".color(:blue)
+		puts "Fetching #{record}...".color(:blue)
 		
 		unless File.exist? destination_path
-			$stderr.puts "Cloning package at path #{destination_path} ...".color(:green)
+			puts "Cloning package at path #{destination_path} ...".color(:green)
 			
 			source_uri = URI(record.uri)
 		
@@ -53,59 +53,127 @@ task :fetch do
 				source_uri = source_uri.path
 			end
 		
-			sh("git", "clone", source_uri.to_s, destination_path.to_s)
+			Teapot::Commands.run("git", "clone", "--recursive", source_uri.to_s, destination_path.to_s)
 		else
-			$stderr.puts "Updating package at path #{destination_path} ...".color(:green)
+			puts "Updating package at path #{destination_path} ...".color(:green)
 			
 			Dir.chdir(destination_path) do
-				sh("git", "pull")
+				Teapot::Commands.run("git", "pull")
+				Teapot::Commands.run("git", "submodule", "update", "--init")
 			end
 		end
 	end
 end
 
-task :install => :fetch do
-	config = Teapot::Config.load
+task :build do
+	config = Teapot::Config.load_default
 	context = Teapot::Context.new(config)
 	
 	config.records.each do |record|
-		$stderr.puts "Installing #{record.name}...".color(:blue)
-		
-		record.load(context).each do |bundle|
-			if bundle.respond_to? :fetch_location
-				location = bundle.fetch_location
-				
-				if !location
-					puts "Could not determine fetch location for #{name}!".color(:red)
-				elsif File.exist? bundle.source_path
-					puts "Source path #{bundle.source_path} already exists!".color(:red)
-				else
-					url = location[:url]
-					local_path = bundle.path + (location[:filename] || File.basename(url))
+		destination_path = record.destination_path
+		
+		bundles = record.load(context)
+		
+		bundles.each do |bundle|
 			
-					puts "Local path: #{local_path}"
+		end
+	end
+end
+
+task :build do |task, arguments|
+	config = Teapot::Config.load_default
+	context = Teapot::Context.new(config)
+	
+	config.records.each do |record|
+		destination_path = record.destination_path
+		
+		record.load(context)
+	end
+
+	build_package = ENV['PACKAGE']
+	build_platform = ENV['PLATFORM']
+	
+	if build_package
+		package = context.packages[build_package]
+		
+		unless package
+			puts "Could not find package #{build_package}".color(:red)
 			
-					unless bundle.source_path.exist?
-						unless local_path.exist?
-							puts "Downloading #{bundle.name} to #{local_path}..."
-							sh("curl", "-L", url, "-o", local_path.to_s)
-						end
+			next
+		end
+		
+		packages = [package]
+	else
+		packages = context.packages.values
+	end
+	
+	if build_platform
+		platform = context.platforms[build_platform.to_sym]
+		
+		unless platform
+			puts "Could not find platform #{build_platform}".color(:red)
 			
-						puts "Extracting #{bundle.name}..."
-						sh("mkdir", bundle.source_path.to_s)
-						sh("tar", "-C", bundle.source_path.to_s, "--strip-components", "1", "-xvf", local_path.to_s)
-					end
-				end
-			end
+			next
 		end
+		
+		platforms = [platform]
+	end
+	
+	unless ENV['ONLY']
+		ordered = Teapot::Package.build_order(context.packages, packages)
+	else
+		ordered = packages
+	end
+	
+	puts "Building #{ordered.join(', ')} for variant #{config.variant}".color(:blue)
+	
+	context.platforms.each do |name, platform|
+		next unless platform.available?
+		
+		puts "Building for #{platform}...".color(:blue)
+		
+		platform.prepare!
+		
+		ordered.each do |package|
+			package.build!(platform, :variant => config.variant)
+		end
+	end
+	
+	puts "Completed build successfully.".color(:green)
+end
+
+task :list do
+	config = Teapot::Config.load_default
+	context = Teapot::Context.new(config)
+	
+	config.records.each do |record|
+		destination_path = record.destination_path
+		
+		record.load(context)
+	end
+	
+	ordered = Teapot::Package::build_order(context.packages, context.packages.values)
+	
+	ordered.each do |package|
+		puts "Package: #{package.name}"
+		
+		if package.depends.size > 0
+			puts "	(depends on #{package.depends.join(', ')})"
+		end
+	end
+	
+	context.platforms.each do |platform|
+		puts "Platform: #{platform.name}"
 	end
 end
 
 task :help do
-	$stderr.puts "To create a new teapot, use the setup task:"
-	$stderr.puts "$ #{File.basename($0)} setup project-path"
+	puts "To create a new teapot, use the setup task:"
+	puts "$ #{File.basename($0)} setup project-path"
 end
 
+task :install => [:fetch, :build]
+
 task :default => :help
 
 $app.top_level

data/lib/teapot/commands.rb

@@ -0,0 +1,32 @@
+# 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 'rainbow'
+
+module Teapot
+	module Commands
+		def self.run(*args)
+			args.collect!(&:to_s)
+			
+			puts args.join(' ').color(:blue)
+			system(*args)
+		end
+	end
+end

data/lib/teapot/config.rb

@@ -21,6 +21,8 @@
 require 'pathname'
 
 require 'teapot/context'
+require 'teapot/environment'
+require 'teapot/commands'
 
 module Teapot
 	class Config
@@ -42,12 +44,14 @@ module Teapot
 				end
 				
 				@options = options
+				@global = Environment.new
 			end
 			
 			attr :klass
 			attr :name
 			attr :uri
 			attr :options
+			attr :global
 			
 			def load(context)
 				context.load(self)
@@ -84,6 +88,8 @@ module Teapot
 		
 			@packages = []
 			@platforms = []
+			
+			@environment = Environment.new
 		end
 
 		def packages_path
@@ -98,9 +104,34 @@ module Teapot
 			@root + (@options[:build_path] || "build")
 		end
 		
+		def variant(*args, &block)
+			name = @options[:variant] || 'debug'
+			
+			if block_given?
+				if args.find{|arg| arg === name}
+					yield
+				end
+			else
+				name
+			end
+		end
+		
+		def host(*args, &block)
+			name = @options[:host_platform] || RUBY_PLATFORM
+			
+			if block_given?
+				if args.find{|arg| arg === name}
+					yield
+				end
+			else
+				name
+			end
+		end
+		
 		attr :options
 		attr :packages
 		attr :platforms
+		attr :environment
 
 		def source(path)
 			@options[:source] = path
@@ -115,10 +146,11 @@ module Teapot
 		end
 
 		def platform(name, options = {})
+			options = {:environment => @environment}.merge(options)
 			@platforms << Record.new(self, Platform, name, options)
 		end
 
-		def self.load(root = Dir.getwd, options = {})
+		def self.load(root, options = {})
 			config = new(root, options)
 			
 			teapot_path = File.join(root, "Teapot")
@@ -129,5 +161,11 @@ module Teapot
 			
 			return config
 		end
+		
+		def self.load_default(root = Dir.getwd, options = {})
+			options.merge!(:variant => ENV['TEAPOT_VARIANT'])
+			
+			load(root, options)
+		end
 	end
 end

data/lib/teapot/context.rb

@@ -19,13 +19,12 @@
 # THE SOFTWARE.
 
 require 'pathname'
+require 'rainbow'
 
 require 'teapot/package'
 require 'teapot/platform'
 
 module Teapot
-	PACKAGE_FILE = "package.rb"
-
 	class Context
 		def initialize(config)
 			@config = config
@@ -41,6 +40,7 @@ module Teapot
 		attr :platforms
 
 		def load(record)
+			@record = record
 			@defined = []
 			
 			path = (record.destination_path + record.loader_path).to_s
@@ -49,8 +49,8 @@ module Teapot
 			@defined
 		end
 
-		def define_package(name, &block)
-			package = Package.new(self, name)
+		def define_package(*args, &block)
+			package = Package.new(self, @record, *args)
 
 			yield(package)
 
@@ -59,8 +59,8 @@ module Teapot
 			@defined << package
 		end
 		
-		def define_platform(name, &block)
-			platform = Platform.new(self, name)
+		def define_platform(*args, &block)
+			platform = Platform.new(self, @record, *args)
 
 			yield(platform)
 
@@ -70,5 +70,9 @@ module Teapot
 
 			@defined << platform
 		end
+		
+		def global name
+			@config.environment[name]
+		end
 	end
 end

data/lib/teapot/environment.rb

@@ -0,0 +1,232 @@
+# 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 'rainbow'
+
+require 'rexec'
+require 'yaml'
+
+require 'teapot/package'
+require 'teapot/platform'
+require 'teapot/commands'
+
+module Teapot
+	class Environment
+		Default = Struct.new(:value)
+		
+		class Constructor
+			def initialize(environment)
+				@environment = environment
+			end
+	
+			def method_missing(name, value = nil, &block)
+				if block_given?
+					@environment[name] = block
+				else
+					@environment[name] = value
+				end
+		
+				name
+			end
+	
+			def [] key
+				@environment[key]
+			end
+	
+			def default(name)
+				@environment[name] = Default.new(@environment[name])
+			end
+		end
+		
+		class Evaluator
+			def initialize(environment)
+				@environment = environment
+			end
+			
+			def method_missing(name)
+				object_value(@environment[name])
+			end
+			
+			private
+			
+			# Compute the literal object value for a given key:
+			def object_value(value)
+				case value
+				when Array
+					value.collect{|item| object_value(item)}
+				when Symbol
+					object_value(@values[value])
+				when Proc
+					object_value(instance_eval(&value))
+				when Default
+					object_value(value.value)
+				else
+					value
+				end
+			end
+		end
+		
+		def self.combine(*environments)
+			# Flatten the list of environments:
+			environments = environments.collect do |environment|
+				if Environment === environment
+					environment.to_a
+				else
+					environment
+				end
+			end.flatten
+			
+			# Resequence based on order:
+			first = Environment.new(nil, environments.shift)
+			top = first
+			
+			environments.each do |tail|
+				top = Environment.new(top, tail)
+			end
+			
+			return top
+		end
+		
+		def initialize(parent = nil, values = nil, &block)
+			@values = (values || {}).to_hash
+			@parent = parent
+			
+			@evaluator = Evaluator.new(self)
+			
+			if block_given?
+				construct(&block)
+			end
+		end
+		
+		def construct(&block)
+			Constructor.new(self).instance_eval(&block)
+		end
+		
+		def dup
+			self.class.new(@values)
+		end
+		
+		attr :values
+		attr :parent
+		
+		def [] (key)
+			environment = lookup(key)
+			
+			environment ? environment.values[key] : nil
+		end
+		
+		def []= (key, value)
+			@values[key] = value
+		end
+		
+		def to_hash
+			@values
+		end
+		
+		def flatten
+			hash = {}
+			
+			flatten_to_hash(hash)
+			
+			Environment.new(nil, hash)
+		end
+		
+		def to_string_hash
+			Hash[@values.map{|key, value| [key.to_s.upcase, string_value(value)]}]
+		end
+		
+		def use(options = {}, &block)
+			system_environment = flatten.to_string_hash
+			
+			puts YAML::dump(system_environment).color(:magenta)
+			
+			Dir.chdir(options[:in] || ".") do
+				RExec.env(system_environment) do
+					@evaluator.instance_eval(&block)
+				end
+			end
+		end
+		
+		def to_s
+			"<#{self.class} #{self.values}>"
+		end
+		
+		def to_a
+			flat = []
+			
+			flatten_to_array(flat)
+			
+			return flat
+		end
+		
+		protected
+		
+		def flatten_to_array(array)
+			if @parent
+				@parent.flatten_to_array(array)
+			end
+			
+			array << self
+		end
+		
+		def flatten_to_hash(hash)
+			if @parent
+				@parent.flatten_to_hash(hash)
+			end
+			
+			@values.each do |key, value|
+				previous = hash[key]
+
+				if Array === previous
+					hash[key] = previous + Array(value)
+				elsif Default == previous
+					hash[key] ||= previous
+				else
+					hash[key] = value
+				end
+			end
+		end
+		
+		# Compute the literal string value for a given key:
+		def string_value(value)
+			case value
+			when Array
+				value.collect{|item| string_value(item)}.join(' ')
+			when Symbol
+				string_value(@values[value])
+			when Proc
+				string_value(@evaluator.instance_eval(&value))
+			when Default
+				string_value(value.value)
+			else
+				value.to_s
+			end
+		end
+		
+		def lookup(name)
+			if @values.include? name
+				self
+			elsif @parent
+				@parent.lookup(name)
+			end
+		end
+	end
+end

data/lib/teapot/package.rb

@@ -1,82 +1,71 @@
+# 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'
 
 module Teapot
-	class Package
-		class BuildError < StandardError
+	class BuildError < StandardError
+	end
+	
+	class Task
+		def initialize
+			@callbacks = {}
 		end
-
-		class Task
-			def initialize
-				@callbacks = {}
-			end
 			
-			def define(name, &callback)
-				@callbacks[name] = callback
-			end
-			
-			def [](name)
-				@callbacks[name] || @callbacks[:all]
-			end
+		def define(name, &callback)
+			@callbacks[name] = callback
 		end
-
-		def self.build_order(available, packages)
-			ordered = []
-
-			expand = lambda do |name|
-				package = available[name]
-
-				unless package
-					puts "Couldn't resolve #{name}"
-				else
-					package.depends.each do |dependency|
-						expand.call(dependency)
-					end
-
-					unless ordered.include? package
-						ordered << package
-					end
-				end
-			end
-
-			packages.each do |package|
-				expand.call(package.name)
-			end
-
-			return ordered
+			
+		def [](name)
+			@callbacks[name] || @callbacks[:all]
 		end
-
-		def initialize(context, name, path = nil)
+	end
+	
+	class Package
+		def initialize(context, record, name)
 			@context = context
-			
+			@record = record
+
 			parts = name.split('-')
 			@name = parts[0..-2].join('-')
 			@version = parts[-1]
 
-			@path = path || (context.config.packages_path + @name)
-
 			@build = Task.new
 
 			@depends = []
 
+			@path = @record.destination_path
 			@source_path = @path + name
-			@fetch_location = nil
 		end
 
+		attr :context
+		attr :record
+		
 		attr :name
 		attr :version
+		
 		attr :path
-		attr :variants
-		attr :fetch_location
 
 		attr :depends, true
 		attr :source_path, true
 
-		def install!
-			if @fetch_location
-			end
-		end
-
 		def build(platform, &block)
 			@build.define(platform, &block)
 		end
@@ -84,23 +73,49 @@ module Teapot
 		def build!(platform = :all, config = {})
 			task = @build[platform.name]
 			
-			puts "Building #{@name} for #{platform.name}"
 			if task
+				environment = Environment.combine(
+					@record.options[:environment],
+					platform.environment,
+					config,
+				)
+				
 				Dir.chdir(@path) do
-					puts "Entering #{@path}..."
-					task.call(platform, platform.config.merge(config))
+					task.call(platform, environment)
 				end
 			else
-				raise BuildError.new("Could not find task #{task_name} for #{platform.name}!")
+				raise BuildError.new("Could not find build task for #{platform.name}!")
 			end
 		end
 
-		def fetch_from(location)
-			@fetch_location = location
-		end
-
 		def to_s
 			"<Package: #{@name}>"
 		end
+
+		def self.build_order(available, packages)
+			ordered = []
+
+			expand = lambda do |name|
+				package = available[name]
+
+				unless package
+					puts "Couldn't resolve #{name}"
+				else
+					package.depends.each do |dependency|
+						expand.call(dependency)
+					end
+
+					unless ordered.include? package
+						ordered << package
+					end
+				end
+			end
+
+			packages.each do |package|
+				expand.call(package.name)
+			end
+
+			return ordered
+		end
 	end
 end

data/lib/teapot/platform.rb

@@ -1,32 +1,43 @@
+# 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 'fileutils'
+require 'rexec/environment'
 
 module Teapot
+	class UnavailableError < StandardError
+	end
+	
 	class Platform
-		class Config
-			def initialize(values = {})
-				@values = values
-			end
+		def initialize(context, record, name)
+			@context = context
+			@record = record
+
+			@name = name
+			@configure = nil
+
+			@available = false
+		end
 		
-			attr :values
+		attr :name
 		
-			def method_missing(name, *args)
-				if name.to_s.match(/^(.*?)(\=)?$/)
-					if $2
-						return @values[$1.to_sym] = args[0]
-					else
-						return @values[$1.to_sym]
-					end
-				else
-					super(name, *args)
-				end
-			end
-			
-			def merge(config)
-				Config.new(@values.merge(config))
-			end
-		end
-	
 		def prefix
 			@context.config.build_path + @name.to_s
 		end
@@ -34,30 +45,19 @@ module Teapot
 		def cmake_modules_path
 			prefix + "share/cmake/modules"
 		end
-	
-		def initialize(context, name)
-			@context = context
-			
-			@name = name
-			@config = nil
-			@available = false
-		end
-		
-		attr :name
 		
 		def configure(&block)
-			@configuration = Proc.new &block
+			@configure = Proc.new &block
 		end
 		
-		def config
-			if available?
-				config = Config.new
-			
-				@configuration.call(config)
-			
-				return config
+		def environment
+			if @available
+				return Environment.combine(
+					@record.options[:environment],
+					Environment.new(&@configure),
+				)
 			else
-				return nil
+				raise UnavailableError.new("Platform is not available for configuration!")
 			end
 		end
 		
@@ -70,7 +70,7 @@ module Teapot
 		end
 		
 		def to_s
-			"<Platform #{@name}: #{@availble ? 'available' : 'inactive'}>"
+			"<Platform #{@name}: #{@available ? 'available' : 'inactive'}>"
 		end
 		
 		def prepare!

data/lib/teapot/version.rb

@@ -1,3 +1,23 @@
+# 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.
+
 module Teapot
-  VERSION = "0.0.1"
+	VERSION = "0.0.3"
 end

data/lib/teapot.rb

@@ -1,5 +1,24 @@
+# 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/version"
 
 module Teapot
-  # Your code goes here...
 end

data/teapot.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
 	
 	gem.add_dependency "rake"
 	gem.add_dependency "rainbow"
+	gem.add_dependency "rexec"
 end

data/test/test_environment.rb

@@ -0,0 +1,69 @@
+# 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 'test/unit'
+require 'stringio'
+
+require 'teapot/environment'
+
+class TestEnvironment < Test::Unit::TestCase
+	def test_environment_chaining
+		a = Teapot::Environment.new
+		a[:cflags] = ["-std=c++11"]
+		
+		b = Teapot::Environment.new(a)
+		b[:cflags] = ["-stdlib=libc++"]
+		
+		expected = {:cflags => ["-std=c++11", "-stdlib=libc++"]}
+		
+		assert_equal expected, b.flatten.to_hash
+	end
+	
+	def test_environment_lambda
+		a = Teapot::Environment.new do
+			sdk "bob-2.6"
+			cflags {"-sdk=#{sdk}"}
+		end
+		
+		b = Teapot::Environment.new(a) do
+			sdk "bob-2.8"
+		end
+
+		expected = {'SDK' => "bob-2.8", 'CFLAGS' => "-sdk=bob-2.8"}
+		
+		assert_equal [:cflags, :sdk], b.flatten.to_hash.keys.sort
+		assert_equal expected, b.flatten.to_string_hash
+	end
+	
+	def test_combine
+		a = Teapot::Environment.new(nil, {:name => 'a'})
+		b = Teapot::Environment.new(a, {:name => 'b'})
+		c = Teapot::Environment.new(nil, {:name => 'c'})
+		d = Teapot::Environment.new(c, {:name => 'd'})
+
+		top = Teapot::Environment.combine(b, d)
+		
+		assert_equal d.values, top.values
+		assert_equal c.values, top.parent.values
+		assert_equal b.values, top.parent.parent.values
+		assert_equal a.values, top.parent.parent.parent.values
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "\tTeapot is a tool for managing complex cross-platform builds. It
   provides\n\tadvanced dependency management via the Teapot file and is supported
   by\n\tthe infusions ecosystem of packages and platform tooling.\n"
@@ -54,17 +70,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - bin/teapot
 - lib/teapot.rb
+- lib/teapot/commands.rb
 - lib/teapot/config.rb
 - lib/teapot/context.rb
+- lib/teapot/environment.rb
 - lib/teapot/package.rb
 - lib/teapot/platform.rb
 - lib/teapot/version.rb
 - teapot.gemspec
+- test/test_environment.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -79,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3245373006178987296
+      hash: -2599303512074911541
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,11 +108,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3245373006178987296
+      hash: -2599303512074911541
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Teapot is a tool for managing complex cross-platform builds.
-test_files: []
+test_files:
+- test/test_environment.rb