teapot 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7dd6530fa6205da0fb6e8ac664cf5afaeaefee7c8b2953b4db59143efe5bc3a
-  data.tar.gz: 71fc02fb6d3bbd8b5bcd4d52322c38ed4c3436284840d8b7a42204b259328665
+  metadata.gz: 0dd1292b87cd5db2fadc2379f270574504222ca5865d020c1463c072ddb14e79
+  data.tar.gz: 9c7a12f5887482e46b896d5a3e77147a28d3563cdf2ec194f489ab064f75d9ef
 SHA512:
-  metadata.gz: dba16c3116e3d58b669847fc070115dccb6aa191fa563dea6a924d3e7aaa5c990516e374defc9db4d582cecc0197786e9e597771cea09d1af18fc902f82139c3
-  data.tar.gz: f3c1235934ea56215e55730c78d0e96b72ddc4aea27c053db3e808216a1e76a7675a7391eb08a87bfdc984f3ef7203677c60fcf5a8c0046397e96ff63e79ac1a
+  metadata.gz: 4dfac1b253ce27cd86644dfae4f9b1ee3b8cc43a1436b11022a33a18b17e0ba53bd79deb420b236b9dd7b1d48f5859a5f1d2cfafc223cbc3689801eefc1f20cc
+  data.tar.gz: 797f3d03946859f2e8c8fefc4a610a3f7bb14d6dad90fdc8063989b7cf1a66524b5608ebeeb7c984455603c8d9a6096be5c0bef74385a4711d326c4bd0af3c13

data/.travis.yml

@@ -2,9 +2,7 @@ language: ruby
 dist: xenial
 cache: bundler
 
-before_install:
-  - gem update --system
-  - gem install bundler
+before_script:
   # For testing purposes:
   - git config --global user.email "samuel@oriontransfer.net"
   - git config --global user.name "Samuel Williams"
@@ -15,16 +13,12 @@ matrix:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
-    - rvm: truffleruby
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O"
-    - rvm: ruby-head
-    - rvm: rbx-3
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: truffleruby
-    - rvm: jruby-head
-    - rvm: rbx-3
+    - rvm: 2.6
+      os: osx
+      before_install: brew install pkgconfig zlib curl openssl libssh2 libgit2
+      env: RUGGED_USE_SYSTEM_LIBRARIES=y
+    - rvm: 2.6
+      env: COVERAGE=BriefSummary,Coveralls
 
 addons:
   apt:

data/Gemfile

@@ -5,11 +5,8 @@ gemspec
 
 group :development do
 	gem 'pry'
-	gem 'pry-coolline'
-	gem 'pry-byebug', platform: :mri
 end
 
-group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-end
+# group :test do
+# 	gem 'rugged', git: 'git://github.com/libgit2/rugged.git', submodules: true
+# end

data/README.md

