teapot 0.0.3 → 0.1.0

data/bin/teapot

@@ -33,51 +33,59 @@ task :fetch do
 	config = Teapot::Config.load_default
 	context = Teapot::Context.new(config)
 	
-	base_uri = URI(config.options[:source].to_s + '/')
+	base_uri = URI(config.options[:source].to_s)
+	
+	if base_uri.scheme == nil || base_uri.scheme == 'file'
+		base_uri = URI "file://" + File.expand_path(base_uri.path, config.root) + "/"
+	end
+	
+	puts "Base URI: #{base_uri}".color(:cyan)
 	
 	config.records.each do |record|
+		next if record.transient?
+		
 		destination_path = record.destination_path
 		
-		puts "Fetching #{record}...".color(:blue)
+		puts "Fetching #{record}...".color(:cyan)
 		
 		unless File.exist? destination_path
-			puts "Cloning package at path #{destination_path} ...".color(:green)
+			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
 		
+			# Git can't handle the default formatting that Ruby uses for file URIs.
 			if source_uri.scheme == "file"
-				source_uri = source_uri.path
+				source_uri = "file://" + source_uri.path
 			end
 		
-			Teapot::Commands.run("git", "clone", "--recursive", source_uri.to_s, destination_path.to_s)
+			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", *clone_arguments)
 		else
-			puts "Updating package at path #{destination_path} ...".color(:green)
+			puts "Updating package at path #{destination_path} ...".color(:cyan)
 			
 			Dir.chdir(destination_path) do
-				Teapot::Commands.run("git", "pull")
+				Teapot::Commands.run("git", "pull", "--depth", 1)
 				Teapot::Commands.run("git", "submodule", "update", "--init")
 			end
 		end
 	end
-end
-
-task :build do
-	config = Teapot::Config.load_default
-	context = Teapot::Context.new(config)
 	
-	config.records.each do |record|
-		destination_path = record.destination_path
-		
-		bundles = record.load(context)
-		
-		bundles.each do |bundle|
-			
-		end
-	end
+	puts "Completed fetch successfully.".color(:green)
 end
 
 task :build do |task, arguments|
@@ -85,8 +93,6 @@ task :build do |task, arguments|
 	context = Teapot::Context.new(config)
 	
 	config.records.each do |record|
-		destination_path = record.destination_path
-		
 		record.load(context)
 	end
 
@@ -108,7 +114,7 @@ task :build do |task, arguments|
 	end
 	
 	if build_platform
-		platform = context.platforms[build_platform.to_sym]
+		platform = context.platforms[build_platform]
 		
 		unless platform
 			puts "Could not find platform #{build_platform}".color(:red)
@@ -117,24 +123,41 @@ task :build do |task, arguments|
 		end
 		
 		platforms = [platform]
+	else
+		platforms = context.platforms.values
 	end
 	
 	unless ENV['ONLY']
-		ordered = Teapot::Package.build_order(context.packages, packages)
+		build_order = Teapot::Package.build_order(context.packages, packages)
 	else
-		ordered = packages
+		build_order = {:ordered => packages, :unresolved => []}
 	end
 	
-	puts "Building #{ordered.join(', ')} for variant #{config.variant}".color(:blue)
+	if build_order[:unresolved].size > 0
+		puts "Unresolved packages:"
+		build_order[:unresolved].each do |(name, from)|
+			puts "\tPackage: #{name} (from #{from})".color(:red)
+		end
+		
+		fail "Cannot continue build due to unresolved dependencies!".color(:red)
+	else
+		ordered = build_order[:ordered]
+	end
 	
-	context.platforms.each do |name, platform|
+	puts "Building #{ordered.join(', ')} for variant #{config.variant}".color(:cyan)
+	
+	platforms.each do |platform|
 		next unless platform.available?
 		
-		puts "Building for #{platform}...".color(:blue)
+		puts "Building for #{platform}...".color(:cyan)
 		
 		platform.prepare!
 		
 		ordered.each do |package|
+			next if package.record.transient?
+			
+			puts "Building #{package}...".color(:cyan)
+			
 			package.build!(platform, :variant => config.variant)
 		end
 	end
