teapot 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd1292b87cd5db2fadc2379f270574504222ca5865d020c1463c072ddb14e79
-  data.tar.gz: 9c7a12f5887482e46b896d5a3e77147a28d3563cdf2ec194f489ab064f75d9ef
+  metadata.gz: 74fb639fe5cc1f9596048d3a55255d8b9ed534114bb7ac4ce0a337274a93b7ec
+  data.tar.gz: ee891bde08844f98b972f76a77ee6427996b5b05de39ac8a0f2ca3891310ee09
 SHA512:
-  metadata.gz: 4dfac1b253ce27cd86644dfae4f9b1ee3b8cc43a1436b11022a33a18b17e0ba53bd79deb420b236b9dd7b1d48f5859a5f1d2cfafc223cbc3689801eefc1f20cc
-  data.tar.gz: 797f3d03946859f2e8c8fefc4a610a3f7bb14d6dad90fdc8063989b7cf1a66524b5608ebeeb7c984455603c8d9a6096be5c0bef74385a4711d326c4bd0af3c13
+  metadata.gz: 5061e625c2c4ccdd3a698a829699a62170e0753d95bdeff9ab87790795aa960974fd0955cf4c68df815cbf5e201ac9492b6f9b11e4e2516d64385a34399bb479
+  data.tar.gz: 331cd7ab35e021d1720a9426332583bd8141cf79f4a5e63da90bf8d19ef2583eb1afb6338e11242ad7da64241c2c8e265ff2be8fed1c28be9e49d3ac5da60762

data/lib/teapot/command/build.rb

@@ -32,7 +32,6 @@ module Teapot
 			
 			options do
 				option '-j/-l/--limit <n>', "Limit the build to <n> concurrent processes.", type: Integer
-				option '--only', "Only build direct dependencies."
 				option '-c/--continuous', "Run the build graph continually (experimental)."
 			end
 			
@@ -50,23 +49,11 @@ module Teapot
 				end
 				
 				chain = selection.chain
-				
-				ordered = chain.ordered
-				
-				if @options[:only]
-					ordered = selection.direct_targets(ordered)
-				end
+				environment = context.configuration.environment
 				
 				controller = ::Build::Controller.new(logger: parent.logger, limit: @options[:limit]) do |controller|
-					ordered.each do |resolution|
-						target = resolution.provider
-						
-						if target.build
-							environment = target.environment(selection.configuration, chain)
-							
-							controller.add_target(target, environment.flatten, self.argv)
-						end
-					end
+					
+					controller.add_chain(chain, self.argv, environment)
 				end
 				
 				walker = nil
@@ -91,7 +78,7 @@ module Teapot
 					end
 				end
 				
-				return chain, ordered
+				return chain
 			end
 			
 			def show_dependencies(walker)

data/lib/teapot/command/clone.rb

@@ -48,7 +48,7 @@ module Teapot
 				end
 				
 				logger.info "Cloning #{@source} to #{root}...".color(:cyan)
-				repository = Rugged::Repository.clone_at(@source, root.to_s, credentials: self.method(:credentials))
+				_repository = Rugged::Repository.clone_at(@source, root.to_s, credentials: self.method(:credentials))
 				
 				# Fetch the initial packages:
 				Fetch[].invoke(nested)

data/lib/teapot/command/fetch.rb

@@ -52,7 +52,6 @@ module Teapot
 				logger = parent.logger
 				context = parent.context
 				
-				updated = Set.new
 				selection = context.select
 				
 				packages = selection.configuration.packages

data/lib/teapot/configuration.rb

@@ -23,7 +23,7 @@ require 'set'
 
 require 'yaml/store'
 
-require_relative 'identity_set'
+require 'build/dependency/set'
 require_relative 'definition'
 
 module Teapot
@@ -40,8 +40,8 @@ module Teapot
 
 			@options = DEFAULT_OPTIONS.merge(options)
 
-			@packages = IdentitySet.new(packages)
-			@imports = IdentitySet.new
+			@packages = Build::Dependency::Set.new(packages)
+			@imports = Build::Dependency::Set.new
 
 			@visibility = :private
 
@@ -63,6 +63,15 @@ module Teapot
 			super
 		end
 
+		def environment
+			configuration = self
+			
+			Build::Environment.new(name: self.name) do
+				default build_path configuration.build_path
+				default platforms_path configuration.build_path
+			end
+		end
+
 		# Controls how the configuration is exposed in the context.
 		attr :visibility
 
@@ -148,7 +157,7 @@ module Teapot
 		end
 
 		# Process all import directives and return a new configuration based on the current configuration. Import directives bring packages and other import directives from the specififed configuration definition.
-		def traverse(configurations, imported = IdentitySet.new, &block)
+		def traverse(configurations, imported = Build::Dependency::Set.new, &block)
 			yield self # Whatever happens here, should ensure that...
 			
 			@imports.each do |import|

data/lib/teapot/context.rb

@@ -32,7 +32,7 @@ module Teapot
 
 			@loaded = {}
 
