rant 0.4.8 → 0.5.0

data/lib/rant/import/filelist/more.rb

@@ -0,0 +1,57 @@
+
+# more.rb - More Rant::FileList methods.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    class FileList
+	# Remove all files which have the given name.
+	def no_file(name)
+            @actions << [:apply_ary_method, :reject!,
+                lambda { |entry|
+                    entry == name && !@keep[entry] && test(?f, entry)
+                }]
+	    @pending = true
+	    self
+	end
+
+	# Remove all entries which contain an element
+	# with the given suffix.
+	def no_suffix(suffix)
+	    @actions << [:no_suffix, suffix]
+	    @pending = true
+	    self
+	end
+
+	def apply_no_suffix(suffix)
+	    elems =  nil
+	    elem = nil
+	    @files.reject! { |entry|
+		elems = Sys.split_all(entry)
+		elems.any? { |elem|
+		    elem =~ /#{suffix}$/ && !@keep[entry]
+		}
+	    }
+	end
+	private :apply_no_suffix
+
+	# Remove all entries which contain an element
+	# with the given prefix.
+	def no_prefix(prefix)
+	    @actions << [:no_prefix, prefix]
+	    @pending = true
+	    self
+	end
+
+	def apply_no_prefix(prefix)
+	    elems = elem = nil
+	    @files.reject! { |entry|
+		elems = Sys.split_all(entry)
+		elems.any? { |elem|
+		    elem =~ /^#{prefix}/ && !@keep[entry]
+		}
+	    }
+	end
+	private :apply_no_prefix
+    end # class FileList
+end # module Rant

data/lib/rant/import/metadata.rb

@@ -8,7 +8,7 @@ module Rant
     def self.init_import_metadata(rac, *rest)
         mi = MetaData::Interface.new(rac)
         rac.var._set("__metadata__", mi)
-        rac.at_return(&mi.method(:save))
+        rac.at_return(&mi.method(:at_rant_return))
         rac.var._init("__autoclean_common__", []) << MetaData::META_FN
     end
     
@@ -105,6 +105,10 @@ module Rant
                 set(key, value, fn, dir)
             end
 
+            def at_rant_return
+                save unless @rac[:dry_run]
+            end
+
             # Assumes to be called from the projects root directory.
             def save
                 @modified_dirs.each_key { |dir|

data/lib/rant/import/nodes/default.rb

@@ -43,11 +43,6 @@ module Rant
 	    @pre_resolved = false
 	    @block = block
 	    @run = false
-	    # success has one of three values:
-	    #	nil	no invoke
-	    #	false	invoked, but fail
-	    #	true	invoked and run successfully
-	    @success = nil
             @receiver = nil
 	end
 
@@ -87,11 +82,6 @@ module Rant
 	    @success == false
 	end
 
-	# Task was run and didn't fail.
-	def done?
-	    @success
-	end
-
 	# Enhance this task with the given dependencies and blk.
 	def enhance(deps = nil, &blk)
 	    if deps
@@ -111,10 +101,6 @@ module Rant
 	    end
 	end
 
-	def needed?
-	    invoke(:needed? => true)
-	end
-
 	# Returns a true value if task was acutally run.
 	# Raises Rant::TaskFail to signal task (or prerequiste) failure.
 	def invoke(opt = INVOKE_OPT)
@@ -319,11 +305,6 @@ module Rant
             true
         end
 
-	def needed?
-	    return false if done?
-	    invoke(:needed? => true)
-	end
-
 	def invoke(opt = INVOKE_OPT)
 	    return circular_dep if @run
 	    @run = true
@@ -384,7 +365,7 @@ module Rant
 	private
 	def run
             goto_task_home
-            @rac.running_task(self)
+            return if @rac.running_task(self)
 	    dir = File.dirname(name)
             @rac.build dir unless dir == "." || dir == "/"
             return unless @block
@@ -457,7 +438,7 @@ module Rant
 	end
 
 	def run
-            @rac.running_task(self)
+            return if @rac.running_task(self)
 	    @rac.sys.mkdir @name unless @isdir
 	    if @block
 		@block.arity == 0 ? @block.call : @block[self]
@@ -537,10 +518,8 @@ module Rant
 	    }
 	    @ts
 	end
-	def needed?
-	    false
-	end
 	def invoke(opt = INVOKE_OPT)
+            # self.timestamp would be required for correctness...
 	    false
 	end
         def related_sources

data/lib/rant/import/signedfile.rb

@@ -31,7 +31,6 @@ module Rant
                     raise ArgumentError, "prerequisites required"
                 @block = block
                 @run = false
-                @success = nil
                 @receiver = nil
             end
             def prerequisites
@@ -57,9 +56,6 @@ module Rant
             def fail?
                 @success == false
             end
-            def done?
-                @success
-            end
             def enhance(deps = nil, &blk)
                 @pre.concat(deps) if deps
                 if @block
@@ -74,9 +70,6 @@ module Rant
                     @block = blk
                 end
             end
