teapot 1.0.0.pre.rc10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24978c48e16ae8ae1dcf5e330149396f08cf233
-  data.tar.gz: b197ab21f377f556d084d06c2e2a88cfe275a2d0
+  metadata.gz: 1e1f73a2d005afa6215f58b96d42e2bf92775768
+  data.tar.gz: 4f45aabef2c5408870cb54534de67f17a9618bb4
 SHA512:
-  metadata.gz: 9f460908b58d31f2683656d2f68087176f63698018f36ae3a29ae121a7c0d1a393929e31cf49e241b6e52e637b9ecc0d1178f4d9a86f557eb3cab0e3e5bfc28c
-  data.tar.gz: 23a8accc88acb6436fdfb54f8e8db448c24a982918fe212a43fce96965098174605ff1784db255cdb1bae3058fb46a47f6c7b0f4c6b7b32ac3b18fc4976946fa
+  metadata.gz: 4c6edc444e2004f83e14684c6e7e3866350250c656493ff8c1b0560f9badd9b22e0acb1390fb41603a7b561cfbfd4a4395386c7a968ce2cec8a1aadc7d1fb4a2
+  data.tar.gz: d7014fa07c93aa84fafddb44eb032cc90f2950adfc619f8a2812d3dcb47769403a5e323546a591ecddeb4fa5b4229950fc24cf5622092f81633fccfcae7dabd0

data/.gitignore

@@ -15,4 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-dream-framework
+kurocha

data/.rspec

@@ -0,0 +1,2 @@
+--color 
+--format documentation 

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
+sudo: false
 before_install:
   # For testing purposes:
   - git config --local user.name "Samuel Williams"
 rvm:
-  - "2.0"
-  - "2.1"
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
+  - rbx-2
 env: COVERAGE=true

data/Gemfile

@@ -3,6 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in teapot.gemspec
 gemspec
 
+group :development do
+	gem 'pry'
+	gem 'pry-coolline'
+end
+
 group :test do
 	gem 'simplecov'
 	gem 'coveralls', require: false

data/Gemfile.local

@@ -0,0 +1,23 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in teapot.gemspec
+gemspec
+
+group :development do
+	gem 'pry'
+	gem 'pry-coolline'
+	
+	gem 'build', path: '../build'
+	gem 'build-environment', path: '../build-environment'
+	gem 'build-files', path: '../build-files'
+	gem 'build-graph', path: '../build-graph'
+	gem 'build-makefile', path: '../build-makefile'
+	
+	gem 'process-daemon', path: '../process-daemon'
+	gem 'process-group', path: '../process-group'
+end
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -1,4 +1,4 @@
-# Teapot
+# ![Teapot](materials/teapot.png?raw=true)
 
 Teapot is a decentralised build tool for managing complex cross-platform projects. It has many goals but it is primarily designed to improve the experience for developers trying to make cross-platform applications and libraries with a minimum of overhead.
 
@@ -23,7 +23,7 @@ Teapot doesn't have a centralised package management system. As such, this examp
 
 Firstly, create your project by running:
 
-	$ teapot create "My Project" https://github.com/dream-framework project
+	$ teapot create "My Project" https://github.com/kurocha project
 	$ cd my-project
 
 You will be asked to merge the project file. At present, merge tools are not very good and thus you may need to take a moment to review the changes. You want to keep most of the original file, but you would like to add the `define_target` blocks which are being added.
@@ -47,13 +47,13 @@ The resulting libraries will be framework dependent, but are typically located i
 
 For Linux (requires `clang-3.2` and `libstdc++-4.8`):
 
-	$ teapot create "Local Tagged Format" https://github.com/dream-framework platform-linux variants tagged-format
+	$ teapot create "Local Tagged Format" https://github.com/kurocha platform-linux variants tagged-format
 	$ cd local-tagged-format
 	$ teapot build Library/TaggedFormat variant-debug
 
 For Mac OS X (requires Xcode Command Line Tools):
 	
-	$ teapot create "Local Tagged Format" https://github.com/dream-framework platform-darwin-osx variants tagged-format
+	$ teapot create "Local Tagged Format" https://github.com/kurocha platform-darwin-osx variants tagged-format
 	$ cd local-tagged-format
 	$ teapot build Library/TaggedFormat variant-debug
 

data/bin/teapot

@@ -47,7 +47,7 @@ OPTIONS = Trollop::options do
 	
 	opt :force, "Force the operation if it would otherwise be be stopped due to a warning."
 	
