teapot 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f65f0293a8919b935c0db96920432e0df489e5e
-  data.tar.gz: fd153aff98dc3f33c9cab3cb486b2d3b3304bcf6
+  metadata.gz: eddf99e30dfd202f8c03b4b075c276eb4eccf6a6
+  data.tar.gz: b739803f53360546415b4f6aa91f51677b2b8dd5
 SHA512:
-  metadata.gz: abbf8e06783cd1060bf30926cbf96f04854b5992cb7e7da252b97be4e9d89d82b1d89fcf1e4430496755a2ee990926b310d7d5e4a56d42f7b5a2035f96d541e4
-  data.tar.gz: b2ba99f9e2d1a42f479d1a91d6ec33437373b43d2902a82fc95da186cf282ce8d5576a992e6345ca98f7308854187e643237a59bdea9c2491c3f3d3683d07437
+  metadata.gz: a76805afdfba7756138fd61d50d9d8cbc63e05bd5e66857d23d94e45bef06206cd0a187f016cd0c4975f45eaf6c22e9a7226fc6f869e90b268a243d70bbcdaaa
+  data.tar.gz: 3df933c8591927c119010d54377a1679a59b40281d5793c9a3e68acafbf8a3c2a3660da7e91172940d1f014b9df8d91a56714e213d1d943247b106b05ede56e8

data/.rspec

@@ -1,2 +1,3 @@
 --color 
 --format documentation 
+--warnings

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 group :development do
 	gem 'pry'
 	gem 'pry-coolline'
+	gem 'pry-byebug'
 end
 
 group :test do

data/PLANNING.md

@@ -0,0 +1,20 @@
+# 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/README.md

@@ -188,7 +188,7 @@ You need to make sure any basic tools, e.g. compilers, system libraries, are ins
 
 - Should packages be built into a shared prefix or should they be built into unique prefixes and joined together either via install or `-L` and `-I`?
 	- Relative include paths might fail to work correctly if headers are not installed into same directory.
-- Should packages expose the tools required to build themselves as dependencies? e.g. should `build-cmake` as required by, say, `OpenCV`, be exposed to all who depend on `OpenCV`? Should there be a mechanism for non-public dependencies, i.e. dependencies which are not exposed to dependants?
+- Should packages expose the tools required to build themselves as dependencies? e.g. should `build-cmake` as required by, say, `OpenCV`, be exposed to all who depend on `OpenCV`? Should there be a mechanism for non-public dependencies, i.e. dependencies which are not exposed to dependants? *YES - Implemented*.
 - Should packages have some way to expose system requirements, e.g. installed compiler, libraries, etc. Perhaps some kind of `Package#valid?` which allows custom logic?
 
 ## Contributing

data/lib/teapot/command.rb

@@ -29,6 +29,9 @@ require_relative 'controller/visualize'
 
 require_relative 'repository'
 
+# For IncompatibleTeapotError
+require_relative 'loader'
+
 require 'samovar'
 
 module Teapot
@@ -126,6 +129,21 @@ module Teapot
 			end
 		end
 
+		class Visualize < Samovar::Command
+			self.description = "Generate a picture of the dependency graph."
+			
+			options do
+				option '-o/--output-path <path>', "The output path for the visualization.", default: "dependency.svg"
+				option '-d/--dependency-name <name>', "Show the partial chain for the given named dependency."
+			end
+			
+			many :targets, "Visualize these targets, or use them to help the dependency resolution process."
+			
+			def invoke(parent)
+				parent.controller.visualize(@targets, **@options)
+			end
+		end
+
 		class Clean < Samovar::Command
 			self.description = "Delete everything in the teapot directory."
 			
@@ -151,6 +169,7 @@ module Teapot
 				'fetch' => Fetch,
 				'list' => List,
 				'build' => Build,
+				'visualize' => Visualize,
 				'clean' => Clean
 			
 			def root

data/lib/teapot/configuration.rb

@@ -24,7 +24,6 @@ require 'set'
 require 'yaml/store'
 
 require_relative 'identity_set'
-require_relative 'context'
 require_relative 'definition'
 
 module Teapot

data/lib/teapot/context.rb