-            def needed?
-                invoke(:needed? => true)
-            end
             def invoke(opt = INVOKE_OPT)
                 return circular_dep if @run
                 @run = true
@@ -226,7 +219,7 @@ module Rant
             end
             private
             def run
-                @rac.running_task(self)
+                return if @rac.running_task(self)
                 @rac.cx.sys.mkdir @name unless test ?d, @name
                 if @block
                     @block.arity == 0 ? @block.call : @block[self]

data/lib/rant/import/sys/more.rb

@@ -6,8 +6,9 @@
 module Rant
     module Sys
         def write_to_file(fn, content)
+            content = content.to_str
             fu_output_message "writing #{content.size} bytes to file `#{fn}'"
-            open fn, "w" do |f|
+            File.open fn, "w" do |f|
                 f.write content
             end
         end

data/lib/rant/import/var/booleans.rb

@@ -0,0 +1,65 @@
+
+# booleans.rb - Constraints for Rantfile boolean variables.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    module RantVar
+	module Constraints
+	    class Bool
+		include Constraint
+		class << self
+		    alias rant_constraint new
+		end
+		def filter(val)
+		    if ::Symbol === val or ::Integer === val
+			val = val.to_s
+		    end
+		    if val == true
+			true
+		    elsif val == false || val == nil
+			false
+		    elsif val.respond_to? :to_str
+			case val.to_str
+			when /^\s*true\s*$/i:	true
+			when /^\s*false\s*$/i:	false
+			when /^\s*y(es)?\s*$/i:	true
+			when /^\s*n(o)?\s*$/:	false
+			when /^\s*on\s*$/i:	true
+			when /^\s*off\s*$/i:	false
+			when /^\s*1\s*$/:	true
+			when /^\s*0\s*$/:	false
+			else
+			    raise ConstraintError.new(self, val)
+			end
+		    else
+			raise ConstraintError.new(self, val)
+		    end
+		end
+		def default
+		    false
+		end
+		def to_s
+		    "bool"
+		end
+	    end
+
+	    class BoolTrue < Bool
+		def default
+		    true
+		end
+	    end
+
+	    #--
+	    # perhaps this should stay a secret ;)
+	    #++
+	    def true.rant_constraint
+		BoolTrue.rant_constraint
+	    end
+	    def false.rant_constraint
+		Bool.rant_constraint
+	    end
+
+        end # module Constraints
+    end # module RantVar
+end # module Rant

data/lib/rant/import/var/lists.rb

@@ -0,0 +1,34 @@
+
+# lists.rb - Constraints for Rantfile list variables.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    module RantVar
+	module Constraints
+	    class List
+		include Constraint
+
+		class << self
+		    alias rant_constraint new
+		end
+
+		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
+    end # module RantVar
+end # module Rant

data/lib/rant/import/var/numbers.rb

@@ -0,0 +1,116 @@
+
+# numbers.rb - Constraints for numeric Rantfile variables.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    module RantVar
+	module Constraints
+
+	    class Integer
+		include Constraint
+
+		class << self
+		    def rant_constraint(range = nil)
+			if range
+			    IntegerInRange.new(range)
+			else
+			    self.new
+			end
+		    end
+		end
+
+		def filter(val)
+		    Kernel::Integer(val)
+		rescue
+		    raise ConstraintError.new(self, val)
+		end
+		def default
+		    0
+		end
+		def to_s
+		    "integer"
+		end
+	    end
+
+	    class IntegerInRange < Integer
+		def initialize(range)
+		    @range = range
+		end
+		def filter(val)
+		    i = super
+		    if @range === i
+			i
+		    else
+			raise ConstraintError.new(self, val)
+		    end
+		end
+		def default
+		    @range.min
+		end
+		def to_s
+		    super + " #{@range}"
+		end
+	    end
+
+	    class Float
+		include Constraint
+
+		class << self
+		    def rant_constraint(range = nil)
+			if range
+			    FloatInRange.new(range)
+			else
+			    self.new
+			end
+		    end
+		end
+
+		def filter(val)
+		    Kernel::Float(val)
+		rescue
+		    raise ConstraintError.new(self, val)
+		end
+		def default
+		    0.0
+		end
+		def to_s
+		    "float"
+		end
+	    end
+
+	    class FloatInRange < Float
+		def initialize(range)
+		    @range = range
+		end
+		def filter(val)
+		    i = super
+		    if @range === i
+			i
+		    else
+			raise ConstraintError.new(self, val)
+		    end
+		end
+		def default
+		    @range.first
+		end
+		def to_s
+		    super + " #{@range}"
+		end
+	    end
+        end # module Constraints
+    end # module RantVar
+end # module Rant
+
+class Range
+    def rant_constraint
+        case first
+        when ::Integer
+            Rant::RantVar::Constraints::IntegerInRange.new(self)
+        when ::Float
+            Rant::RantVar::Constraints::FloatInRange.new(self)
+        else
+            raise NotAConstraintFactoryError.new(self)
+        end
+    end
+end

