teapot 0.1.0 → 0.2.0

data/bin/teapot

@@ -48,6 +48,8 @@ task :fetch do
 		
 		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)
@@ -62,25 +64,25 @@ task :fetch do
 			if source_uri.scheme == "file"
 				source_uri = "file://" + source_uri.path
 			end
-		
-			clone_arguments = [
-				"--recursive",
-				source_uri, destination_path,
-				"--depth", 1,
-			]
 			
-			if record.options[:version]
-				clone_arguments << "--branch"
-				clone_arguments << record.options[:version]
-			end
+			Teapot::Commands.run("git", "clone", source_uri, destination_path, "--branch", branch)
 			
-			Teapot::Commands.run("git", "clone", *clone_arguments)
+			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", "pull", "--depth", 1)
-				Teapot::Commands.run("git", "submodule", "update", "--init")
+				Teapot::Commands.run("git", "fetch", "origin")
+				
+				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")
+				
+				Teapot::Commands.run("git", "submodule", "update", "--init", "--recursive")
 			end
 		end
 	end

data/lib/teapot/build.rb

@@ -0,0 +1,242 @@
+# 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 'shellwords'
+
+module Teapot
+	module Build
+		class Task
+			def initialize(inputs, outputs)
+				@inputs = inputs
+				@outputs = outputs
+			end
+		end
+	
+		class Target
+			def initialize(parent)
+				@parent = parent
+				@tasks = []
+				
+				@configure = nil
+			end
+		
+			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.combine(
+						environment,
+						Environment.new(&@configure),
+					)
+				end
+				
+				environment = environment.flatten.to_string_hash
+				
+				puts YAML::dump(environment).color(:magenta)
+				
+				self.send(command, environment, *arguments)
+			end
+		end
+	
+		class CompilerTarget < Target
+			def initialize(parent, name, options = {})
+				super parent
+			
+				@name = name
+				@options = options
+			end
+			
+			def build_prefix!(environment)
+				build_prefix = Pathname.new(environment[:build_prefix]) + @name
+				
+				build_prefix.mkpath
+				
+				return build_prefix
+			end
+			
+			def install_prefix!(environment)
+				install_prefix = Pathname.new(environment[:install_prefix])
+				
+				install_prefix.mkpath
+				
+				return install_prefix
+			end
+			
+			def compile(environment, source_file)
+				object_file = (build_prefix!(environment) + source_file.basename).sub_ext('.o')
+			
+				case source_file.extname
+				when ".cpp"
+					Commands.run(
+						Commands.split(environment[:cxx]),
+						Commands.split(environment[:cxxflags]),
+						"-c", source_file, "-o", object_file
+					)
+				when ".c"
+					Commands.run(
+						Commands.split(environment[:cc]),
+						Commands.split(environment[:ccflags]),
+						"-c", source_file, "-o", object_file
+					)
+				end
+			
+				return Array object_file
+			end
+		end
+	
+		class Library < CompilerTarget
+			def subdirectory
+				"lib"
+			end
+			
+			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])
+				)
+			
+				return library_file
+			end
+			
+			def build(environment)
+				files = sources
+			
+				objects = sources.collect do |file|
+					compile(environment, file)
+				end
+			
+				return Array link(environment, objects)
+			end
+		
+			def install(environment)
+				prefix = install_prefix!(environment)
+				
+				build(environment).each do |path|
+					destination_path = prefix + subdirectory + path.basename
+					
+					destination_path.dirname.mkpath
+					FileUtils.cp path, destination_path
+				end
+				
+				if defined? headers
+					headers.each do |path|
+						relative_path = path.relative_path_from(root)
+						destination_path = prefix + "include" + relative_path
+					
+						destination_path.dirname.mkpath
+						FileUtils.cp path, destination_path
+					end
+				end
+				
+				if defined? files
+					files.each do |path|
+						relative_path = path.relative_path_from(root)
+						destination_path = prefix + relative_path
+					
+						destination_path.dirname.mkpath
+						FileUtils.cp path, destination_path
+					end
+				end
+			end
+		end
+	
+		class Executable < Library
+			def subdirectory
+				"bin"
+			end
+			
+			def link(environment, objects)
+				executable_file = build_prefix!(environment) + "#{@name}"
+			
+				Commands.run(
+					Commands.split(environment[:cxx]),
+					Commands.split(environment[:cxxflags]),
+					"-o", executable_file, objects,
+					Commands.split(environment[:ldflags])
+				)
+			
+				return executable_file
+			end
+		end
+	
+		class Directory < Target
+			def initialize(parent, root)
+				@root = root
+				@targets = []
+			end
+		
+			attr :root
+			attr :tasks
+		
+			def add_library(*args, &block)
+				@targets << Library.target(self, *args, &block)
+			end
+		
+			def add_executable(*args, &block)
+				@targets << Executable.target(self, *args, &block)
+			end
+		
+			def add_directory(path)
+				directory = Directory.target(self, @root + path)
+			
+				$stderr.puts "Loading #{directory.root}..."
+				build_path = (directory.root + "build.rb").to_s
+				directory.instance_eval(File.read(build_path), build_path)
+			
+				@targets << directory
+			end
+		
+			def execute(command, *arguments)
+				$stderr.puts "Executing #{command} for #{@root}"
+				@targets.each do |target|
+					target.execute(command, *arguments)
+				end
+			end
+		end
+	
+		def self.top(path)
+			Directory.target(nil, path)
+		end
+	end
+end