@@ -104,7 +104,7 @@ module Teapot
 			
 			select(dependency_names)
 			
-			Dependency::chain(@selection, @dependencies, @targets.values)
+			Dependency::Chain.expand(@dependencies, @targets.values, @selection)
 		end
 
 		def direct_targets(ordered)

data/lib/teapot/controller.rb

@@ -18,6 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'context'
 require_relative 'configuration'
 require_relative 'version'
 

data/lib/teapot/controller/build.rb

@@ -71,7 +71,7 @@ module Teapot
 				ordered.each do |resolution|
 					target = resolution.provider
 					
-					environment = target.environment(context.configuration)
+					environment = target.environment(context.configuration, chain)
 					
 					if target.build
 						controller.add_target(target, environment.flatten)

data/lib/teapot/controller/list.rb

@@ -52,28 +52,18 @@ module Teapot
 								log "\t\t- Author: #{author.name}" + contact_text
 							end
 						when Target
-							definition.dependencies.each do |name|
-								log "\t\t- depends on #{name.inspect}".color(:red)
+							definition.dependencies.each do |dependency|
+								log "\t\t- #{dependency}".color(:red)
 							end
 			
-							definition.provisions.each do |(name, provision)|
-								if Dependency::Alias === provision
-									log "\t\t- provides #{name.inspect} => #{provision.dependencies.inspect}".color(:green)
-								else
-									log "\t\t- provides #{name.inspect}".color(:green)
-								end
+							definition.provisions.each do |name, provision|
+								log "\t\t- #{provision}".color(:green)
 							end
 						when Configuration
 							definition.materialize
 						
 							definition.packages.each do |package|
-								if package.local?
-									log "\t\t- links #{package.name} from #{package.options[:local]}".color(:green)
-								elsif package.external?
-									log "\t\t- clones #{package.name} from #{package.external_url(context.root)}".color(:green)
-								else
-									log "\t\t- references #{package.name} from #{package.path}".color(:green)
-								end
+								log "\t\t- #{package}".color(:green)
 							end
 						
 							definition.imports.select(&:explicit).each do |import|

data/lib/teapot/controller/visualize.rb

@@ -21,88 +21,30 @@
 require_relative '../controller'
 
 require 'graphviz'
-require 'yaml'
 
 module Teapot
 	class Controller
-		def visualize(dependency_names = [])
+		def visualize(dependency_names = [], output_path: nil, dependency_name: nil)
 			configuration = context.configuration
 			
 			chain = context.dependency_chain(dependency_names, context.configuration)
 			
-			g = Graphviz::Graph.new
-			g.attributes[:ratio] = :auto
-			
-			base_attributes = {
-				:shape => 'box',
-			}
-			
-			provision_attributes = base_attributes.dup
-			
-			alias_attributes = {
-				:shape => 'box',
-				:color => 'grey',
-			}
-			
-			chain.ordered.each do |resolution|
-				provider = resolution.provider
-				name = resolution.name
-				
-				# Provider is the target that provides the dependency referred to by name.
-				node = g.add_node(name.to_s, base_attributes.dup)
-				
-				if chain.dependencies.include?(name)
-					node.attributes[:color] = 'blue'
-					node.attributes[:penwidth] = 2.0
-				elsif chain.selection.include?(provider.name)
-					node.attributes[:color] = 'brown'
-				end
+			if dependency_name
+				provider = context.dependencies[dependency_name]
 				
-				# A provision has dependencies...
-				provider.dependencies.each do |dependency|
-					dependency_node = g.nodes[dependency.to_s]
-					
-					node.connect(dependency_node) if dependency_node
-				end
-				
-				# A provision provides other provisions...
-				provider.provisions.each do |(provision_name, provision)|
-					next if name == provision_name
-					
-					provides_node = g.nodes[provision_name.to_s] || g.add_node(provision_name.to_s, provision_attributes)
-					
-					if Dependency::Alias === provision
-						provides_node.attributes = alias_attributes
-					end
-					
-					unless provides_node.connected?(node)
-						edge = provides_node.connect(node)
-					end
-				end
+				# TODO The visualisation generated isn't quite right. It's introspecting too much from the packages and not reflecting #ordered and #provisions.
+				chain = chain.partial(provider)
 			end
 			
