teapot 2.0.0.pre.rc1 → 2.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6945788efc0d75eb38df802faf17617bc67116f
-  data.tar.gz: bf5dd81a7bc4cf1bef005d5e584f5fbb54ba9fdd
+  metadata.gz: 24912ef656102df52a040fe466fe1a9309b28272
+  data.tar.gz: af550a07ad4b0e6a8f95c56931df06912c38b5e7
 SHA512:
-  metadata.gz: 034e5b25acb19d9b75589c347d5f281147bed403ab73cc750640ad79c5fb8f3d267d273b6d96d024dcbdd0ba4a31447aaf80734d5a2bb8d383d288120bac0c6c
-  data.tar.gz: 9da112ffe2f501735ec6590ad2ddbce6afbab287b5ff058ac46a8b51517de237cb94e3644a047780cd90e7ec4bfed4a5a11397e848d90eecd87e951c60e25de3
+  metadata.gz: 637f5057b544d7e48c0bcb65c3357498f1f9a688fbff2fdfc02343a7c9d9513c7e36303a577ce68052af5494e50f799b48ca6deaa165de6edc7b9d05b7bc376d
+  data.tar.gz: 99b568ab22dfb5e7185b48d6f6b1a6d96c5fc17bf8da80feccff1bd4d206bc07983c963c47f0aa14635d22d04f6d3d88812321983fadfe5f95f4d3caefa5c9a9

data/.travis.yml

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

data/lib/teapot/command/create.rb

@@ -83,10 +83,12 @@ module Teapot
 			def generate_project(root, project_name, source, packages)
 				name = ::Build::Name.new(project_name)
 				
+				# Otherwise the initial commit will try to include teapot/
 				File.open(root + ".gitignore", "w") do |output|
 					output.puts "teapot/"
 				end
 				
+				# A very basic teapot file to pull in the initial dependencies.
 				File.open(root + TEAPOT_FILE, "w") do |output|
 					output.puts "\# Teapot v#{VERSION} configuration generated at #{Time.now.to_s}", ''
 				

data/lib/teapot/command/fetch.rb

@@ -36,6 +36,8 @@ module Teapot
 				option '--local', "Don't update from source, assume updated local packages."
 			end
 			
+			many :packages, "Only update the specified packages, or all packages if none specified."
+			
 			def invoke(parent)
 				logger = parent.logger
 				context = parent.context
@@ -47,9 +49,12 @@ module Teapot
 				while true
 					configuration.packages.each do |package|
 						next if resolved.include? package
-					
-						fetch_package(context, configuration, package, logger, **@options)
-					
+						
+						# If specific packages were listed, limit updates to them.
+						if @packages.empty? || @packages.include?(package.name)
+							fetch_package(context, configuration, package, logger, **@options)
+						end
+						
 						# We are done with this package, don't try to process it again:
 						resolved << package
 					end
@@ -104,7 +109,7 @@ module Teapot
 			end
 
 			def clone_or_pull_package(context, configuration, package, package_lock, logger)
-				logger.info "Fetching #{package}...".color(:cyan)
+				logger.info "Processing #{package}...".color(:cyan)
 
 				# Where we are going to put the package:
 				destination_path = package.path
@@ -125,26 +130,17 @@ module Teapot
 
 				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)
+				if destination_path.exist?
+					logger.info "Updating package at path #{destination_path}...".color(:cyan)
 
-						raise
-					end
+					repository = Rugged::Repository.new(destination_path.to_s)
+					repository.checkout(commit || 'origin/master')
 				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)
+					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
 				end
 			end
 

data/lib/teapot/command.rb

@@ -50,7 +50,7 @@ module Teapot
 			
 			options do
 				option '-c/--configuration <name>', "Specify a specific build configuration.", default: ENV['TEAPOT_CONFIGURATION']
-				option '--root <path>', "Work in the given root directory.", default: Dir.getwd
+				option '--root <path>', "Work in the given root directory."
 				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging
 				option '-h/--help', "Print out help information."
 				option '-v/--version', "Print out the application version."
@@ -67,7 +67,7 @@ module Teapot
 				default: 'build'
 			
 			def root
-				::Build::Files::Path.expand(@options[:root])
+				::Build::Files::Path.expand(@options[:root] || Dir.getwd)
 			end
 			
 			def verbose?

data/lib/teapot/context.rb

@@ -92,20 +92,32 @@ module Teapot
 
 		def substitutions
 			substitutions = Build::Text::Substitutions.new
-
+			
+			substitutions['TEAPOT_VERSION'] = Teapot::VERSION
+			
 			if @project
-				substitutions['PROJECT_NAME'] = @project.name
+				name = Build::Name.new(@project.name)
+				
+				# e.g. Foo Bar, typically used as a title, directory, etc.
+				substitutions['PROJECT_NAME'] = name.text
+				
+				# e.g. FooBar, typically used as a namespace
+				substitutions['PROJECT_IDENTIFIER'] = name.identifier
+				
+				# e.g. foo-bar, typically used for targets, executables
+				substitutions['PROJECT_TARGET_NAME'] = name.target
+				
 				substitutions['LICENSE'] = @project.license
 			end
-
+			
 			# The user's current name:
 			substitutions['AUTHOR_NAME'] = repository.config['user.name']
 			substitutions['AUTHOR_EMAIL'] = repository.config['user.email']
-
+			
 			current_date = Time.new
 			substitutions['DATE'] = current_date.strftime("%-d/%-m/%Y")
 			substitutions['YEAR'] = current_date.strftime("%Y")
-
+			
 			return substitutions
 		end
 

data/lib/teapot/target.rb

@@ -58,9 +58,6 @@ module Teapot
 				Build::Environment.new(&provision.value)
 			end
 			
-			# Per-configuration package package environment:
-			environments << @package.options[:environment]
-			
 			# Merge all the environments together:
 			environment = Build::Environment.combine(*environments)
 			

data/lib/teapot/version.rb

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

data/teapot.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "rugged"
 	
 	spec.add_dependency "build", "~> 1.1"
-	spec.add_dependency "build-files", "~> 1.0"
+	spec.add_dependency "build-files", "~> 1.3"
 	spec.add_dependency "build-dependency", "~> 1.1"
 	spec.add_dependency "build-uri", "~> 1.0"
 	spec.add_dependency "build-text", "~> 1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc1
+  version: 2.0.0.pre.rc2
 platform: ruby
 authors:
 - Samuel Williams
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: build-dependency
   requirement: !ruby/object:Gem::Requirement