rant 0.4.4 → 0.4.6

data/lib/rant.rb

@@ -5,66 +5,64 @@ require 'rant/rantlib'
 module RantContext
     # Needed for irb, which defines its own +source+ method.
     def source_rf(*args, &block)
-	rac.source(*args, &block)
+        rac.source(*args, &block)
     end
 end
 module Rant
     class FileList
-	def inspect
-	    # what's the right encoding for object_id ?
-	    s = "#<#{self.class}:0x#{"%x" % object_id} "
-	    s << "#{@actions.size} actions, #{@files.size} files"
-	    if @ignore_rx
-		is = @ignore_rx.inspect.gsub(/\n|\t/, ' ')
-		s << ", ignore#{is.squeeze ' '}"
-	    end
-	    if @glob_flags != 0
-		s << ", flags:#@glob_flags"
-	    end
-	    s << ">"
-	end
+        def inspect
+            # what's the right encoding for object_id ?
+            s = "#<#{self.class}:0x#{"%x" % object_id} "
+            s << "#{@actions.size} actions, #{@files.size} files"
+            if @ignore_rx
+                is = @ignore_rx.inspect.gsub(/\n|\t/, ' ')
+                s << ", ignore#{is.squeeze ' '}"
+            end
+            if @glob_flags != 0
+                s << ", flags:#@glob_flags"
+            end
+            s << ">"
+        end
     end
     module Node
-	def inspect
-	    s = "#<#{self.class}:0x#{"%x" % object_id} "
-	    s << "task_id:#{full_name}, action:#{inspect_action}"
-	    s << ", deps:#{inspect_deps}"
-	    s << ">"
-	end
-	private
-	def inspect_action
-	    (defined? @block) ? @block.inspect : "nil"
-	end
-	def inspect_deps
-	    if respond_to? :deps
-		dl = deps
-		s = dl.size.to_s
-		dls = dl.join(",")
-		dls[12..dls.length] = "..." if dls.length > 12
-		s << "[#{dls}]"
-	    else
-		"0"
-	    end
-	end
+        def inspect
+            s = "#<#{self.class}:0x#{"%x" % object_id} "
+            s << "task_id:#{full_name}, action:#{inspect_action}"
+            s << ", deps:#{inspect_deps}"
+            s << ">"
+        end
+        private
+        def inspect_action
+            (defined? @block) ? @block.inspect : "nil"
+        end
+        def inspect_deps
+            if respond_to? :deps
+                dl = deps
+                s = dl.size.to_s
+                dls = dl.join(",")
+                dls[12..dls.length] = "..." if dls.length > 12
+                s << "[#{dls}]"
+            else
+                "0"
+            end
+        end
     end
     class RantApp
-	def inspect
-	    s = "#<#{self.class}:0x#{"%x" % object_id} "
-	    if current_subdir && !current_subdir.empty?
-		s << "subdir:#{current_subdir}, "
-	    end
-	    s << "tasks:#{tasks.size}"
-	    s << ">"
-	end
+        def inspect
+            s = "#<#{self.class}:0x#{"%x" % object_id} "
+            if current_subdir && !current_subdir.empty?
+                s << "subdir:#{current_subdir}, "
+            end
+            s << "tasks:#{tasks.size}"
+            s << ">"
+        end
     end
 end
 
-def rac
-    Rant.rac
+def rant
+    @__rant__
 end
 
-include RantContext
+@__rant__ = Rant::RantApp.new
 
-if $0 == __FILE__
-    exit Rant.run
-end
+include RantContext

data/lib/rant/coregen.rb

@@ -51,7 +51,7 @@ module Rant
 	    # element (and has all other necessary directories as
 	    # prerequisites).
 	    def self.task(rac, ch, name, prerequisites=[], basedir=nil, &block)
-		dirs = ::Rant::Sys.split_path(name)
+		dirs = ::Rant::Sys.split_all(name)
 		if dirs.empty?
 		    rac.abort_at(ch,
 			"Not a valid directory name: `#{name}'")
