teapot 3.2.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505d95b6a2ff7e5926b1bc5133feacbd1b2fd34de76098a3679b92d04564fabb
-  data.tar.gz: ed41d5bb91594b0b3eae63c8fd1e87674b565f6d233212550c7467c8144934cc
+  metadata.gz: f779e4e27a0d19b422632230261b5d29fdfb62e3ff31e97b8a8a0b2a4379cf04
+  data.tar.gz: 904de0c35db0b9389e3eb40e21e7637cad7a34d4c1fcd2445f3eb78a8416f8fc
 SHA512:
-  metadata.gz: 1c6c628f2a7ca144025d8730b9dd26fe7e80c57d656098e7a376271967ca567d40168b5a46f24248338a5983591fd030309e936f1a306f34736626381173b9a5
-  data.tar.gz: 2eeb2992f80ed8f17d95821ea15299feab6193c134cb019d0fe9bb0e412b4987c09d774f17dc2c375546cded1e89c3b000271f77cc531c71534c5535aa501efb
+  metadata.gz: bc18b84d78ed7cfe6593807eca80edcf6bfcd2baa7b7e29dad39a49339a5e87567ebeaee2c1cb491b2827814fe346d0e2d0ea031ddb63932822bac35f587477c
+  data.tar.gz: 9f4a2bed38fa4498c4d1437596b244232ad4c56a9ca6d4db92558a5c14e182c9b8ad875fdb20439e8cc7fb5846b8cde829759137a46c5a31acf99b07ac343a76

data/bin/teapot

@@ -22,40 +22,4 @@
 
 require_relative '../lib/teapot/command'
 
-if command = Teapot::Command.parse(ARGV)
-	logger = command.logger
-
-	begin
-		command.invoke
-	rescue Teapot::IncompatibleTeapotError => error
-		logger.error(command, error) do
-			"Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
-		end
-		
-		exit 1
-	rescue Build::Dependency::UnresolvedDependencyError => error
-		logger.error(command, error) do |buffer|
-			buffer.puts "Unresolved dependencies:"
-
-			error.chain.unresolved.each do |name, parent|
-				buffer.puts "#{parent} depends on #{name.inspect}"
-			
-				conflicts = error.chain.conflicts[name]
-			
-				if conflicts
-					conflicts.each do |conflict|
-						buffer.puts " - provided by #{conflict.name}"
-					end
-				end
-			end
-
-			buffer.puts "Cannot continue due to unresolved dependencies!".color(:red)
-		end
-		
-		exit 2
-	rescue StandardError => error
-		logger.error(command, error)
-		
-		exit 3
-	end
-end
+Teapot::Command::Top.call

data/lib/teapot/command/build.rb

@@ -38,7 +38,7 @@ module Teapot
 			many :targets, "Build these targets, or use them to help the dependency resolution process."
 			split :argv, "Arguments passed to child process(es) of build if any."
 			
-			def invoke
+			def call
 				context = parent.context
 				
 				# The targets to build:
@@ -52,7 +52,6 @@ module Teapot
 				environment = context.configuration.environment
 				
 				controller = ::Build::Controller.new(logger: parent.logger, limit: @options[:limit]) do |controller|
-					
 					controller.add_chain(chain, self.argv, environment)
 				end
 				

data/lib/teapot/command/clean.rb

@@ -25,7 +25,7 @@ module Teapot
 		class Clean < Samovar::Command
 			self.description = "Delete everything in the teapot directory."
 			
-			def invoke
+			def call
 				context = parent.context
 				logger = parent.logger
 				configuration = context.configuration

data/lib/teapot/command/clone.rb

@@ -33,7 +33,7 @@ module Teapot
 			
 			one :source, "The source repository to clone.", required: true
 			
-			def invoke
+			def call
 				logger = parent.logger
 				
 				name = File.basename(::Build::URI[@source].path, ".git")
@@ -49,7 +49,7 @@ module Teapot
 				_repository = Rugged::Repository.clone_at(@source, root.to_s, credentials: self.method(:credentials))
 				
 				# Fetch the initial packages:
-				Fetch[parent: nested].invoke
+				Fetch[parent: nested].call
 			end
 			
 			def credentials(url, username, types)

data/lib/teapot/command/create.rb

@@ -33,7 +33,7 @@ module Teapot
 			one :source, "The source repository to use for fetching packages, e.g. https://github.com/kurocha.", required: true
 			many :packages, "Any packages you'd like to include in the project.", default: ["generate-project"]
 			
-			def invoke
+			def call
 				logger = parent.logger
 				
 				nested = parent['--root', parent.options[:root] || name.gsub(/\s+/, '-').downcase]
@@ -52,7 +52,7 @@ module Teapot
 				generate_project(root, @name, @source, @packages)
 				
 				# Fetch the initial packages:
-				Fetch[parent: nested].invoke
+				Fetch[parent: nested].call
 				
 				context = nested.context
 				selection = context.select
@@ -60,10 +60,10 @@ module Teapot
 				
 				if target_names.any?
 					# Generate the initial project files:
-					Build[*target_names, parent: nested].invoke
+					Build[*target_names, parent: nested].call
 					
 					# Fetch any additional packages:
-					Fetch[parent: nested].invoke
+					Fetch[parent: nested].call
 				end
 				
 				# Stage all files:

data/lib/teapot/command/fetch.rb

@@ -51,7 +51,7 @@ module Teapot
 				parent.context
 			end
 			
-			def invoke
+			def call
 				selection = context.select
 				
 				packages = selection.configuration.packages

data/lib/teapot/command/list.rb

@@ -49,14 +49,14 @@ module Teapot
 					begin
 						script = context.load(package)
 						definitions = script.defined
-					
+						
 						definitions.each do |definition|
 							terminal.puts "\t#{definition}", style: :definition
-					
+							
 							definition.description.each_line do |line|
 								terminal.puts "\t\t#{line.chomp}", style: :description
 							end if definition.description
-					
+							
 							case definition
 							when Project
 								terminal.puts "\t\t- Summary: #{definition.summary}" if definition.summary
@@ -72,7 +72,7 @@ module Teapot
 								definition.dependencies.each do |dependency|
 									terminal.puts "\t\t- #{dependency}", style: :dependency
 								end
-				
+								
 								definition.provisions.each do |name, provision|
 									terminal.puts "\t\t- #{provision}", style: :provision
 								end
@@ -80,7 +80,7 @@ module Teapot
 								definition.packages.each do |package|
 									terminal.puts "\t\t- #{package}", style: :package
 								end
-							
+								
 								definition.imports.select(&:explicit).each do |import|
 									terminal.puts "\t\t- import #{import.name}", style: :import
 								end

data/lib/teapot/command/selection.rb

@@ -41,7 +41,7 @@ module Teapot
 				end
 			end
 			
-			def invoke
+			def call
 				context = parent.context
 				
 				self.process(selection(parent.context))

data/lib/teapot/command.rb

@@ -39,10 +39,6 @@ require 'console'
 
 module Teapot
 	module Command
-		def self.parse(*args)
-			Top.parse(*args)
-		end
-		
 		class Top < Samovar::Command
 			self.description = "A decentralised package manager and build tool."
 			
@@ -97,14 +93,44 @@ module Teapot
 				Context.new(root, configuration: configuration)
 			end
 			
-			def invoke
+			def call
 				if @options[:version]
 					puts "teapot v#{Teapot::VERSION}"
 				elsif @options[:help]
 					print_usage(output: $stdout)
 				else
-					@command.invoke
+					@command.call
+				end
+			rescue Teapot::IncompatibleTeapotError => error
+				logger.error(command, error) do
+					"Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
+				end
+				
+				raise
+			rescue ::Build::Dependency::UnresolvedDependencyError => error
+				logger.error(command, error) do |buffer|
+					buffer.puts "Unresolved dependencies:"
+
+					error.chain.unresolved.each do |name, parent|
+						buffer.puts "#{parent} depends on #{name.inspect}"
+					
+						conflicts = error.chain.conflicts[name]
+					
+						if conflicts
+							conflicts.each do |conflict|
+								buffer.puts " - provided by #{conflict.name}"
+							end
+						end
+					end
+
+					buffer.puts "Cannot continue due to unresolved dependencies!"
 				end
+				
+				raise
+			rescue StandardError => error
+				logger.error(command, error)
+				
+				raise
 			end
 		end
 	end

data/lib/teapot/loader.rb

@@ -97,8 +97,8 @@ module Teapot
 		
 		alias required_version teapot_version
 		
