teapot 0.2.1 → 0.2.2

data/lib/teapot/build/linker.rb

@@ -0,0 +1,42 @@
+# 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
+	module Build
+		module Linker
+			def self.link_static(environment, library_file, objects)
+				if RUBY_PLATFORM =~ /darwin/
+					Teapot::Commands.run(
+						Commands.split(environment[:libtool] || "libtool"),
+						"-static", "-o", library_file, objects,
+					)
+				elsif RUBY_PLATFORM =~ /linux/
+					Commands.run(
+						Commands.split(environment[:ar] || 'ar'),
+						Commands.split(environment[:arflags] || "-cru"),
+						library_file, objects
+					)
+				else
+					raise UnsupportedPlatform.new("Cannot determine linker for #{RUBY_PLATFORM}!")
+				end
+			end
+		end
+	end
+end

data/lib/teapot/build.rb

@@ -25,8 +25,13 @@ require 'pathname'
 require 'rainbow'
 require 'shellwords'
 
+require 'teapot/build/linker'
+
 module Teapot
 	module Build
+		class UnsupportedPlatform < StandardError
+		end
+		
 		class Task
 			def initialize(inputs, outputs)
 				@inputs = inputs
@@ -129,13 +134,9 @@ module Teapot
 			
 			def link(environment, objects)
 				library_file = build_prefix!(environment) + "lib#{@name}.a"
-			
-				Commands.run(
-					Commands.split(environment[:libtool] || "libtool"),
-					"-static", "-o", library_file, objects,
-					Commands.split(environment[:ldflags])
-				)
-			
+				
+				Linker.link_static(environment, library_file, objects)
+				
 				return library_file
 			end
 			

data/lib/teapot/environment.rb

@@ -42,6 +42,7 @@ module Teapot
 		end
 		
 		Default = Struct.new(:value)
+		Replace = Struct.new(:value)
 		
 		class Constructor
 			def initialize(environment)
@@ -65,6 +66,10 @@ module Teapot
 			def default(name)
 				@environment[name] = Default.new(@environment[name])
 			end
+			
+			def replace(name)
+				@environment[name] = Replace.new(@environment[name])
+			end
 		end
 		
 		class Evaluator
@@ -86,9 +91,11 @@ module Teapot
 				when Symbol
 					object_value(@values[value])
 				when Proc
-					object_value(instance_eval(&value))
+					object_value(instance_exec(&value))
 				when Default
 					object_value(value.value)
+				when Replace
+					object_value(value.value)
 				else
 					value
 				end
@@ -116,10 +123,7 @@ module Teapot
 			return top
 		end
 		
-		def initialize(*args, &block)
-			parent = args.shift if args.size == 2
-			values = args.shift
-			
+		def initialize(parent = nil, values = {}, &block)
 			@values = (values || {}).to_hash
 			@parent = parent
 			
@@ -131,7 +135,7 @@ module Teapot
 		end
 		
 		def construct(&block)
-			Constructor.new(self).instance_eval(&block)
+			Constructor.new(self).instance_exec(&block)
 		end
 		
 		def dup
@@ -141,6 +145,14 @@ module Teapot
 		attr :values
 		attr :parent
 		
+		def lookup(name)
+			if @values.include? name
+				self
+			elsif @parent
+				@parent.lookup(name)
+			end
+		end
+		
 		def [] (key)
 			environment = lookup(key)
 			
@@ -167,12 +179,12 @@ module Teapot
 			Hash[@values.map{|key, value| [key, string_value(value)]}]
 		end
 		
-		def to_env_hash
+		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_env_hash
+			system_environment = flatten.to_system_environment_hash
 			
 			puts YAML::dump(system_environment).color(:magenta)
 			
@@ -213,10 +225,15 @@ module Teapot
 			@values.each do |key, value|
 				previous = hash[key]
 
-				if Array === previous
+				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 == previous
-					hash[key] ||= previous
+				elsif Default === value
+					# Update the parent value if not defined.
+					hash[key] = previous || value
 				else
 					hash[key] = value
 				end
@@ -231,20 +248,12 @@ module Teapot
 			when Symbol
 				string_value(@values[value])
 			when Proc
-				string_value(@evaluator.instance_eval(&value))
+				string_value(@evaluator.instance_exec(&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

@@ -109,8 +109,21 @@ module Teapot
 					config,
 				)
 				
+				local_build = environment.merge do
+					default build_prefix "build-#{platform.name}-#{variant}"
+					default install_prefix platform.prefix
+			
+					buildflags [
+						"-I", ->{platform.prefix + "include"},
+					]
+					
+					linkflags [
+						"-L", ->{platform.prefix + "lib"},
+					]
+				end
+				
 				Dir.chdir(@path) do
-					task.call(platform, environment)
+					task.call(platform, local_build)
 				end
 			else
 				raise BuildError.new("Could not find build task for #{platform.name}!")

data/lib/teapot/version.rb

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

data/test/test_environment.rb

@@ -40,17 +40,34 @@ class TestEnvironment < Test::Unit::TestCase
 	def test_environment_lambda
 		a = Teapot::Environment.new do
 			sdk "bob-2.6"
-			cflags {"-sdk=#{sdk}"}
+			ccflags [->{"-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_env_hash
+		c = Teapot::Environment.new(b) do
+			ccflags ["-pipe"]
+		end
+		
+		expected = {'SDK' => "bob-2.8", 'CCFLAGS' => "-sdk=bob-2.8"}
+		
+		assert_equal [:ccflags, :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]
+	end
+	
+	def test_environment_nested_lambda
+		a = Teapot::Environment.new do
+			sdk "bob-2.6"
+			ccflags [->{"-sdk=#{sdk}"}]
+		end
+		
+		b = Teapot::Environment.new(a) do
+			sdk "bob-2.8"
+		end
 	end
 	
 	def test_combine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -77,6 +77,7 @@ files:
 - bin/teapot
 - lib/teapot.rb
 - lib/teapot/build.rb
+- lib/teapot/build/linker.rb
 - lib/teapot/commands.rb
 - lib/teapot/config.rb
 - lib/teapot/context.rb
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3652039777535418332
+      hash: -4088469736954378212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3652039777535418332
+      hash: -4088469736954378212
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24