teapot 2.0.0.pre.rc2 → 2.0.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24912ef656102df52a040fe466fe1a9309b28272
-  data.tar.gz: af550a07ad4b0e6a8f95c56931df06912c38b5e7
+  metadata.gz: 5c635c63b5b441f820b32101a3a3389eff2ef81e
+  data.tar.gz: 859cf5553f07d00409b76bcbadf81dae90c9dcb9
 SHA512:
-  metadata.gz: 637f5057b544d7e48c0bcb65c3357498f1f9a688fbff2fdfc02343a7c9d9513c7e36303a577ce68052af5494e50f799b48ca6deaa165de6edc7b9d05b7bc376d
-  data.tar.gz: 99b568ab22dfb5e7185b48d6f6b1a6d96c5fc17bf8da80feccff1bd4d206bc07983c963c47f0aa14635d22d04f6d3d88812321983fadfe5f95f4d3caefa5c9a9
+  metadata.gz: cd2eef8a30f2efd10420a2c786beebc400623807d19d64465540c839f9b5fceeae59c7d0b42fa0d8924c01224de3def5ae0e4e64b5a66cdb4407db28fb85ed2d
+  data.tar.gz: 4ca2c4261051631ae374f671346c683d59b79002064e5b9d88a3108633fc976ab00dc1ef837f2334df69dd8b360e3c8f72e53d0ae48b63b8e89dde7cec485c43

data/lib/teapot.rb

@@ -20,5 +20,7 @@
 
 require "teapot/version"
 
+require "teapot/context"
+
 module Teapot
 end

data/lib/teapot/command/build.rb

@@ -39,10 +39,19 @@ 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."
 			
+			# The targets to build:
+			def dependency_names(context)
+				if @targets.any?
+					@targets
+				else
+					context.configuration.targets[:build]
+				end
+			end
+			
 			def invoke(parent)
 				context = parent.context
 				
-				chain = context.dependency_chain(@targets, context.configuration)
+				chain = context.dependency_chain(dependency_names(context), context.configuration)
 				
 				ordered = chain.ordered
 				
@@ -57,7 +66,7 @@ module Teapot
 						if target.build
 							environment = target.environment(context.configuration, chain)
 							
-							controller.add_target(target, environment.flatten, @argv)
+							controller.add_target(target, environment.flatten, self.argv)
 						end
 					end
 				end

data/lib/teapot/command/create.rb

@@ -29,18 +29,10 @@ module Teapot
 		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
 				
@@ -64,14 +56,22 @@ module Teapot
 				
 				context = nested.context
 				
-				Build[target_name, *@packages, '--', project_name].invoke(nested)
+				# The targets to build to create the initial project:
+				target_names = context.configuration.targets[:create]
 				
-				# Fetch any additional packages:
-				Fetch[].invoke(nested)
+				if target_names.any?
+					# Generate the initial project files:
+					Build[*target_names].invoke(nested)
+					
+					# Fetch any additional packages:
+					Fetch[].invoke(nested)
+				end
 				
+				# Stage all files:
 				index = repository.index
 				index.add_all
 				
