teapot 3.2.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629d7c7614d378aca1f52df03b7f94fbbbd75bf99c60a2171d5cba2ab63b17ae
-  data.tar.gz: 443aa45d4d4f4d732bb7fce592b35f9312d3a8abadabcd5c4b4a4191f82e3ff9
+  metadata.gz: 9ddf54a5f033a10d5fc574f0222df4cb5f567416d4d279d0a272052527eacfad
+  data.tar.gz: 147d1d9e73c9fd945cdc3d64beba318b2f660aa2aabd974ac3dd9ec487455cc5
 SHA512:
-  metadata.gz: 40486dc53b3a879a786209091b2adc8d70a32c66baac7b12b830bd58dd8917cd5df8c2814621978f41351c0b128b9cc0fb92191b54d10d09c1de3d2483abf767
-  data.tar.gz: 2d29b7ae0f9735121cebcb2b1f887257a2982035b258f50331e9787d47fbbcd2aa89f3ffaab4a9a50de4a9140412985875c000e8d269e60b989eb1d685e35fdc
+  metadata.gz: e394f73f673ac474050f75fbbe2d8a9a2f3eaf381c49b5f928814deb6ec7d32fae0143155025d06da768dad39eadaa39bb7ee7ad89e3588a13f20205b34a9c80
+  data.tar.gz: bc7f8a41f4b8ded58880e777cb3f412245a198885f9cc0002ed43944673956d03c98fbe5c4cb3bd11902b131547e3135ac3537e54233ff0892a2c5a19591b60a

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.rspec_status
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -15,4 +16,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
 kurocha
+dependency.svg

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!"
-		end
-		
-		exit 2
-	rescue StandardError => error
-		logger.error(command, error)
-		
-		exit 3
-	end
-end
+Teapot::Command::Top.call

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/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/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/version.rb

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

data/spec/teapot/command/clone_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Teapot::Command::Clone, order: :defined do
 		subject {top['clone', source]}
 		
 		it "should checkout files" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 			
 			expect(File).to be_exist(root + "teapot.rb")
 			

data/spec/teapot/command/fetch_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Teapot::Command::Fetch, order: :defined do
 		subject {top['clean']}
 		
 		it "should delete all packages" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 			
 			expect(File).to_not be_exist(root + "test-project/teapot/packages/test")
 		end
@@ -59,14 +59,14 @@ RSpec.describe Teapot::Command::Fetch, order: :defined do
 		subject {top['fetch']}
 		
 		it "should fetch repositories" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 			
 			# Did the thing package checkout correctly?
 			expect(File).to be_exist(root + "test-project/teapot/packages/test/thing/teapot.rb")
 		end
 		
 		it "should fetch repositories with no changes" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 			
 			# Did the thing package checkout correctly?
 			expect(File).to be_exist(root + "test-project/teapot/packages/test/thing/teapot.rb")
@@ -84,7 +84,7 @@ RSpec.describe Teapot::Command::Fetch, order: :defined do
 		end
 		
 		it "can't fetch with local modifications" do
-			expect{subject.invoke}.to raise_error(Teapot::Command::FetchError, /local modifications/)
+			expect{subject.call}.to raise_error(Teapot::Command::FetchError, /local modifications/)
 			
 			path.delete
 		end
@@ -99,7 +99,7 @@ RSpec.describe Teapot::Command::Fetch, order: :defined do
 		end
 		
 		it "can fetch changes" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 			
 			expect(File).to be_exist(thing_package_path + "README.md")
 		end

data/spec/teapot/command_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Teapot::Command, order: :defined do
 		it "should create a new project" do
 			root.delete
 			
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 			expect(project_path + "teapot.rb").to be_exist
 			expect(project_path + ".travis.yml").to be_exist
 		end
@@ -45,7 +45,7 @@ RSpec.describe Teapot::Command, order: :defined do
 		subject {top["build", "Run/TestProject"]}
 	
 		it "should build project" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 		end
 	end
 	
@@ -53,7 +53,7 @@ RSpec.describe Teapot::Command, order: :defined do
 		subject {top["fetch"]}
 		
 		it "should fetch any changes" do
-			expect{subject.invoke}.to_not raise_error
+			expect{subject.call}.to_not raise_error
 		end
 	end
 end

data/teapot.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = '>= 2.1.0'
 	
 	spec.add_dependency "graphviz", "~> 1.0"
-	spec.add_dependency "rugged", "~> 0.27.0"
+	spec.add_dependency "rugged", "~> 1.0"
 	
 	spec.add_dependency "build", "~> 2.4"
 	spec.add_dependency "build-environment", "~> 1.10"
@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "build-uri", "~> 1.0"
 	spec.add_dependency "build-text", "~> 1.0"
 	
+	spec.add_dependency "process-group", "~> 1.2"
+	
 	spec.add_dependency "console", "~> 1.0"
 	spec.add_dependency "samovar", "~> 2.0"
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphviz
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: build
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !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: console
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +281,7 @@ homepage: http://www.teapot.nz
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -282,8 +296,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.1.2
+signing_key:
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
 test_files: