rant 0.3.6 → 0.3.8

data/lib/rant/rantlib.rb

@@ -60,7 +60,7 @@ class String
 	if new_ext
 	    self.sub(/#{Regexp.escape ext}$/, new_ext)
 	else
-	    self.sub(/\.[^.]+$/, ".#{ext}")
+	    self.sub(/(\.[^.]*$)|$/, ".#{ext}")
 	end
     end
 end
@@ -138,8 +138,8 @@ module RantContext
 	rac.subdirs(*args)
     end
 
-    def source rantfile
-	rac.source(rantfile)
+    def source(opt, rantfile = nil)
+	rac.source(opt, rantfile)
     end
 
     def sys(*args, &block)
@@ -213,8 +213,8 @@ module Rant
 		@@rac.args.replace(args.flatten)
 		@@rac.run
 	    else
-		@@rac = Rant::RantApp.new(args)
-		@@rac.run
+		@@rac = Rant::RantApp.new
+		@@rac.run(args)
 	    end
 	end
 
@@ -295,12 +295,13 @@ class Rant::RantApp
     # A list of all registered plugins.
     attr_reader :plugins
     # The context in which Rantfiles are loaded. RantContext methods
-    # may be called through an instance_eval on this object (e.g. from
-    # plugins).
+    # may be called through this object (e.g. from plugins).
     attr_reader :context
     alias cx context
     # A hash with all tasks. For fast task lookup use this hash with
     # the taskname as key.
+    #
+    # See also: #resolve, #make
     attr_reader :tasks
     # A list of all imports (code loaded with +import+).
     attr_reader :imports
@@ -314,6 +315,11 @@ class Rant::RantApp
     attr_reader :resolve_hooks
 
     def initialize *args
+	unless args.empty?
+	    STDERR.puts caller[0]
+	    STDERR.puts "Warning: Giving arguments Rant::RantApp.new " +
+		"is deprecated. Give them to the #run method."
+	end
 	@args = args.flatten
 	# Rantfiles will be loaded in the context of this object.
 	@context = RantAppContext.new(self)
@@ -336,7 +342,7 @@ class Rant::RantApp
 	@var.query :ignore, :AutoList, []
 	@imports = []
 
-	@task_show = nil
+	#@task_show = nil
 	@task_desc = nil
 
 	@orig_pwd = nil
@@ -358,8 +364,6 @@ class Rant::RantApp
     end
 
     def rootdir
-	#od = @opts[:directory]
-	#od ? od.dup : ""
 	@opts[:directory]
     end
 
@@ -440,8 +444,9 @@ class Rant::RantApp
     end
 
     # Returns 0 on success and 1 on failure.
-    def run
+    def run *args
 	@run = true
+	@args.concat(args.flatten)
 	# remind pwd
 	@orig_pwd = Dir.pwd
 	# Process commandline.
@@ -479,10 +484,6 @@ class Rant::RantApp
 	goto "#"
 	@plugins.each { |plugin| plugin.rant_done }
 	return 0
-    rescue Rant::RantfileException
-	err_msg "Invalid Rantfile: " + $!.message
-	$stderr.puts "rant aborted!"
-	return 1
     rescue Rant::RantError
 	ch = get_ch_from_backtrace($!.backtrace)
 	if ch
@@ -509,9 +510,6 @@ class Rant::RantApp
     end
 
     ###### methods accessible through RantContext ####################
-    def show *args
-	@task_show = *args.join("\n")
-    end
 
     def desc *args
 	if args.empty? || (args.size == 1 && args.first.nil?)
@@ -539,12 +537,10 @@ class Rant::RantApp
 	ch = Rant::Lib::parse_caller_elem(clr)
 	name = nil
 	pre = []
-	ln = ch[:ln] || 0
-	file = ch[:file]
 	# validate args
 	generator = args.shift
 	unless generator.respond_to? :rant_generate
-	    abort(pos_text(file, ln),
+	    abort_at(ch,
 		"First argument to `gen' has to be a task-generator.")
 	end
 	# ask generator to produce a task for this application
@@ -603,7 +599,7 @@ class Rant::RantApp
 		Rant::CODE_IMPORTS << import_name
 	    rescue LoadError
 		abort(pos_text(file, ln),
-		    "no such plugin library - `#{lc_pl_name}'")
+		    "no such plugin library -- #{lc_pl_name}")
 	    end
 	end
 	pl_class = nil
@@ -611,7 +607,7 @@ class Rant::RantApp
 	    pl_class = ::Rant::Plugin.const_get(pl_name)
 	rescue NameError, ArgumentError
 	    abort(pos_text(file, ln),
-		"`#{pl_name}': no such plugin")
+		"no such plugin -- #{pl_name}")
 	end
 
 	plugin = pl_class.rant_plugin_new(self, ch, *args, &block)
@@ -629,15 +625,14 @@ class Rant::RantApp
     # and a new file task.
     def enhance targ, &block
 	prepare_task(targ, block) { |name,pre,blk|
-	    t = @tasks[name]
-	    if Rant::MetaTask === t
-		t = t.last
-	    end
+	    t = resolve(name).last
 	    if t
 		unless t.respond_to? :enhance
 		    abort("Can't enhance task `#{name}'")
 		end
 		t.enhance(pre, &blk)
+		# Important: return from method, don't break to
+		# prepare_task which would add task t again
 		return t
 	    end
 	    warn_msg "enhance \"#{name}\": no such task",
@@ -646,16 +641,21 @@ class Rant::RantApp
 	}
     end
 
-    def source rantfile
+    # Returns the value of the last expression executed in +rantfile+.
+    def source(opt, rantfile = nil)
+	unless rantfile
+	    rantfile = opt
+	    opt = nil
+	end
+	make_rf = opt != :n && opt != :now
 	rf, is_new = rantfile_for_path(rantfile)
 	return false unless is_new
-	build rantfile
-	unless rf.exist?
-	    abort("source: No such file - #{rantfile}")
+	make rantfile if make_rf
+	unless File.exist? rf.path
+	    abort("source: No such file -- #{rantfile}")
 	end
 
 	load_file rf
-	true
     end
 
     # Search the given directories for Rantfiles.
@@ -665,12 +665,9 @@ class Rant::RantApp
 	ln = cinf[:ln] || 0
 	file = cinf[:file]
 	args.each { |arg|
-	    #if arg.is_a? Symbol
-	    #	arg = arg.to_s
 	    if arg.respond_to? :to_str
 		arg = arg.to_str
-	    end
-	    unless arg.is_a? String
+	    else
 		abort(pos_text(file, ln),
 		    "subdirs: arguments must be strings")
 	    end
@@ -686,15 +683,13 @@ class Rant::RantApp
 		rantfiles_in_dir.each { |f|
 		    loaded = true
 		    rf, is_new = rantfile_for_path(f)
-		    if is_new
-			load_file rf
-		    end
+		    load_file rf if is_new
 		}
 	    ensure
 		#puts "  going back to project dir: #{prev_subdir}"
 		goto_project_dir prev_subdir
 	    end
-	    unless loaded || quiet?
+	    unless loaded || @opts[:no_warn_subdir]
 		warn_msg(pos_text(file, ln),
 		    "subdirs: No Rantfile in subdir `#{arg}'.")
 	    end
@@ -704,22 +699,14 @@ class Rant::RantApp
     end
 
     def sys(*args, &block)
-	if args.empty?
-	    @sys
-	else
-	    @sys.sh(*args)
-	end
+	args.empty? ? @sys : @sys.sh(*args)
     end
 
     # The [] and []= operators may be used to set/get values from this
     # object (like a hash). It is intended to let the different
     # modules, plugins and tasks to communicate with each other.
     def var(*args, &block)
-	if args.empty?
-	    @var
-	else
-	    @var.query(*args, &block)
-	end
+	args.empty? ? @var : @var.query(*args, &block)
     end
     ##################################################################
 
@@ -771,7 +758,6 @@ class Rant::RantApp
 	}
 	name_length < 7 && name_length = 7
 	cmd_length = prefix.length + name_length
-	# TODO: show what's done if rant is invoked without argument
 	unless tlist.first.full_name == def_target
 	    defaults = list_task_names(
 		resolve(def_target)).join(', ')
@@ -802,13 +788,7 @@ class Rant::RantApp
 	rsl
     end
     private :list_task_names
-		
-    # Increase verbosity.
-    def more_verbose
-	@opts[:verbose] += 1
-	@opts[:quiet] = false
-    end
-    
+
     # This is actually an integer indicating the verbosity level.
     # Usual values range from 0 to 3.
     def verbose
@@ -839,7 +819,7 @@ class Rant::RantApp
     # Print a command message as would be done from a call to a
     # Sys method.
     def cmd_msg cmd
-	$stdout.puts cmd unless quiet?
+	puts cmd unless quiet?
     end
 
     ###### public methods regarding plugins ##########################
@@ -889,20 +869,15 @@ class Rant::RantApp
 	# The target list is a list of strings, not Task objects!
 	if target_list.empty?
 	    def_tasks = resolve "default"
-	    #have_default = @rantfiles.any? { |f|
-	    #	f.tasks.any? { |t| t.name == "default" }
-	    #}
 	    unless def_tasks.empty?
 		target_list << "default"
 	    else
-		first = nil
 		@rantfiles.each { |f|
 		    unless f.tasks.empty?
-			first = f.tasks.first.full_name
+			target_list << f.tasks.first.full_name
 			break
 		    end
 		}
-		target_list << first
 	    end
 	end
 	target_list
@@ -915,15 +890,15 @@ class Rant::RantApp
 	matching_tasks = 0
 	target_list.each do |target|
 	    goto "#"
-	    if build(target) == 0
-		abort("Don't know how to build `#{target}'.")
+	    if make(target) == 0
+		abort("Don't know how to make `#{target}'.")
 	    end
 	end
     end
 
     # Invoke all tasks necessary to build +target+. Returns the number
     # of tasks invoked.
-    def build target, opt = {}
+    def make target, opt = {}
 	opt[:force] = true if @force_targets.delete(target)
 	matching_tasks = 0
 	old_subdir = @current_subdir
@@ -941,12 +916,12 @@ class Rant::RantApp
 	Dir.chdir old_pwd
 	matching_tasks
     end
-    public :build
+    public :make
+    alias build make
 
+    # Currently always returns an array (which might actually be a
+    # an empty array, but never nil).
     def resolve task_name, rel_project_dir = @current_subdir
-	#select_tasks_by_name task_name, rel_project_dir
-	# Note: first lines copied from +select_tasks_by_name+
-	# for efficiency reasons
 	s = @tasks[expand_path(rel_project_dir, task_name)]
 	case s
 	when nil
@@ -956,8 +931,8 @@ class Rant::RantApp
 		return s if s
 	    }
 	    []
-	when Rant::Worker: [s]
-	else # assuming MetaTask
+	when Rant::Node: [s]
+	else # assuming list of tasks
 	    s
 	end
     end
@@ -972,9 +947,6 @@ class Rant::RantApp
     # returns true.
     def select_tasks
 	selection = []
-	### pre 0.2.10 ##################
-	# @rantfile.reverse.each { |rf|
-	#################################
 	@rantfiles.each { |rf|
 	    rf.tasks.each { |t|
 		selection << t if yield t
@@ -984,32 +956,6 @@ class Rant::RantApp
     end
     public :select_tasks
 
-    # Returns an array (might be a MetaTask) with all tasks that have
-    # the given name.
-    def select_tasks_by_name name, project_dir = @current_subdir
-	# pre 0.3.1
-	#s = @tasks[name]
-	s = @tasks[expand_path(project_dir, name)]
-	case s
-	when nil: []
-	when Rant::Worker: [s]
-	else # assuming MetaTask
-	    s
-	end
-    end
-    public :select_tasks_by_name
-
-    # Get the first task for which yield returns true. Returns nil if
-    # yield never returned true.
-    def select_task
-	@rantfiles.reverse.each { |rf|
-	    rf.tasks.each { |t|
-		return t if yield t
-	    }
-	}
-	nil
-    end
-
     def load_rantfiles
 	# Take care: When rant isn't invoked from commandline,
 	# some "rant code" could already have run!
@@ -1042,24 +988,28 @@ class Rant::RantApp
 	end
     end
 
+    # Returns the value of the last expression executed in +rantfile+.
+    # +rantfile+ has to be an Rant::Rantfile instance.
     def load_file rantfile
-	msg 1, "source #{rantfile.path}"
+	msg 1, "source #{rantfile}"
+	rv = nil
 	begin
-	    path = rantfile.absolute_path
-	    @context.instance_eval(File.read(path), path)
+	    path = rantfile.path
+	    rv = @context.instance_eval(File.read(path), path)
 	rescue NameError => e
-	    abort("Name error when loading `#{rantfile.path}':",
+	    abort("Name error when loading `#{rantfile}':",
 	    e.message, e.backtrace)
 	rescue LoadError => e
-	    abort("Load error when loading `#{rantfile.path}':",
+	    abort("Load error when loading `#{rantfile}':",
 	    e.message, e.backtrace)
 	rescue ScriptError => e
-	    abort("Script error when loading `#{rantfile.path}':",
+	    abort("Script error when loading `#{rantfile}':",
 	    e.message, e.backtrace)
 	end
 	unless @rantfiles.include?(rantfile)
 	    @rantfiles << rantfile
 	end
+	rv
     end
     private :load_file
 
@@ -1071,9 +1021,9 @@ class Rant::RantApp
 	files = []
 	::Rant::RANTFILES.each { |rfn|
 	    path = dir ? File.join(dir, rfn) : rfn
-	    # We load don't accept rantfiles with pathes that differ
-	    # only in case. This protects from loading the same file
-	    # twice on case insensitive file systems.
+	    # We don't accept rantfiles with pathes that differ only
+	    # in case. This protects from loading the same file twice
+	    # on case insensitive file systems.
 	    unless files.find { |f| f.downcase == path.downcase }
 		files << path if test(?f, path)
 	    end
@@ -1091,14 +1041,9 @@ class Rant::RantApp
 	cmd_opts.quiet = true
 	cmd_opts.each { |opt, value|
 	    case opt
-	    when "--verbose": more_verbose
-	    when "--quiet"
-		@opts[:quiet] = true
-		@opts[:verbose] = -1
-	    when "--err-commands"
-		@opts[:err_commands] = true
+	    when "--verbose": @opts[:verbose] += 1
 	    when "--version"
-		$stdout.puts "rant #{Rant::VERSION}"
+		puts "rant #{Rant::VERSION}"
 		raise Rant::RantDoneException
 	    when "--help"
 		show_help
@@ -1111,12 +1056,9 @@ class Rant::RantApp
 		@arg_rantfiles << value
 	    when "--force-run"
 		@force_targets << value
-	    when "--tasks"
-		@opts[:tasks] = true
-	    when "--stop-after-load"
-		@opts[:stop_after_load] = true
-	    when "--trace-abort"
-		@opts[:trace_abort] = true
+	    else
+		# simple switch
+		@opts[opt.sub(/^--/, '').tr('-', "_").to_sym] = true
 	    end
 	}
     rescue GetoptLong::Error => e
@@ -1138,18 +1080,10 @@ class Rant::RantApp
     def prepare_task(targ, block, clr = caller[2])
 	#STDERR.puts "prepare task (#@current_subdir):\n  #{targ.inspect}"
 
-	# Allow override of caller, usefull for plugins and libraries
+	# Allow override of caller, useful for plugins and libraries
 	# that define tasks.
 	if targ.is_a? Hash
-	    targ.reject! { |k, v|
-		case k
-		when :__caller__
-		    clr = v
-		    true
-		else
-		    false
-		end
-	    }
+	    targ.reject! { |k, v| clr = v if k == :__caller__ }
 	end
 	cinf = Hash === clr ? clr : Rant::Lib::parse_caller_elem(clr)
 
@@ -1174,11 +1108,10 @@ class Rant::RantApp
 	case et
 	when nil
 	    @tasks[n] = task
-	when Rant::Worker
-	    mt = Rant::MetaTask.new n
-	    mt << et << task
+	when Rant::Node
+	    mt = [et, task]
 	    @tasks[n] = mt
-	else # assuming  Rant::MetaTask
+	else # assuming list of tasks
 	    et << task
 	end
     end
@@ -1192,14 +1125,15 @@ class Rant::RantApp
     # and the second is an array with the prerequisites.
     # The third is the file name of +clr+, the fourth is the line number
     # of +clr+.
-    def normalize_task_arg(targ, clr)
+    def normalize_task_arg(targ, ch)
+	# pre 0.3.7: ch in parameter list was clr
 	# TODO: check the code calling this method so that we can
 	# assume clr is already a hash
-	ch = Hash === clr ? clr : Rant::Lib::parse_caller_elem(clr)
+	#ch = Hash === clr ? clr : Rant::Lib::parse_caller_elem(clr)
+
 	name = nil
 	pre = []
-	ln = ch[:ln] || 0
-	file = ch[:file]
+	ln, file = ch[:ln], ch[:file]
 	
 	# process and validate targ
 	if targ.is_a? Hash
@@ -1255,15 +1189,14 @@ class Rant::RantApp
     # the rantfile was created and added, otherwise the rantfile
     # already existed.
     def rantfile_for_path path
-	# TODO: optimization: File.expand_path is called very often
-	# (don't forget the calls from Rant::Path#absolute_path)
+	# all rantfiles have an absolute path as path attribute
 	abs_path = File.expand_path(path)
-	if @rantfiles.any? { |rf| rf.absolute_path == abs_path }
-	    file = @rantfiles.find { |rf| rf.absolute_path == abs_path }
+	if @rantfiles.any? { |rf| rf.path == abs_path }
+	    file = @rantfiles.find { |rf| rf.path == abs_path }
 	    [file, false]
 	else
 	    # create new Rantfile object
-	    file = Rant::Rantfile.new(abs_path, abs_path)
+	    file = Rant::Rantfile.new abs_path
 	    file.project_subdir = @current_subdir
 	    @rantfiles << file
 	    [file, true]
@@ -1311,8 +1244,8 @@ class Rant::RantApp
 		end
 	    elsif Rant::CommandError === orig
 		msg << orig.message if @opts[:err_commands]
-	    else
-		msg << orig.message unless Rant::RantAbortException
+	    elsif !(Rant::RantAbortException === orig)
+		msg << orig.message << orig.backtrace[0..4]
 	    end
 	end
 	err_msg msg unless msg.empty?

data/lib/rant/rantsys.rb

@@ -192,15 +192,12 @@ module Rant
 	if File::ALT_SEPARATOR
 	    # TODO: check for FS case sensitivity?
 	    def mk_all_rx(file)
-
-		/(^|(#{ESC_SEPARATOR}|#{ESC_ALT_SEPARATOR})+)
-		    #{Regexp.escape(file)}
+		/(^|(#{ESC_SEPARATOR}|#{ESC_ALT_SEPARATOR})+)#{Regexp.escape(file)}
 		    ((#{ESC_SEPARATOR}|#{ESC_ALT_SEPARATOR})+|$)/x
 	    end
 	else
 	    def mk_all_rx(file)
-		/(^|#{ESC_SEPARATOR}+)
-		    #{Regexp.escape(file)}
+		/(^|#{ESC_SEPARATOR}+)#{Regexp.escape(file)}
 		    (#{ESC_SEPARATOR}+|$)/x
 	    end
 	end
@@ -213,7 +210,7 @@ module Rant
 	end
 
 	def apply_select blk
-	    @files = @files.select &blk
+	    @files = @files.select(&blk)
 	end
 	private :apply_select
 
@@ -381,7 +378,7 @@ module Rant
 
 	def each_entry &block
 	    @lists.each { |list|
-		list.each &block
+		list.each(&block)
 	    }
 	end
 
@@ -417,7 +414,7 @@ module Rant
 	def message
 	    if !@msg && cmd
 		if status
-		    "Command failed with status #{status.to_s}:\n" +
+		    "Command failed with status #{status.exitstatus}:\n" +
 		    "[#{cmd}]"
 		else
 		    "Command failed:\n[#{cmd}]"
@@ -476,8 +473,8 @@ module Rant
 	    end
 	end
 
-	# Returns a string that can be used as a valid path argument on the
-	# shell respecting portability issues.
+	# Returns a string that can be used as a valid path argument
+	# on the shell respecting portability issues.
 	def sp path
 	    Env.shell_path path
 	end

data/lib/rant/rantvar.rb

@@ -16,15 +16,16 @@
 # If you're looking for general info about Rant, read the
 # README[link:files/README.html].
 module Rant
-    VERSION	= '0.3.6'
+    VERSION	= '0.3.8'
 
     # Those are the filenames for rantfiles.
     # Case matters!
     RANTFILES	= [	"Rantfile",
 			"rantfile",
 			"Rantfile.rb",
-			"rantfile.rb",
+			"rantfile.rb"
 		  ]
+    SUB_RANTFILES = ["subrant"]
     
     # Names of plugins and imports for which code was loaded.
     # Files that where loaded with the `import' commant are directly
@@ -41,9 +42,6 @@ module Rant
     class RantError < StandardError
     end
 
-    class RantfileException < RantError
-    end
-
     # This module is a namespace for generator classes.
     module Generators
     end
@@ -168,7 +166,7 @@ module Rant
 		    begin
 			id = Constraints.const_get(id)
 		    rescue
-			raise NotAConstraintFactoryError.new(ct), caller
+			raise NotAConstraintFactoryError.new(id), caller
 		    end
 		end
 		unless id.respond_to? :rant_constraint

data/lib/rant.rb

@@ -2,6 +2,63 @@
 
 require 'rant/rantlib'
 
+module RantContext
+    # Needed for irb, which defines its own +source+ method.
+    def source_rf(*args, &block)
+	rac.source(*args, &block)
+    end
+end
+module Rant
+    class FileList
+	def inspect
+	    # what's the right encoding for object_id ?
+	    s = "#<#{self.class}:0x#{"%x" % object_id} "
+	    s << "#{@actions.size} actions, #{@files.size} files"
+	    if @ignore_rx
+		is = @ignore_rx.inspect.gsub(/\n|\t/, ' ')
+		s << ", ignore#{is.squeeze ' '}"
+	    end
+	    if @glob_flags != 0
+		s << ", flags:#@glob_flags"
+	    end
+	    s << ">"
+	end
+    end
+    module Node
+	def inspect
+	    s = "#<#{self.class}:0x#{"%x" % object_id} "
+	    s << "task_id:#{full_name}, action:#{inspect_action}"
+	    s << ", deps:#{inspect_deps}"
+	    s << ">"
+	end
+	private
+	def inspect_action
+	    (defined? @block) ? @block.inspect : "nil"
+	end
+	def inspect_deps
+	    if respond_to? :deps
+		dl = deps
+		s = dl.size.to_s
+		dls = dl.join(",")
+		dls[12..dls.length] = "..." if dls.length > 12
+		s << "[#{dls}]"
+	    else
+		"0"
+	    end
+	end
+    end
+    class RantApp
+	def inspect
+	    s = "#<#{self.class}:0x#{"%x" % object_id} "
+	    if current_subdir && !current_subdir.empty?
+		s << "subdir:#{current_subdir}, "
+	    end
+	    s << "tasks:#{tasks.size}"
+	    s << ">"
+	end
+    end
+end
+
 def rac
     Rant.rac
 end