teapot 2.0.0.pre.rc3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c635c63b5b441f820b32101a3a3389eff2ef81e
-  data.tar.gz: 859cf5553f07d00409b76bcbadf81dae90c9dcb9
+  metadata.gz: 291af29396fdc7dfed8f5648e602c102f9843b3b
+  data.tar.gz: ad1145a18295c802dccf49279a2d245825602a25
 SHA512:
-  metadata.gz: cd2eef8a30f2efd10420a2c786beebc400623807d19d64465540c839f9b5fceeae59c7d0b42fa0d8924c01224de3def5ae0e4e64b5a66cdb4407db28fb85ed2d
-  data.tar.gz: 4ca2c4261051631ae374f671346c683d59b79002064e5b9d88a3108633fc976ab00dc1ef837f2334df69dd8b360e3c8f72e53d0ae48b63b8e89dde7cec485c43
+  metadata.gz: 47d8c429b4e2f18459823eaff4bfdb11ff56dbea77b77f8479daa7d5589b7a193a68b6d765ad85d956f00cb9c1960058dd54d786a7a94452f3df533f3f39c730
+  data.tar.gz: 45118dcfdca9e6ac3a33b17e893e3cb3c3f6d30d073694bad250c0f2bd81cb7f4a24700d7d08430068b643b501abe66764503d5ea4315232027831ded53b18f4

data/.travis.yml

@@ -1,11 +1,14 @@
+# Setup the environment:
 language: ruby
 sudo: false
 dist: trusty
 cache: bundler
+
 before_install:
   # For testing purposes:
   - git config --global user.email "samuel@oriontransfer.net"
   - git config --global user.name "Samuel Williams"
+
 rvm:
   - 2.1
   - 2.2
@@ -13,12 +16,21 @@ rvm:
   - 2.4
   - jruby-head
   - ruby-head
+
+# Setup the compilers:
 matrix:
   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"]
-    packages: ["clang-4.0"]
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty-4.0
+    packages:
+      - clang-4.0
+      - libc++-dev
+      - libc++abi-dev
+env:
+  - CC=clang-4.0 CXX=clang++-4.0

data/lib/teapot/command/build.rb

@@ -31,7 +31,7 @@ module Teapot
 			self.description = "Build the specified target."
 			
 			options do
-				option '-j/-l/--limit <n>', "Limit the build to <n> concurrent processes."
+				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

data/lib/teapot/command/create.rb

@@ -34,6 +34,9 @@ module Teapot
 			many :packages, "Any additional packages you'd like to include in the project."
 			
 			def invoke(parent)
+				raise ArgumentError, "project_name is required" unless @project_name
+				raise ArgumentError, "source is required" unless @source
+				
 				logger = parent.logger
 				
 				nested = parent['--root', parent.options[:root] || project_name.gsub(/\s+/, '-').downcase]
@@ -101,13 +104,18 @@ module Teapot
 					output.puts "\# Build Targets", ''
 				
 					output.puts "\# Configurations", ''
-				
-					output.puts "define_configuration #{name.target.dump} do |configuration|"
-					output.puts "\tconfiguration[:source] = #{source.dump}", ''
+					
+					output.puts "define_configuration 'development' do |configuration|"
+					output.puts "\tconfiguration[:source] = #{source.dump}"
+					output.puts "\tconfiguration.import #{name.target.dump}"
 					packages.each do |name|
 						output.puts "\tconfiguration.require #{name.dump}"
 					end
 					output.puts "end", ''
+					
+					output.puts "define_configuration #{name.target.dump} do |configuration|"
+					output.puts "\tconfiguration.public!"
+					output.puts "end"
 				end
 			end
 		end

data/lib/teapot/command/fetch.rb

@@ -117,6 +117,11 @@ module Teapot
 					destination_path.make_symlink(local_path)
 				end
 			end
+			
+			def credentials(url, username, types)
+				# We should prompt for username/password if required...
+				return Rugged::Credentials::SshKeyFromAgent.new(username: username)
+			end
 
 			def clone_or_pull_package(context, configuration, package, package_lock, logger)
 				logger.info "Processing #{package}...".color(:cyan)
@@ -149,7 +154,7 @@ module Teapot
 						raise FetchError.new(package, "Uncommited local modifications")
 					end
 					
-					repository.fetch('origin')
+					repository.fetch('origin', credentials: self.method(:credentials))
 					repository.checkout(branch_name)
 					
 					# Essentially implement git pull:
@@ -170,7 +175,7 @@ module Teapot
 					external_url = package.external_url(context.root)
 					
 					# Clone the repository with the specified branch:
-					repository = Rugged::Repository.clone_at(external_url.to_s, destination_path.to_s, checkout_branch: branch_name)
+					repository = Rugged::Repository.clone_at(external_url.to_s, destination_path.to_s, checkout_branch: branch_name, credentials: self.method(:credentials))
 					
 					# Reset it to the requested commit if required:
 					repository.reset(commit_id, :hard) if commit_id

data/lib/teapot/project.rb

@@ -32,7 +32,13 @@ module Teapot
 		end
 		
 		def name
-			Build::Name.from_target(@name)
+			if @title
+				# Prefer title, it retains case.
+				Build::Name.new(@title)
+			else
+				# Otherwise, if we don't have title, use the target name.
+				Build::Name.from_target(@name)
+			end
 		end
 		
 		def freeze

data/lib/teapot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc3
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -247,12 +247,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.