teapot 0.2.0 → 0.2.1

data/lib/teapot/platform.rb

@@ -53,8 +53,8 @@ module Teapot
 		def environment
 			if @available
 				return Environment.combine(
-					@record.options[:environment],
 					Environment.new(&@configure),
+					@record.options[:environment],
 				)
 			else
 				raise UnavailableError.new("Platform is not available for configuration!")

data/lib/teapot/version.rb

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

data/test/test_environment.rb

@@ -50,7 +50,7 @@ class TestEnvironment < Test::Unit::TestCase
 		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
+		assert_equal expected, b.flatten.to_env_hash
 	end
 	
 	def test_combine
@@ -66,4 +66,21 @@ class TestEnvironment < Test::Unit::TestCase
 		assert_equal b.values, top.parent.parent.values
 		assert_equal a.values, top.parent.parent.parent.values
 	end
+	
+	def test_combine_defaults
+		local = Teapot::Environment.new do
+			architectures ["-m64"]
+		end
+		
+		platform = Teapot::Environment.new do
+			default architectures ["-arch", "i386"]
+		end
+		
+		combined = Teapot::Environment.combine(
+			platform,
+			local
+		)
+		
+		assert_equal ["-m64"], combined[:architectures]
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1475380333635225782
+      hash: -3652039777535418332
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1475380333635225782
+      hash: -3652039777535418332
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24