teapot 0.3.1 → 0.3.2

data/bin/teapot

@@ -29,6 +29,7 @@ require 'rainbow'
 $app = Rake.application = Rake::Application.new
 $app.init('teapot')
 
+# 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)
@@ -51,6 +52,9 @@ task :fetch do
 			
 			local_path = config.root + record.options[:local]
 			
+			# Make the top level directory if required:
+			FileUtils.mkdir_p(destination_path.dirname.to_s)
+			
 			unless File.exist? destination_path
 				FileUtils.ln_s local_path, destination_path
 			end
@@ -100,6 +104,7 @@ task :fetch do
 	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)
@@ -107,7 +112,8 @@ task :build do |task, arguments|
 	config.records.each do |record|
 		record.load(context)
 	end
-
+	
+	# Configure the packages and platforms based on the ENV provided by the user:
 	build_package = ENV['PACKAGE']
 	build_platform = ENV['PLATFORM']
 	
@@ -115,9 +121,7 @@ task :build do |task, arguments|
 		package = context.packages[build_package]
 		
 		unless package
-			puts "Could not find package #{build_package}".color(:red)
-			
-			next
+			fail "Could not find package #{build_package}".color(:red)
 		end
 		
 		packages = [package]
@@ -129,9 +133,7 @@ task :build do |task, arguments|
 		platform = context.platforms[build_platform]
 		
 		unless platform
-			puts "Could not find platform #{build_platform}".color(:red)
-			
-			next
+			fail "Could not find platform #{build_platform}".color(:red)
 		end
 		
 		platforms = [platform]
@@ -177,6 +179,7 @@ task :build do |task, arguments|
 	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)
@@ -209,8 +212,6 @@ task :list do
 	end
 end
 
-task :install => [:fetch, :build, :list]
-
-task :default => :install
+task :default => [:fetch, :build, :list]
 
 $app.top_level

data/lib/teapot/build/linker.rb

@@ -24,13 +24,13 @@ module Teapot
 			def self.link_static(environment, library_file, objects)
 				if RUBY_PLATFORM =~ /darwin/
 					Teapot::Commands.run(
-						Commands.split(environment[:libtool] || "libtool"),
+						environment[:libtool] || "libtool",
 						"-static", "-o", library_file, objects,
 					)
 				elsif RUBY_PLATFORM =~ /linux/
 					Commands.run(
-						Commands.split(environment[:ar] || 'ar'),
-						Commands.split(environment[:arflags] || "-cru"),
+						environment[:ar] || 'ar',
+						environment[:arflags] || "-cru",
 						library_file, objects
 					)
 				else

data/lib/teapot/build.rb

@@ -67,17 +67,18 @@ module Teapot
 		
 			def execute(command, environment, *arguments)
 				if @configure
-					environment = Environment.combine(
-						environment,
-						Environment.new(&@configure),
-					)
+					environment = environment.merge &@configure
 				end
 				
-				environment = environment.flatten.to_string_hash
-				
-				puts YAML::dump(environment).color(:magenta)
+				# Flatten the environment to a hash:
+				values = environment.flatten
+			
+				puts "Executing command #{command} for #{root}...".color(:cyan)
+			
+				# Show the environment to the user:
+				Environment::System::dump(values)
 				
-				self.send(command, environment, *arguments)
+				self.send(command, values, *arguments)
 			end
 		end
 	
@@ -111,14 +112,14 @@ module Teapot
 				case source_file.extname
 				when ".cpp"
 					Commands.run(
-						Commands.split(environment[:cxx]),
-						Commands.split(environment[:cxxflags]),
+						environment[:cxx],
+						environment[:cxxflags],
 						"-c", source_file, "-o", object_file
 					)
 				when ".c"
 					Commands.run(
-						Commands.split(environment[:cc]),
-						Commands.split(environment[:ccflags]),
+						environment[:cc],
+						environment[:cflags],
 						"-c", source_file, "-o", object_file
 					)
 				end
@@ -191,10 +192,10 @@ module Teapot
 				executable_file = build_prefix!(environment) + "#{@name}"
 			
 				Commands.run(
-					Commands.split(environment[:cxx]),
-					Commands.split(environment[:cxxflags]),
+					environment[:cxx],
+					environment[:cxxflags],
 					"-o", executable_file, objects,
-					Commands.split(environment[:ldflags])
+					environment[:ldflags]
 				)
 			
 				return executable_file

data/lib/teapot/environment/base.rb

@@ -0,0 +1,62 @@
+# 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
+	# This is the basic environment data structure which is essentially a linked list of hashes. It is primarily used for organising build configurations across a wide range of different sub-systems, e.g. platform configuration, target configuration, local project configuration, etc. The majority of the actual functionality is exposed in the `environment/*.rb` files.
+	class Environment
+		def initialize(parent = nil, values = {}, &block)
+			@values = (values || {}).to_hash
+			@parent = parent
+			
+			if block_given?
+				Constructor.new(self).instance_exec(&block)
+			end
+		end
+		
+		attr :values
+		attr :parent
+		
+		def lookup(name)
+			if @values.include? name
+				self
+			elsif @parent
+				@parent.lookup(name)
+			end
+		end
+		
+		def [] (key)
+			environment = lookup(key)
+			
+			environment ? environment.values[key] : nil
+		end
+		
+		def []= (key, value)
+			@values[key] = value
+		end
+		
+		def to_hash
+			@values
+		end
+		
+		def to_s
+			"<#{self.class} #{self.values}>"
+		end
+	end
+end

data/lib/teapot/environment/constructor.rb

@@ -0,0 +1,101 @@
+# 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
+	class Environment
+		Default = Struct.new(:value)
+		Replace = 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
+			
+			def replace(name)
+				@environment[name] = Replace.new(@environment[name])
+			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 merge(&block)
+			self.class.combine(
+				self,
+				self.class.new(&block)
+			)
+		end
+		
+		# Convert the hierarchy of environments to an array where the parent comes before the child.
+		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
+	end
+end

data/lib/teapot/environment/evaluator.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.
+
+module Teapot
+	class Environment
+		class Evaluator
+			def initialize(environment)
+				@environment = environment
+			end
+			
+			def method_missing(name)
+				object_value(@environment[name])
+			end
+			
+			# Compute the literal object value for a given key:
+			def object_value(value)
+				case value
+				when Array
+					value.collect{|item| object_value(item)}.flatten
+				when Symbol
+					object_value(@environment[value])
+				when Proc
+					object_value(instance_exec(&value))
+				when Default
+					object_value(value.value)
+				when Replace
+					object_value(value.value)
+				else
+					value
+				end
+			end
+		end
+	end
+end

data/lib/teapot/environment/flatten.rb

@@ -0,0 +1,62 @@
+# 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
+	class Environment
+		def flatten
+			hash = {}
+			
+			# Flatten this chain of environments:
+			flatten_to_hash(hash)
+			
+			# Evaluate all items to their respective object value:
+			evaluator = Evaluator.new(hash)
+			
+			# Evaluate all the individual environment values so that they are flat:
+			Hash[hash.map{|key, value| [key, evaluator.object_value(value)]}]
+		end
+		
+		protected
+		
+		def flatten_to_hash(hash)
+			if @parent
+				@parent.flatten_to_hash(hash)
+			end
+			
+			@values.each do |key, value|
+				previous = hash[key]
+
+				if Replace === value
+					# Replace the parent value
+					hash[key] = value
+				elsif Array === previous
+					# Merge with the parent value
+					hash[key] = previous + Array(value)
+				elsif Default === value
+					# Update the parent value if not defined.
+					hash[key] = previous || value
+				else
+					hash[key] = value
+				end
+			end
+		end
+
+	end
+end

data/lib/teapot/environment/system.rb

@@ -0,0 +1,74 @@
+# 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 'rexec/environment'
+require 'rainbow'
+
+module Teapot
+	class Environment
+		module System
+			def self.shell_escape(value)
+				case value
+				when Array
+					value.flatten.collect{|argument| shell_escape(argument)}.join(' ')
+				else
+					# Ensure that any whitespace has been escaped:
+					value.to_s.gsub(/ /, '\ ')
+				end
+			end
+			
+			def self.convert_to_shell(values)
+				Hash[values.map{|key, value| [
+					key.to_s.upcase,
+					shell_escape(value)
+				]}]
+			end
+			
+			def self.dump(environment, io = STDOUT)
+				environment.to_hash.each do |key, value|
+					io.puts "#{key}:".rjust(20).color(:magenta) + " #{value.inspect}"
+				end
+			end
+		end
+		
+		# Construct an environment from a given system environment:
+		def self.system_environment(env = ENV)
+			self.new(Hash[env.map{|key, value| [key.downcase.to_sym, value]}])
+		end
+		
+		# Apply the environment to the current process temporarily:
+		def use(options = {}, &block)
+			# Flatten the environment to a hash:
+			values = flatten
+			
+			# Convert the hash to suit typical shell specific arguments:
+			build_environment = System::convert_to_shell(values)
+			
+			# Show the environment to the user:
+			System::dump(build_environment)
+			
+			Dir.chdir(options[:in] || ".") do
+				RExec.env(build_environment) do
+					block.call(Environment::Evaluator.new(values))
+				end
+			end
+		end
+	end
+end

data/lib/teapot/environment.rb

@@ -18,242 +18,8 @@
 # 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
-		def self.system_environment(env = ENV)
-			self.new(Hash[env.to_hash.collect{|key, value| [key.downcase.to_sym, value]}])
-		end
-		
-		def merge(&block)
-			self.class.combine(
-				self,
-				self.class.new(&block)
-			)
-		end
-		
-		Default = Struct.new(:value)
-		Replace = 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
-			
-			def replace(name)
-				@environment[name] = Replace.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_exec(&value))
-				when Default
-					object_value(value.value)
-				when Replace
-					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 = {}, &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_exec(&block)
-		end
-		
-		def dup
-			self.class.new(@values)
-		end
-		
-		attr :values
-		attr :parent
-		
-		def lookup(name)
-			if @values.include? name
-				self
-			elsif @parent
-				@parent.lookup(name)
-			end
-		end
-		
-		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, string_value(value)]}]
-		end
-		
-		def to_system_environment_hash
-			Hash[@values.map{|key, value| [key.to_s.upcase, string_value(value)]}]
-		end
-		
-		def use(options = {}, &block)
-			system_environment = flatten.to_system_environment_hash
-			
-			puts YAML::dump(system_environment).color(:magenta)
-			
-			Dir.chdir(options[:in] || ".") do
-				RExec.env(system_environment) do
-					block.call(@evaluator)
-				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 Replace === value
-					# Replace the parent value
-					hash[key] = value
-				elsif Array === previous
-					# Merge with the parent value
-					hash[key] = previous + Array(value)
-				elsif Default === value
-					# Update the parent value if not defined.
-					hash[key] = previous || value
-				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_exec(&value))
-			when Default
-				string_value(value.value)
-			else
-				value.to_s
-			end
-		end
-	end
-end
+require 'teapot/environment/base'
+require 'teapot/environment/constructor'
+require 'teapot/environment/evaluator'
+require 'teapot/environment/flatten'
+require 'teapot/environment/system'

data/lib/teapot/package.rb

@@ -110,15 +110,15 @@ module Teapot
 				)
 				
 				local_build = environment.merge do
-					default build_prefix "build/cache/#{platform.name}-#{config[:variant]}"
+					default build_prefix Pathname.new("build/cache/#{platform.name}-#{config[:variant]}")
 					default install_prefix platform.prefix
 			
 					buildflags [
-						"-I", ->{platform.prefix + "include"},
+						->{"-I" + (platform.prefix + "include").to_s},
 					]
 					
 					linkflags [
-						"-L", ->{platform.prefix + "lib"},
+						->{"-L" + (platform.prefix + "lib").to_s},
 					]
 				end
 				

data/lib/teapot/platform.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'fileutils'
-require 'rexec/environment'
+require 'teapot/environment'
 
 module Teapot
 	class UnavailableError < StandardError

data/lib/teapot/version.rb

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

data/test/test_environment.rb

@@ -40,7 +40,7 @@ class TestEnvironment < Test::Unit::TestCase
 	def test_environment_lambda
 		a = Teapot::Environment.new do
 			sdk "bob-2.6"
-			ccflags [->{"-sdk=#{sdk}"}]
+			cflags [->{"-sdk=#{sdk}"}]
 		end
 		
 		b = Teapot::Environment.new(a) do
@@ -48,21 +48,21 @@ class TestEnvironment < Test::Unit::TestCase
 		end
 		
 		c = Teapot::Environment.new(b) do
-			ccflags ["-pipe"]
+			cflags ["-pipe"]
 		end
 		
 		expected = {'SDK' => "bob-2.8", 'CCFLAGS' => "-sdk=bob-2.8"}
 		
-		assert_equal [:ccflags, :sdk], b.flatten.to_hash.keys.sort
+		assert_equal [:cflags, :sdk], b.flatten.to_hash.keys.sort
 		assert_equal expected, b.flatten.to_system_environment_hash
 		
-		assert_equal "-sdk=bob-2.8 -pipe", c.flatten.to_string_hash[:ccflags]
+		assert_equal "-sdk=bob-2.8 -pipe", c.flatten.to_string_hash[:cflags]
 	end
 	
 	def test_environment_nested_lambda
 		a = Teapot::Environment.new do
 			sdk "bob-2.6"
-			ccflags [->{"-sdk=#{sdk}"}]
+			cflags [->{"-sdk=#{sdk}"}]
 		end
 		
 		b = Teapot::Environment.new(a) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -82,6 +82,11 @@ files:
 - lib/teapot/config.rb
 - lib/teapot/context.rb
 - lib/teapot/environment.rb
+- lib/teapot/environment/base.rb
+- lib/teapot/environment/constructor.rb
+- lib/teapot/environment/evaluator.rb
+- lib/teapot/environment/flatten.rb
+- lib/teapot/environment/system.rb
 - lib/teapot/package.rb
 - lib/teapot/platform.rb
 - lib/teapot/version.rb
@@ -101,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 906117529996691770
+      hash: 4295501369315822730
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 906117529996691770
+      hash: 4295501369315822730
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24