data/lib/rant/import/var/strings.rb

@@ -0,0 +1,43 @@
+
+# strings.rb - Constraints for Rantfile string variables.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    module RantVar
+	module Constraints
+	    class String
+		include Constraint
+
+		class << self
+		    alias rant_constraint new
+		end
+
+		def filter(val)
+		    if val.respond_to? :to_str
+			val.to_str
+		    elsif Symbol === val
+			val.to_s
+		    else
+			raise ConstraintError.new(self, val)
+		    end
+		end
+		def default
+		    ""
+		end
+		def to_s
+		    "string"
+		end
+	    end
+
+	    class ToString < String
+		class << self
+		    alias rant_constraint new
+		end
+		def filter(val)
+		    val.to_s
+		end
+	    end
+        end # module Constraints
+    end # module RantVar
+end # module Rant

data/lib/rant/import.rb

@@ -218,7 +218,12 @@ EOF
 	    cmd_opts.quiet = true
 	    cmd_opts.each { |opt, value|
 		case opt
-		when "--version", "-v":
+		when "--version":
+		    puts "rant-import #{Rant::VERSION}"
+		    done
+                when "-v":
+                    warn_msg "Option `-v' is deprecated and won't be in",
+                        "release 0.6.0. Use `-V' or `--version' instead!."
 		    puts "rant-import #{Rant::VERSION}"
 		    done
 		when "--help": help
@@ -436,10 +441,20 @@ EOF
         # Note:: The comment with the module name in line 3 of the
         #        input is very important.
         def filter_reopen_module(script)
+            loop {
+                script, done = filter_reopen_module_onepass(script)
+                break(script) if done
+            }
+        end
+
+        # Returns true as second return value if at no useless
+        # statement was removed.
+        def filter_reopen_module_onepass(script)
             lines = []
             buffer = []
             identifier = nil # class/module name
-            keyword = nil # class or module
+            keyword = nil # `class' or `module'
+            done = true
             script.split(/\n/).each { |line|
                 if identifier
                     if line.strip.empty?
@@ -449,6 +464,7 @@ EOF
                         lines << ""
                         buffer.clear
                         identifier = keyword = nil
+                        done = false
                     else
                         lines.concat buffer
                         buffer.clear
@@ -463,7 +479,7 @@ EOF
                     lines << line
                 end
             }
-            lines.join("\n") << "\n"
+           [lines.join("\n") << "\n", done]
         end
 
     end	# class RantImport

data/lib/rant/node.rb

@@ -73,6 +73,11 @@ module Rant
 	    @line_number = nil
 	    @run = false
             @project_subdir = ""
+	    # success has one of three values:
+	    #	nil	no invoke
+	    #	false	invoked, but fail
+	    #	true	invoked and run successfully
+	    @success = nil
 	end
 
         def reference_name
@@ -113,12 +118,13 @@ module Rant
             false
         end
 
+	# Task was run and didn't fail.
 	def done?
-	    @done
+	    @success
 	end
 
 	def needed?
-	    !done?
+            invoke(:needed? => true)
 	end
 
 	# True during invoke. Used to encounter circular dependencies.
@@ -139,8 +145,11 @@ module Rant
 	    return circular_dep if run?
 	    @run = true
 	    begin
-		return needed? if opt[:needed?]
-		self.run if opt[:force] || self.needed?
+		return !done? if opt[:needed?]
+                # we don't need to check for opt[:force] here
+                # since a plain Node is run anyway.
+		self.run if !done?
+                @success = true
 	    ensure
 		@run = false
 	    end
@@ -163,15 +172,39 @@ module Rant
             defined? @block and @block
         end
 
+        def dry_run
+            text = "Executing #{name.dump}"
+            text << " [NOOP]" unless has_actions?
+            @rac.cmd_msg text
+            action_descs.each { |ad|
+                @rac.cmd_print "  - "
+                @rac.cmd_msg ad.sub(/\n$/, '').gsub(/\n/, "\n    ")
+            }
+        end
+
         private
 	def run
-	    return unless has_actions?
 	    goto_task_home
-            @rac.running_task(self)
+            return if @rac.running_task(self)
+	    return unless has_actions?
             @receiver.pre_run(self) if defined? @receiver and @receiver
 	    @block.arity == 0 ? @block.call : @block[self] if @block
 	end
 
+        def action_descs
+            descs = []
+            if defined? @receiver and @receiver
+                descs.concat(@receiver.pre_action_descs)
+            end
+            @block ? descs << action_block_desc : descs
+        end
+
+        def action_block_desc
+            @block.inspect =~ /^#<Proc:[\da-z]+@(.+):(\d+)>$/i
+            fn, ln = $1, $2
+            "Ruby Proc at #{fn.sub(/^#{Regexp.escape @rac.rootdir}\//, '')}:#{ln}"
+        end
+
 	def circular_dep
 	    rac.warn_msg "Circular dependency on task `#{full_name}'."
 	    false