-	opt :verbose, "Verbose output and error backtraces."
+	opt :verbose, "Verbose output and error backtraces.", :type => :boolean
 	opt :version, "Print version and exit", :short => :none
 end
 
@@ -88,8 +88,8 @@ module Application
 		source = ARGV.shift
 		packages = ARGV
 		
-		root = Pathname(Dir.getwd) + project_directory
-	
+		root = Build::Files::Path.join(Dir.getwd, project_directory)
+		
 		if root.exist?
 			abort "#{root} already exists!".color(:red)
 		end

data/lib/teapot/configuration.rb

@@ -23,73 +23,18 @@ require 'set'
 
 require 'yaml/store'
 
-require 'teapot/context'
-
-require 'teapot/definition'
+require_relative 'identity_set'
+require_relative 'context'
+require_relative 'definition'
 
 module Teapot
-	# Very similar to a set but uses a specific callback for object identity.
-	class IdentitySet
-		include Enumerable
-		
-		def initialize(contents = [], &block)
-			@table = {}
-			@identity = block
-			
-			contents.each do |object|
-				add(object)
-			end
-		end
-	
-		def initialize_dup(other)
-			@table = other.table.dup
-		end
-	
-		attr :table
-	
-		def add(object)
-			@table[@identity[object]] = object
-		end
-	
-		alias << add
-	
-		def remove(object)
-			@table.delete(@identity[object])
-		end
-	
-		def include?(object)
-			@table.include?(@identity[object])
-		end
-		
-		def each(&block)
-			@table.each_value(&block)
-		end
-	
-		def size
-			@table.size
-		end
-		
-		def clear
-			@table.clear
-		end
-		
-		alias count size
-	
-		def to_s
-			@table.to_s
-		end
-		
-		def self.by_name(contents = [])
-			self.new(contents, &:name)
-		end
-	end
-	
+	# A configuration represents a mapping between package/dependency names and actual source locations. Usually, there is only one configuration, but in some cases it is useful to have more than one, e.g. one for local development using local source code, one for continuous integration, and one for deployment.
 	class Configuration < Definition
 		Import = Struct.new(:name, :explicit, :options)
 		
 		DEFAULT_OPTIONS = {
 			:import => true
-		}
+		}.freeze
 		
 		def initialize(context, package, name, packages = [], options = nil)
 			super context, package, name
@@ -100,12 +45,21 @@ module Teapot
 				@options = DEFAULT_OPTIONS.dup
 			end
 
-			@packages = IdentitySet.by_name(packages)
-			@imports = IdentitySet.by_name
+			@packages = IdentitySet.new(packages)
+			@imports = IdentitySet.new
 
 			@visibility = :private
 		end
 
+		def freeze
+			@options.freeze
+			@packages.freeze
+			@imports.freeze
+			@visibility.freeze
+			
+			super
+		end
+
 		# Controls how the configuration is exposed in the context.
 		attr :visibility
 
@@ -199,7 +153,7 @@ module Teapot
 			return false if @imports.count == 0
 			
 			# Avoid loops in the dependency chain:
-			imported = IdentitySet.new(&:name)
+			imported = IdentitySet.new
 			
 			# Enumerate all imports and attempt to resolve the packages:
 			begin
@@ -211,7 +165,7 @@ module Teapot
 				end
 				
 				imports = @imports
-				@imports = IdentitySet.new(&:name)
+				@imports = IdentitySet.new
 				
 				imports.each do |import|
 					named_configuration = @context.configurations[import.name]
@@ -265,7 +219,7 @@ module Teapot
 		end
 		
 		def to_s
-			"<#{self.class.name} #{@name.dump} visibility=#{@visibility}>"
+			"#<#{self.class} #{@name.dump} visibility=#{@visibility}>"
 		end
 	end
 end

data/lib/teapot/context.rb

@@ -40,6 +40,8 @@ module Teapot
 		end
 	end
 
+	# A context represents a specific root package instance with a given configuration and all related definitions.
+	# A context is stateful in the sense that package selection is specialized based on #select and #dependency_chain. These parameters are usually set up initially as part of the context setup.
 	class Context
 		def initialize(root, options = {})
 			@root = Path[root]

data/lib/teapot/controller/build.rb

@@ -37,9 +37,11 @@ module Teapot
 				ordered = context.direct_targets(ordered)
 			end
 			
-			controller = Build::Controller.new do |controller|
-				ordered.each do |(target, dependency)|
-					environment = target.environment_for_configuration(context.configuration)
+			controller = Build::Controller.new(logger: self.logger) do |controller|
+				ordered.each do |resolution|
+					target = resolution.provider
+					
+					environment = target.environment(context.configuration)
 					
 					if target.build
 						controller.add_target(target, environment.flatten)

