teapot 1.3.1 → 2.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2941cf53da430cdf791523506bc5d24df115506
-  data.tar.gz: cc7092f377444bbc67dd3232137626418f58971f
+  metadata.gz: c6945788efc0d75eb38df802faf17617bc67116f
+  data.tar.gz: bf5dd81a7bc4cf1bef005d5e584f5fbb54ba9fdd
 SHA512:
-  metadata.gz: d3c0fabbb37b1d116467422a3309370a30e04c429dd8ca2c3b297096ae58b4143a5842c59290cd7a214bad74e244225239db32167b3788ebe9c4c588aba7dcf2
-  data.tar.gz: 0a967401cf2bc91f38c71b2a3bb1c622f155bbe91f1e18b4a43373af8c5e5f3537ba6da6f00226dfc7f1ddfdb3ef95401eb0f02f997ea0ec7e71ba56ba5522aa
+  metadata.gz: 034e5b25acb19d9b75589c347d5f281147bed403ab73cc750640ad79c5fb8f3d267d273b6d96d024dcbdd0ba4a31447aaf80734d5a2bb8d383d288120bac0c6c
+  data.tar.gz: 9da112ffe2f501735ec6590ad2ddbce6afbab287b5ff058ac46a8b51517de237cb94e3644a047780cd90e7ec4bfed4a5a11397e848d90eecd87e951c60e25de3

data/.rspec

@@ -1,4 +1,3 @@
---color
 --format documentation
 --backtrace
 --warnings

data/.travis.yml

@@ -14,6 +14,12 @@ rvm:
   - jruby-head
   - ruby-head
 matrix:
+  global:
+    env: CC=clang-4.0 CXX=clang++-4.0
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+addons:
+  apt:
+    sources: ["llvm-toolchain-trusty-4.0"]
+    packages: ["clang-4.0"]

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 group :development do
 	gem 'pry'
 	gem 'pry-coolline'
-	gem 'pry-byebug'
+	gem 'pry-byebug', platform: :mri
 end
 
 group :test do

data/bin/teapot

@@ -22,7 +22,7 @@
 
 require 'teapot/command'
 
-options = Teapot::Command::Top.parse(ARGV)
+options = Teapot::Command.parse(ARGV)
 
 begin
 	options.invoke
@@ -31,10 +31,10 @@ rescue Teapot::IncompatibleTeapotError => error
 	$stderr.puts "Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
 	
 	exit 1
-rescue Teapot::Dependency::UnresolvedDependencyError => error
+rescue Build::Dependency::UnresolvedDependencyError => error
 	$stderr.puts "Unresolved dependencies:"
 
-	error.chain.unresolved.each do |(name, parent)|
+	error.chain.unresolved.each do |name, parent|
 		$stderr.puts "#{parent} depends on #{name.inspect}".color(:red)
 	
 		conflicts = error.chain.conflicts[name]

data/lib/teapot/command/build.rb

@@ -0,0 +1,123 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'samovar'
+
+require 'build/controller'
+
+module Teapot
+	module Command
+		class BuildFailedError < StandardError
+		end
+		
+		class Build < Samovar::Command
+			self.description = "Build the specified target."
+			
+			options do
+				option '-j/-l/--limit <n>', "Limit the build to <n> concurrent processes."
+				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)
+				context = parent.context
+				
+				chain = context.dependency_chain(@targets, context.configuration)
+				
+				ordered = chain.ordered
+				
+				if @options[:only]
+					ordered = context.direct_targets(ordered)
+				end
+				
+				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(context.configuration, chain)
+							
+							controller.add_target(target, environment.flatten, @argv)
+						end
+					end
+				end
+				
+				walker = nil
+				
+				# We need to catch interrupt here, and exit with the correct exit code:
+				begin
+					controller.run do |walker|
+						# show_dependencies(walker)
+						
+						# Only run once is asked:
+						unless @options[:continuous]
+							if walker.failed?
+								raise BuildFailedError.new("Failed to build all nodes successfully!")
+							end
+						
+							break
+						end
+					end
+				rescue Interrupt
+					if walker && walker.failed?
+						raise BuildFailedError.new("Failed to build all nodes successfully!")
+					end
+				end
+				
+				return chain, ordered
+			end
+			
+			def show_dependencies(walker)
+				outputs = {}
+				
+				walker.tasks.each do |node, task|
+					# puts "Task #{task} (#{node}) outputs:"
+					
+					task.outputs.each do |path|
+						path = path.to_s
+						
+						# puts "\t#{path}"
+						
+						outputs[path] = task
+					end
+				end
+				
+				walker.tasks.each do |node, task|
+					dependencies = {}
+					task.inputs.each do |path|
+						path = path.to_s
+						
+						if generating_task = outputs[path]
+							dependencies[path] = generating_task
+						end
+					end
+					
+					puts "Task #{task.inspect} has #{dependencies.count} dependencies."
+					dependencies.each do |path, task|
+						puts "\t#{task.inspect}: #{path}"
+					end
+				end
+			end
+		end
+	end
+end

data/lib/teapot/{metadata.rb → command/clean.rb}

@@ -1,15 +1,15 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -18,25 +18,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'samovar'
+
 module Teapot
-	# This is a very basic class for accessing metadata from a repository. In the future I expect this will be fleshed out a bit more.
-	class Metadata
-		class Section
-			def initialize(name)
-				@name = name
-			end
+	module Command
+		class Clean < Samovar::Command
+			self.description = "Delete everything in the teapot directory."
+			
+			def invoke(parent)
+				context = parent.context
+				logger = parent.logger
+				configuration = context.configuration
+				
+				logger.info "Removing #{configuration.platforms_path}...".color(:cyan)
+				FileUtils.rm_rf configuration.platforms_path
 			
-			def method_missing(parameter_name)
-				`git config #{@name}.#{parameter_name}`.chomp!
+				logger.info "Removing #{configuration.packages_path}...".color(:cyan)
+				FileUtils.rm_rf configuration.packages_path
 			end
 		end
-		
-		def initialize(context)
-			@context = context
-		end
-		
-		def method_missing(name)
-			Section.new(name)
-		end
 	end
 end

data/lib/teapot/command/create.rb

@@ -0,0 +1,112 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'samovar'
+require 'build/name'
+
+require_relative 'fetch'
+require 'rugged'
+
+module Teapot
+	module Command
+		class Create < Samovar::Command
+			self.description = "Create a new teapot package using the specified repository."
+			
+			options do
+				option "-t/--target-name <name>", "The target to use to create the project", default: 'Generate/Project/Initial'
+			end
+			
+			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."
+			
+			def target_name
+				@options[:target_name]
+			end
+			
+			def invoke(parent)
+				logger = parent.logger
+				
+				nested = parent['--root', parent.options[:root] || project_name.gsub(/\s+/, '-').downcase]
+				root = nested.root
+				
+				if root.exist?
+					raise ArgumentError.new("#{root} already exists!")
+				end
+				
+				# Create and set the project root:
+				root.create
+				
+				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)
+				
+				# Fetch the initial packages:
+				Fetch[].invoke(nested)
+				
+				context = nested.context
+				
+				Build[target_name, *@packages, '--', project_name].invoke(nested)
+				
+				# Fetch any additional packages:
+				Fetch[].invoke(nested)
+				
+				index = repository.index
+				index.add_all
+				
+				Rugged::Commit.create(repository,
+					tree: index.write_tree(repository),
+					message: "Initial project files.",
+					parents: repository.empty? ? [] : [repository.head.target].compact,
+					update_ref: 'HEAD'
+				)
+			end
+			
+			def generate_project(root, project_name, source, packages)
+				name = ::Build::Name.new(project_name)
+				
+				File.open(root + ".gitignore", "w") do |output|
+					output.puts "teapot/"
+				end
+				
+				File.open(root + TEAPOT_FILE, "w") do |output|
+					output.puts "\# Teapot v#{VERSION} configuration generated at #{Time.now.to_s}", ''
+				
+					output.puts "required_version #{LOADER_VERSION.dump}", ''
+				
+					output.puts "\# Build Targets", ''
+				
+					output.puts "\# Configurations", ''
+				
+					output.puts "define_configuration #{name.target.dump} do |configuration|"
+					
+					output.puts "\tconfiguration[:source] = #{source.dump}", ''
+				
+					packages.each do |name|
+						output.puts "\tconfiguration.require #{name.dump}"
+					end
+				
+					output.puts "end", ''
+				end
+			end
+		end
+	end
+end

data/lib/teapot/command/fetch.rb

@@ -0,0 +1,183 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'samovar'
+require 'rugged'
+
+module Teapot
+	module Command
+		class Fetch < Samovar::Command
+			self.description = "Fetch remote packages according to the specified configuration."
+			
+			# 3 typical use cases:
+			# - fetch current packages according to lockfile
+			# - write current pacakges into lockfile
+			# - update packages and update lockfile
+			
+			options do
+				option '--update', "Update dependencies to the latest versions."
+				option '--local', "Don't update from source, assume updated local packages."
+			end
+			
+			def invoke(parent)
+				logger = parent.logger
+				context = parent.context
+				
+				resolved = Set.new
+				configuration = context.configuration
+				unresolved = context.unresolved(configuration.packages)
+				
+				while true
+					configuration.packages.each do |package|
+						next if resolved.include? package
+					
+						fetch_package(context, configuration, package, logger, **@options)
+					
+						# We are done with this package, don't try to process it again:
+						resolved << package
+					end
+				
+					# Resolve any/all imports:
+					configuration.materialize
+				
+					previously_unresolved = unresolved
+					unresolved = context.unresolved(configuration.packages)
+				
+					# No additional packages were resolved, we have reached a fixed point:
+					if previously_unresolved == unresolved || unresolved.count == 0
+						break
+					end
+				end
+			
+				if unresolved.count > 0
+					logger.error "Could not fetch all packages!".color(:red)
+					unresolved.each do |package|
+						logger.error "\t#{package}".color(:red)
+					end
+				else
+					logger.info "Completed fetch successfully.".color(:green)
+				end
+			end
+			
+			private
+			
+			def current_metadata(package)
+				repository = Rugged::Repository.new(package.path.to_s)
+				
+				return {
+					commit: repository.head.target.oid,
+					branch: repository.head.name.sub(/^refs\/heads\//, '')
+				}
+			end
+			
+			def link_local_package(context, configuration, package, logger)
+				logger.info "Linking local #{package}...".color(:cyan)
+		
+				local_path = context.root + package.options[:local]
+
+				# Where we are going to put the package:
+				destination_path = package.path
+
+				# Make the top level directory if required:
+				destination_path.dirname.create
+
+				unless destination_path.exist?
+					destination_path.make_symlink(local_path)
+				end
+			end
+
+			def clone_or_pull_package(context, configuration, package, package_lock, logger)
+				logger.info "Fetching #{package}...".color(:cyan)
+
+				# Where we are going to put the package:
+				destination_path = package.path
+
+				base_uri = URI(package.options[:source].to_s)
+
+				if base_uri.scheme == nil || base_uri.scheme == 'file'
+					base_uri = URI "file://" + File.expand_path(base_uri.path, context.root) + "/"
+				end
+
+				branch = package.options.fetch(:branch, 'master')
+
+				if package_lock
+					logger.info "Package locked to commit: #{package_lock[:branch]}/#{package_lock[:commit]}"
+
+					branch = package_lock[:branch]
+				end
+
+				commit = package_lock ? package_lock[:commit] : nil
+
+				unless destination_path.exist?
+					logger.info "Cloning package at path #{destination_path} ...".color(:cyan)
+			
+					begin
+						external_url = package.external_url(context.root)
+						
+						repository = Rugged::Repository.clone_at(external_url.to_s, destination_path.to_s, checkout_branch: branch)
+						repository.checkout(commit) if commit
+						# Repository.new().clone!(external_url, branch, commit)
+					rescue
+						logger.info "Failed to clone #{external_url}...".color(:red)
+
+						raise
+					end
+				else
+					logger.info "Updating package at path #{destination_path} ...".color(:cyan)
+
+					commit = package_lock ? package_lock[:commit] : nil
+					Rugged::Repository.new(destination_path.to_s).checkout(commit)
+					# Repository.new(destination_path).update(branch, commit)
+				end
+			end
+
+			def fetch_package(context, configuration, package, logger, update: false, local: false)
+				if package.local?
+					link_local_package(context, configuration, package, logger)
+				elsif package.external?
+					lock_store = configuration.lock_store
+					
+					# If we are updating, don't bother reading the current branch/commit details.
+					unless update
+						package_lock = lock_store.transaction(true){|store| store[package.name]}
+					end
+					
+					unless local
+						clone_or_pull_package(context, configuration, package, package_lock, logger)
+					end
+					
+					# Lock the package, unless it was already locked:
+					unless package_lock
+						metadata = current_metadata(package)
+						
+						lock_store.transaction do |store|
+							store_metadata = store[package.name]
+							
+							if store_metadata.nil? or store_metadata[:commit] != metadata[:commit]
+								logger.info "Updating lockfile for package #{package.name}: #{metadata[:commit]}..."
+								store[package.name] = metadata
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end

data/lib/teapot/command/list.rb

@@ -0,0 +1,97 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'samovar'
+
+module Teapot
+	module Command
+		class List < Samovar::Command
+			self.description = "List provisions and dependencies of the specified package."
+			
+			many :packages, "Limit the listing to only these packages, or all packages if none specified."
+			
+			def only
+				if @packages.any?
+					Set.new(@packages)
+				end
+			end
+			
+			def invoke(parent)
+				context = parent.context
+				logger = parent.logger
+				
+				# Should this somehow consider context.root_package?
+				context.configuration.packages.each do |package|
+					# The root package is the local package for this context:
+					next unless only == nil or only.include?(package.name)
+					
+					logger.info "Package #{package.name} (from #{package.path}):".bright
+				
+					begin
+						definitions = context.load(package)
+					
+						definitions.each do |definition|
+							logger.info "\t#{definition}"
+					
+							definition.description.each_line do |line|
+								logger.info "\t\t#{line.chomp}".color(:cyan)
+							end if definition.description
+					
+							case definition
+							when Project
+								logger.info "\t\t- Summary: #{definition.summary}" if definition.summary
+								logger.info "\t\t- License: #{definition.license}" if definition.license
+								logger.info "\t\t- Website: #{definition.website}" if definition.website
+								logger.info "\t\t- Version: #{definition.version}" if definition.version
+								
+								definition.authors.each do |author|
+									contact_text = [author.email, author.website].compact.collect{|text|" <#{text}>"}.join
+									logger.info "\t\t- Author: #{author.name}" + contact_text
+								end
+							when Target
+								definition.dependencies.each do |dependency|
+									logger.info "\t\t- #{dependency}".color(:red)
+								end
+				
+								definition.provisions.each do |name, provision|
+									logger.info "\t\t- #{provision}".color(:green)
+								end
+							when Configuration
+								definition.materialize
+							
+								definition.packages.each do |package|
+									logger.info "\t\t- #{package}".color(:green)
+								end
+							
+								definition.imports.select(&:explicit).each do |import|
+									logger.info "\t\t- unmaterialised import #{import.name}".color(:red)
+								end
+							end
+						end
+					rescue NonexistantTeapotError => error
+						logger.info "\t#{error.message}".color(:red)
+					rescue IncompatibleTeapotError => error
+						logger.info "\t#{error.message}".color(:red)
+					end
+				end
+			end
+		end
+	end
+end