teapot 0.5.1 → 0.6.0

data/bin/teapot

@@ -169,10 +169,6 @@ module Application
 			end
 		end
 	end
-	
-	def self.debug
-		puts ARGV.inspect
-	end
 end
 
 time = Benchmark.measure do

data/lib/teapot/build/targets/directory.rb

@@ -37,7 +37,7 @@ module Teapot
 					@root || @parent.root
 				end
 				
-				attr :tasks
+				attr :targets
 				
 				def << (target)
 					@targets << target

data/lib/teapot/build/targets/external.rb

@@ -0,0 +1,91 @@
+# 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/build/target'
+require 'digest/md5'
+
+module Teapot
+	module Build
+		module Targets
+			class External < Build::Target
+				# This file contains a checksum of the build environment. If it changes, even though the source code hasn't changed, it means that we need to recompile.
+				ENVIRONMENT_CHECKSUM_FILE = ".teapot-environment-checksum"
+				
+				def initialize(parent, directory, &block)
+					super parent
+					
+					@directory = directory
+					
+					# Callback for preparing the target and compiling/installing the target.
+					@install = block
+				end
+				
+				def root
+					@parent.root + @directory
+				end
+				
+				def install(values)
+					return unless @install
+					
+					source_path = @parent.root + @directory
+					build_source_path = values[:build_prefix] + @directory
+					build_source_checksum_path = build_source_path + ENVIRONMENT_CHECKSUM_FILE
+					
+					fresh = false
+					
+					# Check the environment checksum to catch any changes to the build environment:
+					if build_source_checksum_path.exist? and File.read(build_source_checksum_path.to_s) != checksum(values)
+						FileUtils.rm_rf(build_source_path.to_s) if build_source_path.exist?
+					end
+					
+					if !build_source_path.exist?
+						build_source_path.mkpath
+						
+						FileUtils.cp_r(source_path.children, build_source_path.to_s)
+						
+						# Write the environment checksum out to a file:
+						File.write(build_source_checksum_path, checksum(values))
+						
+						fresh = true
+					end
+					
+					# Convert the hash to suit typical shell specific arguments:
+					shell_environment = Environment::System::convert_to_shell(values)
+					
+					Dir.chdir(build_source_path) do
+						RExec.env(shell_environment) do
+							@install.call(Environment::Evaluator.new(values), fresh)
+						end
+					end
+				end
+				
+				private
+				
+				def checksum(values)
+					# Calculate a canonical text representation of the environment:
+					text = values.sort.inspect
+					
+					# Digest the text:
+					Digest::MD5.hexdigest(text)
+				end
+			end
+		end
+	end
+end

data/lib/teapot/build.rb

@@ -23,6 +23,7 @@ require 'teapot/build/targets/files'
 require 'teapot/build/targets/library'
 require 'teapot/build/targets/executable'
 require 'teapot/build/targets/application'
+require 'teapot/build/targets/external'
 
 module Teapot
 	module Build
@@ -30,12 +31,22 @@ module Teapot
 			Targets::Directory.target(nil, path)
 		end
 		
-		def self.install_directory(root, directory, *args)
-			target = top(root)
+		module Helpers
+			def install_directory(root, directory, *args)
+				target = Build.top(root)
 		
-			target.add_directory(directory)
+				target.add_directory(directory)
 		
-			target.execute(:install, *args)
+				target.execute(:install, *args)
+			end
+		
+			def install_external(root, directory, *args, &block)
+				target = Build.top(root)
+			
+				target << Targets::External.new(target, directory, &block)
+			
+				target.execute(:install, *args)
+			end
 		end
 	end
 end

data/lib/teapot/commands.rb

@@ -48,7 +48,7 @@ module Teapot
 			if system(*args)
 				true
 			else
-				raise CommandError.new("Non-zero exit status")
+				raise CommandError.new("Non-zero exit status!")
 			end
 		end
 		
@@ -62,6 +62,14 @@ module Teapot
 			# No parallel execution supported by default.
 		end
 		
+		def self.make(*args)
+			run("make", *args, "-j", processor_count)
+		end
+		
+		def self.make_install
+			make("install")
+		end
+		
 		class Pool
 			def initialize(options = {})
 				@commands = []

data/lib/teapot/context.rb

@@ -22,14 +22,19 @@ require 'pathname'
 require 'rainbow'
 
 require 'teapot/target'
+require 'teapot/build'
 
 module Teapot
-	LOADER_VERSION = "0.5"
+	LOADER_VERSION = "0.6"
+	MINIMUM_LOADER_VERSION = "0.6"
 	
 	class IncompatibleTeapot < StandardError
 	end
 	
 	class Loader
+		# Provides install_directory and install_external methods
+		include Build::Helpers
+		
 		def initialize(context, package)
 			@context = context
 			@package = package
@@ -43,17 +48,18 @@ module Teapot
 		attr :version
 		
 		def required_version(version)
-			if version <= LOADER_VERSION
+			if version >= MINIMUM_LOADER_VERSION && version <= LOADER_VERSION
 				@version = version
 			else
-				raise IncompatibleTeapot.new("Version #{version} more recent than #{LOADER_VERSION}!")
+				raise IncompatibleTeapot.new("Version #{version} isn't compatible with current loader!\n" \
+				"Minimum supported version: #{MINIMUM_LOADER_VERSION}; Current version: #{LOADER_VERSION}.")
 			end
 		end
 
 		def define_target(*args, &block)
 			target = Target.new(@context, @package, *args)
 
-			yield(target)
+			yield target
 
 			@context.targets[target.name] = target
 

data/lib/teapot/dependency.rb

@@ -83,7 +83,7 @@ module Teapot
 				@conflicts = {}
 				
 				@dependencies.each do |dependency|
-					expand(dependency, nil)
+					expand(dependency, "<top>")
 				end
 			end
 			

data/lib/teapot/environment/system.rb

@@ -52,23 +52,5 @@ module Teapot
 		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

@@ -22,4 +22,4 @@ require 'teapot/environment/base'
 require 'teapot/environment/constructor'
 require 'teapot/environment/evaluator'
 require 'teapot/environment/flatten'
-require 'teapot/environment/system'
+require 'teapot/environment/system'

data/lib/teapot/target.rb

@@ -64,7 +64,7 @@ module Teapot
 			# The base configuration environment:
 			environments << context.config.environment
 			
-			# The dependencies environments':
+			# Calculate the dependency chain's ordered environments:
 			environments += chain.provisions.collect do |provision|
 				Environment.new(&provision.value)
 			end

data/lib/teapot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -101,6 +101,7 @@ files:
 - lib/teapot/build/targets/compiler.rb
 - lib/teapot/build/targets/directory.rb
 - lib/teapot/build/targets/executable.rb
+- lib/teapot/build/targets/external.rb
 - lib/teapot/build/targets/files.rb
 - lib/teapot/build/targets/library.rb
 - lib/teapot/commands.rb
@@ -133,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2634400056080350506
+      hash: -3435379409085677514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2634400056080350506
+      hash: -3435379409085677514
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24