data/lib/teapot/controller.rb

@@ -26,6 +26,8 @@ require 'rainbow'
 require 'rainbow/ext/string'
 require 'fileutils'
 
+require 'build/logger'
+
 module Teapot
 	class Controller
 		MAXIMUM_FETCH_DEPTH = 20
@@ -34,13 +36,25 @@ module Teapot
 			@root = Pathname(root)
 			@options = options
 			
-			@log_output = @options.fetch(:log, $stdout)
+			log_output = @options.fetch(:log, $stdout)
+			
+			@logger = Logger.new(log_output)
+			
+			@logger.formatter = Build::CompactFormatter.new(verbose: options[:verbose])
+			
+			if options[:verbose]
+				@logger.level = Logger::DEBUG
+			else
+				@logger.level = Logger::INFO
+			end
 			
 			@options[:maximum_fetch_depth] ||= MAXIMUM_FETCH_DEPTH
 		end
 		
+		attr :logger
+		
 		def log(*args)
-			@log_output.puts *args
+			@logger.info(*args)
 		end
 		
 		def context

data/lib/teapot/definition.rb

@@ -28,7 +28,18 @@ module Teapot
 			
 			@description = nil
 		end
-
+		
+		def freeze
+			@name.freeze
+			@description.freeze
+			
+			super
+		end
+		
+		def pretty_print(pp)
+			pp.text self.inspect
+		end
+		
 		# The context in which the definition was loaded:
 		attr :context
 		
@@ -55,7 +66,7 @@ module Teapot
 		end
 		
 		def to_s
-			"<#{self.class.name} #{@name.dump}>"
+			"#<#{self.class} #{@name.dump}>"
 		end
 	end
 end

data/lib/teapot/dependency.rb

@@ -34,6 +34,7 @@ module Teapot
 		
 		Provision = Struct.new(:value)
 		Alias = Struct.new(:dependencies)
+		Resolution = Struct.new(:provider, :name)
 		
 		def priority= value
 			@priority = value
@@ -151,7 +152,6 @@ module Teapot
 						explicit_providers = filter_by_priority(explicit_providers)
 					end
 					
-
 					if explicit_providers.size == 0
 						# No provider was explicitly specified, thus we require explicit conflict resolution:
 						@conflicts[dependency] = viable_providers
@@ -212,7 +212,7 @@ module Teapot
 					# puts "** Appending #{dependency} -> ordered".color(:magenta)
 					
 					# Add the provider to the ordered list.
-					@ordered << [provider, dependency]
+					@ordered << Resolution.new(provider, dependency)
 				end
 				
 				# This goes here because we want to ensure 1/ that if 

data/lib/teapot/generator.rb

@@ -66,7 +66,7 @@ module Teapot
 			source_path = Pathname(path) + source
 			destination_path = Pathname(context.root) + destination
 
-			destination_path.dirname.create
+			destination_path.dirname.mkpath
 
 			File.open(destination_path, mode) do |file|
 				text = File.read(source_path)

data/lib/teapot/identity_set.rb

@@ -0,0 +1,74 @@
+# Copyright, 2015, 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 'forwardable'
+
+module Teapot
+	# Very similar to a set but uses a specific callback (defaults to &:name) for object identity.
+	class IdentitySet
+		include Enumerable
+		
+		def initialize(contents = [])
+			@table = {}
+			
+			contents.each do |object|
+				add(object)
+			end
+		end
+		
+		def freeze
+			@table.freeze
+			
+			super
+		end
+		
+		def initialize_dup(other)
+			@table = other.table.dup
+		end
+		
+		def identity(object)
+			object.name
+		end
+		
+		attr :table
+		
+		def add(object)
+			@table[identity(object)] = object
+		end
+		
+		alias << add
+		
+		def delete(object)
+			@table.delete(identity(object))
+		end
+		
+		def include?(object)
+			@table.include?(identity(object))
+		end
+		
+		def each(&block)
+			@table.each_value(&block)
+		end
+		
+		extend Forwardable
+		
+		def_delegators :@table, :size, :empty?, :clear, :count, :[], :to_s, :inspect
+	end
+end

data/lib/teapot/loader.rb

@@ -27,6 +27,9 @@ require 'build/rule'
 require 'build/name'
 require 'build/files'
 
+# Required for CPU count, etc.
+require 'system'
+
 module Teapot
 	LOADER_VERSION = "1.0.0"
 	MINIMUM_LOADER_VERSION = "1.0"

data/lib/teapot/package.rb

@@ -49,6 +49,15 @@ module Teapot
 			# Copy the options provided:
 			@options = options
 		end
+		
+		def freeze
+			@path.freeze
+			@name.freeze
+			@uri.freeze
+			@options.freeze
+			
+			super
+		end
 
 		attr :name
 		attr :path
@@ -79,7 +88,7 @@ module Teapot
 		end
 
 		def to_s
-			"<#{self.class.name} #{@name.dump} path=#{path}>"
+			"#<#{self.class} #{@name.dump} path=#{path}>"
 		end
 		
 		# Package may be used as hash key / in a set:

data/lib/teapot/project.rb

@@ -31,6 +31,17 @@ module Teapot
 			@authors = []
 		end
 		
+		def freeze
+			@summary.freeze
+			@license.freeze
+			@website.freeze
+			@version.freeze
+			
+			@authors.freeze
+			
+			super
+		end
+		
 		attr :summary, true
 		attr :license, true
 		attr :website, true

data/lib/teapot/substitutions.rb

@@ -20,12 +20,24 @@
 
 module Teapot
 	class Indentation
+		TAB = "\t".freeze
+		
 		def initialize(prefix, level, indent)
 			@prefix = prefix
 			@level = level
 			@indent = indent
 		end
 
+		def freeze
+			indentation
+			
+			@prefix.freeze
+			@level.freeze
+			@indent.freeze
+			
+			super
+		end
+
 		def indentation
 			@indentation ||= @prefix + (@indent * @level)
 		end
@@ -47,7 +59,7 @@ module Teapot
 		end
 		
 		def self.none
-			self.new('', 0, "\t")
+			self.new('', 0, TAB)
 		end
 	end
 	
@@ -56,6 +68,12 @@ module Teapot
 			@ordered = ordered
 		end
 		
+		def freeze
+			@ordered.freeze
+			
+			super
+		end
+		
 		def []= keyword, value
 			if Array === value
 				open, close = *value.each_slice(value.length / 2)
@@ -107,6 +125,13 @@ module Teapot
 
 			attr :keyword
 			attr :value
+			
+			def freeze
+				@keyword.freeze
+				@value.freeze
+				
+				super
+			end
 
 			def apply(text)
 				text.gsub(@keyword, @value)
@@ -131,6 +156,15 @@ module Teapot
 				@indent = indent
 			end
 
+			def freeze
+				@keyword.freeze
+				@open.freeze
+				@close.freeze
+				@indent.freeze
+				
+				super
+			end
+
 			def line_pattern(prefix = '')
 				tag_pattern = Regexp.escape('<' + prefix + @keyword + '>')
 				
@@ -208,7 +242,8 @@ module Teapot
 			substitutions = self.new
 
 			# The user's current name:
-			substitutions['AUTHOR_NAME'] = `git config --global user.name`.chomp
+			substitutions['AUTHOR_NAME'] = context.metadata.user.name
+			substitutions['AUTHOR_EMAIL'] = context.metadata.user.email
 
 			substitutions['PROJECT_NAME'] = context.project.name
 			substitutions['LICENSE'] = context.project.license

data/lib/teapot/target.rb

@@ -42,14 +42,23 @@ module Teapot
 		
 		attr :rulebook
 		
+		def freeze
+			@build.freeze
+			@rulebook.freeze
+			
+			super
+		end
+		
+		# Given a configuration, compute the dependency chain for this target.
 		def provision_chain(configuration)
 			# Reduce the number of keystrokes for good health:
 			context = configuration.context
 			
-			chain = Dependency::chain(context.selection, dependencies, context.targets.values)
+			chain = Dependency::chain(context.selection, self.dependencies, context.targets.values)
 		end
 		
-		def environment_for_configuration(configuration)
+		# Given a specific configuration, generate the build environment based on this target and it's provision chain.
+		def environment(configuration)
 			chain = provision_chain(configuration)
 			
 			environments = []
@@ -64,14 +73,15 @@ module Teapot
 			
 			# Merge all the environments together:
 			environment = Build::Environment.combine(*environments)
-				
+			
 			environment.merge do
 				default platforms_path configuration.platforms_path
-				default build_prefix {platforms_path + "cache/#{platform_name}-#{variant}"}
-				default install_prefix {platforms_path + "#{platform_name}-#{variant}"}
 			end
 		end
 		
+		# Legacy method name.
+		alias environment_for_configuration environment
+		
 		def build(&block)
 			if block_given?
 				@build = block

data/lib/teapot/version.rb

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