@@ -147,33 +170,35 @@ task :list do
 	context = Teapot::Context.new(config)
 	
 	config.records.each do |record|
-		destination_path = record.destination_path
-		
 		record.load(context)
 	end
 	
-	ordered = Teapot::Package::build_order(context.packages, context.packages.values)
+	build_order = Teapot::Package.build_order(context.packages, context.packages.values)
 	
-	ordered.each do |package|
-		puts "Package: #{package.name}"
+	if build_order[:unresolved].size > 0
+		puts "Unresolved packages:"
+		build_order[:unresolved].each do |(name, from)|
+			puts "\tPackage: #{name} (from #{from})".color(:red)
+		end
+	end
+	
+	puts "Ordered packages:"
+	build_order[:ordered].each do |package|
+		puts "\t#{package.class}: #{package.name}".color(:green)
 		
 		if package.depends.size > 0
-			puts "	(depends on #{package.depends.join(', ')})"
+			puts "\t\t(depends on #{package.depends.join(', ')})".color(:green)
 		end
 	end
 	
-	context.platforms.each do |platform|
-		puts "Platform: #{platform.name}"
+	puts "Platforms:"
+	context.platforms.each do |name, platform|
+		puts "\t#{platform.class}: #{platform.name}".color(:green)
 	end
 end
 
-task :help do
-	puts "To create a new teapot, use the setup task:"
-	puts "$ #{File.basename($0)} setup project-path"
-end
-
-task :install => [:fetch, :build]
+task :install => [:fetch, :build, :list]
 
-task :default => :help
+task :default => :install
 
 $app.top_level

data/lib/teapot/commands.rb

@@ -22,11 +22,19 @@ require 'rainbow'
 
 module Teapot
 	module Commands
+		class CommandError < StandardError
+		end
+		
 		def self.run(*args)
 			args.collect!(&:to_s)
 			
 			puts args.join(' ').color(:blue)
-			system(*args)
+			
+			if system(*args)
+				true
+			else
+				raise CommandError.new("Non-zero exit status")
+			end
 		end
 	end
 end

data/lib/teapot/config.rb

@@ -53,16 +53,20 @@ module Teapot
 			attr :options
 			attr :global
 			
+			def transient?
+				@klass == FakePackage
+			end
+			
 			def load(context)
-				context.load(self)
+				if @klass == FakePackage
+					context.packages[@name] = @klass.new(@context, self, @name)
+				else
+					context.load(self)
+				end
 			end
 			
 			def loader_path
-				if @klass == Package
-					"package.rb"
-				elsif @klass == Platform
-					"platform.rb"
-				end
+				"infusion.rb"
 			end
 			
 			def destination_path
@@ -92,6 +96,8 @@ module Teapot
 			@environment = Environment.new
 		end
 
+		attr :root
+
 		def packages_path
 			@root + (@options[:packages_path] || "packages")
 		end
@@ -150,6 +156,10 @@ module Teapot
 			@platforms << Record.new(self, Platform, name, options)
 		end
 
+		def provides(name, options = {})
+			@packages << Record.new(self, FakePackage, name, options)
+		end
+
 		def self.load(root, options = {})
 			config = new(root, options)
 			

data/lib/teapot/context.rb

@@ -25,54 +25,82 @@ require 'teapot/package'
 require 'teapot/platform'
 
 module Teapot
-	class Context
-		def initialize(config)
-			@config = config
-
-			@packages = {}
-			@platforms = {}
-
-			@defined = []
-		end
-
-		attr :config
-		attr :packages
-		attr :platforms
-
-		def load(record)
+	INFUSION_VERSION = "0.1"
+	
+	class IncompatibleInfusion < StandardError
+	end
+	
+	class Infusion
+		def initialize(context, record)
+			@context = context
 			@record = record
-			@defined = []
 			
-			path = (record.destination_path + record.loader_path).to_s
-			self.instance_eval(File.read(path), path)
-			
-			@defined
+			@defined = []
+			@version = nil
+		end
+		
+		attr :record
+		attr :defined
+		attr :version
+		
+		def required_version(version)
+			if version <= INFUSION_VERSION
+				@version = version
+			else
+				raise IncompatibleInfusion.new("Version #{version} more recent than #{INFUSION_VERSION}!")
+			end
 		end
 
 		def define_package(*args, &block)
-			package = Package.new(self, @record, *args)
+			package = Package.new(@context, @record, *args)
 
 			yield(package)
 
-			@packages[package.name] = package
+			@context.packages[package.name] = package
 
 			@defined << package
 		end
 		
 		def define_platform(*args, &block)
-			platform = Platform.new(self, @record, *args)
+			platform = Platform.new(@context, @record, *args)
 
 			yield(platform)
 
 			if platform.available?
-				@platforms[platform.name] = platform
+				@context.platforms[platform.name] = platform
 			end
 
 			@defined << platform
 		end
 		
-		def global name
-			@config.environment[name]
+		def load(path)
+			self.instance_eval(File.read(path), path)
+		end
+	end
+	
+	class Context
+		def initialize(config)
+			@config = config
+
+			@packages = {}
+			@platforms = {}
+		end
+
+		attr :config
+		attr :packages
+		attr :platforms
+
+		def load(record)
+			infusion = Infusion.new(self, record)
+			
+			path = (record.destination_path + record.loader_path).to_s
+			infusion.load(path)
+			
+			if infusion.version == nil
+				raise IncompatibleInfusion.new("No version specified in #{path}!")
+			end
+			
+			infusion.defined
 		end
 	end
 end

data/lib/teapot/environment.rb

@@ -105,7 +105,10 @@ module Teapot
 			return top
 		end
 		
-		def initialize(parent = nil, values = nil, &block)
+		def initialize(*args, &block)
+			parent = args.shift if args.size == 2
+			values = args.shift
+			
 			@values = (values || {}).to_hash
 			@parent = parent
 			
@@ -160,7 +163,7 @@ module Teapot
 			
 			Dir.chdir(options[:in] || ".") do
 				RExec.env(system_environment) do
-					@evaluator.instance_eval(&block)
+					block.call(@evaluator)
 				end
 			end
 		end

data/lib/teapot/package.rb

@@ -38,6 +38,35 @@ module Teapot
 		end
 	end
 	
+	class FakePackage
+		def initialize(context, record, name)
+			@context = context
+			@record = record
+			@name = name
+			@version = nil
+			@path = nil
+		end
+		
+		attr :context
+		attr :record
+		
+		attr :name
+		attr :version
+		
+		attr :path
+
+		def depends
+			@record.options.fetch(:depends, [])
+		end
+		
+		def build!(platform = :all, config = {})
+		end
+		
+		def to_s
+			"<FakePackage: #{@name}>"
+		end
+	end
+	
 	class Package
 		def initialize(context, record, name)
 			@context = context
@@ -94,15 +123,16 @@ module Teapot
 
 		def self.build_order(available, packages)
 			ordered = []
+			unresolved = []
 
-			expand = lambda do |name|
+			expand = lambda do |name, parent|
 				package = available[name]
 
 				unless package
-					puts "Couldn't resolve #{name}"
+					unresolved << [name, parent]
 				else
 					package.depends.each do |dependency|
-						expand.call(dependency)
+						expand.call(dependency, package)
 					end
 
 					unless ordered.include? package
@@ -112,10 +142,10 @@ module Teapot
 			end
 
 			packages.each do |package|
-				expand.call(package.name)
+				expand.call(package.name, nil)
 			end
 
-			return ordered
+			return {:ordered => ordered, :unresolved => unresolved}
 		end
 	end
 end

data/lib/teapot/platform.rb

@@ -70,7 +70,7 @@ module Teapot
 		end
 		
 		def to_s
-			"<Platform #{@name}: #{@available ? 'available' : 'inactive'}>"
+			"<Platform: #{@name} (#{@available ? 'available' : 'inactive'})>"
 		end
 		
 		def prepare!

data/lib/teapot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2599303512074911541
+      hash: 557922474497580822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2599303512074911541
+      hash: 557922474497580822
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24