teapot 0.2.2 → 0.3.1

data/bin/teapot

@@ -46,43 +46,53 @@ task :fetch do
 		
 		destination_path = record.destination_path
 		
-		puts "Fetching #{record}...".color(:cyan)
+		if record.local?
+			puts "Linking local #{record}...".color(:cyan)
+			
+			local_path = config.root + record.options[:local]
+			
+			unless File.exist? destination_path
+				FileUtils.ln_s local_path, destination_path
+			end
+		else
+			puts "Fetching #{record}...".color(:cyan)
 		
-		branch = record.options.fetch(:version, 'master')
+			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)
+			unless File.exist? destination_path
+				puts "Cloning package at path #{destination_path} ...".color(:cyan)
+				FileUtils.mkdir_p(destination_path.to_s)
 			
-			source_uri = URI record.uri
+				source_uri = URI record.uri
 		
-			unless source_uri.absolute?
-				source_uri = base_uri + source_uri
-			end
+				unless source_uri.absolute?
+					source_uri = base_uri + source_uri
+				end
 		
-			# Git can't handle the default formatting that Ruby uses for file URIs.
-			if source_uri.scheme == "file"
-				source_uri = "file://" + source_uri.path
-			end
+				# Git can't handle the default formatting that Ruby uses for file URIs.
+				if source_uri.scheme == "file"
+					source_uri = "file://" + source_uri.path
+				end
 			
-			Teapot::Commands.run("git", "clone", source_uri, destination_path, "--branch", branch)
+				Teapot::Commands.run("git", "clone", source_uri, destination_path, "--branch", branch)
 			
-			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", "submodule", "update", "--init", "--recursive")
+				end
+			else
+				puts "Updating package at path #{destination_path} ...".color(:cyan)
 			
-			Dir.chdir(destination_path) do
-				Teapot::Commands.run("git", "fetch", "origin")
+				Dir.chdir(destination_path) do
+					Teapot::Commands.run("git", "fetch", "origin")
 				
-				Teapot::Commands.run("git", "checkout", branch)
+					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")
+					# 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")
+					Teapot::Commands.run("git", "submodule", "update", "--init", "--recursive")
+				end
 			end
 		end
 	end

data/lib/teapot/config.rb

@@ -57,6 +57,10 @@ module Teapot
 				@klass == FakePackage
 			end
 			
+			def local?
+				@options.key? :local
+			end
+			
 			def load(context)
 				if @klass == FakePackage
 					context.packages[@name] = @klass.new(@context, self, @name)
@@ -160,14 +164,17 @@ module Teapot
 			@packages << Record.new(self, FakePackage, name, options)
 		end
 
+		def load(teapot_path)
+			instance_eval File.read(teapot_path), teapot_path
+		end
+
 		def self.load(root, options = {})
 			config = new(root, options)
 			
-			teapot_path = File.join(root, "Teapot")
+			yield config if block_given?
 			
-			if File.exist? teapot_path
-				config.instance_eval(File.read(teapot_path), teapot_path)
-			end
+			teapot_path = File.join(root, "Teapot")
+			config.load(teapot_path) if File.exist? teapot_path
 			
 			return config
 		end
@@ -175,7 +182,14 @@ module Teapot
 		def self.load_default(root = Dir.getwd, options = {})
 			options.merge!(:variant => ENV['TEAPOT_VARIANT'])
 			
-			load(root, options)
+			# Load project specific Teapot file
+			load(root, options) do |config|
+				user_path = File.expand_path("~/.Teapot")
+				
+				if File.exist? user_path
+					config.load(user_path)
+				end
+			end
 		end
 	end
 end

data/lib/teapot/package.rb

@@ -110,7 +110,7 @@ module Teapot
 				)
 				
 				local_build = environment.merge do
-					default build_prefix "build-#{platform.name}-#{variant}"
+					default build_prefix "build/cache/#{platform.name}-#{config[:variant]}"
 					default install_prefix platform.prefix
 			
 					buildflags [

data/lib/teapot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088469736954378212
+      hash: 906117529996691770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088469736954378212
+      hash: 906117529996691770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24