teapot 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU3OWI1OTkxZTUxMGJjY2FhMmVmZTMyNDQ5OGUxNDcwMDcyNjk1Nw==
+    NTE5MDYzM2ZmZjM5ZWQzM2M3YjhiYzRlZDFjZThmY2Y4NjdjZWE2NQ==
   data.tar.gz: !binary |-
-    ZWVmYzY1OGZjZjkxYzhmNTliOGY1ZjFmZDNiMjBlNTU0OTE4YjkxNw==
+    NjllN2QwNmU5NmZjNzU1YzMwOWQ2ZGU1MDBhN2MyN2JkMDAyNzM0YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjNmMzFkNGM1NmM2ZGY2ZDE4MDVlNzBlMGZjODExMzU5YzdlNWM3MzEwNjVm
-    MmNlZTc0ZDY3MWU0ZDhhYzc4ZTA2NTFmNjU5NjU3ZTdlZTQ5YjkwM2VlZjU0
-    YmNkOTM2ZDQ3MWU1NjJjM2I5ZDI0MGYzZDEzMmUyYjE5MWI3MzI=
+    YmU1Y2NkMmQzZGM3YzRmM2NlMTk1ZjUzZjMwNDA4ZmZhNTU2YTNmY2IyMjQ2
+    YTkwMjcwNGEyNDQ5MzJkYjIzOTgzMDg0OTBkYmZjZGMxZDA5YmU3MGI0ODg4
+    YjI3OTQ1NGRmZTY3ZDBhZWIzNmJmMmM1NzFmMzMyODk1ZDY4OTA=
   data.tar.gz: !binary |-
-    Y2M1NmI5NTY1Y2ZmYmEyMTlhMjRhYTBkY2Q3OGI4YmRkMzdjYmJmYzUxZjMz
-    OTVmOTZjY2JhMmQ1ODQ5ODE0NTM3NmVmY2YzNjc3YzZmZDI2MmE3MzUxYmIx
-    OWVlMzU1ZTk5MWI5ZDFlMDMwZTBjOGQzOWI4NjUzZDEzMDQwMGU=
+    YjI0MDYyM2E4YWY4M2Y5MzQ1NzZmY2NmZGU5MWQ1NmE3MzIzNjQ2OTJjMzFm
+    YjM5OWI2YmYzMzQwZDE2YTEzNTY5ZWExYWI2YmE2MzEyMmNlODFmNDQ0YzJl
+    YjFlNGExY2Y1YmVkYTU5ODhlNjhiZjViYjM0MGVmNzg0NjQ4M2I=

data/lib/teapot/dependency.rb

@@ -160,28 +160,39 @@ module Teapot
 				# 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
-				elsif provision != nil
-					# puts "** Appending #{dependency} -> provisions".color(:magenta)
-					@provisions << provision
 				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 << [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
 		

data/lib/teapot/environment/base.rb

@@ -58,5 +58,13 @@ module Teapot
 		def to_s
 			"<#{self.class} #{self.values}>"
 		end
+		
+		def inspect(output = $stdout, indent = "")
+			@values.each do |(key, value)|
+				output.puts "#{indent}#{key}: #{value}"
+			end
+			
+			@parent.inspect(output, indent + "\t") if @parent
+		end
 	end
 end

data/lib/teapot/graph.rb

@@ -67,7 +67,7 @@ module Teapot
 			@nodes.fetch(path) do
 				node = @nodes[path] = Node.new(self, path)
 				node.extract_dependencies!
-				
+
 				node
 			end
 		end
@@ -87,6 +87,8 @@ module Teapot
 			attr :dependencies
 
 			def changed_since?(modified_time)
+				return true unless @path.exist?
+
 				if @changed == nil
 					# If the file was modified in the future relative to old modified_time:
 					if @path.mtime > modified_time

data/lib/teapot/version.rb

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

data/test/test_environment.rb

@@ -31,8 +31,9 @@ class TestEnvironment < Test::Unit::TestCase
 		
 		b = Teapot::Environment.new(a, {})
 		b[:cflags] = ["-stdlib=libc++"]
+		b[:rcflags] = lambda {cflags.reverse}
 		
-		expected = {:cflags => ["-std=c++11", "-stdlib=libc++"]}
+		expected = {:cflags => ["-std=c++11", "-stdlib=libc++"], :rcflags => ["-stdlib=libc++", "-std=c++11"]}
 		
 		assert_equal expected, b.flatten.to_hash
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Samuel Williams