rant 0.4.6 → 0.4.8

data/lib/rant/import/signedfile.rb

@@ -21,6 +21,8 @@ module Rant
                 }
             end
 
+            attr_accessor :receiver
+
             def initialize(rac, name, prerequisites, &block)
                 super()
                 @rac = rac
@@ -30,7 +32,7 @@ module Rant
                 @block = block
                 @run = false
                 @success = nil
-                @needed_blk = nil
+                @receiver = nil
             end
             def prerequisites
                 @pre
@@ -41,7 +43,7 @@ module Rant
                 @pre.first.to_s
             end
             def has_actions?
-                !!@block
+                @block or @receiver && @receiver.has_pre_action?
             end
             def file_target?
                 true
@@ -75,9 +77,6 @@ module Rant
             def needed?
                 invoke(:needed? => true)
             end
-            def needed(&blk)
-                @needed_blk = blk
-            end
             def invoke(opt = INVOKE_OPT)
                 return circular_dep if @run
                 @run = true
@@ -86,19 +85,17 @@ module Rant
                     goto_task_home
                     @cur_checksums = []
                     @sigs = @rac.var._get("__signature__")
+                    @md = @rac.var._get("__metadata__")
                     key = "prerequisites_sig_#{@sigs.name}"
                     target_key = "target_sig_#{@sigs.name}"
                     up = signed_process_prerequisites(opt)
                     up ||= opt[:force]
-                    if @needed_blk
-                        up = true if @needed_blk.call(self)
-                    end
+                    up = true if @receiver && @receiver.update?(self)
                     @cur_checksums.sort!
                     check_str = @cur_checksums.join
                     @cur_checksums = nil
-                    metadata = @rac.var._get("__metadata__")
-                    old_check_str = metadata.path_fetch(key, @name)
-                    old_target_str = metadata.path_fetch(target_key, @name)
+                    old_check_str = @md.path_fetch(key, @name)
+                    old_target_str = @md.path_fetch(target_key, @name)
                     # check explicitely for plain file, thus allow the
                     # target of a SignedFile to be a directory ;)
                     if test(?f, @name)
@@ -119,18 +116,19 @@ module Rant
                         @sigs.signature_for_file(@name) : ""
                     target_changed = target_str != old_target_str
                     if target_changed
-                        metadata.path_set(target_key, target_str, @name)
+                        @md.path_set(target_key, target_str, @name)
                     end
                     if check_str_changed
-                        metadata.path_set(key, check_str, @name)
+                        @md.path_set(key, check_str, @name)
                     end
+                    @success = true
                     return target_changed
                 rescue TaskFail => e
                     raise
                 rescue Exception => e
                     self.fail(nil, e)
                 ensure
-                    @sigs = nil
+                    @md = @sigs = nil
                     @run = false
                 end
             end
@@ -196,7 +194,8 @@ module Rant
                     self.fail "can't handle prerequisite `#{dep_str}'"
                 end
                 goto_task_home
-                up
+                # changed in 0.4.7
+                false #up
             end
             def handle_file(path)
                 @cur_checksums << @sigs.signature_for_file(path)

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

@@ -26,6 +26,7 @@ module Rant::Generators
 			    i_bin = File.join(::Rant::Env::RUBY_BINDIR,
 				File.basename(bin))
 			    rac.cmd_msg "Writing #{t.name}: #{i_bin}"
+                            # TODO: Better use Env::RUBY_EXE?
 			    f.puts "@#{rac.cx.sys.sp ::Rant::Env::RUBY} #{rac.cx.sys.sp i_bin} %*"
 			}
 		    end

data/lib/rant/import.rb

@@ -24,8 +24,10 @@ module Rant
 	OPTIONS = [
 	    [ "--help",		"-h",	GetoptLong::NO_ARGUMENT,
 		"Print this help and exit."			],
-	    [ "--version",	"-v",	GetoptLong::NO_ARGUMENT,
+	    [ "--version",	"-V",	GetoptLong::NO_ARGUMENT,
 		"Print version of rant-import and exit."	],
+	    [ "-v",	        	GetoptLong::NO_ARGUMENT,
+		"Deprecated. Use -V or --version instead."	],
 	    [ "--quiet",	"-q",	GetoptLong::NO_ARGUMENT,
 		"Operate quiet."				],
 	    [ "--plugins",	"-p",	GetoptLong::REQUIRED_ARGUMENT,
@@ -38,6 +40,8 @@ module Rant
 		"Include comments from Rant sources."		],
 	    [ "--reduce-whitespace", "-r",GetoptLong::NO_ARGUMENT,
 		"Remove as much whitespace from Rant sources as possible." ],
+            [ "--zip",          "-z",   GetoptLong::NO_ARGUMENT,
+                "Compress created script."                      ],
 	    [ "--auto",		"-a",	GetoptLong::NO_ARGUMENT,
 		"Automatically try to determine imports and plugins.\n" +
 		"Warning: loads Rantfile!"			],
@@ -87,6 +91,7 @@ module Rant
 	    @auto = false
 	    @arg_rantfiles = []
 	    @quiet = false
+            @zip = false
 	end
 
 	def run
@@ -132,6 +137,7 @@ Rant::CODE_IMPORTS.concat %w(#{@included_imports.join(' ')}
 alias require_backup_by_rant require
 def require libf
     if libf == "rant"
+        # TODO: needs rework! look at lib/rant.rb
 	self.class.instance_eval { include Rant }
     else
 	begin
@@ -146,8 +152,48 @@ exit Rant.run
 EOF
             msg "Postprocessing..."
             script = filter_reopen_module(script)
-	    File.open @mono_fn, "w" do |mf|
-                mf.write script
+            if @zip
+                msg "zipping and writing to #@zip_fn"
+                require 'zlib'
+                Zlib::GzipWriter.open @zip_fn do |gz|
+                    gz.write script
+                end
+                open @mono_fn, "w" do |mf|
+                    mf.write <<EOF
+#!/usr/bin/env ruby
+
+# #@mono_fn - Monolithic rant script, autogenerated by rant-import #{Rant::VERSION}.
+#
+# 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 script just loads and runs #@zip_fn.
+
+require 'zlib'
+
+dir = File.expand_path(File.dirname(__FILE__))
+path = "\#{dir}/\#{File.basename(__FILE__)}.gz"
+script = nil
+begin
+    Zlib::GzipReader.open(path) { |gz| script = gz.read }
+rescue Errno::ENOENT
+    $stderr.print <<EOH
+The file `\#{path}' should contain the zip-compressed monolithic
+Rant script but doesn't exist!
+EOH
+    exit 1
+end
+
+eval(script)
+EOF
+                end
+            else
+                open @mono_fn, "w" do |mf|
+                    mf.write script
+                end
             end
 	    msg "Done.",
 		"Included imports: " + @included_imports.join(', '),
@@ -172,7 +218,7 @@ EOF
 	    cmd_opts.quiet = true
 	    cmd_opts.each { |opt, value|
 		case opt
-		when "--version"
+		when "--version", "-v":
 		    puts "rant-import #{Rant::VERSION}"
 		    done
 		when "--help": help
@@ -180,6 +226,7 @@ EOF
 		when "--force": @force = true
 		when "--with-comments": @skip_comments = false
 		when "--reduce-whitespace": @reduce_whitespace = true
+                when "--zip": @zip = true
 		when "--imports"
 		    @imports.concat(value.split(/\s*,\s*/))
 		when "--plugins"
@@ -197,6 +244,7 @@ EOF
 		    "Type `rant-import --help' for usage.")
 	    end
 	    @mono_fn = rem_args.first if rem_args.first
+            @zip_fn = "#@mono_fn.gz"
 	rescue GetoptLong::Error => e
 	    abort(e.message)
 	ensure

data/lib/rant/metautils.rb

@@ -0,0 +1,119 @@
+
+# metautils.rb - Meta programming utils for Rant internals.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+module Rant
+    module MetaUtils
+	# Creates three 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 three accessor methods:
+        #   obj.attr_name?::    Return value, true or false
+        #   obj.attr_name::     Set attribute to true
+        #   obj.no_attr_name::  Set attribute to false
+        def rant_flag attr_name
+            attr_name = valid_attr_name attr_name
+            module_eval <<-EOD
+                def #{attr_name}?
+                    @#{attr_name}
+                end
+                def #{attr_name}
+                    @#{attr_name} = true
+                end
+                def no_#{attr_name}
+                    @#{attr_name} = false
+                end
+            EOD
+        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
+        def redirect_accessor(receiver, *attributes)
+            redirect_reader(receiver, *attributes)
+            redirect_writer(receiver, *attributes)
+        end
+        # Create attribute reader methods that redirect to the entity
+        # given as first argument (e.g. an instance variable name).
+        def redirect_reader(receiver, *attributes)
+            attributes.each { |attr_name|
+                attr_name = valid_attr_name attr_name
+                module_eval <<-EOD
+                    def #{attr_name}; #{receiver}.#{attr_name}; end
+                EOD
+            }
+            nil
+        end
+        # Create attribute writer methods that redirect to the entity
+        # given as first argument (e.g. an instance variable name).
+        def redirect_writer(receiver, *attributes)
+            attributes.each { |attr_name|
+                attr_name = valid_attr_name attr_name
+                module_eval <<-EOD
+                    def #{attr_name}=(val); #{receiver}.#{attr_name}=
+                        val; end
+                EOD
+            }
+            nil
+        end
+        def redirect_message(receiver, *messages)
+            messages.each { |message|
+                module_eval <<-EOD
+                    def #{message}(*args, &blk)
+                        # the first ; on the next line is needed
+                        # because of rant-import
+                        ;#{receiver}.#{message}(*args, &blk)
+                    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
+end # module Rant

data/lib/rant/node.rb

@@ -96,6 +96,10 @@ module Rant
 	    sd.empty? ? name : File.join(sd, name)
 	end
 
+        def ch
+            {:file => rantfile.to_str, :ln => line_number}
+        end
+
 	# Change current working directory to the directory this task
 	# was defined in.
 	#
@@ -155,12 +159,17 @@ module Rant
 	def each_target
 	end
 
+        def has_actions?
+            defined? @block and @block
+        end
+
         private
 	def run
-	    return unless @block
+	    return unless has_actions?
 	    goto_task_home
             @rac.running_task(self)
-	    @block.arity == 0 ? @block.call : @block[self]
+            @receiver.pre_run(self) if defined? @receiver and @receiver
+	    @block.arity == 0 ? @block.call : @block[self] if @block
 	end
 
 	def circular_dep

data/lib/rant/rantenv.rb

@@ -13,12 +13,15 @@ module Rant::Env
     OS		= ::Config::CONFIG['target']
     RUBY	= ::Config::CONFIG['ruby_install_name']
     RUBY_BINDIR	= ::Config::CONFIG['bindir']
+    RUBY_EXE = File.join(RUBY_BINDIR, RUBY + ::Config::CONFIG["EXEEXT"])
 
     @@zip_bin = false
     @@tar_bin = false
 
-    def on_windows?
-        OS =~ /mswin/i
+    if OS =~ /mswin/i
+        def on_windows?; true; end
+    else
+        def on_windows?; false; end
     end
 
     def have_zip?

data/lib/rant/rantlib.rb

@@ -77,10 +77,18 @@ class Array
     # Concatenates all elements like #join(' ') but also puts quotes
     # around strings that contain a space.
     def arglist
-	self.shell_pathes.join(' ')
+        warn caller[0]
+        warn "[WARNING] Use `sys.sp(ary)' in Rantfiles instead of deprecated Array#arglist."
+        Rant::Sys.sp(self)
     end
 
     def shell_pathes
+        warn caller[0]
+        warn "[WARNING] Array#shell_pathes is highly deprecated " +
+            "and will not come with future (0.5.0 and later) Rant releases."
+        warn "Use `ary.map { |path| sys.sp path }' in Rantfiles."
+        map { |path| Rant::Sys.sp(path) }
+=begin
 	entry = nil
 	if ::Rant::Env.on_windows?
 	    self.collect { |entry|
@@ -101,6 +109,7 @@ class Array
 		end
 	    }
 	end
+=end
     end
 end
 
@@ -209,7 +218,7 @@ module RantContext
     # +rac+ stands for "rant compiler"
     def rac
         ch = Rant::Lib.parse_caller_elem caller[0]
-        rant.warn_msg(@__rant__.pos_text(ch[:file], ch[:ln]),
+        rant.warn_msg(rant.pos_text(ch[:file], ch[:ln]),
             "Method `rac' is deprecated. Use `rant' instead.")
 	rant
     end
@@ -240,6 +249,7 @@ end
 
 module Rant
 
+    @__rant__ = nil
     class << self
 
 	# Run a new rant application in the current working directory.
@@ -271,14 +281,13 @@ module Rant
 	    if rant && !rant.run?
 		rant.run(args.flatten)
 	    else
-                Rant::MAIN_OBJECT.instance_variable_set(
-                    :@__rant__, Rant::RantApp.new)
+                @__rant__ = Rant::RantApp.new
 		rant.run(args)
 	    end
 	end
 
 	def rant
-	    Rant::MAIN_OBJECT.instance_variable_get(:@__rant__)
+	    @__rant__
 	end
     end
 
@@ -385,13 +394,8 @@ class Rant::RantApp
 
     attr_accessor :node_factory
 
-    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
+    def initialize
+	@args = []
 	# Rantfiles will be loaded in the context of this object.
 	@context = RantAppContext.new(self)
 	@sys = ::Rant::SysObject.new(self)
@@ -471,20 +475,6 @@ class Rant::RantApp
 	    vmsg 1, "in #{abs_path}"
 	end
     end
-=begin
-    # Execute block in subdirectory context to subdir, relative to
-    # project root directory. Important: Does NOT change the process
-    # working directory. Not thread safe.
-    #
-    # For Rant internal use only!
-    def define_in_project_dir(dir)
-        old_subdir = @current_subdir
-        @current_subdir = dir
-        yield
-    ensure
-        @current_subdir = old_subdir
-    end
-=end
     ##################################################################
 
     def run?
@@ -507,7 +497,7 @@ class Rant::RantApp
 	orig_pwd = @rootdir = Dir.pwd
 	# Process commandline.
 	process_args
-        Dir.chdir(@rootdir)
+        Dir.chdir(@rootdir) rescue abort $!.message
 	# read rantfiles, might change @rootdir and Dir.pwd
 	load_rantfiles
 
@@ -541,7 +531,7 @@ class Rant::RantApp
 	return 1
     ensure
 	# TODO: exception handling!
-        Dir.chdir @rootdir
+        Dir.chdir @rootdir if test ?d, @rootdir
         hooks = var._get("__at_return__")
         hooks.each { |hook| hook.call } if hooks
 	@plugins.each { |plugin| plugin.rant_plugin_stop }
@@ -579,7 +569,7 @@ class Rant::RantApp
 	generator = args.shift
 	unless generator.respond_to? :rant_gen
 	    abort_at(ch,
-		"gen: First argument to has to be a task-generator.")
+		"gen: First argument has to be a task-generator.")
 	end
 	# ask generator to produce a task for this application
 	generator.rant_gen(self, ch, args, &block)
@@ -804,7 +794,7 @@ class Rant::RantApp
 	tlist.each { |t|
 	    print(prefix + t.to_s.ljust(name_length) + infix)
 	    dt = t.description.sub(/\s+$/, "")
-	    puts dt.sub(/\n/, "\n" + ' ' * cmd_length + infix + "  ")
+	    puts dt.gsub(/\n/, "\n" + ' ' * cmd_length + infix + "  ")
 	}
 	true
     end
@@ -972,13 +962,15 @@ class Rant::RantApp
 	old_subdir = @current_subdir
 	old_pwd = Dir.pwd
 	resolve(target).each { |t|
-	    matching_tasks += 1
-	    begin
-		t.invoke(opt)
-	    rescue Rant::TaskFail => e
-		err_task_fail(e)
-		abort
-	    end
+            unless opt[:type] == :file && !t.file_target?
+                matching_tasks += 1
+                begin
+                    t.invoke(opt) 
+                rescue Rant::TaskFail => e
+                    err_task_fail(e)
+                    abort
+                end
+            end
 	}
 	@current_subdir = old_subdir
 	Dir.chdir old_pwd
@@ -1057,7 +1049,7 @@ class Rant::RantApp
                     rf, is_new = rantfile_for_path(fn)
                     load_file rf if is_new
                 else
-                    abort "No such file -- #{rf}"
+                    abort "No such file -- #{fn}"
                 end
             }
             return
@@ -1138,14 +1130,6 @@ class Rant::RantApp
 	    path = dir ? File.join(dir, rfn) : rfn
             return path if test ?f, path
 	}
-	::Rant::DEPRECATED_RANTFILES.each { |rfn|
-	    path = dir ? File.join(dir, rfn) : rfn
-            if test ?f, path
-                warn_msg "filename deprecated -- #{path}",
-                    "please rename it to `Rantfile' or `root.rant'!"
-                return path
-            end
-	}
         nil
     end