rant 0.3.0 → 0.3.2

data/lib/rant/import.rb

@@ -267,11 +267,24 @@ EOF
 	# code by directly inserting the code.
 	def resolve_requires script
 	    rs = ""
+	    # TODO: skip multiline comments (=begin, =end) only of
+	    # @skip_comments is true
+	    in_ml_comment = false
 	    script.each { |line|
+		if in_ml_comment
+		    if line =~ /^=end/
+			in_ml_comment = false
+		    end
+		    next if @skip_comments
+		end
 		# skip shebang line
 		next if line =~ /^#! ?(\/|\\)?\w/
 		# skip pure comment lines
 		next if line =~ /^\s*#/ if @skip_comments
+		if line =~ /^=begin\s/
+		    in_ml_comment = true
+		    next if @skip_comments
+		end
 		if line =~ /\s*(require|load)\s+('|")rant\/(\w+)(\.rb)?('|")/
 		    name = $3
 		    next if @core_imports.include? name

data/lib/rant/import/rubypackage.rb

@@ -1,23 +1,6 @@
 
 require 'rant/rantlib'
 
-=begin
-class Rant::MethodRecorder
-    ACCEPT_ALL_BLOCK = lambda { true }
-    def intialize(&accept)
-	@ml = []
-	@accept = &accept || ACCEPT_ALL_BLOCK
-    end
-    def method_missing(sym, *args)
-	if @accept.call(sym, args)
-	    @ml << [sym, args]
-	else
-	    super
-	end
-    end
-end
-=end
-
 class Rant::RubyPackage
 
     class << self
@@ -29,14 +12,14 @@ class Rant::RubyPackage
 		when String: args.first
 		when Symbol: args.first.to_s
 		else
-		    app.abort("RubyDoc takes only one additional " +
+		    app.abort("RubyPackage takes only one additional " +
 			"argument, which should be a string or symbol.")
 		end
 		self.new(:app => app, :__caller__ => ch,
 		    :name => pkg_name, &block)
 	    else
 		app.abort(app.pos_text(file, ln),
-		    "RubyDoc takes only one additional argument, " +
+		    "RubyPackage takes only one additional argument, " +
 		    "which should be a string or symbol.")
 	    end
 	end
@@ -105,7 +88,11 @@ class Rant::RubyPackage
 	    end
 	    def #{a}=(val)
 		unless val.nil? || Array === val
-		    val = [val]
+		    if val.respond_to? :to_ary
+			val = val.to_ary
+		    else
+			val = [val]
+		    end
 		end
 		@data["#{a}"] = val
 	    end
@@ -129,6 +116,9 @@ class Rant::RubyPackage
 	name = opts[:name]
 	@ch = opts[:__caller__] || Rant::Lib.parse_caller_elem(caller[0])
 	unless name
+	    # TODO: pos_text
+	    @app.warn_msg(@app.pos_text(@ch[:file], @ch[:ln]),
+		"No package name given, using directory name.")
 	    # use directory name as project name
 	    name = File.split(Dir.pwd)[1]
 	    # reset name if it contains a slash or a backslash
@@ -149,6 +139,35 @@ class Rant::RubyPackage
 	end
     end
 
+    def validate_attrs(pkg_type = :general)
+	%w(name files).each { |a|
+	    pkg_requires_attr a
+	}
+	case pkg_type
+	when :gem
+	    %w(version summary).each { |a|
+		gem_requires_attr a
+	    }
+	end
+    end
+    private :validate_attrs
+
+    def gem_requires_attr(attr_name)
+	unless @data[attr_name] || @data["gem-#{attr_name}"]
+	    @app.abort("RubyPackaged defined: " +
+		@app.pos_text(@ch[:file], @ch[:ln]),
+		"gem specification requires `#{attr_name}' attribute")
+	end
+    end
+
+    def pkg_requires_attr(attr_name)
+	unless @data[attr_name]
+	    @app.abort("RubyPackaged defined: " +
+		@app.pos_text(@ch[:file], @ch[:ln]),
+		"`#{attr_name}' attribute required")
+	end
+    end
+
     def map_to_gemspec spec
 	mapped_attrs = []
 	# Map attributes from data to the gem spec as explicitely
@@ -174,6 +193,7 @@ class Rant::RubyPackage
 	    end
 	}
     end
+    private :map_to_gemspec
 
     def pkg_dir_task
 	return if @pkg_dir_task
@@ -224,6 +244,7 @@ class Rant::RubyPackage
     # Create task for gem building. If tname is a true value, a
     # shortcut-task will be created.
     def gem_task(tname = :gem)
+	validate_attrs(:gem)
 	# We first define the task to create the gem, and afterwards
 	# the task to create the pkg directory to ensure that a
 	# pending description is used to describe the gem task.
@@ -273,6 +294,7 @@ class Rant::RubyPackage
     end
 
     def tar_task(tname = :tar)
+	validate_attrs
 	# Create tar task first to ensure that a pending description
 	# is used for the tar task and not for the dist dir task.
 	pkg_name = tar_pkg_path
@@ -292,6 +314,7 @@ class Rant::RubyPackage
     end
 
     def zip_task(tname = :zip)
+	validate_attrs
 	# Create zip task first to ensure that a pending description
 	# is used for the zip task and not for the dist dir task.
 	pkg_name = zip_pkg_path

data/lib/rant/plugin/configure.rb

@@ -11,8 +11,8 @@ module Rant::Plugin
     # The configuration file will be read and the data hash
     # set up accordingly.
     # ==== Config file doesn't exist
-    # The configuration process is run with +startup_modes+ which
-    # has to be one of CHECK_MODES. +startup_modes+ defaults to
+    # The configuration process is run with +init_modes+ which
+    # has to be one of CHECK_MODES. +init_modes+ defaults to
     # :default, which means if the configfile doesn't exist,
     # all values will be set to their defaults on startup.
     # === Access to configuration in Rantfile
@@ -78,6 +78,10 @@ module Rant::Plugin
 	# Decide what the configure plugin does on startup if the
 	# configuration file doesn't exist. Initialized to
 	# <tt>[:guess]</tt>.
+	#
+	# If you want to control when the plugin should initialize the
+	# configuration values, set this to +[:explicit]+ and call the
+	# +init+ method with the init_modes you like as argument.
 	attr_accessor :init_modes
 
 	# Decide what the configure plugin does *after* reading the
@@ -199,6 +203,17 @@ module Rant::Plugin
 	   checklist << ConfigureCheck.new(key, val, &block) 
 	end
 
+	def init modes = @init_modes
+	    if modes == [:explicit]
+		modes = [:guess]
+	    end
+	    @no_action = @no_action_list.include? @app.cmd_targets.first
+	    unless @no_action
+		init_config modes
+		@configured = true
+	    end
+	end
+
 	# Run the configure process in the given modes.
 	def run_checklist(modes = [:guess, :interact])
 	    @checklist.each { |c|
@@ -230,8 +245,7 @@ module Rant::Plugin
 	end
 
 	def rant_plugin_init
-	    @no_action = @no_action_list.include? @app.cmd_targets.first
-	    @no_action || init_config
+	    init unless @init_modes == [:explicit]
 	end
 
 	def rant_plugin_stop
@@ -242,12 +256,12 @@ module Rant::Plugin
 	private
 
 	# Returns true on success, nil on failure.
-	def init_config
+	def init_config modes
 	    if File.exist? @file
 		read_yaml
 		@configured = true
-	    elsif !@init_modes == [:default]
-		run_checklist @init_modes
+	    elsif modes != [:default]
+		run_checklist modes
 	    end
 	    if @override_modes && !@override_modes.empty?
 		run_checklist @override_modes

data/lib/rant/plugin/csharp.rb

@@ -87,7 +87,7 @@ module Rant
 	def take_common_attrs comp
 	    @csc_name = comp.csc_name
 	    @long_name = comp.long_name
-	    @csc = comp.csc
+	    @csc_bin = comp.csc_bin
 	    @debug = comp.debug
 	    comp.defines.each { |e|
 		@defines << e unless @defines.include? e
@@ -148,25 +148,23 @@ module Rant
 	def initialize(app, assembly)
 	    @assembly = assembly
 	    super(app, @assembly.out) { |t|
-		app.context.instance_eval {
-		    sys.sh assembly.send("cmd_" + assembly.target)
-		}
+		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
-	### experimental ###
+=end
 	def invoke(force = false)
 	    @assembly.init
 	    @pre.concat(@assembly.sources)
 	    @pre.concat(@assembly.resources) if @assembly.resources
 	    super
 	end
-	####################
     end
 end	# module Rant
 
@@ -234,9 +232,9 @@ module Rant::Plugin
 		c.interact {
 		    c.prompt "Command to invoke your C# Compiler: "
 		}
-		c.react {
-		    c.msg "Using `#{c.value}' as C# compiler."
-		}
+		#c.react {
+		#    c.msg "Using `#{c.value}' as C# compiler."
+		#}
 	    end
 	    @config.check "csc-optimize" do |c|
 		c.default true
@@ -256,6 +254,7 @@ module Rant::Plugin
 	    return nil unless @config
 	    return nil unless @config.configured?
 	    csc_bin = @config["csc"]
+	    #puts "using csc from config: " + csc_bin
 	    csc = Rant::CsCompiler.new
 	    csc.csc = csc_bin
 	    csc.optimize = @config["csc-optimize"]

data/lib/rant/rantenv.rb

@@ -31,6 +31,9 @@ class Rant::Path
     def absolute_path
 	@abs_path ||= File.expand_path(@path)
     end
+    def dirname
+	File.dirname absolute_path
+    end
 end
 
 # This module provides some platform indenpendant

data/lib/rant/rantfile.rb

@@ -18,13 +18,17 @@ module Rant
     class Rantfile < Path
 
 	attr_reader :tasks
+	attr_accessor :project_subdir
 	
 	def initialize(*args)
 	    super
 	    @tasks = []
+	    @project_subdir = nil
 	end
     end	# class Rantfile
 
+    # Any +object+ is considered a _task_ if
+    # <tt>Rant::Worker === object</tt> is true.
     module Worker
 
 	INVOKE_OPT = {}.freeze
@@ -52,6 +56,19 @@ module Rant
 	    name
 	end
 
+	def project_subdir
+	    @rantfile.nil? ? "" : @rantfile.project_subdir
+	end
+
+	def full_name
+	    sd = project_subdir
+	    sd.empty? ? name : File.join(sd, name)
+	end
+
+	def goto_task_home
+	    @app.goto_project_dir project_subdir
+	end
+
 	def done?
 	    @done
 	end
@@ -60,8 +77,17 @@ module Rant
 	    !done?
 	end
 
-	# +opt+ shouldn't be modified
+	# +opt+ is a Hash and shouldn't be modified.
+	# All objects implementing the Rant::Worker protocol should
+	# know about the following +opt+ values:
+	# <tt>:needed?</tt>::
+	#	Just check if this task is needed.  Should do the same
+	#	as calling Worker#needed?
+	# <tt>:force</tt>::
+	#	Run task action even if needed? is false.
 	def invoke(opt = INVOKE_OPT)
+	    goto_task_home
+	    return needed? if opt[:needed?]
 	    self.run if opt[:force] || self.needed?
 	end
 
@@ -71,6 +97,7 @@ module Rant
 
 	def run
 	    return unless @block
+	    goto_task_home
 	    @block.arity == 0 ? @block.call : @block[self]
 	end
 	private :run
@@ -90,16 +117,16 @@ module Rant
 
 	class << self
 	    def for_task t
-		mt = self.new(t.name)
+		mt = self.new(t.full_name)
 		mt << t
 	    end
 	    def for_tasks *tasks
-		mt = self.new(tasks.first.name)
+		mt = self.new(tasks.first.full_name)
 		mt.concat tasks
 		mt
 	    end
 	    def for_task_list tasks
-		mt = self.new(tasks.first.name)
+		mt = self.new(tasks.first.full_name)
 		mt.concat tasks
 		mt
 	    end
@@ -121,6 +148,7 @@ module Rant
 	def invoke(opt = INVOKE_OPT)
 	    uf = false
 	    each { |t| t.invoke(opt) && uf = true }
+	    uf
 	end
 
 	def description
@@ -166,8 +194,7 @@ module Rant
 			block) { |name,pre,blk|
 		    # TODO: ensure pre is empty
 		    # TODO: earlier setting of app?
-		    t = self.new(app, name, &blk)
-		    t
+		    self.new(app, name, &blk)
 		}
 	    end
 	end
@@ -190,7 +217,7 @@ module Rant
 	end
 
 	def app
-	    @app || Rant.rantapp
+	    @app
 	end
 
 	def needed &block
@@ -210,6 +237,7 @@ module Rant
 	def needed?
 	    return false if done?
 	    return true if @needed.nil?
+	    goto_task_home
 	    if @needed.arity == 0
 		@needed.call
 	    else
@@ -218,6 +246,8 @@ module Rant
 	end
 
 	def invoke(opt = INVOKE_OPT)
+	    return needed? if opt[:needed?]
+	    goto_task_home
 	    if opt[:force] && !@done
 		self.run
 		@done = true
@@ -247,14 +277,10 @@ module Rant
 	class << self
 	    def rant_generate(app, ch, args, &block)
 		if args.size == 1
-		    if Hash === args.first
-			UserTask.rant_generate(app, ch, args, &block)
-		    else
-			LightTask.rant_generate(app, ch, args, &block)
-		    end
+		    UserTask.rant_generate(app, ch, args, &block)
 		else
 		    app.abort("Task generator currently takes only one" +
-			" argument. (Generates a LightTask or UserTask)")
+			" argument. (generates a UserTask)")
 		end
 	    end
 	end
@@ -306,17 +332,21 @@ module Rant
 	end
 
 	# Enhance this task with the given dependencies and blk.
-	def enhance(deps = [], &blk)
+	def enhance(deps = nil, &blk)
 	    if deps
 		@pre_resolved = false
 		@pre.concat deps
 	    end
-	    if blk
-		first_block = @block
-		@block = lambda { |t|
-		    first_block[t]
-		    blk[t]
-		}
+	    if @block
+		if blk
+		    first_block = @block
+		    @block = lambda { |t|
+			first_block[t]
+			blk[t]
+		    }
+		end
+	    else
+		@block = blk
 	    end
 	end
 
@@ -332,6 +362,7 @@ module Rant
 	end
 
 	def internal_invoke opt, ud_init = true
+	    goto_task_home
 	    update = ud_init || opt[:force]
 	    dep = nil
 	    uf = false
@@ -414,10 +445,11 @@ module Rant
 	    if @pre_resolved
 		return @pre.each { |t| yield(t) }
 	    end
+	    my_full_name = full_name
 	    @pre.map! { |t|
 		if Worker === t
 		    # Remove references to self from prerequisites!
-		    if t.name == @name
+		    if t.full_name == my_full_name
 			nil
 		    else
 			yield(t)
@@ -425,15 +457,13 @@ module Rant
 		    end
 		else
 		    t = t.to_s if Symbol === t
-		    if t == @name
+		    if t == my_full_name
 			nil
 		    else
-			# Pre 0.2.6 task selection scheme ###########
-			# Take care: selection is an array of tasks
-			#selection = @app.select_tasks { |st| st.name == t }
-			#############################################
-
-			selection = @app.select_tasks_by_name t
+			#STDERR.puts "selecting `#{t}'"
+			selection = @app.select_tasks_by_name t,
+					project_subdir
+			#STDERR.puts selection.size
 			if selection.empty?
 			    # use return value of yield
 			    yield(t)
@@ -496,6 +526,7 @@ module Rant
 	private
 	def ud_init_by_needed
 	    if @needed
+		goto_task_home
 		@needed.arity == 0 ? @needed.call : @needed[self]
 	    end
 	end
@@ -525,6 +556,7 @@ module Rant
 
 	def invoke(opt = INVOKE_OPT)
 	    return if done?
+	    goto_task_home
 	    if @path.exist?
 		@ts = @path.mtime
 		internal_invoke opt, false
@@ -558,6 +590,8 @@ module Rant
     # directory.
     class DirTask < Task
 
+	# TODO: subdir support
+
 	class << self
 
 	    # Generate a task for making a directory path.
@@ -633,10 +667,9 @@ module Rant
 	end
 
 	def handle_filetask(dep, opt)
-	    return true if dep.invoke opt
+	    return @block if dep.invoke opt
 	    if dep.path.exist?
-		#puts "***`#{dep.name}' requires update" if dep.path.mtime > @ts
-		dep.path.mtime > @ts
+		@block && dep.path.mtime > @ts
 	    end
 	end
 
@@ -647,7 +680,7 @@ module Rant
 		    "in prerequisites: no such file or task: `#{dep}'"
 		self.fail
 	    end
-	    [dep, dep.mtime > @ts]
+	    [dep, @block && dep.mtime > @ts]
 	end
 
 	def run
@@ -657,7 +690,7 @@ module Rant
 		@app.sys.touch @name
 	    end
 	end
-    end
+    end	# class DirTask
     module Generators
 	Directory = ::Rant::DirTask
     end