teapot 0.6.0 → 0.7.0

data/lib/teapot/package.rb

@@ -0,0 +1,109 @@
+# 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 'pathname'
+
+require 'teapot/context'
+require 'teapot/environment'
+require 'teapot/commands'
+
+require 'teapot/definition'
+
+module Teapot
+	class Package
+		def initialize(path, name, options = {})
+			# The path where the package is (or will be) located:
+			@path = path
+
+			# Get the name of the package from the options, if provided:
+			if options[:name]
+				@name = options[:name]
+			end
+
+			if Symbol === name
+				# If the name argument was symbolic, we convert it into a string, and use it for both the uri and the name itself:
+				@uri = name.to_s
+				@name ||= @uri
+			else
+				# Otherwise, we assume a path may have been given, and use that instead:
+				@name ||= File.basename(name)
+				@uri = name
+			end
+			
+			# Copy the options provided:
+			@options = options
+ 		end
+
+		attr :name
+		attr :path
+
+		attr :uri
+		attr :options, true
+
+		def local?
+			@options.key? :local
+		end
+
+		def external?
+			@options.key? :source
+		end
+
+		def external_url(relative_root)
+			base_uri = URI(@options[:source].to_s)
+
+			if base_uri.scheme == nil || base_uri.scheme == 'file'
+				base_uri = URI "file://" + File.expand_path(base_uri.path, relative_root) + "/"
+			end
+
+			return relative_url(base_uri)
+		end
+
+		def to_s
+			"<#{self.class.name} #{@name.dump} path=#{path}>"
+		end
+		
+		# Package may be used as hash key / in a set:
+		
+		def hash
+			@path.hash
+		end
+		
+		def eql?(other)
+			@path.eql?(other.path)
+		end
+		
+		private
+		
+		def relative_url(base_uri)
+			source_uri = URI(@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 = "file://" + source_uri.path
+			end
+
+			return source_uri
+		end
+	end
+end

data/lib/teapot/target.rb

@@ -21,48 +21,41 @@
 require 'pathname'
 require 'teapot/build'
 require 'teapot/dependency'
+require 'teapot/definition'
 
 module Teapot
 	class BuildError < StandardError
 	end
 	
-	class Target
+	class Target < Definition
 		include Dependency
 		
 		def initialize(context, package, name)
-			@context = context
-			@package = package
+			super context, package, name
 
-			@name = name
-
-			@install = nil
-
-			@path = @package.path
+			@build = nil
 		end
 
-		attr :context
-		attr :package
-		attr :name
-
-		attr :path
-
 		def builder
 			Build.top(@path)
 		end
 
-		def install(&block)
-			@install = Proc.new(&block)
+		def build(&block)
+			@build = Proc.new(&block)
 		end
 
-		def install!(context, config = {})
-			return unless @install
+		def build!(configuration, config = {})
+			return unless @build
+			
+			# Reduce the number of keystrokes for good health:
+			context = configuration.context
 			
 			chain = Dependency::chain(context.selection, dependencies, context.targets.values)
 			
 			environments = []
 			
 			# The base configuration environment:
-			environments << context.config.environment
+			# environments << configuration.environment
 			
 			# Calculate the dependency chain's ordered environments:
 			environments += chain.provisions.collect do |provision|
@@ -76,7 +69,7 @@ module Teapot
 			environment = Environment.combine(*environments)
 				
 			local_build = environment.merge do
-				default platforms_path context.config.platforms_path
+				default platforms_path configuration.platforms_path
 				default build_prefix {platforms_path + "cache/#{platform_name}-#{variant}"}
 				default install_prefix {platforms_path + "#{platform_name}-#{variant}"}
 			
@@ -84,11 +77,7 @@ module Teapot
 				append linkflags {"-L#{install_prefix + "lib"}"}
 			end
 			
-			@install.call(local_build)
-		end
-
-		def to_s
-			"<Target: #{@name}>"
+			@build.call(local_build)
 		end
 	end
 end

data/lib/teapot/version.rb

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

data/teapot.gemspec

@@ -20,9 +20,14 @@ Gem::Specification.new do |gem|
 	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 	gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 	gem.require_paths = ["lib"]
-	
+
+	gem.required_ruby_version = '>= 1.9.3'
+
 	gem.add_dependency "rainbow"
 	gem.add_dependency "rexec"
 	gem.add_dependency "trollop"
 	gem.add_dependency "facter"
+
+	# This could be a good option in the future for teapot fetch:
+	#gem.add_dependency "rugged"
 end

data/test/teapot.rb

@@ -0,0 +1,33 @@
+
+#
+#  This file is part of the "Teapot" project, and is released under the MIT license.
+#
+
+required_version "0.7"
+
+define_configuration 'test' do |configuration|
+	configuration.public!
+	
+	configuration[:source] = "../dream-framework"
+
+	configuration.require "variants"
+
+	configuration.require "platform-darwin-osx"
+	configuration.require "platform-darwin-ios"
+
+	configuration.require "unit-test"
+	configuration.require "euclid"
+
+	configuration.require "ogg"
+	configuration.require "vorbis"
+
+	configuration.require "jpeg"
+	configuration.require "png"
+
+	configuration.require "freetype"
+
+	configuration.require "dream"
+	configuration.require "tagged-format"
+
+	configuration.require "opencv"
+end

data/test/{test_config.rb → test_teapot.rb}

@@ -22,20 +22,23 @@ require 'pathname'
 require 'test/unit'
 require 'stringio'
 
-require 'teapot/config'
+require 'teapot/context'
 
 class TestConfig < Test::Unit::TestCase
 	ROOT = Pathname.new(__FILE__).dirname
 	
-	def test_config
-		config = Teapot::Config.new(ROOT)
+	def test_context
+		context = Teapot::Context.new(ROOT)
 		
-		config.instance_eval do
-			source "../infusions/"
-			package "png"
-		end
+		# There is one configuration:
+		assert_equal 1, context.configurations.count
 		
-		assert_equal "../infusions/", config.options[:source]
-		assert_equal 1, config.packages.size
+		# No targets were defined:
+		assert_equal 0, context.targets.count
+		
+		default_configuration = context.default_configuration
+		
+		# 13 defined packages + 1 implicit package.
+		assert_equal 14, default_configuration.packages.count
 	end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rexec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,8 +96,16 @@ files:
 - lib/teapot/build/targets/files.rb
 - lib/teapot/build/targets/library.rb
 - lib/teapot/commands.rb
-- lib/teapot/config.rb
+- lib/teapot/configuration.rb
 - lib/teapot/context.rb
+- lib/teapot/controller.rb
+- lib/teapot/controller/build.rb
+- lib/teapot/controller/clean.rb
+- lib/teapot/controller/create.rb
+- lib/teapot/controller/fetch.rb
+- lib/teapot/controller/generate.rb
+- lib/teapot/controller/list.rb
+- lib/teapot/definition.rb
 - lib/teapot/dependency.rb
 - lib/teapot/environment.rb
 - lib/teapot/environment/base.rb
@@ -114,43 +113,42 @@ files:
 - lib/teapot/environment/evaluator.rb
 - lib/teapot/environment/flatten.rb
 - lib/teapot/environment/system.rb
+- lib/teapot/generator.rb
+- lib/teapot/loader.rb
+- lib/teapot/name.rb
+- lib/teapot/package.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
 - teapot.gemspec
-- test/test_config.rb
+- test/teapot.rb
 - test/test_dependency.rb
 - test/test_environment.rb
+- test/test_teapot.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3435379409085677514
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3435379409085677514
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
 test_files:
-- test/test_config.rb
+- test/teapot.rb
 - test/test_dependency.rb
 - test/test_environment.rb
+- test/test_teapot.rb

data/lib/teapot/config.rb

@@ -1,164 +0,0 @@
-# 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 'pathname'
-
-require 'teapot/context'
-require 'teapot/environment'
-require 'teapot/commands'
-
-module Teapot
-	class Config
-		include Dependency
-		
-		class Package
-			def initialize(config, name, options = {})
-				@config = config
-				
-				if options[:name]
-					@name = options[:name]
-				end
-				
-				if Symbol === name
-					@uri = name.to_s
-					@name ||= @uri
-				else
-					@name ||= File.basename(name)
-					@uri = name
-				end
-				
-				@options = options
-				@global = Environment.new
-			end
-			
-			attr :name
-			attr :uri
-			attr :options
-			attr :global
-			
-			def relative_url(base_uri)
-				source_uri = URI(@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 = "file://" + source_uri.path
-				end
-				
-				return source_uri
-			end
-			
-			def local?
-				@options.key? :local
-			end
-			
-			def loader_path
-				"teapot.rb"
-			end
-			
-			def path
-				@config.packages_path + @name
-			end
-			
-			def to_s
-				"<#{@name}>"
-			end
-		end
-		
-		def initialize(root, options = {})
-			@root = Pathname.new(root)
-			@options = options
-
-			@packages = []
-
-			@environment = Environment.new
-		end
-
-		def name
-			:config
-		end
-
-		attr :root
-		attr :packages
-		attr :options
-
-		attr :environment
-
-		def packages_path
-			@root + (@options[:packages_path] || "packages")
-		end
-		
-		def platforms_path
-			@root + (@options[:platforms_path] || "platforms")
-		end
-		
-		def host(*args, &block)
-			name = @options[:host_platform] || RUBY_PLATFORM
-			
-			if block_given?
-				if args.find{|arg| arg === name}
-					yield
-				end
-			else
-				name
-			end
-		end
-		
-		attr :options
-		attr :packages
-
-		def source(path)
-			@options[:source] = path
-		end
-
-		def package(name, options = {})
-			@packages << Package.new(self, 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)
-			
-			yield config if block_given?
-			
-			teapot_path = File.join(root, "Teapot")
-			config.load(teapot_path) if File.exist? teapot_path
-			
-			return config
-		end
-		
-		def self.load_default(root = Dir.getwd, 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