teapot 1.3.1 → 2.0.0.pre.rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0.pre.rc1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: build
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: build-files
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: facets
+  name: build-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,33 +194,25 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.local
-- PLANNING.md
 - README.md
 - Rakefile
 - bin/teapot
 - lib/teapot.rb
 - lib/teapot/command.rb
+- lib/teapot/command/build.rb
+- lib/teapot/command/clean.rb
+- lib/teapot/command/create.rb
+- lib/teapot/command/fetch.rb
+- lib/teapot/command/list.rb
+- lib/teapot/command/status.rb
+- lib/teapot/command/visualize.rb
 - lib/teapot/configuration.rb
 - lib/teapot/context.rb
-- lib/teapot/controller.rb
-- lib/teapot/controller/build.rb
-- lib/teapot/controller/clean.rb
-- lib/teapot/controller/create.rb
-- lib/teapot/controller/fetch.rb
-- lib/teapot/controller/generate.rb
-- lib/teapot/controller/list.rb
-- lib/teapot/controller/visualize.rb
 - lib/teapot/definition.rb
-- lib/teapot/dependency.rb
-- lib/teapot/generator.rb
 - lib/teapot/identity_set.rb
 - lib/teapot/loader.rb
-- lib/teapot/merge.rb
-- lib/teapot/metadata.rb
 - lib/teapot/package.rb
 - lib/teapot/project.rb
-- lib/teapot/repository.rb
-- lib/teapot/substitutions.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
 - materials/kurocha.png
@@ -217,17 +223,9 @@ files:
 - spec/teapot/command_spec.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
-- spec/teapot/generator_spec.rb
-- spec/teapot/generator_spec/teapot.rb
-- spec/teapot/generator_spec/template/$NAME.txt
 - spec/teapot/identity_set_spec.rb
-- spec/teapot/merge_spec.rb
-- spec/teapot/metadata_spec.rb
-- spec/teapot/substitutions_spec.rb
 - spec/teapot/target_spec.rb
 - spec/teapot/target_spec/teapot.rb
-- spec/teapot/wait_spec.rb
-- spec/teapot/wait_spec/teapot.rb
 - teapot.gemspec
 homepage: http://www.teapot.nz
 licenses:
@@ -244,12 +242,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
@@ -258,14 +256,6 @@ test_files:
 - spec/teapot/command_spec.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
-- spec/teapot/generator_spec.rb
-- spec/teapot/generator_spec/teapot.rb
-- spec/teapot/generator_spec/template/$NAME.txt
 - spec/teapot/identity_set_spec.rb
-- spec/teapot/merge_spec.rb
-- spec/teapot/metadata_spec.rb
-- spec/teapot/substitutions_spec.rb
 - spec/teapot/target_spec.rb
 - spec/teapot/target_spec/teapot.rb
-- spec/teapot/wait_spec.rb
-- spec/teapot/wait_spec/teapot.rb

data/PLANNING.md

@@ -1,20 +0,0 @@
-# Planning
-
-Teapot 2.0 will feature isolated build directories and private dependencies.
-
-## Isolated Build Directories
-
-Individual packages will be built into discrete directories:
-
-```
-teapot/#{platform}/libpng/include/png.h
-teapot/#{platform}/libpng/lib/libpng.a
-```
-
-## Private Dependencies
-
-All dependencies by default are public.
-
-Given a package, C, that depends on B, and B publicly depends on A, C also depends on A.
-
-The problem is that some dependencies of B should not also be dependencies of A, for example internal build tools, etc. It's not necessary for a consumer of A to be aware of C in all cases.

data/lib/teapot/controller/build.rb

@@ -1,107 +0,0 @@
-# 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_relative '../controller'
-require 'build/controller'
-
-module Teapot
-	class Controller
-		class BuildFailedError < StandardError
-		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
-		
-		def build(dependency_names)
-			chain = context.dependency_chain(dependency_names, context.configuration)
-			
-			ordered = chain.ordered
-			
-			if @options[:only]
-				ordered = context.direct_targets(ordered)
-			end
-			
-			controller = Build::Controller.new(logger: self.logger, limit: @options[:limit]) do |controller|
-				ordered.each do |resolution|
-					target = resolution.provider
-					
-					environment = target.environment(context.configuration, chain)
-					
-					if target.build
-						controller.add_target(target, environment.flatten)
-					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
-	end
-end

