rant 0.3.8 → 0.4.0

data/lib/rant/import/rubypackage.rb

@@ -4,7 +4,7 @@ require 'rant/rantlib'
 class Rant::Generators::RubyPackage
 
     class << self
-	def rant_generate(app, ch, args, &block)
+	def rant_gen(app, ch, args, &block)
 	    if !args || args.empty?
 		self.new(:app => app, :__caller__ => ch, &block)
 	    elsif args.size == 1
@@ -109,7 +109,6 @@ class Rant::Generators::RubyPackage
 	@app = opts[:app] || Rant.rantapp
 	@pkg_dir = "pkg"
 	@pkg_dir_task = nil
-	@dist_dir_task = nil
 	@gem_task = nil
 	@tar_task = nil
 	@zip_task = nil
@@ -185,6 +184,10 @@ class Rant::Generators::RubyPackage
 	    next if attr =~ /^gem\-./
 	    next if mapped_attrs.include? attr
 	    setter = "#{attr}="
+            if attr == "files"
+                spec.send(setter, val.dup) if val
+                next
+            end
 	    spec.send(setter, val) if spec.respond_to? setter
 	}
 	# `gem-' attributes override others for gem spec
@@ -198,50 +201,9 @@ class Rant::Generators::RubyPackage
 
     def pkg_dir_task
 	return if @pkg_dir_task
-	if @dist_dir_task
-	    # not ideal but should work: If only the gem task will
-	    # be run, dist dir creation wouldn't be necessary
-	    return @pkg_dir_task = @dist_dir_task
-	end
 	@pkg_dir_task = @app.gen(Rant::Generators::Directory, @pkg_dir)
     end
 
-    def dist_dir_task
-	return if @dist_dir_task
-	pkg_name = pkg_dist_dir
-	dist_dir = pkg_dist_dir
-	@dist_dir_task = @app.gen(Rant::Generators::Directory,
-		dist_dir => files) { |t|
-	    # ensure to create new and empty destination directory
-	    if Dir.entries(dist_dir).size > 2	# "." and ".."
-		@app.sys.rm_rf(dist_dir)
-		@app.sys.mkdir(dist_dir)
-	    end
-	    # evaluate directory structure first
-	    dirs = []
-	    fl = []
-	    files.each { |e|
-		if test(?d, e)
-		    dirs << e unless dirs.include? e
-		else	# assuming e is a file
-		    fl << e
-		    dir = File.dirname(e)
-		    dirs << dir unless dir == "." || dirs.include?(dir)
-		end
-	    }
-	    # create directory structure
-	    dirs.each { |dir|
-		dest = File.join(dist_dir, dir)
-		@app.sys.mkpath(dest) unless test(?d, dest)
-	    }
-	    # link or copy files
-	    fl.each { |f|
-		dest = File.join(dist_dir, f)
-		@app.sys.safe_ln(f, dest)
-	    }
-	}
-    end
-
     # Create task for gem building. If tname is a true value, a
     # shortcut-task will be created.
     def gem_task(tname = :gem)
@@ -302,16 +264,15 @@ class Rant::Generators::RubyPackage
 	pkg_files = files
 	if tname
 	    # shortcut task
-	    @app.task({:__caller__ => @ch, tname => pkg_name})
+	    @app.cx.task({:__caller__ => @ch, tname => pkg_name})
 	end
 	# actual tar-creating task
-	@tar_task = @app.file(:__caller__ => @ch,
-		pkg_name => [pkg_dist_dir] + pkg_files) { |t|
-	    @app.sys.cd(@pkg_dir) {
-		@app.sys %W(tar zcf #{tar_pkg_name} #{pkg_base_name})
-	    }
-	}
-	dist_dir_task
+        @app.cx.import "package/tgz"
+        @tar_task =
+        Rant::Generators::Package::Tgz.rant_gen(@app, @ch,
+            ["#@pkg_dir/#{pkg_base_name}",
+            # we use tar.gz extension here for backwards compatibility
+            {:files => pkg_files, :extension => ".tar.gz"}])
     end
 
     def zip_task(tname = :zip)
@@ -325,17 +286,10 @@ class Rant::Generators::RubyPackage
 	    @app.task({:__caller__ => @ch, tname => pkg_name})
 	end
 	# actual zip-creating task
-	@zip_task = @app.file(:__caller__ => @ch,
-		pkg_name => [pkg_dist_dir] + pkg_files) { |t|
-	    @app.sys.cd(@pkg_dir) {
-		# zip options:
-		#   y: store symlinks instead of referenced files
-		#   r: recurse into directories
-		#   q: quiet operation
-		@app.sys %W(zip -yqr #{zip_pkg_name} #{pkg_base_name})
-	    }
-	}
-	dist_dir_task
+        @app.cx.import "package/zip"
+        @zip_task =
+        Rant::Generators::Package::Zip.rant_gen(@app, @ch,
+            ["#@pkg_dir/#{pkg_base_name}", {:files => pkg_files}])
     end
 
     # Create a task which runs gem/zip/tar tasks.
@@ -361,23 +315,15 @@ class Rant::Generators::RubyPackage
 
     # Returns true if at least one task was defined.
     def def_available_tasks
-	defined = false
-	if Rant::Env.have_tar?
-	    # we don't create shortcut tasks, hence nil as argument
-	    self.tar_task(nil)
-	    defined = true
-	end
-	if Rant::Env.have_zip?
-	    self.zip_task(nil)
-	    defined = true
-	end
+	self.tar_task(nil)
+	self.zip_task(nil)
 	begin
 	    require 'rubygems'
 	    self.gem_task(nil)
 	    defined = true
 	rescue LoadError
 	end
-	defined
+	true
     end
 
     def pkg_base_name
@@ -392,10 +338,6 @@ class Rant::Generators::RubyPackage
 	pkg_dist_dir + ".gem"
     end
 
-    #--
-    # Arghhh... tar makes me feel angry
-    #++
-
     def tar_pkg_name
 	pkg_base_name + ".tar.gz"
     end

data/lib/rant/import/rubytest.rb

@@ -6,7 +6,7 @@ module Rant
 
 	class << self
 
-	    def rant_generate(app, ch, args, &block)
+	    def rant_gen(app, ch, args, &block)
 		if !args || args.empty?
 		    self.new(app, ch, &block)
 		elsif args.size == 1

data/lib/rant/import/subfile.rb

@@ -6,33 +6,47 @@
 require 'rant/rantlib'
 
 class Rant::Generators::SubFile
-    def self.rant_generate(rac, ch, args, &block)
+    def self.rant_gen(rac, ch, args, &block)
 	case args.size
 	when 1
-	    basedir, fine = nil, args.first
-	    path = fine
+	    fine, basedir = args
 	when 2
 	    basedir, fine = args
-	    path = File.join(basedir, fine)
 	else
 	    rac.abort_at(ch, "SubFile takes one or two arguments.")
 	end
+	deps = []
+	if fine.respond_to? :to_hash
+            # hash should contain only one element
+	    fine = fine.to_hash
+	    fine.each { |k, v|
+		ch = v && next if k == :__caller__
+		fine = k
+                if Rant::FileList === v
+                    deps = v.dup
+		elsif v.respond_to? :to_ary
+		    deps.concat(v.to_ary)
+		else
+		    deps << v
+		end
+	    }
+	end
+	path = basedir ? File.join(basedir, fine) : fine
 	file_desc = rac.pop_desc
-	rac.prepare_task(path, block, ch) { |name,pre,blk|
+	rac.prepare_task({path => deps}, block, ch) { |name,pre,blk|
 	    dir, file = File.split(fine.to_s)
 	    dirp = basedir ? File.join(basedir, dir) : dir
 	    unless dir == "."
-		dt = rac.resolve(dirp)
-		if dt.empty?
-		    dt = [if basedir
-			rac.cx.gen(
-			    ::Rant::Generators::Directory, basedir, dir)
+                unless rac.tasks.include? dirp
+		    if basedir
+			::Rant::Generators::Directory.rant_gen(
+			    rac, ch, [basedir, dir])
 		    else
-			rac.cx.gen(
-			    ::Rant::Generators::Directory, dir)
-		    end]
+			::Rant::Generators::Directory.rant_gen(
+			    rac, ch, [dir])
+		    end
 		end
-		pre.concat(dt)
+                pre << dirp
 	    end
 	    rac.cx.desc file_desc
 	    ::Rant::FileTask.new(rac, name, pre, &blk)

data/lib/rant/import/win32/rubycmdwrapper.rb

@@ -8,7 +8,7 @@ require 'rant/rantlib'
 module Rant::Generators
     module Win32
 	module RubyCmdWrapper
-	    def self.rant_generate(rac, ch, args, &block)
+	    def self.rant_gen(rac, ch, args, &block)
 		fl = args.first
 		unless args.size == 1 and fl.respond_to? :to_ary
 		    rac.abort_at(ch,

data/lib/rant/import.rb

@@ -78,10 +78,10 @@ module Rant
 	    @mono_fn = nil
 	    @force = false
 	    @rantapp = nil
-	    @core_imports = []
-	    @lib_imports = []
 	    @included_plugins = []
 	    @included_imports = []
+            # contains all filenames as given to +require+
+            @included_files = []
 	    @skip_comments = true
 	    @reduce_whitespace = false
 	    @auto = false
@@ -234,7 +234,7 @@ EOF
 		    "This file should contains the core of rant, so import is impossible.",
 		    "Please check your rant installation!")
 	    end
-	    @core_imports << "rantlib"
+	    @included_files << "rant/rantlib"
 	    resolve_requires rantlib
 	end
 
@@ -242,13 +242,19 @@ EOF
 	    rs = ""
 	    @imports.each { |name|
 		next if @included_imports.include? name
-		path = get_lib_rant_path "import/#{name}.rb"
+                lib_name = "import/#{name}"
+                lib_fn = "#{lib_name}.rb"
+                rfn = "rant/#{lib_name}"
+		path = get_lib_rant_path lib_fn
 		unless path
 		    abort("No such import - #{name}")
 		end
-		msg "Including import `#{name}'", path
-		@included_imports << name.dup
-		rs << resolve_requires(File.read(path))
+                @included_imports << name.dup
+                unless @included_files.include? rfn
+                    @included_files << rfn
+                    msg "Including import `#{name}'", path
+                    rs << resolve_requires(File.read(path))
+                end
 	    }
 	    rs
 	end
@@ -258,13 +264,19 @@ EOF
 	    @plugins.each { |name|
 		lc_name = name.downcase
 		next if @included_plugins.include? lc_name
-		path = get_lib_rant_path "plugin/#{lc_name}.rb"
+                plugin_name = "plugin/#{lc_name}"
+                plugin_fn = "#{plugin_name}.rb"
+                rfn = "rant/#{plugin_name}"
+		path = get_lib_rant_path plugin_fn
 		unless File.exist? path
 		    abort("No such plugin - #{name}")
 		end
-		msg "Including plugin `#{lc_name}'", path
 		@included_plugins << lc_name
-		rs << resolve_requires(File.read(path))
+                unless @included_files.include? rfn
+                    @included_files << rfn
+                    msg "Including plugin `#{lc_name}'", path
+                    rs << resolve_requires(File.read(path))
+                end
 	    }
 	    rs
 	end
@@ -283,6 +295,12 @@ EOF
 		end
 		# skip shebang line
 		next if line =~ /^#! ?(\/|\\)?\w/
+                # uncomment line if +uncomment+ directive given
+                if line =~ /^\s*#.*#\s?rant-import:\s?uncomment\s*$/
+                    line.sub! '#', ''
+                end
+                # skip line if +remove+ directive given
+                next if line =~ /#\s?rant-import:\s?remove\s*$/
 		# skip pure comment lines
 		next if line =~ /^\s*#/ if @skip_comments
 		if line =~ /^=begin\s/
@@ -291,10 +309,11 @@ EOF
 		end
 		name = nil
 		lib_file = nil
-		if line =~ /\s*(require|load)\s+('|")rant\/(\w+)(\.rb)?('|")/
+		if line =~ /\s*(require|load)\s+('|")rant\/([\w\/]+)(\.rb)?('|")/
 		    # Rant library code
 		    name = $3
-		elsif line =~ /\s*(require|load)\s+('|")rant\/(import\/\w+)(\.rb)?('|")/
+		elsif line =~
+                    /\s*(require|load)\s+('|")rant\/(import\/[\w\/]+)(\.rb)?('|")/
 		    # some "import" code
 		    name = $3
 		elsif line =~ /\s*(require|load)\s+('|")([^\2]+)\2[^r]*rant-import/
@@ -302,16 +321,17 @@ EOF
 		    lib_file = $3
 		end
 		if name
-		    next if @core_imports.include? name
+                    rfn = "rant/#{name}"
+		    next if @included_files.include? rfn
 		    path = get_lib_rant_path "#{name}.rb"
 		    msg "Including `#{name}'", path
-		    @core_imports << name
+		    @included_files << rfn
 		    rs << resolve_requires(File.read(path))
 		elsif lib_file
-		    next if @lib_imports.include? lib_file
+		    next if @included_files.include? lib_file
 		    path = get_lib_path "#{lib_file}.rb"
 		    msg "Including `#{lib_file}'", path
-		    @lib_imports << lib_file
+		    @included_files << lib_file
 		    rs << resolve_requires(File.read(path))
 		else
 		    line.sub!(/^\s+/, '') if @reduce_whitespace

data/lib/rant/plugin/csharp.rb

@@ -9,7 +9,7 @@ module Rant
     class Generators::Assembly < CsCompiler
 	class << self
 
-	    def rant_generate(app, clr, args, &block)
+	    def rant_gen(app, clr, args, &block)
 		assembly = self.new(&block)
 		if args.size == 1
 		    targ = args.first

data/lib/rant/rantenv.rb

@@ -4,8 +4,8 @@ require 'rbconfig'
 
 module Rant end
 
-# This module provides some platform indenpendant
-# (let's hope) environment information.
+# This module interfaces with the environment to provide
+# information/conversion methods in a portable manner.
 module Rant::Env
     OS		= ::Config::CONFIG['target']
     RUBY	= ::Config::CONFIG['ruby_install_name']
@@ -176,14 +176,3 @@ module Rant::Console
 
     extend self
 end
-
-class Rant::CustomConsole
-    include Rant::Console
-
-    def initialize msg_prefix = RANT_PREFIX
-	@msg_prefix = msg_prefix || ""
-    end
-    def msg_prefix=(str)
-	@msg_prefix = str || ""
-    end
-end

data/lib/rant/rantfile.rb

@@ -170,7 +170,7 @@ module Rant
 	include Node
 
 	class << self
-	    def rant_generate(rac, ch, args, &block)
+	    def rant_gen(rac, ch, args, &block)
 		unless args.size == 1
 		    rac.abort("LightTask takes only one argument " +
 			"which has to be the taskname (string or symbol)")
@@ -242,9 +242,9 @@ module Rant
 	T0 = Time.at(0).freeze
 
 	class << self
-	    def rant_generate(rac, ch, args, &block)
+	    def rant_gen(rac, ch, args, &block)
 		if args.size == 1
-		    UserTask.rant_generate(rac, ch, args, &block)
+		    UserTask.rant_gen(rac, ch, args, &block)
 		else
 		    rac.abort("Task generator currently takes only one" +
 			" argument. (generates a UserTask)")
@@ -459,7 +459,7 @@ module Rant
     class UserTask < Task
 
 	class << self
-	    def rant_generate(rac, ch, args, &block)
+	    def rant_gen(rac, ch, args, &block)
 		unless args.size == 1
 		    rac.abort("UserTask takes only one argument " +
 			"which has to be like one given to the " +
@@ -594,7 +594,7 @@ module Rant
 	    # block will be called after complete directory creation.
 	    # After the block execution, the modification time of the
 	    # directory will be updated.
-	    def rant_generate(rac, ch, args, &block)
+	    def rant_gen(rac, ch, args, &block)
 		case args.size
 		when 1
 		    name, pre, file, ln = rac.normalize_task_arg(args.first, ch)
@@ -630,11 +630,11 @@ module Rant
 		task_block = nil
 		desc_for_last = rac.pop_desc
 		dirs.each { |dir|
-		    pre = [path]
-		    pre.compact!
+                    pre = [path]
+                    pre.compact!
 		    if dir.equal?(dirs.last)
 			rac.cx.desc desc_for_last
-			pre.concat prerequisites if prerequisites
+                        pre = prerequisites + pre
 			task_block = block
 		    end
 		    path = path.nil? ? dir : File.join(path, dir)
@@ -713,7 +713,7 @@ module Rant
     class SourceNode
 	include Node
 
-	def self.rant_generate(rac, ch, args)
+	def self.rant_gen(rac, ch, args)
 	    unless args.size == 1
 		rac.abort_at(ch, "SourceNode takes one argument.")
 	    end
@@ -800,7 +800,7 @@ module Rant
 	class Rule < ::Proc
 	    # Generate a rule by installing an at_resolve hook for
 	    # +rac+.
-	    def self.rant_generate(rac, ch, args, &block)
+	    def self.rant_gen(rac, ch, args, &block)
 		unless args.size == 1
 		    rac.abort_at(ch, "Rule takes only one argument.")
 		end
@@ -863,7 +863,7 @@ module Rant
 	end	# class Rule
 
 	class Action
-	    def self.rant_generate(rac, ch, args, &block)
+	    def self.rant_gen(rac, ch, args, &block)
 		unless args.empty?
 		    rac.warn_msg(rac.pos_text(ch[:file], ch[:ln]),
 			"Action doesn't take arguments.")

data/lib/rant/rantlib.rb

@@ -539,12 +539,12 @@ class Rant::RantApp
 	pre = []
 	# validate args
 	generator = args.shift
-	unless generator.respond_to? :rant_generate
+	unless generator.respond_to? :rant_gen
 	    abort_at(ch,
 		"First argument to `gen' has to be a task-generator.")
 	end
 	# ask generator to produce a task for this application
-	generator.rant_generate(self, ch, args, &block)
+	generator.rant_gen(self, ch, args, &block)
     end
 
     # Currently ignores block.
@@ -938,6 +938,10 @@ class Rant::RantApp
     end
     public :resolve
 
+    # This hook will be invoked when no matching task is found for a
+    # target. It may create one or more tasks for the target, which is
+    # given as argument, on the fly and return an array of the created
+    # tasks or nil.
     def at_resolve &block
 	@resolve_hooks << block if block
     end
@@ -1244,7 +1248,7 @@ class Rant::RantApp
 		end
 	    elsif Rant::CommandError === orig
 		msg << orig.message if @opts[:err_commands]
-	    elsif !(Rant::RantAbortException === orig)
+	    elsif orig && !(Rant::RantAbortException === orig)
 		msg << orig.message << orig.backtrace[0..4]
 	    end
 	end

data/lib/rant/rantsys.rb

@@ -57,6 +57,7 @@ module Rant
 	end
 
 	def to_ary
+            #puts caller
 	    resolve if @pending
 	    @files
 	end
@@ -68,7 +69,9 @@ module Rant
 	def +(other)
 	    case other
 	    when Array
-		dup.files.concat(other)
+		c = dup
+		c.files.concat(other)
+		c
 	    when FileList
 		c = other.dup
 		c.actions.concat(@actions)
@@ -80,11 +83,22 @@ module Rant
 	    end
 	end
 
-	def <<(file)
+        # Add file to filelist unless it matches an exclude pattern.
+        # Take care: Don't rely on any order when inserting a file
+        # with this method!
+	def add(file)
 	    @files << file unless file =~ ignore_rx
 	    self
 	end
 
+        # Like #add but doesn't honor exclude patterns.
+        # Returns self.
+        def <<(file)
+            #STDERR.puts caller unless String === file
+            @actions << [:apply_ary_method_1, :push, file]
+            self
+        end
+
 	def concat(ary)
 	    resolve if @pending
 	    ix = ignore_rx
@@ -316,10 +330,47 @@ module Rant
 	def arglist
 	    to_ary.arglist
 	end
+
+        # Same as #uniq! but evaluation is delayed until the next read
+        # access (e.g. by calling #each). Always returns self.
+        def lazy_uniq!
+            @actions << [:apply_ary_method, :uniq!]
+            @pending = true
+            self
+        end
+
+        # Same as #sort! but evaluation is delayed until the next read
+        # access (e.g. by calling #each). Always returns self.
+        def lazy_sort!
+            @actions << [:apply_ary_method, :sort!]
+            @pending = true
+            self
+        end
+
+        private
+        def apply_ary_method(meth)
+            @files.send meth
+        end
+        def apply_ary_method_1(meth, arg1)
+            @files.send meth, arg1
+        end
     end	# class FileList
 
     class RacFileList < FileList
 
+        # Returns files if <tt>FileList === files</tt>, otherwise
+        # a new RacFileList with <tt>file.to_ary</tt> as initial set
+        # of files.
+        def self.filelist(rac, files)
+            return files if FileList === files
+            fl = self.new(rac)
+            fl.instance_eval {
+                @pending = false
+                @files = files.to_ary
+            }
+            fl
+        end
+
 	attr_reader :subdir
 	attr_reader :basedir
 

data/lib/rant/rantvar.rb

@@ -16,7 +16,7 @@
 # If you're looking for general info about Rant, read the
 # README[link:files/README.html].
 module Rant
-    VERSION	= '0.3.8'
+    VERSION	= '0.4.0'
 
     # Those are the filenames for rantfiles.
     # Case matters!
@@ -46,6 +46,67 @@ module Rant
     module Generators
     end
 
+    @__rant_no_value__ = Object.new.freeze
+    def self.__rant_no_value__
+	@__rant_no_value__
+    end
+
+    module MetaUtils
+	# Creates two accessor methods:
+	#    obj.attr_name::	Return value of instance variable
+	#			@attr_name
+	#    obj.attr_name = val::	Set value instance variable
+	#				@attr_name to val
+	#    obj.attr_name val::	same as above
+	def rant_attr attr_name
+	    attr_name = valid_attr_name attr_name
+	    attr_writer attr_name
+	    module_eval <<-EOD
+		def #{attr_name} val=Rant.__rant_no_value__
+		    if val.equal? Rant.__rant_no_value__
+			@#{attr_name}
+		    else
+			@#{attr_name} = val
+		    end
+		end
+	    EOD
+	    nil
+	end
+	# Creates accessor methods like #rant_attr for the attribute
+	# attr_name. Additionally, values are converted with to_str
+	# before assignment to instance variables happens.
+	def string_attr attr_name
+	    attr_name = valid_attr_name attr_name
+	    module_eval <<-EOD
+		def #{attr_name}=(val)
+		    if val.respond_to? :to_str
+			@#{attr_name} = val.to_str
+		    else
+			raise ArgumentError,
+			    "string (#to_str) value required", caller
+		    end
+		end
+		def #{attr_name} val=Rant.__rant_no_value__
+		    if val.equal? Rant.__rant_no_value__
+			@#{attr_name}
+		    else
+			self.__send__(:#{attr_name}=, val)
+		    end
+		end
+	    EOD
+	    nil
+	end
+	# attr_name is converted to a string with #to_s and has to
+	# match /^\w+$/. Returns attr_name.to_s.
+	def valid_attr_name attr_name
+	    attr_name = attr_name.to_s
+	    attr_name =~ /^\w+$/ or
+		raise ArgumentError,
+		    "argument has to match /^\w+$/", caller
+	    attr_name
+	end
+    end # module MetaUtils
+
     module RantVar
 
 	class Error < RantError