teapot 3.2.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629d7c7614d378aca1f52df03b7f94fbbbd75bf99c60a2171d5cba2ab63b17ae
-  data.tar.gz: 443aa45d4d4f4d732bb7fce592b35f9312d3a8abadabcd5c4b4a4191f82e3ff9
+  metadata.gz: d58b6f1be99cfff7bcaa495193453f704e8b01a5285f15c22fec6ea2e05aa918
+  data.tar.gz: 753c3a24cb73ab459af7b200914a58624c668eaa59bc343b10a3b0ac3a307535
 SHA512:
-  metadata.gz: 40486dc53b3a879a786209091b2adc8d70a32c66baac7b12b830bd58dd8917cd5df8c2814621978f41351c0b128b9cc0fb92191b54d10d09c1de3d2483abf767
-  data.tar.gz: 2d29b7ae0f9735121cebcb2b1f887257a2982035b258f50331e9787d47fbbcd2aa89f3ffaab4a9a50de4a9140412985875c000e8d269e60b989eb1d685e35fdc
+  metadata.gz: 607c931ec0e01cc6b5c79a14cda5bb99d7bef7710a61357ccaef1a9c73f6f26e5ada13654bff11c0c7335993b41dd998f3879ec881c2a45578ea3354a33d4469
+  data.tar.gz: e25dcade6d83f87e70ac24ee83c79857c9cb718f0d1a5c82334550be027cf1ab0fadb9ca07b25608899fe46e1481a472758bc73052f41bf3e7f535ee0ae74e8b

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/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
@@ -135,7 +135,7 @@ module Teapot
 					base_uri = URI "file://" + File.expand_path(base_uri.path, context.root) + "/"
 				end
 
-				branch_name = package.options.fetch(:branch, 'master')
+				branch_name = package.options[:branch]
 
 				if package_lock
 					logger.info "Package locked to commit: #{package_lock[:branch]}/#{package_lock[:commit]}"
@@ -145,7 +145,7 @@ module Teapot
 				end
 
 				if destination_path.exist?
-					logger.info "Updating package at path #{destination_path}..." #.color(:cyan)
+					logger.info "Updating package at path #{destination_path}..."
 
 					repository = Rugged::Repository.new(destination_path.to_s)
 
@@ -155,7 +155,7 @@ module Teapot
 					end
 					
 					repository.fetch('origin', credentials: self.method(:credentials))
-					repository.checkout(branch_name)
+					repository.checkout(branch_name) if branch_name
 					
 					# Essentially implement git pull:
 					if commit_id

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

@@ -35,11 +35,11 @@ module Teapot
 			
 			super
 		end
-		
-		def pretty_print(pp)
-			pp.text self.inspect
+
+		def inspect
+			"\#<#{self.class.name} #{@name}>"
 		end
-		
+
 		# The context in which the definition was loaded:
 		attr :context
 		

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.1"
+	VERSION = "3.5.0"
 end