data/lib/teapot/controller/clean.rb

@@ -1,35 +0,0 @@
-# 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_relative '../controller'
-
-module Teapot
-	class Controller
-		def clean
-			configuration = context.configuration
-			
-			log "Removing #{configuration.platforms_path}...".color(:cyan)
-			FileUtils.rm_rf configuration.platforms_path
-		
-			log "Removing #{configuration.packages_path}...".color(:cyan)
-			FileUtils.rm_rf configuration.packages_path
-		end
-	end
-end

data/lib/teapot/controller/create.rb

@@ -1,73 +0,0 @@
-# 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_relative '../controller'
-require_relative 'fetch'
-
-require 'build/name'
-
-module Teapot
-	class Controller
-		def create(project_name, source, packages)
-			name = Build::Name.new(project_name)
-			
-			log "Creating project named #{project_name} at path #{@root}...".color(:cyan)
-			
-			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
-
-			# Fetch the initial packages:
-			self.fetch
-
-			# Generate the default project if it is possible to do so:
-			generate_project(project_name)
-			
-			self.reload!
-			
-			# Fetch any additional packages:
-			self.fetch
-		end
-		
-		private
-		
-		def generate_project(project_name)
-			if context.generators.key? 'project'
-				generate('project', [project_name], true)
-			end
-		end
-	end
-end

data/lib/teapot/controller/fetch.rb

@@ -1,173 +0,0 @@
-# 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_relative '../controller'
-require_relative '../repository'
-
-module Teapot
-	class Controller
-		def fetch(**options)
-			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, **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
-				log "Could not fetch all packages!".color(:red)
-				unresolved.each do |package|
-					log "\t#{package}".color(:red)
-				end
-			else
-				log "Completed fetch successfully.".color(:green)
-			end
-		end
-		
-		private
-
-		def current_commit(package)
-			IO.popen(['git', '--git-dir', (package.path + '.git').to_s, 'rev-parse', '--verify', 'HEAD']) do |io|
-				io.read.chomp!
-			end
-		end
-		
-		def current_branch(package)
-			IO.popen(['git', '--git-dir', (package.path + '.git').to_s, 'rev-parse', '--abbrev-ref', 'HEAD']) do |io|
-				io.read.chomp!
-			end		
-		end
-		
-		def current_metadata(package)
-			{
-				branch: current_branch(package),
-				commit: current_commit(package)
-			}
-		end
-		
-		def link_local_package(context, configuration, package)
-			log "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)
-			log "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
-				log "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?
-				log "Cloning package at path #{destination_path} ...".color(:cyan)
-		
-				begin
-					external_url = package.external_url(context.root)
-
-					Repository.new(destination_path).clone!(external_url, branch, commit)
-				rescue
-					log "Failed to clone #{external_url}...".color(:red)
-
-					raise
-				end
-			else
-				log "Updating package at path #{destination_path} ...".color(:cyan)
-
-				commit = package_lock ? package_lock[:commit] : nil
-				Repository.new(destination_path).update(branch, commit)
-			end
-		end
-
-		def fetch_package(context, configuration, package, update: false, local: false)
-			if package.local?
-				link_local_package(context, configuration, package)
-			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)
-				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]
-							log("Updating lockfile for package #{package.name}: #{metadata[:commit]}...")
-							store[package.name] = metadata
-						end
-					end
-				end
-			end
-		end
-	end
-end

data/lib/teapot/controller/generate.rb

@@ -1,45 +0,0 @@
-# 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_relative '../controller'
-
-module Teapot
-	class Controller
-		def generate(name, arguments, force = false)
-			context.configuration.load_all
-
-			unless force
-				# Check dirty status of local repository:
-				if Repository.new(@root).status.size != 0
-					abort "You have unstaged changes/unadded files. Please stash/commit them before running the generator.".color(:red)
-				end
-			end
-
-			generator = context.generators[name]
-
-			unless generator
-				abort "Could not find generator with name #{name.inspect}".color(:red)
-			end
-
-			log "Generating #{name.inspect} with arguments #{arguments.inspect}".color(:cyan)
-			generator.generate!(*arguments)
-		end
-	end
-end