teapot 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe943a787623142f2f892d4b91fbbd55ff623e0
-  data.tar.gz: 62551632283c22eb90bac52fdfebaf1caa331962
+  metadata.gz: 64f2a0edc8ff6b5841b0ff8cf5e2cb7d35ef977c
+  data.tar.gz: 41621d952ff9bd058b74a6ff7d2c95feb199f849
 SHA512:
-  metadata.gz: 849356a7ede4e858cb2551ac95be4a6a4aa385913be803032e580c804c2f64bc4f3d340ed1bf3adf868a5bdea06a503a48eabf3533e6cfd3a7a0efc27e382557
-  data.tar.gz: 30b8d32b64da3cab383e7dc97bac312d4fcd14d095cfffd6c47a3d929b5bef17ea94b37a864e5a76d08ca83f0d8b695b115f36685a9c3893e8eb857ba79a2a95
+  metadata.gz: 6d7a7cbe915fc27ebbd148658b4731cc093d8e905a3444120ba511f35b19ebc6c2d670956d411e2fcfce742d14591081581ac551757999fba397e08d5c1518a2
+  data.tar.gz: 08421526dd8288ae6e009ceca30ccea7200c3cc9f04b4687e5f53f0ab175cdf316bb943b11911d54f9fa5990117fe525c1a843ea5f10b574717a63ffe5e10267

data/lib/teapot/configuration.rb

@@ -30,16 +30,76 @@ require 'teapot/commands'
 require 'teapot/definition'
 
 module Teapot
+	# Very similar to a set but uses a specific callback for object identity.
+	class IdentitySet
+		include Enumerable
+		
+		def initialize(contents = [], &block)
+			@table = {}
+			@identity = block
+			
+			contents.each do |object|
+				add(object)
+			end
+		end
+	
+		def initialize_dup(other)
+			@table = other.table.dup
+		end
+	
+		attr :table
+	
+		def add(object)
+			@table[@identity[object]] = object
+		end
+	
+		alias << add
+	
+		def remove(object)
+			@table.delete(@identity[object])
+		end
+	
+		def include?(object)
+			@table.include?(@identity[object])
+		end
+		
+		def each(&block)
+			@table.each_value(&block)
+		end
+	
+		def size
+			@table.size
+		end
+		
+		def clear
+			@table.clear
+		end
+		
+		alias count size
+	
+		def to_s
+			@table.to_s
+		end
+	end
+	
 	class Configuration < Definition
-		Import = Struct.new(:name, :options)
+		Import = Struct.new(:name, :explicit, :options)
 		
-		def initialize(context, package, name, packages = Set.new, options = {})
+		DEFAULT_OPTIONS = {
+			:import => true
+		}
+		
+		def initialize(context, package, name, packages = [], options = nil)
 			super context, package, name
 
-			@options = options
+			if options
+				@options = options
+			else
+				@options = DEFAULT_OPTIONS.dup
+			end
 
-			@packages = packages
-			@imports = []
+			@packages = IdentitySet.new(packages, &:name)
+			@imports = IdentitySet.new(&:name)
 
 			@visibility = :private
 		end
@@ -69,17 +129,17 @@ module Teapot
 			options = options ? @options.merge(options) : @options.dup
 			
 			@packages << Package.new(packages_path + name.to_s, name, options)
+			
+			if options[:import] == true
+				import(name, false)
+			elsif String === options[:import]
+				import(options[:import])
+			end
 		end
 
 		# Specifies that this package will import additional configuration records from another definition.
-		def import(name)
-			@imports << Import.new(name, @options.dup)
-		end
-
-		# Require and import the named package.
-		def import!(name, options = nil)
-			require(name, options)
-			import(name)
+		def import(name, explicit = true)
+			@imports << Import.new(name, explicit, @options.dup)
 		end
 
 		# Create a group for configuration options which will be only be active within the group block.
@@ -134,39 +194,61 @@ module Teapot
 		# Process all import directives and return a new configuration based on the current configuration. Import directives bring packages and other import directives from the specififed configuration definition.
 		def materialize
 			# Potentially no materialization is required:
-			return self if @imports.count == 0
-			
-			# Before trying to materialize, we should load all possible packages:
-			@packages.each do |package|
-				@context.load(package) rescue nil
-			end
-			
-			# Create a new configuration which will represent the materialised version:
-			configuration = self.class.new(@context, @package, @name, @packages.dup, @options.dup)
+			return false if @imports.count == 0
 			
 			# Enumerate all imports and attempt to resolve the packages:
-			@imports.each do |import|
-				named_configuration = @context.configurations[import.name]
+			begin
+				updated = false
 				
-				if named_configuration && named_configuration != self
-					configuration.append(named_configuration.materialize, import.options)
-				else
-					# It couldn't be resolved...
-					configuration.imports << import
+				# Before trying to materialize, we should load all possible packages:
+				@packages.each do |package|
+					@context.load(package) rescue nil
 				end
-			end
+				
+				imports = @imports
+				@imports = IdentitySet.new(&:name)
+				
+				imports.each do |import|
+					named_configuration = @context.configurations[import.name]
+				
+					if named_configuration && named_configuration != self
+						updated = self.merge(named_configuration, import.options) || updated
+					else
+						# It couldn't be resolved...
+						@imports << import
+					end
+				end
+			end while updated
 			
-			return configuration
+			return true
 		end
 		
-		def append(configuration, options)
-			@packages += configuration.packages.collect do |package|
-				package.dup.tap{|package| package.options = options.merge(package.options)}
+		# Merge an external configuration into this configuration. We won't override already defined packages.
+		def merge(configuration, options)
+			updated = false
+			
+			configuration.packages.each do |external_package|
+				# The top level configuration will override packages that are defined by imported configurations. This is desirable behaviour, as it allows us to flatten the configuration but provide overrides if required.
+				unless @packages.include? external_package
+					options = options.merge(external_package.options)
+					
+					@packages << Package.new(packages_path + external_package.name, external_package.name, options)
+					
+					updated = true
+				end
 			end
 			
-			@imports += configuration.imports.collect do |import|
-				import.dup.tap{|import| import.options = options.merge(import.options)}
+			configuration.imports.each do |external_import|
+				unless @imports.include? external_import
+					options = options.merge(external_import.options)
+					
+					@imports << Import.new(external_import.name, external_import.explicit, options)
+					
+					updated = true
+				end
 			end
+			
+			return updated
 		end
 		
 		def to_s

data/lib/teapot/context.rb

@@ -65,7 +65,7 @@ module Teapot
 			end
 
 			# Materialize the configuration:
-			@configuration = @configuration.materialize if @configuration
+			@configuration.materialize if @configuration
 		end
 
 		attr :root

data/lib/teapot/controller/fetch.rb

@@ -40,7 +40,7 @@ module Teapot
 				end
 			
 				# Resolve any/all imports:
-				configuration = configuration.materialize
+				configuration.materialize
 			
 				previously_unresolved = unresolved
 				unresolved = context.unresolved(configuration.packages)

data/lib/teapot/controller/list.rb

@@ -61,7 +61,7 @@ module Teapot
 								end
 							end
 						when Configuration
-							definition = definition.materialize
+							definition.materialize
 						
 							definition.packages.each do |package|
 								if package.local?
@@ -73,7 +73,7 @@ module Teapot
 								end
 							end
 						
-							definition.imports.each do |import|
+							definition.imports.select(&:explicit).each do |import|
 								log "\t\t- unmaterialised import #{import.name}".color(:red)
 							end
 						end

data/lib/teapot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow