teapot 2.2.0 → 3.2.0

data/lib/teapot/loader.rb

@@ -30,7 +30,8 @@ module Teapot
 	# Cannot load packages newer than this.
 	# Version 1.3: Added support for build-dependency library which allows options for `#depends`. The primary use case is private dependencies.
 	# Version 2.0: Generators removed and refactored into build.
-	LOADER_VERSION = "2.0"
+	# Version 2.3: Rework install_prefix -> build_prefix.
+	LOADER_VERSION = "3.0"
 	
 	# Cannot load packages older than this.
 	MINIMUM_LOADER_VERSION = "1.0"
@@ -46,7 +47,7 @@ module Teapot
 		attr :version
 	end
 	
-	class NonexistantTeapotError < StandardError
+	class MissingTeapotError < StandardError
 		def initialize(path)
 			super "Could not read file at #{path}!"
 		end
@@ -66,6 +67,8 @@ module Teapot
 			@defined = []
 			@version = nil
 			
+			@configurations = Build::Dependency::Set.new
+			
 			@default_project = nil
 			@default_configuration = nil
 			
@@ -77,6 +80,8 @@ module Teapot
 		attr :defined
 		attr :version
 		
+		attr :configurations
+		
 		attr :default_project
 		attr :default_configuration
 		
@@ -103,9 +108,11 @@ module Teapot
 		
 		def define_target(*args)
 			target = Target.new(@context, @package, *args)
-
+			
 			yield target
-
+			
+			target.update_environments!
+			
 			@defined << target
 		end
 		
@@ -116,6 +123,7 @@ module Teapot
 
 			@default_configuration ||= configuration
 			@defined << configuration
+			@configurations << configuration
 		end
 		
 		# Checks the host patterns and executes the block if they match.
@@ -162,7 +170,7 @@ module Teapot
 		
 		# Load a teapot.rb file relative to the root of the @package.
 		def load!(path = teapot_path)
-			raise NonexistantTeapotError.new(path) unless File.exist?(path)
+			raise MissingTeapotError.new(path) unless File.exist?(path)
 			
 			script = Script.new(@context, @package)
 			

data/lib/teapot/select.rb

@@ -0,0 +1,148 @@
+# 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_relative 'loader'
+require_relative 'package'
+
+require 'build/rulebook'
+require 'build/text/substitutions'
+require 'build/text/merge'
+
+module Teapot
+	class AlreadyDefinedError < StandardError
+		def initialize(definition, previous)
+			super "Definition #{definition.name} in #{definition.path} has already been defined in #{previous.path}!"
+		end
+
+		def self.check(definition, definitions)
+			previous = definitions[definition.name]
+
+			raise self.new(definition, previous) if previous
+		end
+	end
+	
+	# A selection is a specific view of the data exposed by the context at a specific point in time.
+	class Select
+		def initialize(context, configuration, names = [])
+			@context = context
+			@configuration = Configuration.new(context, configuration.package, configuration.name, [], configuration.options)
+			
+			@targets = {}
+			@configurations = {}
+			@projects = {}
+			
+			@dependencies = []
+			@selection = Set.new
+			@resolved = Build::Dependency::Set.new
+			@unresolved = Build::Dependency::Set.new
+			
+			load!(configuration, names)
+			
+			@chain = nil
+		end
+		
+		attr :context
+		attr :configuration
+		
+		attr :targets
+		attr :projects
+		
+		# Alises as defined by Configuration#targets
+		attr :aliases
+		
+		# All public configurations.
+		attr :configurations
+		
+		attr :dependencies
+		attr :selection
+		
+		attr :resolved
+		attr :unresolved
+		
+		def chain
+			@chain ||= Build::Dependency::Chain.expand(@dependencies, @targets.values, @selection)
+		end
+		
+		def direct_targets(ordered)
+			@dependencies.collect do |dependency|
+				ordered.find{|(package, _)| package.provides? dependency}
+			end.compact
+		end
+		
+		private
+		
+		# Add a definition to the current context.
+		def append definition
+			case definition
+			when Target
+				AlreadyDefinedError.check(definition, @targets)
+				@targets[definition.name] = definition
+			when Configuration
+				# We define configurations in two cases, if they are public, or if they are part of the root package of this context.
+				if definition.public? or definition.package == @context.root_package
+					AlreadyDefinedError.check(definition, @configurations)
+					@configurations[definition.name] = definition
+				end
+			when Project
+				AlreadyDefinedError.check(definition, @projects)
+				@projects[definition.name] = definition
+			end
+		end
+		
+		def load_package!(package)
+			begin
+				script = @context.load(package)
+				
+				# Load the definitions into the current selection:
+				script.defined.each do |definition|
+					append(definition)
+				end
+				
+				@resolved << package
+			rescue MissingTeapotError, IncompatibleTeapotError
+				# If the package doesn't exist or the teapot version is too old, it failed:
+				@unresolved << package
+			end
+		end
+		
+		def load!(configuration, names)
+			# Load the root package which makes all the named configurations and targets available.
+			load_package!(@context.root_package)
+			
+			# Load all packages defined by this configuration.
+			configuration.traverse(@configurations) do |configuration|
+				@configuration.merge(configuration) do |package|
+					# puts "Load package: #{package} from #{configuration}"
+					load_package!(package)
+				end
+			end
+			
+			@configuration.freeze
+			
+			names.each do |name|
+				if @targets.key? name
+					@selection << name
+				else
+					@dependencies << name
+				end
+			end
+		end
+	end
+end

