rant 0.3.2 → 0.3.4

data/install.rb

@@ -0,0 +1,6 @@
+
+# Install Rant with Rant :)
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "lib"))
+require 'rant/rantlib'
+
+exit Rant.run("install")

data/lib/rant.rb

@@ -2,7 +2,11 @@
 
 require 'rant/rantlib'
 
-include Rant
+def rac
+    Rant.rac
+end
+
+include RantContext
 
 if $0 == __FILE__
     exit Rant.run

data/lib/rant/import.rb

@@ -29,6 +29,8 @@ module Rant
 		"Print this help and exit."			],
 	    [ "--version",	"-v",	GetoptLong::NO_ARGUMENT,
 		"Print version of rant-import and exit."	],
+	    [ "--quiet",	"-q",	GetoptLong::NO_ARGUMENT,
+		"Operate quiet."				],
 	    [ "--plugins",	"-p",	GetoptLong::REQUIRED_ARGUMENT,
 		"Include PLUGINS (comma separated list)."	],
 	    [ "--imports",	"-i",	GetoptLong::REQUIRED_ARGUMENT,
@@ -86,16 +88,17 @@ module Rant
 	    @reduce_whitespace = false
 	    @auto = false
 	    @arg_rantfiles = []
+	    @quiet = false
 	end
 
 	def run
 	    process_args
 
 	    if @auto
-		@rantapp = RantApp.new(
-		    %w(-v --stop-after-load) +
+		rac_args = %w(--stop-after-load) + 
 		    @arg_rantfiles.collect { |rf| "-f#{rf}" }
-		    )
+		rac_args << "-v" unless @quiet
+		@rantapp = RantApp.new(rac_args)
 		unless @rantapp.run == 0
 		    abort("Auto-determination of required code failed.")
 		end
@@ -111,7 +114,7 @@ module Rant
 		mf << <<EOH
 #!/usr/bin/env ruby
 
-# #@mono_fn - Monolithic rant script, autogenerated by rant-import.
+# #@mono_fn - Monolithic rant script, autogenerated by rant-import #{Rant::VERSION}.
 #
 # Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
 #
@@ -171,6 +174,7 @@ EOF
 		    puts "rant-import #{Rant::VERSION}"
 		    done
 		when "--help": help
+		when "--quiet": @quiet = true
 		when "--force": @force = true
 		when "--with-comments": @skip_comments = false
 		when "--reduce-whitespace": @reduce_whitespace = true
@@ -211,6 +215,10 @@ EOF
 	    done
 	end
 
+	def msg *args
+	    super unless @quiet
+	end
+
 	def abort(*text)
 	    err_msg(*text) unless text.empty?
 	    raise RantImportAbortException

data/lib/rant/import/rubydoc.rb

@@ -47,7 +47,7 @@ module Rant
 	    @verbose = false
 
 	    yield self if block_given?
-	    app.var["gen-rubydoc-rdoc_opts"] = self.rdoc_opts.dup
+	    app.var[:rubydoc_opts] = self.rdoc_opts.dup
 
 	    @pre ||= []
 	    @pre.concat(self.rdoc_source_deps)

data/lib/rant/import/rubypackage.rb

@@ -1,7 +1,7 @@
 
 require 'rant/rantlib'
 
-class Rant::RubyPackage
+class Rant::Generators::RubyPackage
 
     class << self
 	def rant_generate(app, ch, args, &block)
@@ -266,7 +266,7 @@ class Rant::RubyPackage
 	    end
 	    Gem.manage_gems
 	    # map rdoc options from application vars
-	    @data["rdoc_options"] ||= @app.var["gen-rubydoc-rdoc_opts"]
+	    @data["rdoc_options"] ||= @app.var[:rubydoc_opts]
 	    if @data["rdoc_options"]
 		# remove the --op option, otherwise rubygems will
 		# install the rdoc in the wrong directory (at least as

data/lib/rant/import/rubytest.rb

@@ -31,6 +31,7 @@ module Rant
 	attr_accessor :test_dir
 
 	def initialize(app, cinf, name = :test, prerequisites = [], &block)
+	    @rac = app
 	    @name = name
 	    @pre = prerequisites
 	    @block = block
@@ -77,10 +78,10 @@ module Rant
 	def optlist
 	    options = (@options.is_a? Array) ?
 		@options.arglist : @options 
-	    ENV["TESTOPTS"] || options || ""
+	    @rac.cx.var["TESTOPTS"] || options || ""
 	end
 	def filelist
-	    return Dir[ENV['TEST']] if ENV['TEST']
+	    return Dir[@rac.cx.var['TEST']] if @rac.cx.var['TEST']
 	    filelist = @test_files || []
 	    if filelist.empty?
 		if @test_dirs && !@test_dirs.empty?

data/lib/rant/plugin/csharp.rb

@@ -145,27 +145,23 @@ module Rant
     end	# class Generators::Assembly
 
     class AssemblyTask < FileTask
+
 	def initialize(app, assembly)
 	    @assembly = assembly
 	    super(app, @assembly.out) { |t|
 		app.context.sys assembly.send("cmd_" + assembly.target)
 	    }
 	end
-=begin
-	def resolve_prerequisites
-	    @assembly.init
-	    @pre.concat(@assembly.sources)
-	    @pre.concat(@assembly.resources) if @assembly.resources
-	    super
-	end
-=end
+
 	def invoke(force = false)
+	    goto_task_home
 	    @assembly.init
 	    @pre.concat(@assembly.sources)
 	    @pre.concat(@assembly.resources) if @assembly.resources
 	    super
 	end
-    end
+
+    end	# class AssemblyTask
 end	# module Rant
 
 module Rant::Plugin

data/lib/rant/rantenv.rb

@@ -41,6 +41,7 @@ end
 module Rant::Env
     OS		= ::Config::CONFIG['target']
     RUBY	= ::Config::CONFIG['ruby_install_name']
+    RUBY_BINDIR	= ::Config::CONFIG['bindir']
 
     @@zip_bin = false
     @@tar_bin = false

data/lib/rant/rantfile.rb

@@ -49,11 +49,12 @@ module Rant
 	    @description = nil
 	    @rantfile = nil
 	    @line_number = nil
+	    @run = false
 	end
 
-	# Returns the +name+ attribute.
+	# Returns the full name of this task.
 	def to_s
-	    name
+	    full_name
 	end
 
 	def project_subdir
@@ -77,6 +78,11 @@ module Rant
 	    !done?
 	end
 
+	# True during invoke. Used to encounter circular dependencies.
+	def run?
+	    @run
+	end
+
 	# +opt+ is a Hash and shouldn't be modified.
 	# All objects implementing the Rant::Worker protocol should
 	# know about the following +opt+ values:
@@ -85,10 +91,16 @@ module Rant
 	#	as calling Worker#needed?
 	# <tt>:force</tt>::
 	#	Run task action even if needed? is false.
+	# Returns true if task action was run.
 	def invoke(opt = INVOKE_OPT)
-	    goto_task_home
-	    return needed? if opt[:needed?]
-	    self.run if opt[:force] || self.needed?
+	    return circular_dep if run?
+	    @run = true
+	    begin
+		return needed? if opt[:needed?]
+		self.run if opt[:force] || self.needed?
+	    ensure
+		@run = false
+	    end
 	end
 
 	def fail msg = nil
@@ -102,14 +114,20 @@ module Rant
 	end
 	private :run
 
+	def circular_dep
+	    app.warn_msg "Circular dependency on task `#{full_name}'."
+	    false
+	end
+	private :circular_dep
+
 	def hash
 	    name.hash
 	end
 
 	def eql? other
-	    Worker === other and name.eql? other.name
+	    Worker === other and full_name.eql? other.full_name
 	end
-    end
+    end	# module Worker
 
     # A list of tasks with an equal name.
     class MetaTask < Array
@@ -238,33 +256,36 @@ module Rant
 	    return false if done?
 	    return true if @needed.nil?
 	    goto_task_home
-	    if @needed.arity == 0
-		@needed.call
-	    else
-		@needed[self]
-	    end
+	    @needed.arity == 0 ? @needed.call : @needed[self]
 	end
 
 	def invoke(opt = INVOKE_OPT)
-	    return needed? if opt[:needed?]
-	    goto_task_home
-	    if opt[:force] && !@done
-		self.run
-		@done = true
-	    else
-		if needed?
-		    run
+	    return circular_dep if @run
+	    @run = true
+	    begin
+		return needed? if opt[:needed?]
+		# +run+ already calls +goto_task_home+
+		#goto_task_home
+		if opt[:force] && !@done
+		    self.run
 		    @done = true
 		else
-		    false
+		    if needed?
+			run
+			@done = true
+		    else
+			false
+		    end
 		end
+	    rescue CommandError => e
+		err_msg e.message if app[:err_commands]
+		self.fail
+	    rescue SystemCallError => e
+		err_msg e.message
+		self.fail
+	    ensure
+		@run = false
 	    end
-	rescue CommandError => e
-	    err_msg e.message if app[:err_commands]
-	    self.fail
-	rescue SystemCallError => e
-	    err_msg e.message
-	    self.fail
 	end
     end	# LightTask
 
@@ -287,13 +308,17 @@ module Rant
 
 	def initialize(app, name, prerequisites = [], &block)
 	    super()
-	    @app = app || Rant.rantapp
+	    @app = app || Rant.rac
 	    @name = name or raise ArgumentError, "name not given"
 	    @pre = prerequisites || []
 	    @pre_resolved = false
 	    @block = block
 	    @run = false
-	    @fail = false
+	    # success has one of three values:
+	    #	nil	no invoke
+	    #	false	invoked, but fail
+	    #	true	invoked and run successfully
+	    @success = nil
 	end
 
 	# Get a list of the *names* of all prerequisites. The
@@ -303,6 +328,11 @@ module Rant
 	    @pre.collect { |pre| pre.to_s }
 	end
 
+	# First prerequisite.
+	def source
+	    @pre.first.to_s
+	end
+
 	# True if this task has at least one action (block to be
 	# executed) associated.
 	def has_actions?
@@ -315,20 +345,20 @@ module Rant
 	    @pre << pre
 	end
 
-	# Was this task ever run? If this is true, it doesn't
+	# Was this task ever invoked? If this is true, it doesn't
 	# necessarily mean that the run was successfull!
-	def run?
-	    @run
+	def invoked?
+	    !@success.nil?
 	end
 
 	# True if last task run fail.
 	def fail?
-	    @fail
+	    @success == false
 	end
 
 	# Task was run and didn't fail.
 	def done?
-	    run? && !fail?
+	    @success
 	end
 
 	# Enhance this task with the given dependencies and blk.
@@ -357,8 +387,14 @@ module Rant
 	# Returns a true value if task was acutally run.
 	# Raises Rant::TaskFail to signal task (or prerequiste) failure.
 	def invoke(opt = INVOKE_OPT)
-	    return if done?
-	    internal_invoke opt
+	    return circular_dep if @run
+	    @run = true
+	    begin
+		return if done?
+		internal_invoke opt
+	    ensure
+		@run = false
+	    end
 	end
 
 	def internal_invoke opt, ud_init = true
@@ -379,13 +415,12 @@ module Rant
 	    }
 	    # Never run a task block for a "needed?" query.
 	    return update if opt[:needed?]