-		def define_project(*args)
-			project = Project.new(@context, @package, *args)
+		def define_project(*arguments, **options)
+			project = Project.new(@context, @package, *arguments, **options)
 			
 			yield project
 			
@@ -106,8 +106,8 @@ module Teapot
 			@defined << project
 		end
 		
-		def define_target(*args)
-			target = Target.new(@context, @package, *args)
+		def define_target(*arguments, **options)
+			target = Target.new(@context, @package, *arguments, **options)
 			
 			yield target
 			
@@ -116,8 +116,8 @@ module Teapot
 			@defined << target
 		end
 		
-		def define_configuration(*args)
-			configuration = Configuration.new(@context, @package, *args)
+		def define_configuration(*arguments, **options)
+			configuration = Configuration.new(@context, @package, *arguments, **options)
 
 			yield configuration
 
@@ -127,11 +127,11 @@ module Teapot
 		end
 		
 		# Checks the host patterns and executes the block if they match.
-		def host(*args, &block)
+		def host(*arguments, **options, &block)
 			name = @context.options[:host_platform] || RUBY_PLATFORM
 			
 			if block_given?
-				if args.find{|arg| arg === name}
+				if arguments.find{|argument| argument === name}
 					yield
 				end
 			else

data/lib/teapot/select.rb

@@ -42,7 +42,7 @@ module Teapot
 	class Select
 		def initialize(context, configuration, names = [])
 			@context = context
-			@configuration = Configuration.new(context, configuration.package, configuration.name, [], configuration.options)
+			@configuration = Configuration.new(context, configuration.package, configuration.name, [], **configuration.options)
 			
 			@targets = {}
 			@configurations = {}

data/lib/teapot/version.rb

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

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: graphviz
+  name: build
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: build-dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: build
+  name: build-environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: build-environment
+  name: build-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: build-files
+  name: build-files-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: build-dependency
+  name: build-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: build-uri
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: build-text
+  name: console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -123,7 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: console
+  name: graphviz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: process-group
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -151,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,51 +235,40 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: "\tTeapot is a tool for managing complex cross-platform builds. It provides\n\tadvanced
-  package-based dependency management with a single configuration file\n\tper project.
-  It can fetch, list, build, visualise and create projects, and\n\thas been designed
-  from the ground up to support collaborative decentralised\n\tdevelopment.\n"
+        version: '3.6'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables:
 - teapot
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- Gemfile.local
-- README.md
-- Rakefile
 - bin/teapot
 - lib/teapot.rb
 - lib/teapot/command.rb
@@ -245,29 +290,11 @@ files:
 - lib/teapot/select.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
-- materials/kurocha.png
-- materials/kurocha.svg
-- materials/teapot.png
-- materials/teapot.svg
-- spec/spec_helper.rb
-- spec/teapot/command/clone_spec.rb
-- spec/teapot/command/fetch_spec.rb
-- spec/teapot/command/fetch_spec/repositories/thing/README.md
-- spec/teapot/command/fetch_spec/repositories/thing/teapot.rb
-- spec/teapot/command/fetch_spec/test-project/teapot.rb
-- spec/teapot/command_spec.rb
-- spec/teapot/configuration_spec.rb
-- spec/teapot/configuration_spec/teapot.rb
-- spec/teapot/context_spec.rb
-- spec/teapot/context_spec/teapot.rb
-- spec/teapot/target_spec.rb
-- spec/teapot/target_spec/teapot.rb
-- teapot.gemspec
 homepage: http://www.teapot.nz
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -282,21 +309,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
-test_files:
-- spec/spec_helper.rb
-- spec/teapot/command/clone_spec.rb
-- spec/teapot/command/fetch_spec.rb
-- spec/teapot/command/fetch_spec/repositories/thing/README.md
-- spec/teapot/command/fetch_spec/repositories/thing/teapot.rb
-- spec/teapot/command/fetch_spec/test-project/teapot.rb
-- spec/teapot/command_spec.rb
-- spec/teapot/configuration_spec.rb
-- spec/teapot/configuration_spec/teapot.rb
-- spec/teapot/context_spec.rb
-- spec/teapot/context_spec/teapot.rb
-- spec/teapot/target_spec.rb
-- spec/teapot/target_spec/teapot.rb
+test_files: []

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-kurocha

data/.rspec

@@ -1,4 +0,0 @@
---format documentation
---backtrace
---warnings
---require spec_helper