@@ -10,6 +10,7 @@ Teapot is a decentralised build tool for managing complex cross-platform project
 [![Build Status](https://secure.travis-ci.org/kurocha/teapot.svg)](http://travis-ci.org/kurocha/teapot)
 [![Code Climate](https://codeclimate.com/github/kurocha/teapot.svg)](https://codeclimate.com/github/kurocha/teapot)
 [![Coverage Status](https://coveralls.io/repos/kurocha/teapot/badge.svg)](https://coveralls.io/r/kurocha/teapot)
+[![Gitter Chat](https://badges.gitter.im/kurocha/community.svg)](https://gitter.im/kurocha/community)
 
 ## Installation
 

data/lib/teapot/configuration.rb

@@ -50,7 +50,7 @@ module Teapot
 		end
 
 		def freeze
-			return if frozen?
+			return self if frozen?
 			
 			@options.freeze
 			@packages.freeze
@@ -128,11 +128,13 @@ module Teapot
 			context.root + "teapot/packages/#{name}"
 		end
 
-		# The path where built products will be installed.
-		def platforms_path
-			context.root + "teapot/platforms/#{name}"
+		# The path where built products will be placed.
+		def build_path
+			context.root + "teapot/build/#{name}"
 		end
 
+		alias platforms_path build_path
+
 		def lock_path
 			context.root + "#{@name}-lock.yml"
 		end

data/lib/teapot/context.rb

@@ -18,135 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'loader'
-require_relative 'package'
-
-require 'build/rulebook'
-require 'build/text/substitutions'
-require 'build/text/merge'
+require_relative 'select'
 
 module Teapot
-	class AlreadyDefinedError < StandardError
-		def initialize(definition, previous)
-			super "Definition #{definition.name} in #{definition.path} has already been defined in #{previous.path}!"
-		end
-
-		def self.check(definition, definitions)
-			previous = definitions[definition.name]
-
-			raise self.new(definition, previous) if previous
-		end
-	end
-	
-	# A selection is a specific view of the data exposed by the context at a specific point in time.
-	class Select
-		def initialize(context, configuration, names = [])
-			@context = context
-			@configuration = Configuration.new(context, configuration.package, configuration.name, [], configuration.options)
-			
-			@targets = {}
-			@configurations = {}
-			@projects = {}
-			@rules = Build::Rulebook.new
-			
-			@dependencies = []
-			@selection = Set.new
-			@unresolved = Set.new
-			
-			load!(configuration, names)
-			
-			@chain = nil
-		end
-		
-		attr :context
-		attr :configuration
-		
-		attr :targets
-		attr :projects
-		
-		# Alises as defined by Configuration#targets
-		attr :aliases
-		
-		# All public configurations.
-		attr :configurations
-
-		attr :rules
-		
-		attr :dependencies
-		attr :selection
-		attr :unresolved
-		
-		def chain
-			@chain ||= Build::Dependency::Chain.expand(@dependencies, @targets.values, @selection)
-		end
-		
-		def direct_targets(ordered)
-			@dependencies.collect do |dependency|
-				ordered.find{|(package, _)| package.provides? dependency}
-			end.compact
-		end
-		
-		private
-		
-		# Add a definition to the current context.
-		def append definition
-			case definition
-			when Target
-				AlreadyDefinedError.check(definition, @targets)
-				@targets[definition.name] = definition
-			when Configuration
-				# We define configurations in two cases, if they are public, or if they are part of the root package of this context.
-				if definition.public? or definition.package == @context.root_package
-					AlreadyDefinedError.check(definition, @configurations)
-					@configurations[definition.name] = definition
-				end
-			when Project
-				AlreadyDefinedError.check(definition, @projects)
-				@projects[definition.name] = definition
-			when Rule
-				AlreadyDefinedError.check(definition, @rules)
-				@rules << definition
-			end
-		end
-		
-		def load_package!(package)
-			begin
-				script = @context.load(package)
-				
-				# Load the definitions into the current selection:
-				script.defined.each do |definition|
-					append(definition)
-				end
-			rescue NonexistantTeapotError, IncompatibleTeapotError
-				# If the package doesn't exist or the teapot version is too old, it failed:
-				@unresolved << package
-			end
-		end
-		
-		def load!(configuration, names)
-			# Load the root package which makes all the named configurations and targets available.
-			load_package!(@context.root_package)
-			
-			# Load all packages defined by this configuration.
-			configuration.traverse(@configurations) do |configuration|
-				@configuration.merge(configuration) do |package|
-					# puts "Load package: #{package} from #{configuration}"
-					load_package!(package)
-				end
-			end
-			
-			@configuration.freeze
-			
-			names.each do |name|
-				if @targets.key? name
-					@selection << name
-				else
-					@dependencies << name
-				end
-			end
-		end
-	end
-	
 	# 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)

data/lib/teapot/loader.rb

@@ -30,7 +30,8 @@ module Teapot
 	# Cannot load packages newer than this.
 	# Version 1.3: Added support for build-dependency library which allows options for `#depends`. The primary use case is private dependencies.
 	# Version 2.0: Generators removed and refactored into build.
-	LOADER_VERSION = "2.0"
+	# Version 2.3: Rework install_prefix -> build_prefix.
+	LOADER_VERSION = "2.3"
 	
 	# Cannot load packages older than this.
 	MINIMUM_LOADER_VERSION = "1.0"
@@ -103,9 +104,9 @@ module Teapot
 		
 		def define_target(*args)
 			target = Target.new(@context, @package, *args)
-
+			
 			yield target
-
+			
 			@defined << target
 		end
 		

data/lib/teapot/select.rb

@@ -0,0 +1,149 @@
+# 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 'loader'
+require_relative 'package'
+
+require 'build/rulebook'
+require 'build/text/substitutions'
+require 'build/text/merge'
+
+module Teapot
+	class AlreadyDefinedError < StandardError
+		def initialize(definition, previous)
+			super "Definition #{definition.name} in #{definition.path} has already been defined in #{previous.path}!"
+		end
+
+		def self.check(definition, definitions)
+			previous = definitions[definition.name]
+
+			raise self.new(definition, previous) if previous
+		end
+	end
+	
+	# A selection is a specific view of the data exposed by the context at a specific point in time.
+	class Select
+		def initialize(context, configuration, names = [])
+			@context = context
+			@configuration = Configuration.new(context, configuration.package, configuration.name, [], configuration.options)
+			
+			@targets = {}
+			@configurations = {}
+			@projects = {}
+			@rules = Build::Rulebook.new
+			
+			@dependencies = []
+			@selection = Set.new
+			@unresolved = Set.new
+			
+			load!(configuration, names)
+			
+			@chain = nil
+		end
+		
+		attr :context
+		attr :configuration
+		
+		attr :targets
+		attr :projects
+		
+		# Alises as defined by Configuration#targets
+		attr :aliases
+		
+		# All public configurations.
+		attr :configurations
+
+		attr :rules
+		
+		attr :dependencies
+		attr :selection
+		attr :unresolved
+		
+		def chain
+			@chain ||= Build::Dependency::Chain.expand(@dependencies, @targets.values, @selection)
+		end
+		
+		def direct_targets(ordered)
+			@dependencies.collect do |dependency|
+				ordered.find{|(package, _)| package.provides? dependency}
+			end.compact
+		end
+		
+		private
+		
+		# Add a definition to the current context.
+		def append definition
+			case definition
+			when Target
+				AlreadyDefinedError.check(definition, @targets)
+				@targets[definition.name] = definition
+			when Configuration
+				# We define configurations in two cases, if they are public, or if they are part of the root package of this context.
+				if definition.public? or definition.package == @context.root_package
+					AlreadyDefinedError.check(definition, @configurations)
+					@configurations[definition.name] = definition
+				end
+			when Project
+				AlreadyDefinedError.check(definition, @projects)
+				@projects[definition.name] = definition
+			when Rule
+				AlreadyDefinedError.check(definition, @rules)
+				@rules << definition
+			end
+		end
+		
+		def load_package!(package)
+			begin
+				script = @context.load(package)
+				
+				# Load the definitions into the current selection:
+				script.defined.each do |definition|
+					append(definition)
+				end
+			rescue NonexistantTeapotError, IncompatibleTeapotError
+				# If the package doesn't exist or the teapot version is too old, it failed:
+				@unresolved << package
+			end
+		end
+		
+		def load!(configuration, names)
+			# Load the root package which makes all the named configurations and targets available.
+			load_package!(@context.root_package)
+			
+			# Load all packages defined by this configuration.
+			configuration.traverse(@configurations) do |configuration|
+				@configuration.merge(configuration) do |package|
+					# puts "Load package: #{package} from #{configuration}"
+					load_package!(package)
+				end
+			end
+			
+			@configuration.freeze
+			
+			names.each do |name|
+				if @targets.key? name
+					@selection << name
+				else
+					@dependencies << name
+				end
+			end
+		end
+	end
+end

data/lib/teapot/target.rb

@@ -32,23 +32,28 @@ module Teapot
 	class Target < Definition
 		include Build::Dependency
 		
-		def initialize(context, package, name)
-			super context, package, name
+		def initialize(*)
+			super
 			
 			@build = nil
-			
-			@rulebook = Build::Rulebook.new
 		end
 		
-		attr :rulebook
-		
 		def freeze
+			return self if frozen?
+			
 			@build.freeze
-			@rulebook.freeze
 			
 			super
 		end
 		
+		def build(&block)
+			if block_given?
+				@build = block
+			end
+			
+			return @build
+		end
+		
 		# Given a specific configuration, generate the build environment based on this target and it's provision chain.
 		def environment(configuration, chain)
 			chain = chain.partial(self)
@@ -62,16 +67,11 @@ module Teapot
 			environment = Build::Environment.combine(*environments)
 			
 			environment.merge do
+				default build_path configuration.build_path
+				
+				# TODO deprecated - remove in 3.0
 				default platforms_path configuration.platforms_path
 			end
 		end
-		
-		def build(&block)
-			if block_given?
-				@build = block
-			end
-			
-			return @build
-		end
 	end
 end

data/lib/teapot/version.rb

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

data/spec/spec_helper.rb

@@ -1,29 +1,5 @@
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
-	begin
-		require 'simplecov'
-		
-		SimpleCov.start do
-			add_filter "/spec/"
-		end
-		
-		if ENV['TRAVIS']
-			require 'coveralls'
-			Coveralls.wear!
-		end
-	rescue LoadError
-		warn "Could not load simplecov: #{$!}"
-	end
-end
-
-require "bundler/setup"
-require "teapot"
-require 'pry'
-
-RSpec.shared_context Teapot::Context do
-	let(:root) {Build::Files::Path[__dir__] + 'context'}
-	let(:context) {Teapot::Context.new(root, load_root: false)}
-end
+require "covered/rspec"
 
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure

data/teapot.gemspec

@@ -38,10 +38,8 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "samovar", "~> 1.7"
 	
-	# This could be a good option in the future for teapot fetch:
-	#spec.add_dependency "rugged"
-	
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -136,20 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +228,7 @@ files:
 - lib/teapot/loader.rb
 - lib/teapot/package.rb
 - lib/teapot/project.rb
+- lib/teapot/select.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
 - materials/kurocha.png
@@ -254,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.