@@ -126,29 +126,29 @@ module Rant
 		end
 		esc_target = nil
 		target_rx = case target
-		when String
-		    esc_target = Regexp.escape(target)
-		    /#{esc_target}$/
-		when Regexp
-		    target
-		else
+                    when String
+                        esc_target = Regexp.escape(target)
+                        /#{esc_target}$/
+                    when Regexp
+                        target
+                    else
 		    rac.abort_at(ch, "rule target has " +
 			"to be a string or regular expression")
 		end
 		src_proc = case src_arg
-		when String
-		    unless String === target
-			rac.abort(ch, "rule target has to be a string " +
-			    "if source is a string")
-		    end
-		    lambda { |name| name.sub(/#{esc_target}$/, src_arg) }
-		when Proc: src_arg
-		when nil: lambda { |name| [] }
-		else
-		    rac.abort_at(ch, "rule source has to be " +
-			"String or Proc")
-		end
-		blk = self.new { |task_name|
+                    when String
+                        unless String === target
+                            rac.abort(ch, "rule target has to be " +
+                                  "a string if source is a string")
+                        end
+                        lambda { |name| name.sub(/#{esc_target}$/, src_arg) }
+                    when Proc: src_arg
+                    when nil: lambda { |name| [] }
+                    else
+                        rac.abort_at(ch, "rule source has to be " +
+                            "String or Proc")
+                    end
+		blk = self.new { |task_name, rel_project_dir|
 		    if target_rx =~ task_name
                         have_src = true
                         src = src_proc[task_name]

data/lib/rant/import.rb

@@ -104,16 +104,11 @@ module Rant
 		@plugins.concat(@rantapp.plugins.map { |p| p.name })
 	    end
 
-            #unless @imports.include? "nodes/default"
-                #@imports.unshift "nodes/default"
-            #end
-	    
 	    if File.exist?(@mono_fn) && !@force
 		abort("#{@mono_fn} exists. Rant won't overwrite this file.",
 		    "Add --force to override this restriction.")
 	    end
-	    File.open(@mono_fn, "w") { |mf|
-		mf << <<EOH
+            script = <<EOH
 #!/usr/bin/env ruby
 
 # #@mono_fn - Monolithic rant script, autogenerated by rant-import #{Rant::VERSION}.
@@ -124,10 +119,10 @@ module Rant
 # You can distribute/modify this program under the terms of
 # the GNU LGPL, Lesser General Public License version 2.1.
 EOH
-		mf << mono_rant_core
-		mf << mono_imports
-		mf << mono_plugins
-		mf << <<EOF
+            script << mono_rant_core
+            script << mono_imports
+	    script << mono_plugins
+            script << <<EOF
 
 $".concat([#{@included_files.map{ |f| "'" + f + ".rb'" }.join(", ")}])
 Rant::CODE_IMPORTS.concat %w(#{@included_imports.join(' ')}
@@ -149,7 +144,11 @@ end
 
 exit Rant.run
 EOF
-	    }
+            msg "Postprocessing..."
+            script = filter_reopen_module(script)
+	    File.open @mono_fn, "w" do |mf|
+                mf.write script
+            end
 	    msg "Done.",
 		"Included imports: " + @included_imports.join(', '),
 		"Included plugins: " + @included_plugins.join(', '),
@@ -366,5 +365,58 @@ EOF
 	    nil
 	end
 
+        # Takes a script text as argument and returns the same script
+        # but without unnecessary `end module XY' statements.
+        #
+        # Example input:
+        #
+        #   1 module Rant
+        #   2     # more code
+        #   3 end # module Rant
+        #   4
+        #   5
+        #   6 module Rant
+        #   7   # more code
+        #
+        # gives:
+        #
+        #   1 module Rant
+        #   2     # more code
+        #   5
+        #   7   # more code
+        #
+        # Note:: The comment with the module name in line 3 of the
+        #        input is very important.
+        def filter_reopen_module(script)
+            lines = []
+            buffer = []
+            identifier = nil # class/module name
+            keyword = nil # class or module
+            script.split(/\n/).each { |line|
+                if identifier
+                    if line.strip.empty?
+                        buffer << line
+                    elsif line =~ /^\s*#{keyword}\s+#{identifier}\s*$/
+                        # replace buffer with one empty line
+                        lines << ""
+                        buffer.clear
+                        identifier = keyword = nil
+                    else
+                        lines.concat buffer
+                        buffer.clear
+                        identifier = keyword = nil
+                        redo
+                    end
+                elsif line =~ /\s*end\s*#\s*(module|class)\s+(\w+)\s*$/
+                    keyword = $1
+                    identifier = $2
+                    buffer << line
+                else
+                    lines << line
+                end
+            }
+            lines.join("\n") << "\n"
+        end
+
     end	# class RantImport
 end	# module Rant

data/lib/rant/import/archive.rb

@@ -9,6 +9,7 @@
 
 require 'rant/rantlib'
 require 'rant/import/subfile'
+#require 'rant/progress' #rant-import:uncomment
 #require 'rant/tempfile' #rant-import:uncomment
 
 module Rant::Generators::Archive
@@ -82,7 +83,9 @@ module Rant::Generators::Archive
 		end
 	    }
             desc = pkg.rac.pop_desc
-	    pkg.define_manifest_task if opts[:files] && opts[:manifest]
+            if opts[:files] and opts[:manifest] || flags.include?(:manifest)
+                pkg.define_manifest_task
+            end
             pkg.rac.cx.desc desc
 	    pkg.define_task
 	    pkg
@@ -195,11 +198,9 @@ module Rant::Generators::Archive
 	def define_manifest_task
 	    return @manifest_task if @manifest_task
 	    @manifest_task =
-		@rac.gen ::Rant::Generators::Task, @manifest do |t|
-		    def t.each_target
-			goto_task_home
-			yield name
-		    end
+                ::Rant::Generators::Task.rant_gen(
+                        @rac, @ch, [@manifest]) do |t|
+                    t.file_target
 		    t.needed {
                         # fl refers to @res_files
                         fl = get_files
@@ -308,16 +309,47 @@ module Rant::Generators::Archive
 			dirs << dir unless dir == "." || dirs.include?(dir)
 		    end
 		}
+                require 'rant/progress' #rant-import:remove
 		# create directory structure
-		dirs.each { |dir|
-		    dest = File.join(@dist_path, dir)
-		    cx.sys.mkpath(dest) unless test(?d, dest)
-		}
-		# link or copy files
-		fl.each { |f|
-		    dest = File.join(@dist_path, f)
-		    cx.sys.safe_ln(f, dest)
-		}
+                progress = Rant::ProgressCountdown.new(dirs.size, @rac)
+                dir_msg = "Creating directories under #@dist_path: "
+                msg_len = dir_msg.length
+                unless dirs.empty?
+                    @rac.cmd_print dir_msg
+                    dirs.each { |dir|
+                        FileUtils.mkpath(File.join(@dist_path, dir))
+                        progress.inc
+                    }
+                    @rac.cmd_msg "done"
+                end
+                # link/copy files to package directory
+                f = fl.first
+                if f
+                    progress = Rant::ProgressCountdown.new(fl.size, @rac)
+                    dest = File.join(@dist_path, f)
+                    ln_supported = true
+                    begin
+                        FileUtils.ln(f, dest)
+                        fl.shift
+                        @rac.cmd_print "Linking "
+                    rescue Exception #Errno::EOPNOTSUPP
+                        ln_supported = false
+                        @rac.cmd_print "Copying "
+                    end
+                    @rac.cmd_print \
+                        "#{progress.total} files to #@dist_path: ".ljust(msg_len - 8)
+                    progress.inc if ln_supported
+                    fl.each { |f|
+                       dest = File.join(@dist_path, f)
+                       if ln_supported
+                           FileUtils.ln(f, dest)
+                       else
+                           FileUtils.cp(f, dest)
+                       end
+                       progress.inc
+                    }
+                    @rac.cmd_msg "done"
+                end
 	    }
 	end
     end # class Base

data/lib/rant/import/archive/tgz.rb

@@ -37,7 +37,7 @@ module Rant::Generators::Archive
 	end
         def minitar_tgz fn, files, opts = {:recurse => false}
             require 'zlib'
-            require 'rant/archive/minitar'
+            require 'rant/archive/minitar' #rant-import:remove
             @rac.cmd_msg "minitar #{fn}"
             files = files.to_ary if files.respond_to? :to_ary
             tgz = Zlib::GzipWriter.new(File.open(fn, 'wb'))

data/lib/rant/import/autoclean.rb

@@ -5,6 +5,7 @@
 
 require 'rant/rantlib'
 require 'rant/import/clean'
+require 'rant/import/sys/more'
 
 class Rant::Generators::AutoClean
     def self.rant_gen(rac, ch, args, &block)
@@ -21,24 +22,29 @@ class Rant::Generators::AutoClean
 
 	# create task
 	rac.task :__caller__ => ch, tname => [] do |t|
-	    rac.tasks.each { |n, worker|
-		if Array === worker
-		    worker.each { |subw|
-			subw.each_target { |entry| clean rac, entry }
+            add_common_dirs = {}
+	    rac.tasks.each { |name, node|
+		if Array === node
+                    f = node.first
+                    if f.file_target?
+                        add_common_dirs[File.dirname(f.full_name)] = true
+                    end
+		    node.each { |subw|
+			subw.each_target { |entry| rac.sys.clean entry }
 		    }
 		else
-		    worker.each_target { |entry| clean rac, entry }
+                    if node.file_target?
+                        add_common_dirs[File.dirname(node.full_name)] = true
+                    end
+		    node.each_target { |entry| rac.sys.clean entry }
 		end
 	    }
 	    target_rx = nil
 	    rac.resolve_hooks.each { |hook|
 		if hook.respond_to? :each_target
 		    hook.each_target { |entry|
-			if test ?f, entry
-			    rac.cx.sys.rm_f entry
-			else
-			    rac.cx.sys.rm_rf entry
-			end
+                        add_common_dirs[File.expand_path(File.dirname(entry))] = true
+                        rac.sys.clean entry
 		    }
 		elsif hook.respond_to? :target_rx
 		    next(rx) unless (t_rx = hook.target_rx)
@@ -46,15 +52,13 @@ class Rant::Generators::AutoClean
 			Regexp.union(target_rx, t_rx)
 		end
 	    }
+            t.goto_task_home
 	    if target_rx
-		rac.msg 1, "searching for rule products"
-		rac.cx.sys["**/*"].each { |entry|
+		rac.vmsg 1, "searching for rule products"
+		rac.sys["**/*"].each { |entry|
 		    if entry =~ target_rx
-			if test ?f, entry
-			    rac.cx.sys.rm_f entry
-			else
-			    rac.cx.sys.rm_rf entry
-			end
+                        add_common_dirs[File.dirname(entry)] = true
+                        rac.sys.clean entry
 		    end
 		}
 	    end
@@ -64,18 +68,16 @@ class Rant::Generators::AutoClean
                     sd = rf.project_subdir
                     common.each { |fn|
                         path = sd.empty? ? fn : File.join(sd, fn)
-                        clean rac, path
+                        rac.sys.clean path
+                    }
+                }
+                #STDERR.puts add_common_dirs.inspect
+                add_common_dirs.each { |dir, _|
+                    common.each { |fn|
+                        rac.sys.clean File.join(dir, fn)
                     }
                 }
             end
-            t.goto_task_home
 	end
     end
-    def self.clean(rac, entry)
-        if test ?f, entry
-            rac.cx.sys.rm_f entry
-        elsif test ?e, entry
-            rac.cx.sys.rm_rf entry
-        end
-    end
 end