rant 0.4.4 → 0.4.6

data/lib/rant/rantsys.rb

@@ -6,6 +6,20 @@
 require 'fileutils'
 require 'rant/rantenv'
 
+# Fix FileUtils::Verbose visibility issue
+if RUBY_VERSION == "1.8.3"
+    module FileUtils
+        METHODS = singleton_methods - %w(private_module_function
+            commands options have_option? options_of collect_method)
+        module Verbose
+            class << self
+                public(*::FileUtils::METHODS)
+            end
+            public(*::FileUtils::METHODS)
+        end
+    end
+end
+
 module Rant
 
     class FileList
@@ -124,17 +138,25 @@ module Rant
 	end
 	##############################################################
 
+if Object.method_defined? :fcall # in Ruby 1.9 like __send__
 	def resolve
 	    @pending = false
-	    @actions.each { |action|
-		self.send(*action)
-	    }
-	    @actions.clear
+	    @actions.each{ |action| self.fcall(*action) }.clear
 	    ix = ignore_rx
 	    if ix
 		@files.reject! { |f| f =~ ix && !@keep[f] }
 	    end
 	end
+else
+	def resolve
+	    @pending = false
+	    @actions.each{ |action| self.__send__(*action) }.clear
+	    ix = ignore_rx
+	    if ix
+		@files.reject! { |f| f =~ ix && !@keep[f] }
+	    end
+	end
+end
 
 	def include(*patterns)
 	    patterns.flatten.each { |pat|
@@ -269,7 +291,7 @@ module Rant
 	    elems = nil
 	    @files.reject! { |entry|
                 next if @keep[entry]
-		elems = Sys.split_path(entry)
+		elems = Sys.split_all(entry)
 		i = elems.index(name)
 		if i
 		    path = File.join(*elems[0..i])
@@ -303,7 +325,7 @@ module Rant
 	    elems =  nil
 	    elem = nil
 	    @files.reject! { |entry|
-		elems = Sys.split_path(entry)
+		elems = Sys.split_all(entry)
 		elems.any? { |elem|
 		    elem =~ /#{suffix}$/ && !@keep[entry]
 		}
@@ -322,7 +344,7 @@ module Rant
 	def apply_no_prefix(prefix)
 	    elems = elem = nil
 	    @files.reject! { |entry|
-		elems = Sys.split_path(entry)
+		elems = Sys.split_all(entry)
 		elems.any? { |elem|
 		    elem =~ /^#{prefix}/ && !@keep[entry]
 		}
@@ -513,7 +535,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.rac.cmd_msg msg if ::Rant.rac
+            # direct calls through Rant::Sys are silent
 	end
         private :fu_output_message
 
@@ -534,21 +556,25 @@ module Rant
 	    cmd_args.flatten!
 	    cmd = cmd_args.join(" ")
 	    fu_output_message cmd
+            success = system(*cmd_args)
 	    if block_given?
-		block[system(*cmd_args), $?]
-	    else
-		system(*cmd_args) or raise CommandError.new(cmd, $?)
+                block[$?]
+            elsif !success
+		raise CommandError.new(cmd, $?)
 	    end
 	end
 
 	# Run a new Ruby interpreter with the given arguments:
 	#     sys.ruby "install.rb"
 	def ruby(*args, &block)
-	    if args.size > 1
-		sh([Env::RUBY] + args, &block)
-	    else
-		sh("#{Env::RUBY} #{args.first}", &block)
-	    end
+            if args.empty?
+                # The empty string argument ensures that +system+
+                # doesn't start a subshell but invokes ruby directly.
+                # The empty string argument is ignored by ruby.
+                sh(Env::RUBY, '', &block)
+            else
+                sh(args.unshift(Env::RUBY), &block)
+            end
 	end
 
 	# Returns a string that can be used as a valid path argument
@@ -573,15 +599,26 @@ module Rant
 	end
 
 	# Split a path in all elements.
-	def split_path(path)
+	def split_all(path)
 	    base, last = File.split(path)
 	    return [last] if base == "." || last == "/"
 	    return [base, last] if base == "/"
-	    split_path(base) + [last]
+	    split_all(base) + [last]
 	end
 
+        def split_path(str)
+            str.split(Env.on_windows? ? ";" : ":")
+        end
+
 	extend self
 
+        if RUBY_VERSION >= "1.9.0"
+            class << self
+                public(*::FileUtils::METHODS)
+            end
+            public(*::FileUtils::METHODS)
+        end
+
     end	# module Sys
 
     # An instance of this class is returned from the +sys+ method in
@@ -592,9 +629,6 @@ module Rant
     class SysObject
 	include Sys
 
-	# The controlling Rant compiler.
-	attr_reader :rac
-
 	def initialize(rac)
 	    @rac = rac or
 		raise ArgumentError, "controller required"
@@ -610,10 +644,15 @@ module Rant
 	    RacFileList.new(@rac, *patterns)
 	end
 
+        def expand_path(path)
+            File.expand_path(@rac.project_to_fs_path(path))
+        end
+
 	private
 	# Delegates FileUtils messages to +rac+.
 	def fu_output_message(cmd)
 	    @rac.cmd_msg cmd
 	end
     end
-end	# module Rant
+end # module Rant
+# this line prevents ruby 1.8.3 from crashing with: [BUG] unknown node type 0

data/lib/rant/rantvar.rb

@@ -16,16 +16,14 @@
 # If you're looking for general info about Rant, read the
 # README[link:files/README.html].
 module Rant
-    VERSION	= '0.4.4'
+    VERSION = '0.4.6'
 
     # Those are the filenames for rantfiles.
     # Case matters!
-    RANTFILES	= [	"Rantfile",
-			"rantfile",
-			"Rantfile.rb",
-			"rantfile.rb"
-		  ]
-    SUB_RANTFILES = ["subrant"]
+    ROOT_RANTFILE = "root.rant"
+    SUB_RANTFILE = "sub.rant"
+    RANTFILES = [ "Rantfile", "rantfile", ROOT_RANTFILE ]
+    DEPRECATED_RANTFILES = [ "Rantfile.rb", "rantfile.rb" ]
     
     # Names of plugins and imports for which code was loaded.
     # Files that where loaded with the `import' commant are directly
@@ -39,7 +37,7 @@ module Rant
     class RantDoneException < StandardError
     end
 
-    class RantError < StandardError
+    class Error < StandardError
     end
 
     # This module is a namespace for generator classes.
@@ -127,7 +125,7 @@ module Rant
 
     module RantVar
 
-	class Error < RantError
+	class Error < Rant::Error
 	end
 
 	class ConstraintError < Error

data/misc/TODO

@@ -1,11 +1,29 @@
 
 = TODO
 
+== Update documentation with regards to resolve hooks.
+
+The argument list for resolve hooks has changed in version 0.4.5.
+A hook has to accept two arguments now, the first is the target name
+and the second is the project directory the resolve action is relative
+to. Previously, a resolve hook got only the target name as argument.
+
+== Eventually replace <tt>#</tt> with another symbol.
+
+The # symbol as reference to the project's root directory should
+eventuelly get replaced with a better fitting symbol. Many shells
+interpret it as comment start and thus escaping/quoting is needed if
+<tt>#some_target</tt> arguments are used on the commandline. This
+could get a common source of annoyance/bugs.
+
+Favorite candidate is currently <tt>@</tt>.
+
 == Improve SourceNode types
 
 Currently a SourceNode can only have other SourceNodes or files as
 prerequisites. But if e.g., a header file should be autogenerated,
 this isn't sufficient anymore.
+Done (0.4.5).
 
 ---
 Update

data/misc/devel-notes

@@ -1,9 +1,12 @@
 
+== Rant::Env.find_bin...
+... could honour PATHEXT on windows.
+
 == Task alias
 Since +alias+ is a Ruby keyword, we could use +nick+ to create task
 alises.
 Other choices: short, cut, name, label, syn, synonym, ident, term,
-    shortcut, abbreviation
+    shortcut, abbreviation, link
 
 == Here docs
 Don't use here documents in the Rant sources, imports and plugins.

data/test/Rantfile

@@ -20,11 +20,11 @@ file "version.t" do |t|
 end
 
 gen Action do
-    rac.build "version.t"
+    rant.build "version.t"
 end
 
 auto_t_task = source "auto.rf"
-rac.abort unless auto_t_task.name == "auto.t"
+rant.abort unless auto_t_task.name == "auto.t"
 
 task :clean do
     sys.rm_f %w(auto.t auto.rf version.t)
@@ -45,7 +45,7 @@ task :subdir_tmp do
 end
 
 task :build_test_t do |t|
-    rac.build "tmp.t/test.t"
+    rant.build "tmp.t/test.t"
     # just ensure we're NOT in the tmp.t directory
     #STDERR.puts Dir.pwd
     test(?d, "tmp.t") or t.fail
@@ -87,4 +87,18 @@ end
 
 task :dep_on_make_files => ["make_files.t"]
 
+task "print_name.t" do |t|
+    puts t.full_name
+end
+
+file "depends_name.t" => "print_name.t" do |t|
+    import "sys/more"
+    sys.write_to_file t.name, File.read(t.source) + "a\n"
+end
+
+task "call-make" do |t|
+    make "print_name.t"
+    puts t.full_name
+end
+
 # vim: ft=ruby

data/test/deprecated/README

@@ -0,0 +1,6 @@
+This directory contains tests for deprecated features.
+
+The test file names have the form test_digit_digit_digit.rb,
+where the digits represent the Rant release version with which the
+features tested in the file (and thus the testfile itself) will
+disappear.

data/test/deprecated/test_0_4_8.rb

@@ -0,0 +1,41 @@
+
+require 'test/unit'
+require 'tutil'
+
+$test_deprecated_dir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestDeprecated_0_4_8 < Test::Unit::TestCase
+    include Rant::TestUtil
+
+    def setup
+        Dir.chdir $test_deprecated_dir
+    end
+    def test_Rantfile_rb
+        in_local_temp_dir do
+            write_to_file "Rantfile.rb", <<-EOF
+                task :a do |t|
+                    puts t.name
+                end
+            EOF
+            out, err = assert_rant
+            assert_equal("a\n", out)
+            assert_match(/\bWARNING\b/, err)
+            assert_match(/\bRantfile\.rb\b/, err)
+            assert_match(/\bdeprecated\b/, err)
+        end
+    end
+    def test_rantfile_rb
+        in_local_temp_dir do
+            write_to_file "Rantfile.rb", <<-EOF
+                task :a do |t|
+                    puts t.name
+                end
+            EOF
+            out, err = assert_rant
+            assert_equal("a\n", out)
+            assert_match(/\bWARNING\b/, err)
+            assert_match(/\bRantfile\.rb\b/, err)
+            assert_match(/\bdeprecated\b/, err)
+        end
+    end
+end

data/test/deprecated/test_0_5_2.rb

@@ -0,0 +1,33 @@
+
+require 'test/unit'
+require 'tutil'
+
+$test_deprecated_dir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestDeprecated_0_5_2 < Test::Unit::TestCase
+    include Rant::TestUtil
+
+    def setup
+        Dir.chdir $test_deprecated_dir
+    end
+    def test_method_rac
+        in_local_temp_dir do
+            write_to_file "root.rant", <<-EOF
+                import "sys/more"
+                file "f" do |t|
+                    sys.write_to_file t.name, "nix"
+                end
+                task :a do
+                    rac.build "f"
+                end
+            EOF
+            out, err = assert_rant("a")
+            assert test(?f, "f")
+            assert_equal "nix", File.read("f")
+            assert_match(/\bWARNING\b/, err)
+            assert_match(/\brac\b/, err)
+            assert_match(/\brant\b/, err)
+            assert_match(/\bdeprecated\b/, err)
+        end
+    end
+end

data/test/import/md5/root.rant

@@ -0,0 +1,9 @@
+
+import "md5"
+import "sys/more", "autoclean"
+
+gen Rule, :t => :tt do |t|
+    sys.write_to_file t.name, "abc\n"
+end
+
+gen AutoClean

data/test/import/md5/test_md5.rb

@@ -0,0 +1,45 @@
+
+require 'test/unit'
+require 'tutil'
+
+$test_import_md5_dir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestImportMd5 < Test::Unit::TestCase
+    include Rant::TestUtil
+    def setup
+	# Ensure we run in test directory.
+	Dir.chdir($test_import_md5_dir)
+    end
+    def teardown
+	Dir.chdir($test_import_md5_dir)
+        Rant::Sys.rm_f Rant::FileList["**/*.rant.meta"]
+        Rant::Sys.rm_rf Rant::FileList["*.t", "*.tt"]
+    end
+    def test_rule_root_and_subdir
+        Rant::Sys.mkdir "sub.td"
+        Rant::Sys.touch "sub.td/a.tt"
+        out, err = assert_rant "sub.td/a.t"
+        assert err.empty?
+        assert_match(/\bwriting\b.*a\.t\b/, out)
+        out, err = assert_rant "sub.td/a.t"
+        assert err.empty?
+        assert out.empty?
+        Dir.chdir "sub.td"
+        out, err = assert_rant "-u", "a.t"
+        assert err.empty?
+        lines = out.split(/\n/)
+        assert(lines.size == 1)
+        assert(out !~ /writing|a\.t/)
+        Dir.chdir $test_import_md5_dir
+        out, err = assert_rant "sub.td/a.t"
+        assert err.empty?
+        assert out.empty?
+        assert_rant "autoclean"
+        assert !test(?e, "sub.td/a.t")
+        assert !test(?e, "sub.td/.rant.meta")
+        assert Dir["**/*.rant.meta"].empty?
+    ensure
+        Dir.chdir $test_import_md5_dir
+        Rant::Sys.rm_rf "sub.td"
+    end
+end

data/test/import/metadata/Rantfile

@@ -8,9 +8,9 @@ var[:__metadata__].set("cmd", "touch a", "a")
 
 if var[:subdir]
     subdirs "sub"
-    rac.goto "sub"
+    rant.goto "sub"
         p var[:__metadata__].fetch("cmd", "b", "sub")
-    rac.goto "#"
+    rant.goto "@"
 else
     p var[:__metadata__].fetch("cmd", "a")
 end