data/lib/teapot/commands.rb

@@ -19,14 +19,19 @@
 # THE SOFTWARE.
 
 require 'rainbow'
+require 'shellwords'
 
 module Teapot
 	module Commands
 		class CommandError < StandardError
 		end
 		
+		def self.split(arg)
+			Shellwords.split(arg || "")
+		end
+		
 		def self.run(*args)
-			args.collect!(&:to_s)
+			args = args.flatten.collect &:to_s
 			
 			puts args.join(' ').color(:blue)
 			

data/lib/teapot/context.rb

@@ -25,7 +25,7 @@ require 'teapot/package'
 require 'teapot/platform'
 
 module Teapot
-	INFUSION_VERSION = "0.1"
+	INFUSION_VERSION = "0.2"
 	
 	class IncompatibleInfusion < StandardError
 	end

data/lib/teapot/environment.rb

@@ -30,6 +30,17 @@ 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)
 		
 		class Constructor
@@ -153,11 +164,15 @@ module Teapot
 		end
 		
 		def to_string_hash
+			Hash[@values.map{|key, value| [key, string_value(value)]}]
+		end
+		
+		def to_env_hash
 			Hash[@values.map{|key, value| [key.to_s.upcase, string_value(value)]}]
 		end
 		
 		def use(options = {}, &block)
-			system_environment = flatten.to_string_hash
+			system_environment = flatten.to_env_hash
 			
 			puts YAML::dump(system_environment).color(:magenta)
 			

data/lib/teapot/version.rb

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

data/test/test_environment.rb

@@ -29,7 +29,7 @@ class TestEnvironment < Test::Unit::TestCase
 		a = Teapot::Environment.new
 		a[:cflags] = ["-std=c++11"]
 		
-		b = Teapot::Environment.new(a)
+		b = Teapot::Environment.new(a, {})
 		b[:cflags] = ["-stdlib=libc++"]
 		
 		expected = {:cflags => ["-std=c++11", "-stdlib=libc++"]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,6 +76,7 @@ files:
 - Rakefile
 - bin/teapot
 - lib/teapot.rb
+- lib/teapot/build.rb
 - lib/teapot/commands.rb
 - lib/teapot/config.rb
 - lib/teapot/context.rb
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 557922474497580822
+      hash: -1475380333635225782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 557922474497580822
+      hash: -1475380333635225782
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24