+				# Commit the initial project files:
 				Rugged::Commit.create(repository,
 					tree: index.write_tree(repository),
 					message: "Initial project files.",
@@ -93,19 +93,20 @@ module Teapot
 					output.puts "\# Teapot v#{VERSION} configuration generated at #{Time.now.to_s}", ''
 				
 					output.puts "required_version #{LOADER_VERSION.dump}", ''
+					
+					output.puts "define_project #{name.target.dump} do |project|"
+					output.puts "\tproject.title = #{name.text.dump}"
+					output.puts "end", ''
 				
 					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

data/lib/teapot/command/fetch.rb

@@ -19,10 +19,20 @@
 # THE SOFTWARE.
 
 require 'samovar'
+
 require 'rugged'
 
 module Teapot
 	module Command
+		class FetchError < StandardError
+			def initialize(package, message)
+				super(message)
+				@package = package
+			end
+			
+			attr :package
+		end
+		
 		class Fetch < Samovar::Command
 			self.description = "Fetch remote packages according to the specified configuration."
 			
@@ -51,7 +61,7 @@ module Teapot
 						next if resolved.include? package
 						
 						# If specific packages were listed, limit updates to them.
-						if @packages.empty? || @packages.include?(package.name)
+						if @packages.nil? || @packages.empty? || @packages.include?(package.name)
 							fetch_package(context, configuration, package, logger, **@options)
 						end
 						
@@ -120,27 +130,55 @@ module Teapot
 					base_uri = URI "file://" + File.expand_path(base_uri.path, context.root) + "/"
 				end
 
-				branch = package.options.fetch(:branch, 'master')
+				branch_name = package.options.fetch(:branch, 'master')
 
 				if package_lock
 					logger.info "Package locked to commit: #{package_lock[:branch]}/#{package_lock[:commit]}"
 
-					branch = package_lock[:branch]
+					branch_name = package_lock[:branch]
+					commit_id = package_lock[:commit]
 				end
 
-				commit = package_lock ? package_lock[:commit] : nil
-
 				if destination_path.exist?
 					logger.info "Updating package at path #{destination_path}...".color(:cyan)
 
 					repository = Rugged::Repository.new(destination_path.to_s)
-					repository.checkout(commit || 'origin/master')
+
+					# Are there uncommitted changes in the work tree?
+					if repository.to_enum(:status).any?
+						raise FetchError.new(package, "Uncommited local modifications")
+					end
+					
+					repository.fetch('origin')
+					repository.checkout(branch_name)
+					
+					# Essentially implement git pull:
+					if commit_id
+						# Lookup the named branch:
+						branch = repository.branches[branch_name].resolve
+					else
+						# Lookup the current branch and upstream commit:
+						branch = repository.branches[repository.head.name]
+						commit_id = branch.upstream.target_id
+					end
+					
+					# Reset it to the requested commit if required:
+					repository.reset(commit_id, :hard)
 				else
 					logger.info "Cloning package at path #{destination_path}...".color(:cyan)
 					
 					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
+					
+					# Clone the repository with the specified branch:
+					repository = Rugged::Repository.clone_at(external_url.to_s, destination_path.to_s, checkout_branch: branch_name)
+					
+					# Reset it to the requested commit if required:
+					repository.reset(commit_id, :hard) if commit_id
+				end
+				
+				# Rugged currently doesn't have good (any?) support for submodules, so we diretly invoke git here:
+				if repository.submodules.any?
+					system("git", "submodule", "update", "--init", "--recursive", chdir: package.path)
 				end
 			end
 

data/lib/teapot/configuration.rb

@@ -48,6 +48,9 @@ module Teapot
 			@imports = IdentitySet.new
 
 			@visibility = :private
+			
+			# A list of named targets for specific purposes:
+			@targets = Hash.new{|hash,key| hash[key] = Array.new}
 		end
 
 		def freeze
@@ -56,6 +59,8 @@ module Teapot
 			@imports.freeze
 			@visibility.freeze
 			
+			@targets.freeze
+			
 			super
 		end
 
@@ -70,6 +75,9 @@ module Teapot
 			@visibility = :public
 		end
 
+		# A table of named targets for specific purposes.
+		attr :targets
+
 		# Options used to bind packages to this configuration.
 		attr :options
 
@@ -178,7 +186,7 @@ module Teapot
 						# Mark this as resolved
 						imported << import
 						
-						updated = self.merge(named_configuration, import.options) || updated
+						updated = self.update(named_configuration, import.options) || updated
 					else
 						# It couldn't be resolved and hasn't already been resolved...
 						@imports << import
@@ -190,7 +198,7 @@ module Teapot
 		end
 		
 		# Merge an external configuration into this configuration. We won't override already defined packages.
-		def merge(configuration, options)
+		def update(configuration, options)
 			updated = false
 			
 			configuration.packages.each do |external_package|
@@ -214,6 +222,12 @@ module Teapot
 				end
 			end
 			
+			configuration.targets.each do |key, value|
+				@targets[key] += value
+				
+				updated = true
+			end
+			
 			return updated
 		end
 		

data/lib/teapot/context.rb

@@ -44,7 +44,7 @@ module Teapot
 	# A context represents a specific root package instance with a given configuration and all related definitions.
 	# A context is stateful in the sense that package selection is specialized based on #select and #dependency_chain. These parameters are usually set up initially as part of the context setup.
 	class Context
-		def initialize(root, options = {})
+		def initialize(root, **options)
 			@root = Path[root]
 			@options = options
 
@@ -58,9 +58,7 @@ module Teapot
 
 			@loaded = {}
 
-			unless options[:fake]
-				load_root_package(options)
-			end
+			load_root_package(options) unless options[:load_root] == false
 		end
 
 		attr :root
@@ -96,7 +94,7 @@ module Teapot
 			substitutions['TEAPOT_VERSION'] = Teapot::VERSION
 			
 			if @project
-				name = Build::Name.new(@project.name)
+				name = @project.name
 				
 				# e.g. Foo Bar, typically used as a title, directory, etc.
 				substitutions['PROJECT_NAME'] = name.text

data/lib/teapot/project.rb

@@ -31,7 +31,12 @@ module Teapot
 			@authors = []
 		end
 		
+		def name
+			Build::Name.from_target(@name)
+		end
+		
 		def freeze
+			@title.freeze
 			@summary.freeze
 			@license.freeze
 			@website.freeze
@@ -42,6 +47,7 @@ module Teapot
 			super
 		end
 		
+		attr_accessor :title
 		attr_accessor :summary
 		attr_accessor :license
 		attr_accessor :website

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "2.0.0-rc2"
+	VERSION = "2.0.0-rc3"
 end

data/spec/spec_helper.rb

@@ -19,6 +19,11 @@ end
 require "bundler/setup"
 require "teapot"
 
+RSpec.shared_context Teapot::Context do
+	let(:root) {Build::Files::Path[__dir__] + 'context'}
+	let(:context) {Teapot::Context.new(root, load_root: false)}
+end
+
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure
 	config.example_status_persistence_file_path = ".rspec_status"

data/spec/teapot/command/fetch_spec.rb

@@ -0,0 +1,107 @@
+
+# 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 'teapot/command'
+
+RSpec.describe Teapot::Command::Fetch, order: :defined do
+	let(:root) {Build::Files::Path.new(__dir__) + "fetch_spec"}
+	let(:project_path) {root + 'test-project'}
+	let(:thing_path) {root + "repositories/thing"}
+	let(:thing_package_path) {project_path + "teapot/packages/test/thing"}
+	
+	let(:top) {Teapot::Command::Top["--root", project_path.to_s]}
+	
+	context "clean project" do
+		subject {top['clean']}
+		
+		it "should delete all packages" do
+			expect{subject.invoke}.to_not raise_error
+			
+			expect(File).to_not be_exist(root + "test-project/teapot/packages/test")
+		end
+		
+		it "can create thing repository" do
+			(thing_path + ".git").delete
+			
+			system("git", "init", chdir: thing_path)
+			system("git", "add", "teapot.rb", chdir: thing_path)
+			system("git", "commit", "-m", "Teapot file for testing", chdir: thing_path)
+		end
+		
+		let(:lockfile_path) {root + "test-project/test-lock.yml"}
+		
+		it "should delete the lock file" do
+			lockfile_path.delete
+			
+			expect(File).to_not be_exist(lockfile_path)
+		end
+	end
+	
+	context "initial fetch" do
+		subject {top['fetch']}
+		
+		it "should fetch repositories" do
+			expect{subject.invoke}.to_not raise_error
+			
+			# Did the thing package checkout correctly?
+			expect(File).to be_exist(root + "test-project/teapot/packages/test/thing/teapot.rb")
+		end
+		
+		it "should fetch repositories with no changes" do
+			expect{subject.invoke}.to_not raise_error
+			
+			# Did the thing package checkout correctly?
+			expect(File).to be_exist(root + "test-project/teapot/packages/test/thing/teapot.rb")
+		end
+	end
+	
+	context "fetch with worktree modifications" do
+		subject {top['fetch']}
+		let(:path) {root + "test-project/teapot/packages/test/thing/README.md"}
+		
+		it "can make local modifications" do
+			path.write("Hello World")
+			
+			expect(File).to be_exist(path)
+		end
+		
+		it "can't fetch with local modifications" do
+			expect{subject.invoke}.to raise_error(Teapot::Command::FetchError, /local modifications/)
+			
+			path.delete
+		end
+	end
+	
+	context "fetch with upstream changes" do
+		subject {top['fetch', '--update']}
+		
+		it "can commit upstream changes" do
+			system("git", "add", "README.md", chdir: thing_path)
+			system("git", "commit", "-m", "Add documentation", chdir: thing_path)
+		end
+		
+		it "can fetch changes" do
+			expect{subject.invoke}.to_not raise_error
+			
+			expect(File).to be_exist(thing_package_path + "README.md")
+		end
+	end
+end

data/spec/teapot/command/fetch_spec/repositories/thing/README.md

@@ -0,0 +1,3 @@
+# Thing
+
+This thing is so great.

data/spec/teapot/command/fetch_spec/repositories/thing/teapot.rb

@@ -0,0 +1,2 @@
+
+teapot_version "2.0"

data/spec/teapot/command/fetch_spec/test-project/teapot.rb

@@ -0,0 +1,8 @@
+
+teapot_version "2.0"
+
+define_configuration "test" do |configuration|
+	configuration[:source] = "../repositories"
+	
+	configuration.require "thing"
+end

data/spec/teapot/command_spec.rb

@@ -21,21 +21,23 @@
 require 'teapot/command'
 
 RSpec.describe Teapot::Command, order: :defined do
-	let!(:source) {"https://github.com/kurocha"}
-	let!(:root) {Build::Files::Path.new(__dir__) + "command_spec"}
-	let!(:project_name) {"Test Project"}
-	let!(:project_path) {root + 'test-project'}
+	let(:source) {"https://github.com/kurocha"}
+	# let(:source) {File.expand_path("../../../../kurocha", __dir__)}
+	let(:root) {Build::Files::Path.new(__dir__) + "command_spec"}
+	let(:project_name) {"Test Project"}
+	let(:project_path) {root + 'test-project'}
 	
 	let(:top) {Teapot::Command::Top["--root", project_path.to_s]}
 	
 	context Teapot::Command::Create do
-		subject {top["create", project_name, source.to_s, "project"]}
+		subject {top["create", project_name, source.to_s, "generate-project", "generate-travis"]}
 		
 		it "should create a new project" do
 			root.delete
 			
 			expect{subject.invoke}.to_not raise_error
 			expect(project_path + "teapot.rb").to be_exist
+			expect(project_path + ".travis.yml").to be_exist
 		end
 	end
 	
@@ -46,4 +48,12 @@ RSpec.describe Teapot::Command, order: :defined do
 			expect{subject.invoke}.to_not raise_error
 		end
 	end
+	
+	context Teapot::Command::Fetch do
+		subject {top["fetch"]}
+		
+		it "should fetch any changes" do
+			expect{subject.invoke}.to_not raise_error
+		end
+	end
 end

data/spec/teapot/configuration_spec.rb

@@ -0,0 +1,42 @@
+# 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 'teapot/context'
+require 'teapot/configuration'
+
+RSpec.describe Teapot::Configuration do
+	include_context Teapot::Context
+	
+	let(:master) {Teapot::Configuration.new(context, Teapot::Package.new(root + 'master', 'master'), 'master')}
+	let(:embedded) {Teapot::Configuration.new(context, Teapot::Package.new(root + 'embedded', 'embedded'), 'embedded')}
+	
+	context "with create targets" do
+		before(:each) do
+			master.targets[:create] << "hello"
+			embedded.targets[:create] << "world"
+		end
+		
+		it "can merge packages" do
+			expect(master.update(embedded, {})).to be_truthy
+			
+			expect(master.targets[:create]).to be == ["hello", "world"]
+		end
+	end
+end

data/teapot.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "build-uri", "~> 1.0"
 	spec.add_dependency "build-text", "~> 1.0"
 	
-	spec.add_dependency "samovar", "~> 1.6"
+	spec.add_dependency "samovar", "~> 1.7"
 	
 	# This could be a good option in the future for teapot fetch:
 	#spec.add_dependency "rugged"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc2
+  version: 2.0.0.pre.rc3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,12 @@ files:
 - materials/teapot.png
 - materials/teapot.svg
 - spec/spec_helper.rb
+- spec/teapot/command/fetch_spec.rb
+- spec/teapot/command/fetch_spec/repositories/thing/README.md
+- spec/teapot/command/fetch_spec/repositories/thing/teapot.rb
+- spec/teapot/command/fetch_spec/test-project/teapot.rb
 - spec/teapot/command_spec.rb
+- spec/teapot/configuration_spec.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
 - spec/teapot/identity_set_spec.rb
@@ -253,7 +258,12 @@ specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
 test_files:
 - spec/spec_helper.rb
+- spec/teapot/command/fetch_spec.rb
+- spec/teapot/command/fetch_spec/repositories/thing/README.md
+- spec/teapot/command/fetch_spec/repositories/thing/teapot.rb
+- spec/teapot/command/fetch_spec/test-project/teapot.rb
 - spec/teapot/command_spec.rb
+- spec/teapot/configuration_spec.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
 - spec/teapot/identity_set_spec.rb