teapot 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f2a0edc8ff6b5841b0ff8cf5e2cb7d35ef977c
-  data.tar.gz: 41621d952ff9bd058b74a6ff7d2c95feb199f849
+  metadata.gz: abdffc9e228ea78ccdd980fe913d57db8888db03
+  data.tar.gz: d2615667fdee353c3ed34e2521443d8111e3ffce
 SHA512:
-  metadata.gz: 6d7a7cbe915fc27ebbd148658b4731cc093d8e905a3444120ba511f35b19ebc6c2d670956d411e2fcfce742d14591081581ac551757999fba397e08d5c1518a2
-  data.tar.gz: 08421526dd8288ae6e009ceca30ccea7200c3cc9f04b4687e5f53f0ab175cdf316bb943b11911d54f9fa5990117fe525c1a843ea5f10b574717a63ffe5e10267
+  metadata.gz: 889208dbe3ea2535f296f8a9e1916421c8b5ab10fe9667b7c6095e9550b2cbd592183b68d6b3a11a8b9c51fc5682f5654df5d0196380993a725738a6de2ce613
+  data.tar.gz: b9c7b4348b0adc44a3324d45bced141dd951fa60369ddb4eb776224b8bd8905ea55e494821fa9a61eeea4c579d72bd78bc9ffb4f1d3e83455d4bebe49297a9e5

data/lib/teapot/configuration.rb

@@ -80,6 +80,10 @@ module Teapot
 		def to_s
 			@table.to_s
 		end
+		
+		def self.by_name(contents = [])
+			self.new(contents, &:name)
+		end
 	end
 	
 	class Configuration < Definition
@@ -98,8 +102,8 @@ module Teapot
 				@options = DEFAULT_OPTIONS.dup
 			end
 
-			@packages = IdentitySet.new(packages, &:name)
-			@imports = IdentitySet.new(&:name)
+			@packages = IdentitySet.by_name(packages)
+			@imports = IdentitySet.by_name
 
 			@visibility = :private
 		end
@@ -196,6 +200,9 @@ module Teapot
 			# Potentially no materialization is required:
 			return false if @imports.count == 0
 			
+			# Avoid loops in the dependency chain:
+			imported = IdentitySet.new(&:name)
+			
 			# Enumerate all imports and attempt to resolve the packages:
 			begin
 				updated = false
@@ -210,11 +217,19 @@ module Teapot
 				
 				imports.each do |import|
 					named_configuration = @context.configurations[import.name]
-				
+
+					# So we don't get into some crazy cycle:
+					next if imported.include? import
+					
+					# It would be nice if we could detect cycles and issue an error to the user. However, sometimes the case above is not hit at the point where the cycle begins - it isn't clear at what point the user explicitly created a cycle, and what configuration actually ends up being imported a second time.
+					
 					if named_configuration && named_configuration != self
+						# Mark this as resolved
+						imported << import
+						
 						updated = self.merge(named_configuration, import.options) || updated
 					else
-						# It couldn't be resolved...
+						# It couldn't be resolved and hasn't already been resolved...
 						@imports << import
 					end
 				end

data/lib/teapot/controller/create.rb

@@ -44,7 +44,7 @@ module Teapot
 				output.puts "\tconfiguration[:source] = #{source.dump}", ''
 			
 				packages.each do |name|
-					output.puts "\tconfiguration.import! #{name.dump}"
+					output.puts "\tconfiguration.require #{name.dump}"
 				end
 			
 				output.puts "end", ''

data/lib/teapot/version.rb

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

metadata

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