data/lib/teapot/target.rb

@@ -32,40 +32,20 @@ module Teapot
 	class Target < Definition
 		include Build::Dependency
 		
-		def initialize(context, package, name)
-			super context, package, name
+		def initialize(*)
+			super
 			
 			@build = nil
-			
-			@rulebook = Build::Rulebook.new
 		end
 		
-		attr :rulebook
-		
 		def freeze
+			return self if frozen?
+			
 			@build.freeze
-			@rulebook.freeze
 			
 			super
 		end
 		
-		# Given a specific configuration, generate the build environment based on this target and it's provision chain.
-		def environment(configuration, chain)
-			chain = chain.partial(self)
-			
-			# Calculate the dependency chain's ordered environments:
-			environments = chain.provisions.collect do |provision|
-				Build::Environment.new(&provision.value)
-			end
-			
-			# Merge all the environments together:
-			environment = Build::Environment.combine(*environments)
-			
-			environment.merge do
-				default platforms_path configuration.platforms_path
-			end
-		end
-		
 		def build(&block)
 			if block_given?
 				@build = block
@@ -73,5 +53,23 @@ module Teapot
 			
 			return @build
 		end
+		
+		def update_environments!
+			return unless @build
+			
+			self.provisions.each do |key, provision|
+				build = @build
+				original = provision.value
+				
+				wrapper = proc do |*arguments|
+					self.instance_exec(*arguments, &original) if original
+					self.instance_exec(*arguments, &build) if build
+				end
+				
+				provision.value = wrapper
+			end
+			
+			@build = nil
+		end
 	end
 end

data/lib/teapot/version.rb

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

data/spec/spec_helper.rb

@@ -1,29 +1,5 @@
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
-	begin
-		require 'simplecov'
-		
-		SimpleCov.start do
-			add_filter "/spec/"
-		end
-		
-		if ENV['TRAVIS']
-			require 'coveralls'
-			Coveralls.wear!
-		end
-	rescue LoadError
-		warn "Could not load simplecov: #{$!}"
-	end
-end
-
-require "bundler/setup"
-require "teapot"
-require 'pry'
-
-RSpec.shared_context Teapot::Context do
-	let(:root) {Build::Files::Path[__dir__] + 'context'}
-	let(:context) {Teapot::Context.new(root, load_root: false)}
-end
+require "covered/rspec"
 
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure

data/spec/teapot/command/clone_spec.rb

@@ -23,7 +23,7 @@ require 'teapot/command'
 
 RSpec.describe Teapot::Command::Clone, order: :defined do
 	let(:root) {Build::Files::Path.new(__dir__) + "clone_spec"}
-	let(:source) {'http://github.com/kurocha/tagged-format'}
+	let(:source) {'https://github.com/kurocha/tagged-format'}
 	
 	let(:top) {Teapot::Command::Top["--root", root.to_s]}
 	

data/spec/teapot/context_spec.rb

@@ -27,14 +27,32 @@ RSpec.describe Teapot::Context do
 	it "should specify correct number of packages" do
 		default_configuration = context.configuration
 		
-		expect(default_configuration.packages.count).to be == 13
+		expect(default_configuration.packages.count).to be == 0
 	end
 	
-	it "should load teapot.rb file" do
+	it "should select configuration" do
+		expect(context.configuration.name).to be == 'development'
+	end
+	
+	context "with specific configuration" do
+		let(:context) {Teapot::Context.new(root, configuration: 'context_spec')}
+		
+		it "should select configuration" do
+			expect(context.configuration.name).to be == 'context_spec'
+		end
+		
+		it "should specify correct number of packages" do
+			default_configuration = context.configuration
+			
+			expect(default_configuration.packages.count).to be == 13
+		end
+	end
+	
+	it "should load teapot script" do
 		selection = context.select
 		
 		# There is one configuration:
-		expect(selection.configurations.count).to be == 1
+		expect(selection.configurations.count).to be == 2
 		expect(selection.targets.count).to be == 1
 		
 		# We didn't expect any of them to actually load...

data/spec/teapot/context_spec/teapot.rb

@@ -3,9 +3,16 @@
 #  This file is part of the "Teapot" project, and is released under the MIT license.
 #
 
-teapot_version "1.0.0"
+teapot_version "3.0.0"
 
-define_configuration 'test' do |configuration|
+define_target "context_spec" do |target|
+end
+
+define_configuration 'development' do |configuration|
+	configuration.import 'context_spec'
+end
+
+define_configuration 'context_spec' do |configuration|
 	configuration.public!
 	
 	configuration[:source] = "../kurocha"
@@ -31,6 +38,3 @@ define_configuration 'test' do |configuration|
 
 	configuration.require "opencv"
 end
-
-define_target "context_spec" do |target|
-end

data/spec/teapot/target_spec.rb

@@ -23,7 +23,7 @@ require 'teapot/context'
 RSpec.describe Teapot::Target do
 	let(:root) {Build::Files::Path.new(__dir__) + "target_spec"}
 	
-	it "should generate environment for configuration" do
+	it "should generate correct chain for configuration" do
 		context = Teapot::Context.new(root)
 		selection = context.select(["Test/TargetSpec"])
 		
@@ -39,15 +39,6 @@ RSpec.describe Teapot::Target do
 		expect(chain.ordered[1].name).to be == 'Platform/generic'
 		expect(chain.ordered[2].name).to be == 'Test/TargetSpec'
 		expect(chain.ordered[2].provider).to be == target
-		
-		environment = target.environment(selection.configuration, chain)
-		# Environment#to_hash flattens the environment and evaluates all values:
-		hash = environment.to_hash
-		
-		expect(hash[:variant]).to be == 'debug'
-		expect(hash[:platform_name]).to be == 'generic'
-		
-		expect(hash).to include(:buildflags, :linkflags, :build_prefix, :install_prefix, :platforms_path)
 	end
 	
 	it "should match wildcard packages" do

data/teapot.gemspec

@@ -16,34 +16,29 @@ Gem::Specification.new do |spec|
 	spec.summary       = %q{Teapot is a tool for managing complex cross-platform builds.}
 	spec.homepage      = "http://www.teapot.nz"
 	spec.license       = "MIT"
-
+	
 	spec.files         = `git ls-files`.split($/)
 	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 	
-	spec.has_rdoc = 'yard'
-	
 	spec.required_ruby_version = '>= 2.1.0'
 	
-	spec.add_dependency "rainbow", "~> 2.0"
+	spec.add_dependency "graphviz", "~> 1.0"
+	spec.add_dependency "rugged", "~> 0.27.0"
 	
-	spec.add_dependency "graphviz", "~> 0.4"
-	
-	spec.add_dependency "rugged"
-	
-	spec.add_dependency "build", "~> 1.1"
-	spec.add_dependency "build-files", "~> 1.3"
-	spec.add_dependency "build-dependency", "~> 1.1"
+	spec.add_dependency "build", "~> 2.4"
+	spec.add_dependency "build-environment", "~> 1.10"
+	spec.add_dependency "build-files", "~> 1.4"
+	spec.add_dependency "build-dependency", "~> 1.4"
 	spec.add_dependency "build-uri", "~> 1.0"
 	spec.add_dependency "build-text", "~> 1.0"
 	
-	spec.add_dependency "samovar", "~> 1.7"
-	
-	# This could be a good option in the future for teapot fetch:
-	#spec.add_dependency "rugged"
+	spec.add_dependency "console", "~> 1.0"
+	spec.add_dependency "samovar", "~> 2.0"
 	
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
 end