rant 0.3.2 → 0.3.4

data/lib/rant/rantsys.rb

@@ -4,15 +4,6 @@ require 'rant/rantenv'
 
 module Rant
 
-    class Glob < String
-	class << self
-	    # A synonym for +new+.
-	    def [](pattern)
-		new(pattern)
-	    end
-	end
-    end
-
     class FileList
 	include Enumerable
 
@@ -23,6 +14,8 @@ module Rant
 	# Flags for the File::fnmatch method.
 	# Initialized to 0.
 	attr_accessor :glob_flags
+	
+	attr_reader :ignore_rx
 
 	class << self
 	    def [](*patterns)
@@ -34,12 +27,21 @@ module Rant
 	    @glob_flags = 0
 	    @files = []
 	    @actions = patterns.map { |pat| [:apply_include, pat] }
+	    @ignore_rx = nil
 	    @pending = true
 	    yield self if block_given?
 	end
 
+	def dup
+	    c = super
+	    c.files = @files.dup
+	    c.actions = @actions.dup
+	    c.ignore_rx = @ignore_rx.dup if @ignore_rx
+	    c
+	end
+
 	protected
-	attr_reader :actions, :files
+	attr_accessor :actions, :files
 	attr_accessor :pending
 
 	public
@@ -75,7 +77,14 @@ module Rant
 	end
 
 	def <<(file)
-	    @files << file
+	    @files << file unless file =~ ignore_rx
+	    self
+	end
+
+	def concat(ary)
+	    resolve if @pending
+	    ix = ignore_rx
+	    @files.concat(ary.to_ary.reject { |f| f =~ ix })
 	    self
 	end
 
@@ -87,7 +96,9 @@ module Rant
 	def method_missing(sym, *args, &block)
 	    if @files.respond_to? sym
 		resolve if @pending
+		fh = @files.hash
 		@files.send(sym, *args, &block)
+		@pending = true unless @files.hash == fh
 	    else
 		super
 	    end
@@ -100,6 +111,10 @@ module Rant
 		self.send(*action)
 	    }
 	    @actions.clear
+	    ix = ignore_rx
+	    if ix
+		@files.reject! { |f| f =~ ix }
+	    end
 	end
 
 	def include(*patterns)
@@ -128,6 +143,24 @@ module Rant
 	    self
 	end
 
+	def ignore(*patterns)
+	    patterns.each { |pat|
+		add_ignore_rx(Regexp === pat ? pat : mk_all_rx(pat))
+	    }
+	    @pending = true
+	    self
+	end
+
+	def add_ignore_rx(rx)
+	    @ignore_rx =
+	    if @ignore_rx
+		Regexp.union(@ignore_rx, rx)
+	    else
+		rx
+	    end
+	end
+	private :add_ignore_rx
+
 	def apply_exclude(pattern)
 	    @files.reject! { |elem|
 		File.fnmatch? pattern, elem, @glob_flags
@@ -270,34 +303,35 @@ module Rant
 	def arglist
 	    to_ary.arglist
 	end
-=begin
-	def arglist
-	    self.list.join(' ')
-	end
-
-	def list
-	    if ::Rant::Env.on_windows?
-		self.collect { |entry|
-		    entry = entry.tr("/", "\\")
-		    if entry.include? ' '
-			'"' + entry + '"'
-		    else
-			entry
-		    end
-		}
-	    else
-		self.collect { |entry|
-		    if entry.include? ' '
-			"'" + entry + "'"
-		    else
-			entry
-		    end
-		}
-	    end
+    end	# class FileList
+
+    class RacFileList < FileList
+
+	def initialize(rac, *patterns)
+	    @rac = rac
+	    super(*patterns)
+	    @ignore_hash = nil
+	    update_ignore_rx
 	end
-=end
 
-    end	# class FileList
+	private :ignore
+
+	def ignore_rx
+	    update_ignore_rx
+	    @ignore_rx
+	end
+
+	private
+	def update_ignore_rx
+	    ri = @rac.var[:ignore]
+	    rh = ri.hash
+	    unless rh == @ignore_hash
+		@ignore_rx = nil
+		ignore(*ri) if ri
+		@ignore_hash = rh
+	    end
+	end
+    end
 
     class CommandError < StandardError
 	attr_reader :cmd
@@ -338,7 +372,7 @@ module Rant
 	# We override the output method of the FileUtils module to
 	# allow the Rant application to control output.
 	def fu_output_message(msg)	#:nodoc:
-	    ::Rant.rantapp.cmd_msg msg if ::Rant.rantapp
+	    ::Rant.rac.cmd_msg msg if ::Rant.rac
 	end
 
 	def sh(*cmd_args, &block)
@@ -396,18 +430,27 @@ module Rant
     class SysObject
 	include Sys
 
-	# This could be an Rant application. It has to respond to
-	# +:cmd_msg+.
-	attr_reader :controller
+	# The controlling Rant compiler.
+	attr_reader :rac
 
-	def initialize(controller)
-	    @controller = controller or
+	def initialize(rac)
+	    @rac = rac or
 		raise ArgumentError, "controller required"
 	end
 
+	def glob(*args, &block)
+	    fl = RacFileList.new(@rac, *args)
+	    fl.instance_eval(&block) if block
+	    fl
+	end
+
+	def [](*patterns)
+	    RacFileList.new(@rac, *patterns)
+	end
+
 	private
 	def fu_output_message(cmd)
-	    @controller.cmd_msg cmd
+	    @rac.cmd_msg cmd
 	end
     end
 end	# module Rant

data/lib/rant/rantvar.rb

@@ -1,24 +1,95 @@
 
+# rantvar.rb - Constants required by all Rant code.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+#
+# This program is free software.
+# You can distribute/modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.1.
+#
 # This file provides support for the +var+ attribute of the Rant
 # application (Rant::RantApp#var).
 
 module Rant
+    VERSION	= '0.3.4'
+
+    # Those are the filenames for rantfiles.
+    # Case matters!
+    RANTFILES	= [	"Rantfile",
+			"rantfile",
+			"Rantfile.rb",
+			"rantfile.rb",
+		  ]
+    
+    # Names of plugins and imports for which code was loaded.
+    # Files that where loaded with the `import' commant are directly
+    # added; files loaded with the `plugin' command are prefixed with
+    # "plugin/".
+    CODE_IMPORTS = []
+    
+    class RantAbortException < StandardError
+    end
+
+    class RantDoneException < StandardError
+    end
+
+    class RantError < StandardError
+    end
+
+    class RantfileException < RantError
+    end
+
+    # This module is a namespace for generator classes.
+    module Generators
+    end
+
     module RantVar
 
-	class Error < StandardError
+	class Error < RantError
 	end
 
 	class ConstraintError < Error
+
+	    attr_reader :constraint, :val
+
+	    def initialize(constraint, val, msg = nil)
+		#super(msg)
+		@msg = msg
+		@constraint = constraint
+		@val = val
+	    end
+
+	    def message
+		# TODO: handle @msg
+		val_desc = @val.inspect
+		val_desc[7..-1] = "..." if val_desc.length > 10
+		"#{val_desc} doesn't match constraint: #@constraint"
+	    end
 	end
 
 	class InvalidVidError < Error
+	    def initialize(vid, msg = nil)
+		@msg = msg
+		@vid = vid
+	    end
+	    def message
+		# TODO: handle @msg
+		vid_desc = @vid.inspect
+		vid_desc[7..-1] = "..." if vid_desc.length > 10
+		"#{vid_desc} is not a valid var identifier"
+	    end
 	end
 
 	class InvalidConstraintError < Error
 	end
 
+	class QueryError < Error
+	end
+
 	class Space
 
+	    @@env_ref = Object.new
+
 	    def initialize
 		# holds all values
 		@store = {}
@@ -26,44 +97,190 @@ module Rant
 		@constraints = {}
 	    end
 
+	    def query(*args, &block)
+		# currently ignoring block
+		case args.size
+		when 0
+		    raise QueryError, "no arguments", caller
+		when 1
+		    arg = args.first
+		    if Hash === arg
+			init_all arg
+		    else
+			self[arg]
+		    end
+		when 2..3
+		    vid, constraint, val = *args
+		    begin
+			constraint =
+			    Constraints.const_get(constraint).new
+		    rescue
+			raise QueryError,
+			    "no such constraint: #{constraint}", caller
+		    end
+		    constrain vid, constraint
+		    self[vid] = val if val
+		else
+		    raise QueryError, "to many arguments"
+		end
+	    end
+
 	    # Get var with name +vid+.
 	    def [](vid)
-		unless RantVar.valid_vid? vid
-		    raise InvalidVidError, vid 
-		end
-		@store[vid]
+		vid = RantVar.valid_vid vid
+		val = @store[vid]
+		val.equal?(@@env_ref) ? ENV[vid] : val
 	    end
 
 	    # Set var with name +vid+ to val. Throws a ConstraintError
 	    # if +val+ doesn't match the constraint on +vid+ (if a
 	    # constraint is registered for +vid+).
 	    def []=(vid, val)
-		unless RantVar.valid_vid? vid
-		    raise InvalidVidError, vid 
-		end
+		vid = RantVar.valid_vid(vid)
 		c = @constraints[vid]
-		@store[vid] = c ? c.filter(val) : val
+		if @store[vid] == @@env_ref
+		    ENV[vid] = c ? c.filter(val) : val
+		else
+		    @store[vid] = c ? c.filter(val) : val
+		end
+	    end
+
+	    # Use ENV instead of internal store for given vars.
+	    # Probably useful for vars like CC, CFLAGS, etc.
+	    def env *vars
+		vars.flatten.each { |var|
+		    vid = RantVar.valid_vid(var)
+		    cur_val = @store[vid]
+		    next if cur_val == @@env_ref
+		    ENV[vid] = cur_val unless cur_val.nil?
+		    @store[vid] = @@env_ref
+		}
+		nil
+	    end
+
+	    def set_all hash
+		unless Hash === hash
+		    raise QueryError,
+			"set_all argument has to be a hash"
+		end
+		hash.each_pair { |k, v|
+		    self[k] = v
+		}
+	    end
+
+	    def init_all hash
+		unless Hash === hash
+		    raise QueryError,
+			"init_all argument has to be a hash"
+		end
+		hash.each_pair { |k, v|
+		    self[k] = v if self[k].nil?
+		}
 	    end
 
 	    # Add +constraint+ for var with id +vid+.
 	    def constrain vid, constraint
-		unless RantVar.valid_vid? vid
-		    raise InvalidVidError, vid 
-		end
+		vid = RantVar.valid_vid(vid)
 		unless RantVar.valid_constraint? constraint
 		    raise InvalidConstraintError, constraint
 		end
 		@constraints[vid] = constraint
+		if @store.member? vid
+		    begin
+			val = @store[vid]
+			@store[vid] = constraint.filter(@store[vid])
+		    rescue
+			@store[vid] = constraint.default
+			raise ConstraintError.new(constraint, val)
+		    end
+		else
+		    @store[vid] = constraint.default
+		end
 	    end
 
 	end	# class Space
 
 	module Constraint
-	end	# module Constraint
+	    def matches? val
+		filter val
+		true
+	    rescue
+		return false
+	    end
+	end
+
+	module Constraints
+
+	    class Integer
+		include Constraint
+
+		def filter(val)
+		    Kernel::Integer(val)
+		rescue
+		    raise ConstraintError.new(self, val)
+		end
+		def default
+		    0
+		end
+		def to_s
+		    "integer"
+		end
+	    end
+
+	    class AutoList
+		include Constraint
+
+		def filter(val)
+		    if val.respond_to? :to_ary
+			val.to_ary
+		    elsif val.nil?
+			raise ConstraintError.new(self, val)
+		    else
+			[val]
+		    end
+		end
+		def default
+		    []
+		end
+		def to_s
+		    "list or single, non-nil value"
+		end
+	    end
+
+	    class List
+		include Constraint
+
+		def filter(val)
+		    if val.respond_to? :to_ary
+			val.to_ary
+		    else
+			raise ConstraintError.new(self, val)
+		    end
+		end
+		def default
+		    []
+		end
+		def to_s
+		    "list (Array)"
+		end
+	    end
+
+	    Array = List
+
+	end	# module Constraints
 
 	# A +vid+ has to be a String to be valid.
-	def valid_vid?(obj)
-	    String === obj
+	def valid_vid(obj)
+	    case obj
+	    when String: obj
+	    when Symbol: obj.to_s
+	    else
+		if obj.respond_to? :to_str
+		    obj.to_str
+		else
+		    raise InvalidVidError.new(obj)
+		end
+	    end
 	end
 	
 	# A constraint has to respond to the following methods:
@@ -74,9 +291,11 @@ module Rant
 	#   Return true if _val_ matches constraint.
 	def valid_constraint?(obj)
 	    # TODO: check for arity
-	    obj.respond_to?(:filter) && obj.respond_to?(:matches?)
+	    obj.respond_to?(:filter) &&
+		obj.respond_to?(:matches?) &&
+		obj.respond_to?(:default)
 	end
 
-	module_function :valid_constraint?, :valid_vid?
+	module_function :valid_constraint?, :valid_vid
     end	# module RantVar
 end	# module Rant