-			# Put all dependencies at the same level so as to not make the graph too confusing.
-			done = Set.new
-			chain.ordered.each do |resolution|
-				provider = resolution.provider
-				name = resolution.name
-				
-				p = g.graphs[provider.name] || g.add_subgraph(provider.name, :rank => :same)
-				
-				provider.dependencies.each do |dependency|
-					next if done.include? dependency
-					
-					done << dependency
-					
-					dependency_node = g.nodes[dependency.to_s]
-					
-					p.add_node(dependency_node.name)
-				end
-			end
+			visualization = Build::Dependency::Visualization.new
+			
+			graph = visualization.generate(chain)
 			
-			Graphviz::output(g, :path => "graph.pdf")
+			if output
+				Graphviz::output(graph, :path => output)
+			end
 			
-			puts g.to_dot
+			return graph
 		end
 	end
 end

data/lib/teapot/definition.rb

@@ -50,7 +50,7 @@ module Teapot
 		attr :name
 		
 		# A textual description of the definition, possibly in markdown format:
-		attr :description, true
+		attr :description
 		
 		def description=(text)
 			if text =~ /^(\t+)/

data/lib/teapot/dependency.rb

@@ -1,4 +1,4 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2017, 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
@@ -18,224 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'set'
+require 'build/dependency'
 
 module Teapot
