teapot 2.2.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 40d564684024a42a0762e51eef5fdcccea99eb81
-  data.tar.gz: 4dcc60428ead96eca66951c50ba891dcd366741f
+SHA256:
+  metadata.gz: 505d95b6a2ff7e5926b1bc5133feacbd1b2fd34de76098a3679b92d04564fabb
+  data.tar.gz: ed41d5bb91594b0b3eae63c8fd1e87674b565f6d233212550c7467c8144934cc
 SHA512:
-  metadata.gz: 39344b2e907c0718480aeb96439bfd509c5bfabdfd8e859ea5185fd573e9b96d42594ecc4644699c7cec9270e771b598c2c381d0bc557905d3b6ed04c2f8836e
-  data.tar.gz: ab69319d540e01679dee8cd9ddfbb45d69fd22d363cc2dce531bc4b34c50fc198e9de35cb287516e2ddb37396ccb2dc9ca829ff7825e6e2497535684cfce015c
+  metadata.gz: 1c6c628f2a7ca144025d8730b9dd26fe7e80c57d656098e7a376271967ca567d40168b5a46f24248338a5983591fd030309e936f1a306f34736626381173b9a5
+  data.tar.gz: 2eeb2992f80ed8f17d95821ea15299feab6193c134cb019d0fe9bb0e412b4987c09d774f17dc2c375546cded1e89c3b000271f77cc531c71534c5535aa501efb

data/.travis.yml

@@ -1,27 +1,24 @@
-# Setup the environment:
 language: ruby
-sudo: false
-dist: trusty
+dist: xenial
 cache: bundler
 
-before_install:
+before_script:
   # For testing purposes:
   - git config --global user.email "samuel@oriontransfer.net"
   - git config --global user.name "Samuel Williams"
 
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - jruby-head
-  - ruby-head
-
-# Setup the compilers:
 matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.6
+      os: osx
+      before_install: brew install pkgconfig zlib curl openssl libssh2 libgit2
+      # env: RUGGED_USE_SYSTEM_LIBRARIES=y
+    - rvm: 2.6
+      env: COVERAGE=BriefSummary,Coveralls
 
 addons:
   apt:
@@ -32,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,14 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in teapot.gemspec
 gemspec
-
-group :development do
-	gem 'pry'
-	gem 'pry-coolline'
-	gem 'pry-byebug', platform: :mri
-end
-
-group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-end

data/README.md

@@ -10,6 +10,7 @@ Teapot is a decentralised build tool for managing complex cross-platform project
 [![Build Status](https://secure.travis-ci.org/kurocha/teapot.svg)](http://travis-ci.org/kurocha/teapot)
 [![Code Climate](https://codeclimate.com/github/kurocha/teapot.svg)](https://codeclimate.com/github/kurocha/teapot)
 [![Coverage Status](https://coveralls.io/repos/kurocha/teapot/badge.svg)](https://coveralls.io/r/kurocha/teapot)
+[![Gitter Chat](https://badges.gitter.im/kurocha/community.svg)](https://gitter.im/kurocha/community)
 
 ## Installation
 

data/bin/teapot

@@ -20,40 +20,42 @@
 # 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)
+if command = Teapot::Command.parse(ARGV)
+	logger = command.logger
 
-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:"
+	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|
-		$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)
+			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
-
-	$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

data/lib/teapot/command.rb

@@ -33,12 +33,9 @@ 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
@@ -57,16 +54,16 @@ module Teapot
 				option '-v/--version', "Print out the application version."
 			end
 			
-			nested '<command>',
-				'create' => Create,
-				'clone' => Clone,
-				'fetch' => Fetch,
-				'list' => List,
-				'status' => Status,
-				'build' => Build,
-				'visualize' => Visualize,
-				'clean' => Clean,
-				default: 'build'
+			nested :command, {
+				"create" => Create,
+				"clone" => Clone,
+				"fetch" => Fetch,
+				"list" => List,
+				"status" => Status,
+				"build" => Build,
+				"visualize" => Visualize,
+				"clean" => Clean,
+			}, default: 'build'
 			
 			def root
 				::Build::Files::Path.expand(@options[:root] || Dir.getwd)
@@ -81,15 +78,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,15 +97,13 @@ module Teapot
 				Context.new(root, configuration: configuration)
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def invoke
 				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)
-					end
+					@command.invoke
 				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 invoke
 				context = parent.context
 				
 				# The targets to build:
@@ -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/clean.rb

@@ -25,15 +25,15 @@ module Teapot
 		class Clean < Samovar::Command
 			self.description = "Delete everything in the teapot directory."
 			
-			def invoke(parent)
+			def invoke
 				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 invoke
 				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].invoke
 			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 invoke
 				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].invoke
 				
 				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].invoke
 					
 					# Fetch any additional packages:
-					Fetch[].invoke(nested)
+					Fetch[parent: nested].invoke
 				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 invoke
 				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)