teapot 2.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd1292b87cd5db2fadc2379f270574504222ca5865d020c1463c072ddb14e79
-  data.tar.gz: 9c7a12f5887482e46b896d5a3e77147a28d3563cdf2ec194f489ab064f75d9ef
+  metadata.gz: 9ddf54a5f033a10d5fc574f0222df4cb5f567416d4d279d0a272052527eacfad
+  data.tar.gz: 147d1d9e73c9fd945cdc3d64beba318b2f660aa2aabd974ac3dd9ec487455cc5
 SHA512:
-  metadata.gz: 4dfac1b253ce27cd86644dfae4f9b1ee3b8cc43a1436b11022a33a18b17e0ba53bd79deb420b236b9dd7b1d48f5859a5f1d2cfafc223cbc3689801eefc1f20cc
-  data.tar.gz: 797f3d03946859f2e8c8fefc4a610a3f7bb14d6dad90fdc8063989b7cf1a66524b5608ebeeb7c984455603c8d9a6096be5c0bef74385a4711d326c4bd0af3c13
+  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/.travis.yml

@@ -16,7 +16,7 @@ matrix:
     - rvm: 2.6
       os: osx
       before_install: brew install pkgconfig zlib curl openssl libssh2 libgit2
-      env: RUGGED_USE_SYSTEM_LIBRARIES=y
+      # env: RUGGED_USE_SYSTEM_LIBRARIES=y
     - rvm: 2.6
       env: COVERAGE=BriefSummary,Coveralls
 
@@ -29,5 +29,5 @@ addons:
       - clang-4.0
       - libc++-dev
       - libc++abi-dev
-env:
-  - CC=clang-4.0 CXX=clang++-4.0
+# env:
+#   - CC=clang-4.0 CXX=clang++-4.0

data/Gemfile

@@ -2,11 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in teapot.gemspec
 gemspec
-
-group :development do
-	gem 'pry'
-end
-
-# group :test do
-# 	gem 'rugged', git: 'git://github.com/libgit2/rugged.git', submodules: true
-# end

data/bin/teapot

@@ -20,40 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/command'
+require_relative '../lib/teapot/command'
 
-options = Teapot::Command.parse(ARGV)
-
-begin
-	options.invoke
-rescue Teapot::IncompatibleTeapotError => error
-	$stderr.puts error.message.color(:red)
-	$stderr.puts "Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
-	
-	exit 1
-rescue Build::Dependency::UnresolvedDependencyError => error
-	$stderr.puts "Unresolved dependencies:"
-
-	error.chain.unresolved.each do |name, parent|
-		$stderr.puts "#{parent} depends on #{name.inspect}".color(:red)
-	
-		conflicts = error.chain.conflicts[name]
-	
-		if conflicts
-			conflicts.each do |conflict|
-				$stderr.puts " - provided by #{conflict.name}".color(:red)
-			end
-		end
-	end
-
-	$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
-	
-	exit 2
-rescue StandardError => error
-	$stderr.puts error.message.color(:red)
-	
-	# Could be nice to have some improved error reporting.
-	$stderr.puts error.backtrace
-	
-	exit 3
-end
+Teapot::Command::Top.call

data/lib/teapot/command.rb

@@ -33,19 +33,12 @@ require_relative 'context'
 require_relative 'configuration'
 require_relative 'version'
 
-require 'uri'
-require 'rainbow'
-require 'rainbow/ext/string'
 require 'fileutils'
 
-require 'build/logger'
+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."
 			
@@ -57,7 +50,7 @@ module Teapot
 				option '-v/--version', "Print out the application version."
 			end
 			