-	module Dependency
-		class UnresolvedDependencyError < StandardError
-			def initialize(chain)
-				super "Unresolved dependency chain!"
-				
-				@chain = chain
-			end
-			
-			attr :chain
-		end
-		
-		Provision = Struct.new(:value)
-		Alias = Struct.new(:dependencies)
-		Resolution = Struct.new(:provider, :name)
-		
-		def priority= value
-			@priority = value
-		end
-		
-		def priority
-			@priority || 0
-		end
-		
-		def provides?(name)
-			provisions.key? name
-		end
-		
-		def provides(name_or_aliases, &block)
-			if String === name_or_aliases || Symbol === name_or_aliases
-				name = name_or_aliases
-				
-				provisions[name] = Provision.new(block)
-			else
-				aliases = name_or_aliases
-				
-				aliases.each do |name, dependencies|
-					provisions[name] = Alias.new(Array(dependencies))
-				end
-			end
-		end
-		
-		def provisions
-			@provisions ||= {}
-		end
-		
-		def depends(name)
-			dependencies << name
-		end
-		
-		def depends?(name)
-			dependencies.include? name
-		end
-		
-		def dependencies
-			@dependencies ||= Set.new
-		end
-		
-		class Chain
-			def initialize(selection, dependencies, providers, options = {})
-				# Explicitly selected targets which will be used when resolving ambiguity:
-				@selection = Set.new(selection)
-				
-				# The list of dependencies that needs to be satisfied:
-				@dependencies = dependencies
-				
-				# The available providers which match up to required dependencies:
-				@providers = providers
-				
-				@resolved = Set.new
-				@ordered = []
-				@provisions = []
-				@unresolved = []
-				@conflicts = {}
-				
-				@options = options
-				
-				@dependencies.each do |dependency|
-					expand(dependency, "<top>")
-				end
-			end
-			
-			attr :selection
-			attr :dependencies
-			attr :providers
-			
-			attr :resolved
-			attr :ordered
-			attr :provisions
-			attr :unresolved
-			attr :conflicts
-			
-			private
-			
-			def ignore_priority?
-				@options[:ignore_priority]
-			end
-			
-			def filter_by_priority(viable_providers)
-				# Sort from highest priority to lowest priority:
-				viable_providers = viable_providers.sort{|a,b| b.priority <=> a.priority}
-				
-				# The first item has the highest priority:
-				highest_priority = viable_providers.first.priority
-				
-				# We compute all providers with the same highest priority (may be zero):
-				return viable_providers.take_while{|provider| provider.priority == highest_priority}
-			end
-			
-			def filter_by_selection(viable_providers)
-				return viable_providers.select{|provider| @selection.include? provider.name}
-			end
-			
-			def find_provider(dependency, parent)
-				# Mostly, only one package will satisfy the dependency...
-				viable_providers = @providers.select{|provider| provider.provides? dependency}
-
-				# puts "** Found #{viable_providers.collect(&:name).join(', ')} viable providers.".color(:magenta)
-
-				if viable_providers.size > 1
-					# ... however in some cases (typically where aliases are being used) an explicit selection must be made for the build to work correctly.
-					explicit_providers = filter_by_selection(viable_providers)
-					
-					# puts "** Filtering to #{explicit_providers.collect(&:name).join(', ')} explicit providers.".color(:magenta)
-					
-					if explicit_providers.size != 1 and !ignore_priority?
-						# If we were unable to select a single package, we may use the priority to limit the number of possible options:
-						explicit_providers = viable_providers if explicit_providers.empty?
-						
-						explicit_providers = filter_by_priority(explicit_providers)
-					end
-					
-					if explicit_providers.size == 0
-						# No provider was explicitly specified, thus we require explicit conflict resolution:
-						@conflicts[dependency] = viable_providers
-						return nil
-					elsif explicit_providers.size == 1
-						# The best outcome, a specific provider was named:
-						return explicit_providers.first
-					else
-						# Multiple providers were explicitly mentioned that satisfy the dependency.
-						@conflicts[dependency] = explicit_providers
-						return nil
-					end
-				else
-					return viable_providers.first
-				end
-			end
-			
-			def expand(dependency, parent)
-				# puts "** Expanding #{dependency} from #{parent}".color(:magenta)
-				
-				if @resolved.include? dependency
-					# puts "** Already resolved dependency!".color(:magenta)
-					
-					return
-				end
-				
-				provider = find_provider(dependency, parent)
-
-				if provider == nil
-					# puts "** Couldn't find provider -> unresolved".color(:magenta)
-					@unresolved << [dependency, parent]
-					return nil
-				end
-				
-				provision = provider.provisions[dependency]
-				
-				# We will now satisfy this dependency by satisfying any dependent dependencies, but we no longer need to revisit this one.
-				@resolved << dependency
-
-				# If the provision was an Alias, make sure to resolve the alias first:
-				if Alias === provision
-					# puts "** Resolving alias #{provision}".color(:magenta)
-
-					provision.dependencies.each do |dependency|
-						expand(dependency, provider)
-					end
-				end
-
-				unless @resolved.include?(provider)
-					# We are now satisfying the provider by expanding all its own dependencies:
-					@resolved << provider
-
-					# Make sure we satisfy the provider's dependencies first:
-					provider.dependencies.each do |dependency|
-						expand(dependency, provider)
-					end
-
-					# puts "** Appending #{dependency} -> ordered".color(:magenta)
-					
-					# Add the provider to the ordered list.
-					@ordered << Resolution.new(provider, dependency)
-				end
-				
-				# This goes here because we want to ensure 1/ that if 
-				unless provision == nil or Alias === provision
-					# puts "** Appending #{dependency} -> provisions".color(:magenta)
-					
-					# Add the provision to the set of required provisions.
-					@provisions << provision
-				end
-				
-				# For both @ordered and @provisions, we ensure that for [...xs..., x, ...], x is satisfied by ...xs....
-			end
-		end
-		
-		# An `UnresolvedDependencyError` will be thrown if there are any unresolved dependencies.
-		def self.chain(selection, dependencies, providers)
-			chain = Chain.new(selection, dependencies, providers)
-
-			if chain.unresolved.size > 0
-				raise UnresolvedDependencyError.new(chain)
-			end
-
-			return chain
-		end
-	end
+	Dependency = ::Build::Dependency
 end

data/lib/teapot/loader.rb

@@ -27,14 +27,12 @@ require 'build/rule'
 require 'build/name'
 require 'build/files'
 
-# Required for CPU count, etc.
-require 'system'
-
 module Teapot
-	# Cannot load packages newer than this:
-	LOADER_VERSION = "1.1"
+	# 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.
+	LOADER_VERSION = "1.3"
 	
-	# Cannot load packages older than this:
+	# Cannot load packages older than this.
 	MINIMUM_LOADER_VERSION = "1.0"
 	
 	class IncompatibleTeapotError < StandardError
@@ -53,6 +51,18 @@ module Teapot
 		attr :path
 	end
 	
