rant 0.3.6 → 0.3.8

data/lib/rant/import/subfile.rb

@@ -0,0 +1,41 @@
+
+# subfile.rb - "SubFile" generator for Rant.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+require 'rant/rantlib'
+
+class Rant::Generators::SubFile
+    def self.rant_generate(rac, ch, args, &block)
+	case args.size
+	when 1
+	    basedir, fine = nil, args.first
+	    path = fine
+	when 2
+	    basedir, fine = args
+	    path = File.join(basedir, fine)
+	else
+	    rac.abort_at(ch, "SubFile takes one or two arguments.")
+	end
+	file_desc = rac.pop_desc
+	rac.prepare_task(path, 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)
+		    else
+			rac.cx.gen(
+			    ::Rant::Generators::Directory, dir)
+		    end]
+		end
+		pre.concat(dt)
+	    end
+	    rac.cx.desc file_desc
+	    ::Rant::FileTask.new(rac, name, pre, &blk)
+	}
+    end
+end

data/lib/rant/import/truth.rb

@@ -5,7 +5,7 @@
 # Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
 
 module Rant
-    module Worker
+    module Node
 	def %(desc)
 	    @description = case @description
 	    when nil: desc
@@ -15,6 +15,11 @@ module Rant
 	    self
 	end
     end
+    class RacFileList
+	def %(fu_sym)
+	    @rac.cx.sys.send(fu_sym, to_ary)
+	end
+    end
 end
 module RantContext
     def drag(name, *args, &block)

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

@@ -0,0 +1,37 @@
+
+# rubycmdwrapper.rb - "Win32::RubyCmdWrapper" generator for Rant.
+#
+# Copyright (C) 2005 Stefan Lang <langstefan@gmx.at>
+
+require 'rant/rantlib'
+
+module Rant::Generators
+    module Win32
+	module RubyCmdWrapper
+	    def self.rant_generate(rac, ch, args, &block)
+		fl = args.first
+		unless args.size == 1 and fl.respond_to? :to_ary
+		    rac.abort_at(ch,
+			"Win32::RubyCmdWrapper takes a list of filenames.")
+		end
+		if fl.respond_to? :exclude
+		    fl.exclude "*.cmd"
+		end
+		fl = fl.to_ary
+		cmd_files = fl.map { |f| f.sub_ext "cmd" }
+		cmd_files.zip(fl).each { |cmd, bin|
+		    # the .cmd file does not depend on the bin file
+		    rac.cx.file cmd do |t|
+			open(t.name, "w") { |f|
+			    i_bin = File.join(::Rant::Env::RUBY_BINDIR,
+				File.basename(bin))
+			    rac.cmd_msg "Writing #{t.name}: #{i_bin}"
+			    f.puts "@#{rac.cx.sys.sp ::Rant::Env::RUBY} #{rac.cx.sys.sp i_bin} %*"
+			}
+		    end
+		}
+		cmd_files
+	    end
+	end
+    end
+end

data/lib/rant/import.rb

@@ -31,7 +31,7 @@ module Rant
 	    [ "--plugins",	"-p",	GetoptLong::REQUIRED_ARGUMENT,
 		"Include PLUGINS (comma separated list)."	],
 	    [ "--imports",	"-i",	GetoptLong::REQUIRED_ARGUMENT,
-		"Include IMPORTS (coma separated list)."	],
+		"Include IMPORTS (comma separated list)."	],
 	    [ "--force",		GetoptLong::NO_ARGUMENT,
 		"Force overwriting of output file."		],
 	    [ "--with-comments",	GetoptLong::NO_ARGUMENT,
@@ -79,6 +79,7 @@ module Rant
 	    @force = false
 	    @rantapp = nil
 	    @core_imports = []
+	    @lib_imports = []
 	    @included_plugins = []
 	    @included_imports = []
 	    @skip_comments = true
@@ -95,8 +96,8 @@ module Rant
 		rac_args = %w(--stop-after-load) + 
 		    @arg_rantfiles.collect { |rf| "-f#{rf}" }
 		rac_args << "-v" unless @quiet
-		@rantapp = RantApp.new(rac_args)
-		unless @rantapp.run == 0
+		@rantapp = RantApp.new
+		unless @rantapp.run(rac_args) == 0
 		    abort("Auto-determination of required code failed.")
 		end
 		@imports.concat(@rantapp.imports)
@@ -289,10 +290,16 @@ EOF
 		    next if @skip_comments
 		end
 		name = nil
+		lib_file = nil
 		if line =~ /\s*(require|load)\s+('|")rant\/(\w+)(\.rb)?('|")/
+		    # Rant library code
 		    name = $3
 		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/
+		    # a require which is explicitely labelled with rant-import
+		    lib_file = $3
 		end
 		if name
 		    next if @core_imports.include? name
@@ -300,6 +307,12 @@ EOF
 		    msg "Including `#{name}'", path
 		    @core_imports << name
 		    rs << resolve_requires(File.read(path))
+		elsif lib_file
+		    next if @lib_imports.include? lib_file
+		    path = get_lib_path "#{lib_file}.rb"
+		    msg "Including `#{lib_file}'", path
+		    @lib_imports << lib_file
+		    rs << resolve_requires(File.read(path))
 		else
 		    line.sub!(/^\s+/, '') if @reduce_whitespace
 		    rs << line
@@ -308,6 +321,8 @@ EOF
 	    rs
 	end
 
+	private
+
 	def get_lib_rant_path(fn)
 	    path = File.join(LIB_DIR, fn)
 	    return path if File.exist?(path)
@@ -318,5 +333,13 @@ EOF
 	    nil
 	end
 
+	def get_lib_path(fn)
+	    $:.each { |lib_dir|
+		path = File.join(lib_dir, fn)
+		return path if File.exist?(path)
+	    }
+	    nil
+	end
+
     end	# class RantImport
 end	# module Rant

data/lib/rant/rantenv.rb

@@ -4,38 +4,6 @@ require 'rbconfig'
 
 module Rant end
 
-class Rant::Path
-    attr_reader :path
-    def initialize path, abs_path = nil
-	@path = path or raise ArgumentError, "path not given"
-	@abs_path = abs_path
-    end
-    def to_s
-	@path.dup
-    end
-    def to_str
-	@path.dup
-    end
-    def exist?
-	File.exist? @path
-    end
-    def file?
-	test ?f, @path
-    end
-    def dir?
-	test ?d, @path
-    end
-    def mtime
-	File.mtime @path
-    end
-    def absolute_path
-	@abs_path ||= File.expand_path(@path)
-    end
-    def dirname
-	File.dirname absolute_path
-    end
-end
-
 # This module provides some platform indenpendant
 # (let's hope) environment information.
 module Rant::Env