rant 0.4.4 → 0.4.6

data/lib/rant/import/c/dependencies.rb

@@ -102,7 +102,7 @@ class Rant::Generators::C::Dependencies
 		end
 		rf_str << file_deps(cf, deps) << "\n"
 	    }
-	    rac.msg 1, "writing C source dependencies to #{t.name}"
+	    rac.vmsg 1, "writing C source dependencies to #{t.name}"
 	    open(t.name, "w") { |f|
 		f.puts
 		f.puts "# #{t.name}"

data/lib/rant/import/directedrule.rb

@@ -73,10 +73,7 @@ class Rant::Generators::DirectedRule
 	@esc_target_dir = Regexp.escape(target_dir)
 	@block = block
     end
-    def call(name)
-	self[name]
-    end
-    def [](name)
+    def [](name, rel_project_dir)
 	#puts "rule (#@target) for #{name} ?"
 	if name =~ /^#@esc_target_dir\// && name =~ @target_rx
 	    #puts "  matches"

data/lib/rant/import/metadata.rb

@@ -40,7 +40,7 @@ module Rant
             #   => Dir.pwd has to be:   /home/foo/myproject/bar
             #
             # Returns nil only if the value doesn't exist.
-            def fetch(key, target, dir=@rac.current_subdir)
+            def fetch(key, target, dir=@rac.current_subdir, meta_dir=nil)
                 # first check if a value for the given key, target and
                 # dir already exists
                 dstore = @store[dir]
@@ -53,7 +53,7 @@ module Rant
                 end
                 # check if the meta file in dir was already read
                 unless @read_dirs.include? dir
-                    read_meta_file_in_dir(dir)
+                    read_meta_file_in_dir(dir, meta_dir)
                 end
                 tstore = @store[dir][target]
                 tstore[key] if tstore
@@ -82,6 +82,29 @@ module Rant
                 nil
             end
 
+            def path_fetch(key, target_path)
+                tdir, fn = File.split target_path
+                sdir = @rac.current_subdir
+                if tdir == '.'
+                    fetch(key, fn, sdir)
+                else
+                    dir = sdir.empty? ? tdir : "#{sdir}/#{tdir}"
+                    fetch(key, fn, dir, tdir)
+                end
+            end
+
+            def path_set(key, value, target_path)
+                tdir, fn = File.split target_path
+                sdir = @rac.current_subdir
+                if tdir == '.'
+                    dir = sdir
+                else
+                    dir = sdir.empty? ? tdir : "#{sdir}/#{tdir}"
+                end
+                #STDERR.puts "#{key}:#{value}:#{fn}:#{dir}"
+                set(key, value, fn, dir)
+            end
+
             # Assumes to be called from the projects root directory.
             def save
                 @modified_dirs.each_key { |dir|
@@ -92,12 +115,12 @@ module Rant
 
             private
             # assumes that dir is already the current working
-            # directory
-            def read_meta_file_in_dir(dir)
+            # directory if meta_dir is nil
+            def read_meta_file_in_dir(dir, meta_dir)
                 #puts "in dir: #{dir}, pwd: #{Dir.pwd}"
                 @read_dirs[dir] = true
                 #fn = dir.empty? ? META_FN : File.join(dir, META_FN)
-                fn = META_FN
+                fn = meta_dir ? File.join(meta_dir, META_FN) : META_FN
                 dstore = @store[dir]
                 @store[dir] = dstore = {} unless dstore
                 return unless File.exist? fn
@@ -151,8 +174,8 @@ module Rant
 
             def invalid_format(fn)
                 raise Rant::Error, "The file `#{fn}' is used by " +
-                    "Rant to store meta information, it is in an " +
-                    "invalid state. Check that it doesn't contain " +
+                    "Rant to store meta information, it is in an\n" +
+                    "invalid state. Check that it doesn't contain\n" +
                     "important data, remove it and retry."
             end
 

data/lib/rant/import/nodes/default.rb

@@ -32,12 +32,11 @@ module Rant
 
     class Task
 	include Node
-	include Console
 
 	def initialize(rac, name, prerequisites = [], &block)
 	    super()
-	    @rac = rac || Rant.rac
-	    @name = name or raise ArgumentError, "name not given"
+	    @rac = rac or raise ArgumentError, "rac not given"
+            @name = name or raise ArgumentError, "name not given"
 	    @pre = prerequisites || []
 	    @pre_resolved = false
 	    @block = block
@@ -126,7 +125,7 @@ module Rant
 	    end
 	end
 
-	def internal_invoke opt, ud_init = true
+	def internal_invoke(opt, ud_init = true)
 	    goto_task_home
 	    update = ud_init || opt[:force]
 	    dep = nil
@@ -187,7 +186,7 @@ module Rant
 	#
 	# See also: handle_node, handle_timestamped
 	def handle_non_node(dep, opt)
-	    err_msg "Unknown task `#{dep}',",
+	    @rac.err_msg "Unknown task `#{dep}',",
 		"referenced in `#{rantfile.path}', line #{@line_number}!"
 	    self.fail
 	end
@@ -246,6 +245,7 @@ module Rant
 	    # used for initialization, not ment as action
 	    @block = nil
 	    @needed = nil
+            @target_files = nil
 	    # allow setting of @block and @needed
 	    yield self if block_given?
 	end
@@ -257,6 +257,25 @@ module Rant
 	def needed(&block)
 	    @needed = block
 	end
+
+        def file_target?
+            @target_files and @target_files.include? @name
+        end
+
+        def each_target(&block)
+            goto_task_home
+            @target_files.each(&block) if @target_files
+        end
+        
+        def file_target(*args)
+            args.flatten!
+            args << @name if args.empty?
+            if @target_files
+                @target_files.concat(args)
+            else
+                @target_files = args
+            end
+        end
 	
 	# We simply override this method and call internal_invoke with
 	# the +ud_init+ flag according to the result of a call to the
@@ -289,6 +308,10 @@ module Rant
 	    @ts = T0
 	end
 
+        def file_target?
+            true
+        end
+
 	def needed?
 	    return false if done?
 	    invoke(:needed? => true)
@@ -312,20 +335,32 @@ module Rant
 	    end
 	end
 
-	def timestamp
+	def timestamp(opt = INVOKE_OPT)
 	    File.exist?(@name) ? File.mtime(@name) : T0
 	end
 
+        def handle_node(dep, opt)
+            #STDERR.puts "treating #{dep.full_name} as file dependency"
+            return true if dep.file_target? && dep.invoke(opt)
+	    if File.exist? dep.name
+                File.mtime(dep.name) > @ts
+            elsif !dep.file_target?
+		@rac.err_msg @rac.pos_text(rantfile.path, line_number),
+		    "in prerequisites: no such file: `#{dep.full_name}'"
+		self.fail
+	    end
+        end
+
 	def handle_timestamped(dep, opt)
 	    return true if dep.invoke opt
 	    #puts "***`#{dep.name}' requires update" if dep.timestamp > @ts
-	    dep.timestamp > @ts
+	    dep.timestamp(opt) > @ts
 	end
 
 	def handle_non_node(dep, opt)
             goto_task_home # !!??
 	    unless File.exist? dep
-		err_msg @rac.pos_text(rantfile.path, line_number),
+		@rac.err_msg @rac.pos_text(rantfile.path, line_number),
 		    "in prerequisites: no such file or task: `#{dep}'"
 		self.fail
 	    end
@@ -342,8 +377,9 @@ module Rant
 	private
 	def run
             goto_task_home
+            @rac.running_task(self)
 	    dir = File.dirname(name)
-            @rac.build dir unless dir == "."
+            @rac.build dir unless dir == "." || dir == "/"
             return unless @block
             @block.arity == 0 ? @block.call : @block[self]
 	end
@@ -382,15 +418,31 @@ module Rant
 	    end
 	end
 
+        def file_target?
+            true
+        end
+
+        def handle_node(dep, opt)
+            #STDERR.puts "treating #{dep.full_name} as file dependency"
+            return true if dep.file_target? && dep.invoke(opt)
+	    if File.exist? dep.name
+                File.mtime(dep.name) > @ts
+            elsif !dep.file_target?
+		@rac.err_msg @rac.pos_text(rantfile.path, line_number),
+		    "in prerequisites: no such file: `#{dep.full_name}'"
+		self.fail
+	    end
+        end
+
 	def handle_timestamped(dep, opt)
 	    return @block if dep.invoke opt
-	    @block && dep.timestamp > @ts
+	    @block && dep.timestamp(opt) > @ts
 	end
 
 	def handle_non_node(dep, opt)
             goto_task_home
 	    unless File.exist? dep
-		err_msg @rac.pos_text(rantfile.path, line_number),
+		@rac.err_msg @rac.pos_text(rantfile.path, line_number),
 		    "in prerequisites: no such file or task: `#{dep}'"
 		self.fail
 	    end
@@ -398,6 +450,7 @@ module Rant
 	end
 
 	def run
+            @rac.running_task(self)
 	    @rac.sys.mkdir @name unless @isdir
 	    if @block
 		@block.arity == 0 ? @block.call : @block[self]
@@ -438,7 +491,7 @@ module Rant
 	    @pre
 	end
 	# Note: The timestamp will only be calculated once!
-	def timestamp
+	def timestamp(opt = INVOKE_OPT)
 	    # Circular dependencies don't generate endless
 	    # recursion/loops because before calling the timestamp
 	    # method of any other node, we set @ts to some non-nil
@@ -464,8 +517,9 @@ module Rant
 		    end
 		else
 		    nodes.each { |node|
+                        node.invoke(opt)
 			if node.respond_to? :timestamp
-			    node_ts = node.timestamp
+			    node_ts = node.timestamp(opt)
                             goto_task_home
 			    @ts = node_ts if node_ts > @ts
 			else

data/lib/rant/import/rubypackage.rb

@@ -106,7 +106,7 @@ class Rant::Generators::RubyPackage
     attr_accessor :pkg_dir
 
     def initialize(opts = {})
-	@app = opts[:app] || Rant.rantapp
+	@app = opts[:app] or raise ":app argument required"
 	@pkg_dir = "pkg"
 	@pkg_dir_task = nil
 	@gem_task = nil

data/lib/rant/import/rubytest.rb

@@ -46,18 +46,18 @@ module Rant
 
 	    @pre ||= []
 	    # define the task
-	    app.task({:__caller__ => cinf, @name => @pre}) { |t|
-		arg = ""
-		libpath = (@libs.nil? || @libs.empty?) ?
-		    nil : @libs.join(File::PATH_SEPARATOR)
-		if libpath
-		    arg << "-I " << Env.shell_path(libpath) << " "
-		end
-		arg << "-S testrb " << optlist
+	    app.task(:__caller__ => cinf, @name => @pre) { |t|
+		args = []
+                if @libs && !@libs.empty?
+                    args << "-I#{@libs.join File::PATH_SEPARATOR}"
+                end
+                # TODO: don't use testrb
+                args << "-S" << "testrb"
+                args.concat optlist
 		if @test_dir
-		    app.context.sys.cd(@test_dir) {
-			arg << filelist.arglist
-			app.context.sys.ruby arg
+		    app.sys.cd(@test_dir) {
+			args.concat filelist
+			app.sys.ruby args
 		    }
 		else
 		    if test(?d, "test")
@@ -65,26 +65,32 @@ module Rant
 		    elsif test(?d, "tests")
 			@test_dirs << "tests"
 		    end
-		    arg << filelist.arglist
-		    app.context.sys.ruby arg
+		    args.concat filelist
+		    app.context.sys.ruby args
 		end
 	    }
 	end
 	def optlist
-	    options = (@options.is_a? Array) ?
-		@options.arglist : @options 
-	    @rac.cx.var["TESTOPTS"] || options || ""
+            if @options.respond_to? :to_ary
+                @options.to_ary
+            elsif @options
+                [@options.to_str]
+            else
+                []
+            end
+            # previously Rant (0.4.4 and earlier versions) honoured
+            # var["TESTOPTS"]
 	end
 	def filelist
-	    return Dir[@rac.cx.var['TEST']] if @rac.cx.var['TEST']
+	    return @rac.sys[@rac.var['TEST']] if @rac.var['TEST']
 	    filelist = @test_files || []
 	    if filelist.empty?
 		if @test_dirs && !@test_dirs.empty?
 		    @test_dirs.each { |dir|
-			filelist.concat(Dir[File.join(dir, @pattern)])
+			filelist.concat(@rac.sys[File.join(dir, @pattern)])
 		    }
 		else
-		    filelist.concat(Dir[@pattern]) if @pattern
+		    filelist.concat(@rac.sys[@pattern]) if @pattern
 		end
 	    end
 	    filelist

data/lib/rant/import/signedfile.rb

@@ -43,6 +43,9 @@ module Rant
             def has_actions?
                 !!@block
             end
+            def file_target?
+                true
+            end
             def <<(pre)
                 @pre << pre
             end
@@ -94,8 +97,8 @@ module Rant
                     check_str = @cur_checksums.join
                     @cur_checksums = nil
                     metadata = @rac.var._get("__metadata__")
-                    old_check_str = metadata.fetch(key, @name)
-                    old_target_str = metadata.fetch(target_key, @name)
+                    old_check_str = metadata.path_fetch(key, @name)
+                    old_target_str = metadata.path_fetch(target_key, @name)
                     # check explicitely for plain file, thus allow the
                     # target of a SignedFile to be a directory ;)
                     if test(?f, @name)
@@ -116,10 +119,10 @@ module Rant
                         @sigs.signature_for_file(@name) : ""
                     target_changed = target_str != old_target_str
                     if target_changed
-                        metadata.set(target_key, target_str, @name)
+                        metadata.path_set(target_key, target_str, @name)
                     end
                     if check_str_changed
-                        metadata.set(key, check_str, @name)
+                        metadata.path_set(key, check_str, @name)
                     end
                     return target_changed
                 rescue TaskFail => e
@@ -135,7 +138,7 @@ module Rant
                 goto_task_home
                 yield @name
             end
-            def timestamp
+            def timestamp(opt = INVOKE_OPT)
                 File.exist?(@name) ? File.mtime(@name) : T0
             end
             def signature
@@ -143,7 +146,7 @@ module Rant
                 sigs = @rac.var._get("__signature__")
                 md = @rac.var._get("__metadata__")
                 key = "target_sig_#{sigs.name}"
-                md.fetch(key, @name)
+                md.path_fetch(key, @name)
             end
             private
             # returns true if update required
@@ -181,7 +184,7 @@ module Rant
                 up
             end
             def handle_node(node, dep_str, opt)
-                up = node.invoke(opt)
+                up = node.invoke(opt) if node.file_target?
                 if node.respond_to? :signature
                     @cur_checksums << node.signature
                 elsif test(?f, dep_str)
@@ -189,6 +192,8 @@ module Rant
                     handle_file(dep_str)
                 elsif File.exist?(dep_str)
                     @cur_checksums << @sigs.signature_for_string(dep_str)
+                elsif !node.file_target?
+                    self.fail "can't handle prerequisite `#{dep_str}'"
                 end
                 goto_task_home
                 up
@@ -218,10 +223,11 @@ module Rant
                 sigs = @rac.var._get("__signature__")
                 md = @rac.var._get("__metadata__")
                 key = "prerequisites_sig_#{sigs.name}"
-                md.fetch(key, @name)
+                md.path_fetch(key, @name)
             end
             private
             def run
+                @rac.running_task(self)
                 @rac.cx.sys.mkdir @name unless test ?d, @name
                 if @block
                     @block.arity == 0 ? @block.call : @block[self]

data/lib/rant/import/sys/more.rb

@@ -0,0 +1,22 @@
+
+# more.rb - Experimental sys methods.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    module Sys
+        def write_to_file(fn, content)
+            fu_output_message "writing #{content.size} bytes to file `#{fn}'"
+            open fn, "w" do |f|
+                f.write content
+            end
+        end
+        def clean(entry)
+            if test ?f, entry
+                rm_f entry
+            elsif test ?e, entry
+                rm_rf entry
+            end
+        end
+    end # module Sys
+end # module Rant