teapot 1.0.0.pre.rc4 → 1.0.0.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 251ea130da35d001ed422700d3c632af11991a20
-  data.tar.gz: 17cf1f80e489cb72dfbed9b6e6d8526724746c58
+  metadata.gz: bb0a1d45164325d2d77c3d68dc5f459c4c633e4d
+  data.tar.gz: aabed3ec2828480b020c852c92e1fbc3821935f8
 SHA512:
-  metadata.gz: 3fb8f690ace29ceca0e63c5998452a9b0d429fe8806e73a3fe52fcd82873bbd9e5b7700b50a793981d3c7e49e9d2097448dfa5e26ce29468915f4e2ce8081b3e
-  data.tar.gz: 600a16ac1435f5045e055a4b0c8cbebc57a9e8dbceedd766b0a2b8645ac4a16a61b40ded62fe7291e4fd73704f31e539b883e5e040c76157297a4dfbb7bd9da3
+  metadata.gz: 7f43013b1d0935b6bf97c8caa9e1c72ca0102f5fab5df8e0acfd86e1d1070d209f7b4de3f4dd6184526a6e2448341519e1ab75f794ba2e4a1d90cb8d2e7dd9b4
+  data.tar.gz: e33f4fc7502997addd232293da08717c0144ef6ab00738f1add4a18f6a3085f94841d69cd5cb67eca72114a40b907c4959176bdd9d7706ef6e9468bba62b7774

data/lib/teapot/build.rb

@@ -111,7 +111,7 @@ module Teapot
 			end
 			
 			def update(rule, arguments, &block)
-				arguments = rule.normalize(arguments)
+				arguments = rule.normalize(arguments, self)
 				
 				# A sub-graph for a particular build is isolated based on the task class used to instantiate it, so we use this as part of the key.
 				child_node = @controller.nodes.fetch([self.class, rule.name, arguments]) do |key|

data/lib/teapot/rule.rb

@@ -74,11 +74,11 @@ module Teapot
 				return true
 			end
 			
-			def compute(arguments)
+			def compute(arguments, scope)
 				if implicit?
-					@dynamic.call(arguments)
+					scope.instance_exec(arguments, &@dynamic)
 				elsif dynamic?
-					@dynamic.call(arguments[@name], arguments)
+					scope.instance_exec(arguments[@name], arguments, &@dynamic)
 				else
 					arguments[@name]
 				end
@@ -137,10 +137,11 @@ module Teapot
 			return true
 		end
 		
-		def normalize(arguments)
+		# The scope is the context in which the dynamic rule computation is done, usually an instance of Task.
+		def normalize(arguments, scope)
 			Hash[
 				@parameters.collect do |parameter|
-					[parameter.name, parameter.compute(arguments)]
+					[parameter.name, parameter.compute(arguments, scope)]
 				end
 			]
 		end

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "1.0.0-rc4"
+	VERSION = "1.0.0-rc5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc4
+  version: 1.0.0.pre.rc5
 platform: ruby
 authors:
 - Samuel Williams
@@ -215,8 +215,6 @@ files:
 - lib/teapot/environment/evaluator.rb
 - lib/teapot/environment/flatten.rb
 - lib/teapot/environment/system.rb
-- lib/teapot/extractors/linker_extractor.rb
-- lib/teapot/extractors/preprocessor_extractor.rb
 - lib/teapot/generator.rb
 - lib/teapot/loader.rb
 - lib/teapot/merge.rb

data/lib/teapot/extractors/linker_extractor.rb

@@ -1,57 +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/graph'
-
-module Teapot
-	module Extractors
-		module LinkerExtractor
-			# Give back a list of library paths for a specific set of ldflags.
-			def self.libraries(flags)
-				roots = []
-				libraries = []
-				paths = []
-				
-				# Extract include directories:
-				flags.each do |option|
-					if option.to_s =~ /^-L(.+)/
-						roots << Pathname($1)
-					elsif option.to_s =~ /^-l(.+)/
-						libraries << Pathname($1)
-					end
-				end
-				
-				libraries.each do |name|
-					archive_name = "lib#{name}.a"
-					
-					roots.each do |root|
-						archive_path = root + archive_name
-						
-						paths << archive_path
-						
-						break
-					end
-				end
-				
-				return paths
-			end
-		end
-	end
-end

data/lib/teapot/extractors/preprocessor_extractor.rb

@@ -1,62 +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/graph'
-
-module Teapot
-	module Extractors
-		class PreprocessorExtractor < Graph::Extractor
-			def self.include_directories(flags)
-				roots = []
-
-				# Extract include directories:
-				flags.each do |option|
-					if option.to_s =~ /^-I(.+)/
-						roots << Pathname($1)
-					end
-				end
-
-				return roots
-			end
-		
-			def initialize(patterns, roots = [])
-				super patterns
-				
-				@roots = roots
-			end
-
-			def extract(path)
-				local_root = Pathname(path).dirname
-
-				File.open(path).each do |line|
-					if line =~ /\#(?:include|import) "(.*?)"/
-						path = local_root + $1
-		
-						yield path if path.exist?
-					elsif line =~ /\#(?:include|import) \<(.*?)\>/
-						path = @roots.collect{|root| root+$1}.find{|path| path.exist?}
-		
-						yield path if path
-					end
-				end
-			end
-		end
-	end
-end