-	    if update
-		@run = true
-		run
-	    end
-	    @run
+	    run if update
+	    @success = true
+	    # IMPORTANT: return update flag
+	    update
 	rescue StandardError => e
-	    @fail = true
+	    @success = false
 	    case e
 	    when TaskFail: raise
 	    when CommandError
@@ -446,6 +481,7 @@ module Rant
 		return @pre.each { |t| yield(t) }
 	    end
 	    my_full_name = full_name
+	    my_project_subdir = project_subdir
 	    @pre.map! { |t|
 		if Worker === t
 		    # Remove references to self from prerequisites!
@@ -461,8 +497,8 @@ module Rant
 			nil
 		    else
 			#STDERR.puts "selecting `#{t}'"
-			selection = @app.select_tasks_by_name t,
-					project_subdir
+			selection = @app.resolve t,
+					my_project_subdir
 			#STDERR.puts selection.size
 			if selection.empty?
 			    # use return value of yield
@@ -519,8 +555,14 @@ module Rant
 	# the +ud_init+ flag according to the result of a call to the
 	# +needed+ block.
 	def invoke(opt = INVOKE_OPT)
-	    return if done?
-	    internal_invoke(opt, ud_init_by_needed)
+	    return circular_dep if @run
+	    @run = true
+	    begin
+		return if done?
+		internal_invoke(opt, ud_init_by_needed)
+	    ensure
+		@run = false
+	    end
 	end
 
 	private
@@ -528,6 +570,7 @@ module Rant
 	    if @needed
 		goto_task_home
 		@needed.arity == 0 ? @needed.call : @needed[self]
+	    #else: true #??
 	    end
 	end
     end	# class UserTask
@@ -555,14 +598,20 @@ module Rant
 	end
 
 	def invoke(opt = INVOKE_OPT)
-	    return if done?
-	    goto_task_home
-	    if @path.exist?
-		@ts = @path.mtime
-		internal_invoke opt, false
-	    else
-		@ts = T0
-		internal_invoke opt, true
+	    return circular_dep if @run
+	    @run = true
+	    begin
+		return if done?
+		goto_task_home
+		if @path.exist?
+		    @ts = @path.mtime
+		    internal_invoke opt, false
+		else
+		    @ts = T0
+		    internal_invoke opt, true
+		end
+	    ensure
+		@run = false
 	    end
 	end
 
@@ -590,8 +639,6 @@ module Rant
     # directory.
     class DirTask < Task
 
-	# TODO: subdir support
-
 	class << self
 
 	    # Generate a task for making a directory path.
@@ -650,19 +697,26 @@ module Rant
 	    @isdir = nil
 	end
 
-	def needed?
-	    invoke(:needed? => true)
-	end
+	#def needed?
+	#    invoke(:needed? => true)
+	#end
 
 	def invoke(opt = INVOKE_OPT)
-	    return if done?
-	    @isdir = test(?d, @name)
-	    if @isdir
-		@ts = @block ? test(?M, @name) : Time.now
-		internal_invoke opt, false
-	    else
-		@ts = T0
-		internal_invoke opt, true
+	    return circular_dep if @run
+	    @run = true
+	    begin
+		return if done?
+		goto_task_home
+		@isdir = test(?d, @name)
+		if @isdir
+		    @ts = @block ? test(?M, @name) : Time.now
+		    internal_invoke opt, false
+		else
+		    @ts = T0
+		    internal_invoke opt, true
+		end
+	    ensure
+		@run = false
 	    end
 	end
 
@@ -692,6 +746,68 @@ module Rant
 	end
     end	# class DirTask
     module Generators
+	Task = ::Rant::Task
+	LightTask = ::Rant::LightTask
 	Directory = ::Rant::DirTask
-    end
+
+	class Rule
+	    # TODO
+	    def self.rant_generate(rac, ch, args, &block)
+		unless args.size == 1
+		    rac.abort_at(ch, "Rule takes only one argument.")
+		end
+		arg = args.first
+		target = nil
+		src_arg = nil
+		if Symbol === arg
+		    target = ".#{arg}"
+		elsif arg.respond_to? :to_str
+		    target = arg.to_str
+		elsif Regexp === arg
+		    target = arg
+		elsif Hash === arg && arg.size == 1
+		    arg.each_pair { |target, src_arg| }
+		    src_arg = src_arg.to_str if src_arg.respond_to? :to_str
+		    target = target.to_str if target.respond_to? :to_str
+		    src_arg = ".#{src_arg}" if Symbol === src_arg
+		    target = ".#{target}" if Symbol === target
+		else
+		    rac.abort_at(ch, "Rule argument " +
+			"has to be a hash with one key-value pair.")
+		end
+		esc_target = nil
+		target_rx = case target
+		when String
+		    esc_target = Regexp.escape(target)
+		    /#{esc_target}$/
+		when Regexp
+		    target
+		else
+		    rac.abort_at(ch, "rule target has " +
+			"to be a string or regular expression")
+		end
+		src_proc = case src_arg
+		when String
+		    unless String === target
+			rac.abort(ch, "rule target has to be a string " +
+			    "if source is a string")
+		    end
+		    lambda { |name| name.sub(/#{esc_target}$/, src_arg) }
+		when Proc: src_arg
+		when nil: lambda { |name| [] }
+		else
+		    rac.abort_at(ch, "rule source has to be " +
+			"String or Proc")
+		end
+		rac.at_resolve { |task_name|
+		    if target_rx =~ task_name
+			[rac.file(:__caller__ => ch,
+			    task_name => src_proc[task_name], &block)]
+		    else
+			nil
+		    end
+		}
+	    end
+	end	# class Rule
+    end	# module Generators
 end # module Rant