+	# This is a quick hack so that we can avoid using the system gem.. it's used in build-make package.
+	# TODO Remove this and also the dependency on facets, or fix facets.
+	module System
+		module CPU
+			def self.count
+				require 'etc'
+				
+				Etc.nprocessors rescue 4
+			end
+		end
+	end
+	
 	class Loader
 		Files = Build::Files
 		Rule = Build::Rule

data/lib/teapot/package.rb

@@ -19,8 +19,8 @@
 # THE SOFTWARE.
 
 require 'build/files'
+require 'build/uri'
 
-require_relative 'context'
 require_relative 'definition'
 
 module Teapot
@@ -63,32 +63,37 @@ module Teapot
 		attr :path
 
 		attr :uri
-		attr :options, true
+		attr_accessor :options
+
+		def local
+			@options[:local].to_s
+		end
 
 		def local?
-			@options.key? :local
+			@options.include?(:local)
 		end
 
 		def external?
-			@options.key? :source
+			@options.include?(:source)
 		end
 
-		def source
-			@options[:source].to_s + '/'
+		# The source uri from which this package would be cloned. Might be relative, in which case it's relative to the root of the context.
+		def source_uri
+			Build::URI[@options[:source]]
 		end
 
-		def external_url(relative_root)
-			base_uri = URI(source)
-
-			if base_uri.scheme == nil || base_uri.scheme == 'file'
-				base_uri = URI "file://" + File.expand_path(base_uri.path, relative_root) + "/"
-			end
-
-			return relative_url(base_uri)
+		def external_url(root_path = nil)
+			Build::URI[root_path] + source_uri + Build::URI[@uri]
 		end
 
 		def to_s
-			"#<#{self.class} #{@name.dump} path=#{path}>"
+			if self.local?
+				"links #{@name} from #{self.local}"
+			elsif self.external?
+				"clones #{@name} from #{self.external_url}"
+			else
+				"references #{@name} from #{@path}"
+			end
 		end
 		
 		# Package may be used as hash key / in a set:
@@ -100,22 +105,5 @@ module Teapot
 		def eql?(other)
 			@path.eql?(other.path)
 		end
-		
-		private
-		
-		def relative_url(base_uri)
-			source_uri = URI(@uri)
-
-			unless source_uri.absolute?
-				source_uri = base_uri + source_uri
-			end
-	
-			# Git can't handle the default formatting that Ruby uses for file URIs.
-			if source_uri.scheme == "file"
-				source_uri = "file://" + source_uri.path
-			end
-
-			return source_uri
-		end
 	end
 end

data/lib/teapot/project.rb

@@ -42,10 +42,10 @@ module Teapot
 			super
 		end
 		
-		attr :summary, true
-		attr :license, true
-		attr :website, true
-		attr :version, true
+		attr_accessor :summary
+		attr_accessor :license
+		attr_accessor :website
+		attr_accessor :version
 		
 		attr :authors
 		

data/lib/teapot/repository.rb

@@ -28,7 +28,7 @@ module Teapot
 			def self.run(*args, &block)
 				options = Hash === args.last ? args.pop : {}
 				
-				args = args.flatten.collect &:to_s
+				args = args.flatten.collect(&:to_s)
 				
 				puts args.join(' ').color(:blue) + " in #{options[:chdir] || Dir.getwd}"
 				

data/lib/teapot/target.rb

@@ -25,6 +25,8 @@ require_relative 'definition'
 require 'build/environment'
 require 'build/rulebook'
 
+require 'pry'
+
 module Teapot
 	class BuildError < StandardError
 	end
@@ -49,22 +51,12 @@ module Teapot
 			super
 		end
 		
-		# Given a configuration, compute the dependency chain for this target.
-		def provision_chain(configuration)
-			# Reduce the number of keystrokes for good health:
-			context = configuration.context
-			
-			chain = Dependency::chain(context.selection, self.dependencies, context.targets.values)
-		end
-		
 		# Given a specific configuration, generate the build environment based on this target and it's provision chain.
-		def environment(configuration)
-			chain = provision_chain(configuration)
-			
-			environments = []
+		def environment(configuration, chain)
+			chain = chain.partial(self)
 			
 			# Calculate the dependency chain's ordered environments:
-			environments += chain.provisions.collect do |provision|
+			environments = chain.provisions.collect do |provision|
 				Build::Environment.new(&provision.value)
 			end
 			
@@ -79,9 +71,6 @@ module Teapot
 			end
 		end
 		
-		# Legacy method name.
-		alias environment_for_configuration environment
-		
 		def build(&block)
 			if block_given?
 				@build = block

data/lib/teapot/version.rb

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

data/spec/teapot/target_spec.rb

@@ -40,7 +40,7 @@ module Teapot::TargetSpec
 			expect(chain.ordered[2].name).to be == 'Test/TargetSpec'
 			expect(chain.ordered[2].provider).to be == target
 			
-			environment = target.environment(context.configuration)
+			environment = target.environment(context.configuration, chain)
 			# Environment#to_hash flattens the environment and evaluates all values:
 			hash = environment.to_hash
 			

data/spec/teapot/wait_spec.rb

@@ -39,7 +39,7 @@ module Teapot::WaitSpec
 				ordered.each do |resolution|
 					target = resolution.provider
 					
-					environment = target.environment(context.configuration)
+					environment = target.environment(context.configuration, chain)
 					
 					if target.build
 						controller.add_target(target, environment.flatten)
@@ -48,8 +48,6 @@ module Teapot::WaitSpec
 			end
 			
 			controller.update
-			
-			puts $log
 		end
 	end
 end

data/teapot.gemspec

@@ -24,15 +24,16 @@ Gem::Specification.new do |spec|
 	
 	spec.has_rdoc = 'yard'
 	
-	spec.required_ruby_version = '>= 2.1'
+	spec.required_ruby_version = '>= 2.1.0'
 	
 	spec.add_dependency "rainbow", "~> 2.0"
-	spec.add_dependency "system", "~> 0.1.3"
 	
-	spec.add_dependency "graphviz", "~> 0.3"
+	spec.add_dependency "graphviz", "~> 0.4"
 	
-	spec.add_dependency "build", "~> 1.0.9"
-	spec.add_dependency "build-files", "~> 1.0.5"
+	spec.add_dependency "build", "~> 1.0"
+	spec.add_dependency "build-files", "~> 1.0"
+	spec.add_dependency "build-dependency", "~> 1.1"
+	spec.add_dependency "build-uri", "~> 1.0"
 	
 	spec.add_dependency "facets", "~> 3.1"
 	spec.add_dependency "samovar", "~> 1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -25,61 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: system
+  name: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: graphviz
+  name: build
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: build
+  name: build-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: build-files
+  name: build-dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: build-uri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +181,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.local
+- PLANNING.md
 - README.md
 - Rakefile
 - bin/teapot
@@ -202,7 +217,6 @@ files:
 - spec/teapot/command_spec.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
-- spec/teapot/dependency_spec.rb
 - spec/teapot/generator_spec.rb
 - spec/teapot/generator_spec/teapot.rb
 - spec/teapot/generator_spec/template/$NAME.txt
@@ -227,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -235,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
@@ -243,7 +257,6 @@ test_files:
 - spec/teapot/command_spec.rb
 - spec/teapot/context_spec.rb
 - spec/teapot/context_spec/teapot.rb
-- spec/teapot/dependency_spec.rb
 - spec/teapot/generator_spec.rb
 - spec/teapot/generator_spec/teapot.rb
 - spec/teapot/generator_spec/template/$NAME.txt

data/spec/teapot/dependency_spec.rb

@@ -1,166 +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 'teapot/dependency'
-
-module Teapot::DependencySpec
-	class BasicDependency
-		include Teapot::Dependency
-		
-		def initialize(name = nil)
-			@name = name
-		end
-		
-		attr :name
-		
-		def inspect
-			"<BasicDependency:#{@name}>"
-		end
-	end
-	
-	describe Teapot::Dependency do
-		it "Should resolve dependency chain" do
-			a = BasicDependency.new
-			
-			a.provides 'apple' do
-				fruit ['apple']
-			end
-			
-			b = BasicDependency.new
-			
-			b.provides 'orange' do
-				fruit ['orange']
-			end
-			
-			c = BasicDependency.new
-			
-			c.provides 'fruit-juice' do
-				juice ['ice', 'cold']
-			end
-			
-			c.depends 'apple'
-			c.depends 'orange'
-			
-			chain = Teapot::Dependency::chain([], ['fruit-juice'], [a, b, c])
-			expect(chain.ordered.collect(&:first)).to be == [a, b, c]
-			
-			d = BasicDependency.new
-			
-			d.provides 'pie' do
-			end
-			
-			d.depends 'apple'
-			
-			chain = Teapot::Dependency::chain([], ['pie'], [a, b, c, d])
-			
-			expect(chain.unresolved).to be == []
-			expect(chain.ordered.collect(&:first)).to be == [a, d]
-		end
-		
-		it "should report conflicts" do
-			apple = BasicDependency.new('apple')
-			apple.provides 'apple'
-			apple.provides 'fruit'
-		
-			bananna = BasicDependency.new('bananna')
-			bananna.provides 'fruit'
-		
-			salad = BasicDependency.new('salad')
-			salad.depends 'fruit'
-			salad.provides 'salad'
-		
-			chain = Teapot::Dependency::Chain.new([], ['salad'], [apple, bananna, salad])
-			expect(chain.unresolved.first).to be == ["fruit", salad]
-			expect(chain.conflicts).to be == {"fruit" => [apple, bananna]}
-		
-			chain = Teapot::Dependency::Chain.new(['apple'], ['salad'], [apple, bananna, salad])
-			expect(chain.unresolved).to be == []
-			expect(chain.conflicts).to be == {}
-		end
-		
-		it "should resolve aliases" do
-			apple = BasicDependency.new('apple')
-			apple.provides 'apple'
-			apple.provides :fruit => 'apple'
-		
-			bananna = BasicDependency.new('bananna')
-			bananna.provides 'bananna'
-			bananna.provides :fruit => 'bananna'
-		
-			salad = BasicDependency.new('salad')
-			salad.depends :fruit
-			salad.provides 'salad'
-		
-			chain = Teapot::Dependency::chain(['apple'], ['salad'], [apple, bananna, salad])
-			expect(chain.unresolved).to be == []
-			expect(chain.conflicts).to be == {}
-			
-			expect(chain.ordered.size).to be == 2
-			expect(chain.ordered[0]).to be == Teapot::Dependency::Resolution.new(apple, "apple")
-			expect(chain.ordered[1]).to be == Teapot::Dependency::Resolution.new(salad, "salad")
-		end
-		
-		it "should select dependencies with high priority" do
-			bad_apple = BasicDependency.new('bad_apple')
-			bad_apple.provides 'apple'
-			bad_apple.priority = 20
-			
-			good_apple = BasicDependency.new('good_apple')
-			good_apple.provides 'apple'
-			good_apple.priority = 40
-			
-			chain = Teapot::Dependency::chain([], ['apple'], [bad_apple, good_apple])
-			
-			expect(chain.unresolved).to be == []
-			expect(chain.conflicts).to be == {}
-			
-			# Should select higher priority package by default:
-			expect(chain.ordered).to be == [Teapot::Dependency::Resolution.new(good_apple, 'apple')]
-		end
-		
-		it "should expose direct dependencies" do
-			system = BasicDependency.new('linux')
-			system.provides 'linux'
-			system.provides 'clang'
-			system.provides system: 'linux'
-			system.provides compiler: 'clang'
-			
-			library = BasicDependency.new('library')
-			library.provides 'library'
-			library.depends :system
-			library.depends :compiler
-			
-			application = BasicDependency.new('application')
-			application.provides 'application'
-			application.depends :compiler
-			application.depends 'library'
-			
-			chain = Teapot::Dependency::chain([], ['application'], [system, library, application])
-			
-			expect(chain.unresolved).to be == []
-			expect(chain.conflicts).to be == {}
-			expect(chain.ordered).to be == [
-				Teapot::Dependency::Resolution.new(system, 'clang'),
-				Teapot::Dependency::Resolution.new(library, 'library'),
-				Teapot::Dependency::Resolution.new(application, 'application'),
-			]
-		end
-	end
-end