-			nested '<command>', {
+			nested :command, {
 				"create" => Create,
 				"clone" => Clone,
 				"fetch" => Fetch,
@@ -81,15 +74,13 @@ module Teapot
 			end
 			
 			def logger
-				@logger ||= Logger.new($stderr).tap do |logger|
-					logger.formatter = ::Build::CompactFormatter.new(verbose: verbose?)
-					
+				@logger ||= Console::Logger.new(Console.logger, verbose: self.verbose?).tap do |logger|
 					if verbose?
-						logger.level = Logger::DEBUG
+						logger.debug!
 					elsif quiet?
-						logger.level = Logger::WARN
+						logger.warn!
 					else
-						logger.level = Logger::INFO
+						logger.info!
 					end
 				end
 			end
@@ -102,16 +93,44 @@ module Teapot
 				Context.new(root, configuration: configuration)
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def call
 				if @options[:version]
 					puts "teapot v#{Teapot::VERSION}"
-				elsif @options[:help] or @command.nil?
-					print_usage(program_name)
+				elsif @options[:help]
+					print_usage(output: $stdout)
 				else
-					track_time do
-						@command.invoke(self)
+					@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

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'samovar'
+require_relative 'selection'
 
 require 'build/controller'
 
@@ -27,19 +27,18 @@ module Teapot
 		class BuildFailedError < StandardError
 		end
 		
-		class Build < Samovar::Command
+		class Build < Selection
 			self.description = "Build the specified target."
 			
 			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
 			
 			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(parent)
+			def call
 				context = parent.context
 				
 				# The targets to build:
@@ -50,23 +49,10 @@ 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 +77,7 @@ module Teapot
 					end
 				end
 				
-				return chain, ordered
+				return chain
 			end
 			
 			def show_dependencies(walker)

data/lib/teapot/command/clean.rb

@@ -25,15 +25,15 @@ module Teapot
 		class Clean < Samovar::Command
 			self.description = "Delete everything in the teapot directory."
 			
-			def invoke(parent)
+			def call
 				context = parent.context
 				logger = parent.logger
 				configuration = context.configuration
 				
-				logger.info "Removing #{configuration.platforms_path}...".color(:cyan)
-				FileUtils.rm_rf configuration.platforms_path
+				logger.info "Removing #{configuration.build_path}..."
+				FileUtils.rm_rf configuration.build_path
 			
-				logger.info "Removing #{configuration.packages_path}...".color(:cyan)
+				logger.info "Removing #{configuration.packages_path}..."
 				FileUtils.rm_rf configuration.packages_path
 			end
 		end

data/lib/teapot/command/clone.rb

@@ -31,11 +31,9 @@ module Teapot
 		class Clone < Samovar::Command
 			self.description = "Clone a remote repository and fetch all dependencies."
 			
-			one :source, "The source repository to clone."
+			one :source, "The source repository to clone.", required: true
 			
-			def invoke(parent)
-				raise ArgumentError, "source is required" unless @source
-				
+			def call
 				logger = parent.logger
 				
 				name = File.basename(::Build::URI[@source].path, ".git")
@@ -47,11 +45,11 @@ module Teapot
 					raise ArgumentError.new("#{root} already exists!")
 				end
 				
-				logger.info "Cloning #{@source} to #{root}...".color(:cyan)
-				repository = Rugged::Repository.clone_at(@source, root.to_s, credentials: self.method(:credentials))
+				logger.info "Cloning #{@source} to #{root}..."
+				_repository = Rugged::Repository.clone_at(@source, root.to_s, credentials: self.method(:credentials))
 				
 				# Fetch the initial packages:
-				Fetch[].invoke(nested)
+				Fetch[parent: nested].call
 			end
 			
 			def credentials(url, username, types)

data/lib/teapot/command/create.rb

@@ -29,17 +29,14 @@ module Teapot
 		class Create < Samovar::Command
 			self.description = "Create a new teapot package using the specified repository."
 			
-			one :project_name, "The name of the new project in title-case, e.g. 'My Project'."
-			one :source, "The source repository to use for fetching packages, e.g. https://github.com/kurocha."
-			many :packages, "Any additional packages you'd like to include in the project."
+			one :name, "The name of the new project in title-case, e.g. 'My Project'.", required: true
+			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(parent)
-				raise ArgumentError, "project_name is required" unless @project_name
-				raise ArgumentError, "source is required" unless @source
-				
+			def call
 				logger = parent.logger
 				
-				nested = parent['--root', parent.options[:root] || project_name.gsub(/\s+/, '-').downcase]
+				nested = parent['--root', parent.options[:root] || name.gsub(/\s+/, '-').downcase]
 				root = nested.root
 				
 				if root.exist?
@@ -51,11 +48,11 @@ module Teapot
 				
 				repository = Rugged::Repository.init_at(root.to_s)
 				
-				logger.info "Creating project named #{project_name} at path #{root}...".color(:cyan)
-				generate_project(root, @project_name, @source, @packages)
+				logger.info "Creating project named #{name} at path #{root}..."
+				generate_project(root, @name, @source, @packages)
 				
 				# Fetch the initial packages:
-				Fetch[].invoke(nested)
+				Fetch[parent: nested].call
 				
 				context = nested.context
 				selection = context.select
@@ -63,10 +60,10 @@ module Teapot
 				
 				if target_names.any?
 					# Generate the initial project files:
-					Build[*target_names].invoke(nested)
+					Build[*target_names, parent: nested].call
 					
 					# Fetch any additional packages:
-					Fetch[].invoke(nested)
+					Fetch[parent: nested].call
 				end
 				
 				# Stage all files:
@@ -82,8 +79,8 @@ module Teapot
 				)
 			end
 			
-			def generate_project(root, project_name, source, packages)
-				name = ::Build::Name.new(project_name)
+			def generate_project(root, name, source, packages)
+				name = ::Build::Name.new(name)
 				
 				# Otherwise the initial commit will try to include teapot/
 				File.open(root + ".gitignore", "w") do |output|

data/lib/teapot/command/fetch.rb

@@ -18,8 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'samovar'
-
+require_relative 'selection'
 require 'rugged'
 
 module Teapot
@@ -48,19 +47,21 @@ module Teapot
 			
 			many :packages, "Only update the specified packages, or all packages if none specified."
 			
-			def invoke(parent)
-				logger = parent.logger
-				context = parent.context
-				
-				updated = Set.new
+			def context
+				parent.context
+			end
+			
+			def call
 				selection = context.select
 				
 				packages = selection.configuration.packages
 				
-				if @packages.any?
-					packages = packages.slice(@packages)
+				if specified_packages = self.packages
+					packages = packages.slice(specified_packages)
 				end
 				
+				logger = parent.logger
+				
 				# If no additional packages were resolved, we have reached a fixed point:
 				while packages.any?
 					packages.each do |package|
@@ -78,12 +79,15 @@ module Teapot
 				end
 			
 				if selection.unresolved.count > 0
-					logger.error "Could not fetch all packages!".color(:red)
-					selection.unresolved.each do |package|
-						logger.error "\t#{package}".color(:red)
+					logger.error(self) do |buffer|
+						buffer.puts "Could not fetch all packages!"
+						
+						selection.unresolved.each do |package|
+							buffer.puts "\t#{package}"
+						end
 					end
 				else
-					logger.info "Completed fetch successfully.".color(:green)
+					logger.info "Completed fetch successfully."
 				end
 			end
 			
@@ -99,7 +103,7 @@ module Teapot
 			end
 			
 			def link_local_package(context, configuration, package, logger)
-				logger.info "Linking local #{package}...".color(:cyan)
+				logger.info "Linking local #{package}..." #.color(:cyan)
 		
 				local_path = context.root + package.options[:local]
 
@@ -120,7 +124,7 @@ module Teapot
 			end
 
 			def clone_or_pull_package(context, configuration, package, package_lock, logger)
-				logger.info "Processing #{package}...".color(:cyan)
+				logger.info "Processing #{package}..." #.color(:cyan)
 
 				# Where we are going to put the package:
 				destination_path = package.path
@@ -141,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}..." #.color(:cyan)
 
 					repository = Rugged::Repository.new(destination_path.to_s)
 
@@ -166,7 +170,7 @@ module Teapot
 					# Reset it to the requested commit if required:
 					repository.reset(commit_id, :hard)
 				else
-					logger.info "Cloning package at path #{destination_path}...".color(:cyan)
+					logger.info "Cloning package at path #{destination_path}..." #.color(:cyan)
 					
 					external_url = package.external_url(context.root)