-			load_root_package(options) unless options[:load_root] == false
+			load_root_package(**options)
 		end
 
 		attr :root
@@ -102,7 +102,7 @@ module Teapot
 		
 		private
 		
-		def load_root_package(options)
+		def load_root_package(**options)
 			# Load the root package:
 			script = load(root_package)
 

data/lib/teapot/loader.rb

@@ -31,7 +31,7 @@ module Teapot
 	# 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.
 	# Version 2.3: Rework install_prefix -> build_prefix.
-	LOADER_VERSION = "2.3"
+	LOADER_VERSION = "3.0"
 	
 	# Cannot load packages older than this.
 	MINIMUM_LOADER_VERSION = "1.0"
@@ -107,6 +107,8 @@ module Teapot
 			
 			yield target
 			
+			target.update_environments!
+			
 			@defined << target
 		end
 		

data/lib/teapot/target.rb

@@ -54,24 +54,22 @@ module Teapot
 			return @build
 		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)
+		def update_environments!
+			return unless @build
 			
-			# 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 build_path configuration.build_path
+			self.provisions.each do |key, provision|
+				build = @build
+				original = provision.value
 				
-				# TODO deprecated - remove in 3.0
-				default platforms_path configuration.platforms_path
+				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.3.0"
+	VERSION = "3.0.0"
 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

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
 	
 	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.0"
+	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"
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: build-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: build-dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: build-uri
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,6 @@ files:
 - lib/teapot/configuration.rb
 - lib/teapot/context.rb
 - lib/teapot/definition.rb
-- lib/teapot/identity_set.rb
 - lib/teapot/loader.rb
 - lib/teapot/package.rb
 - lib/teapot/project.rb
@@ -246,7 +245,6 @@ files:
 - spec/teapot/configuration_spec/teapot.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
-- spec/teapot/identity_set_spec.rb
 - spec/teapot/target_spec.rb
 - spec/teapot/target_spec/teapot.rb
 - teapot.gemspec
@@ -285,6 +283,5 @@ test_files:
 - spec/teapot/configuration_spec/teapot.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
-- spec/teapot/identity_set_spec.rb
 - spec/teapot/target_spec.rb
 - spec/teapot/target_spec/teapot.rb

data/lib/teapot/identity_set.rb

@@ -1,78 +0,0 @@
-# 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
-		
-		attr :table
-		
-		def freeze
-			@table.freeze
-			
-			super
-		end
-		
-		def initialize_dup(other)
-			@table = other.table.dup
-		end
-		
-		def identity(object)
-			object.name
-		end
-		
-		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
-		
-		def slice(names)
-			names.collect{|name| @table[name]}
-		end
-		
-		extend Forwardable
-		
-		def_delegators :@table, :size, :empty?, :clear, :count, :[], :to_s, :inspect
-	end
-end

data/spec/teapot/identity_set_spec.rb

@@ -1,94 +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 'teapot/identity_set'
-
-module Teapot::IdentitySetSpec
-	describe Teapot::IdentitySet do
-		NamedObject = Struct.new(:name, :age)
-		
-		let(:bob) {NamedObject.new('Bob', 10)}
-		let(:empty_identity_set) {Teapot::IdentitySet.new}
-		let(:bob_identity_set) {Teapot::IdentitySet.new([bob])}
-		
-		it "should contain named objects" do
-			expect(bob_identity_set).to be_include bob
-		end
-		
-		it "can enumerate all contained objects" do
-			expect(bob_identity_set.each.to_a).to be == [bob]
-		end
-		
-		it "could contain items" do
-			expect(bob_identity_set).to_not be_empty
-			expect(bob_identity_set.size).to be == 1
-		end
-		
-		it "could be empty" do
-			expect(empty_identity_set).to be_empty
-		end
-		
-		it "could contain many items" do
-			identity_set = empty_identity_set
-			
-			names = ["Apple", "Orange", "Banana", "Kiwifruit"]
-			
-			names.each_with_index do |name, index|
-				identity_set << NamedObject.new(name, index)
-			end
-			
-			expect(identity_set.size).to be == names.size
-		end
-		
-		it "can be cleared" do
-			identity_set = bob_identity_set.dup
-			
-			expect(identity_set).to_not be_empty
-			
-			identity_set.clear
-			
-			expect(identity_set).to be_empty
-		end
-		
-		it "can delete items" do
-			identity_set = bob_identity_set.dup
-			
-			expect(identity_set).to_not be_empty
-			
-			identity_set.delete(bob)
-			
-			expect(identity_set).to be_empty
-		end
-		
-		it "can be frozen" do
-			empty_identity_set.freeze
-			
-			expect(empty_identity_set).to be_frozen
-		end
-		
-		it "can look up named items" do
-			expect(bob_identity_set[bob.name]).to be == bob
-		end
-		
-		it "should have string representation" do
-			expect(bob_identity_set.to_s).to be =~ /Bob/
-		end
-	end
-end