rant 0.3.0 → 0.3.2

data/rantmethods.rb

@@ -77,3 +77,49 @@ file "bench-depsearch" do |t|
 	EOT
     }
 end
+
+=begin
+class TraceObject < Object
+    ml = public_instance_methods + protected_instance_methods + private_instance_methods
+    ml.each { |m|
+	eval <<-EOM
+	    def #{m}(*args)
+		print "TraceObject##{m}("
+		print args.join(", ")
+		print ")"
+		puts(block_given? ? " block_given" : "")
+		super
+	    end
+	EOM
+    }
+end
+=end
+
+class TraceArray < Array
+    ml = public_instance_methods + protected_instance_methods + private_instance_methods
+    ml.delete "print"
+    ml.delete "block_given?"
+    ml.delete "puts"
+    ml.each { |m|
+	eval <<-EOM
+	    def #{m}(*args)
+		print "TraceArray##{m}("
+		print args.join(", ")
+		print ")"
+		puts(block_given? ? " block_given" : "")
+		super
+	    end
+	EOM
+    }
+end
+
+# list the methods that are sent to an object that is in an array
+# which is flattened.
+#task :flatten do
+    #    to = TraceObject.new
+    #[to].flatten
+    #end
+
+task :flatten_ary do
+    [TraceArray.new].flatten
+end

data/setup.rb

@@ -7,6 +7,9 @@
 # You can distribute/modify this program under the terms of
 # the GNU LGPL, Lesser General Public License version 2.1.
 #
+# Modifications made by Stefan Lang are marked with a line
+### stefan ###
+#
 
 unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
   module Enumerable
@@ -1124,9 +1127,14 @@ class Installer
   end
 
   def setup_dir_bin(rel)
-    all_files_in(curr_srcdir()).each do |fname|
-      adjust_shebang "#{curr_srcdir()}/#{fname}"
-    end
+    ### stefan ###
+    # Do not adjust shebang on Windows as it is useless and setup.rb
+    # is failing for me (Note: already fixed in adjust_shebang).
+    #unless PLATFORM =~ /mswin/i
+	all_files_in(curr_srcdir()).each do |fname|
+	  adjust_shebang "#{curr_srcdir()}/#{fname}"
+	end
+    #end
   end
 
   def adjust_shebang(path)
@@ -1136,14 +1144,20 @@ class Installer
       File.open(path, 'rb') {|r|
         first = r.gets
         return unless File.basename(config('rubypath')) == 'ruby'
+	### stefan ###
+	# Add <tt>|| ""</tt> which avoids an ArgumentError if first
+	# line doesn't match the regexp.
         return unless File.basename(first.sub(/\A\#!/, '').split[0] || "") == 'ruby'
         $stderr.puts "adjusting shebang: #{File.basename(path)}" if verbose?
         File.open(tmpfile, 'wb') {|w|
           w.print first.sub(/\A\#!\s*\S+/, '#! ' + config('rubypath'))
           w.write r.read
         }
-        move_file tmpfile, File.basename(path)
       }
+      ### stefan ###
+      # Move +move_file+ out of File.open block to close tmpfile
+      # before unlinking (which didn't work on Windows).
+      move_file tmpfile, File.basename(path)
     ensure
       File.unlink tmpfile if File.exist?(tmpfile)
     end

data/test/plugin/configure/Rantfile

@@ -3,8 +3,6 @@
 rd = File.expand_path("../../../lib")
 $:.unshift rd unless $:.include? rd
 
-require 'rant'
-
 task :hello do |t|
     sys.touch t.name
 end
@@ -41,7 +39,3 @@ end
 task :clean do
     sys.rm_f %w(config hello value_a value_a_guess)
 end
-
-if $0 == __FILE__
-    Rant.run
-end

data/test/plugin/configure/test_configure.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require 'rant'
+require 'rant/rantlib'
 require 'tutil'
 
 $testPluginConfigureDir = File.expand_path(File.dirname(__FILE__))
@@ -30,7 +30,7 @@ class TestPluginConfigure < Test::Unit::TestCase
     end
     def test_configure
 	capture_std do
-	    assert_equal(Rant.run("configure"), 0)
+	    assert_equal(0, Rant.run("configure"))
 	end
 	assert(File.exist?("config"),
 	    "config should have been created by `configure'")

data/test/plugin/csharp/test_csharp.rb

@@ -1,13 +1,16 @@
 
 require 'test/unit'
-require 'rant'
+require 'rant/rantlib'
 require 'rant/plugin/csharp'
 require 'tutil'
 
 $testPluginCsDir = File.expand_path(File.dirname(__FILE__))
-$have_csc = Env.find_bin("csc") || Env.find_bin("cscc") || Env.find_bin("mcs")
+$have_csc ||= Rant::Env.find_bin("csc") ||
+    Rant::Env.find_bin("cscc") || Rant::Env.find_bin("mcs")
 
 class TestPluginCsharp < Test::Unit::TestCase
+    include Rant
+
     def setup
 	# Ensure we run in test directory.
 	Dir.chdir($testPluginCsDir) unless Dir.pwd == $testPluginCsDir
@@ -16,6 +19,8 @@ class TestPluginCsharp < Test::Unit::TestCase
 	capture_std do
 	    assert(Rant.run("clean"), 0)
 	end
+	assert(Dir["*.{exe,dll,obj}"].empty?,
+	    "task :clean should remove exe, dll and obj files")
     end
 if $have_csc
     # Try to compile the "hello world" program. Requires cscc, csc

data/test/plugin/rantfile

@@ -0,0 +1,45 @@
+
+conf = plugin :Configure do |conf|
+    conf.init_modes = [:explicit]
+    conf.override_modes = [:env]
+    conf.task           # define a task named :configure
+    conf.check "target" do |c|
+        c.default "conf_csharp.exe"
+        c.interact {
+            c.prompt "Name for executable: "
+        }
+    end
+    # define more checks
+end
+
+plugin :Csharp do |cs|
+    cs.config = conf
+end
+
+conf.init
+
+task :default => ["conf_csharp.cs", conf["target"]]
+
+# from our example above
+gen Assembly, conf["target"] do |t|
+    t.libs = %w(System.Xml.dll)
+    t.sources = Dir["*.cs"]
+end
+
+file "conf_csharp.cs" do |t|
+    File.open(t.name, "w") { |f|
+	f << <<-EOF
+class ConfCSharp
+{
+    public static void Main(string[] args)
+    {
+	System.Console.WriteLine("ConfCSharp");
+    }
+}
+	EOF
+    }
+end
+
+task :clean do
+    sys.rm_f Dir["*.{exe,cs}"] + %w(config)
+end

data/test/plugin/test_conf_csharp.rb

@@ -0,0 +1,53 @@
+
+require 'test/unit'
+require 'rant/rantlib'
+require 'tutil'
+
+$testPluginConfCsDir = File.expand_path(File.dirname(__FILE__))
+$have_csc ||= Rant::Env.find_bin("csc") ||
+    Rant::Env.find_bin("cscc") || Rant::Env.find_bin("mcs")
+
+class TestConfCsharp < Test::Unit::TestCase
+    def setup
+	# Ensure we run in test directory.
+	Dir.chdir($testPluginConfCsDir) unless Dir.pwd == $testPluginConfCsDir
+    end
+    def teardown
+	capture_std do
+	    assert_equal(0, Rant.run("clean"))
+	end
+    end
+if $have_csc
+    def test_defaults
+	capture_std do
+	    assert_equal(0, Rant.run([]))
+	end
+	assert(test(?f, "conf_csharp.cs"),
+	    "conf_csharp.cs should be created by default task")
+	assert(test(?f, "conf_csharp.exe"),
+	    "conf_csharp.exe should be compiled by default task")
+	assert(test(?f, "config"),
+	    "config should habe been created by Configure plugin")
+    end
+    def test_with_explicit_target
+	capture_std do
+	    assert_equal(0, Rant.run(%w(target=myprog.exe)))
+	end
+	assert(test(?f, "conf_csharp.cs"))
+	assert(test(?f, "myprog.exe"),
+	    "myprog.exe was given as target name on commandline")
+	assert(test(?f, "config"))
+	File.delete "myprog.exe"
+	capture_std do
+	    assert_equal(0, Rant.run([]))
+	end
+	assert(test(?f, "myprog.exe"),
+	    "target should be set to myprog.exe from config")
+    end
+else
+    # required to fool test/unit
+    def test_dummy
+	assert(true)
+    end
+end
+end

data/test/project1/Rantfile

@@ -62,6 +62,10 @@ gen Directory, "dir/sub2" do |t|
     sys.touch "#{t.name}/postprocess"
 end
 
+gen Directory, "dir/sub3" => "dep1" do |t|
+    sys.touch "#{t.name}/postprocess"
+end
+
 file "tbe" => :dep1 do |t|
     sys.touch t.name
     sleep 2

data/test/project1/test_project.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require 'rant'
+require 'rant/rantlib'
 require 'tutil'
 
 # Ensure we run in testproject directory.
@@ -37,24 +37,24 @@ class TestProject1 < Test::Unit::TestCase
 	end
 	assert(File.exist?("target"))
 	Rant.reset
-	sleep 2
+	timeout
 	capture_std do
 	    assert_equal(Rant.run("create_dep"), 0)
 	end
 	assert(File.exist?("dep"))
-	assert(sys.uptodate?("dep", "target"),
+	assert(Rant::Sys.uptodate?("dep", "target"),
 	    "`create_target' was run before `create_dep'")
-	sleep 2
+	timeout
 	capture_std do
 	    assert_equal(Rant.run("target"), 0)
 	end
 	assert(File.exist?("target"))
 	assert(File.exist?("dep"))
-	assert(sys.uptodate?("target", "dep"),
+	assert(Rant::Sys.uptodate?("target", "dep"),
 	    "`target' should be newer than `dep'")
 	t1 = File.mtime "target"
 	Rant.reset
-	sleep 2
+	timeout
 	capture_std do
 	    assert_equal(Rant.run("target"), 0)
 	end
@@ -123,6 +123,31 @@ class TestProject1 < Test::Unit::TestCase
 	assert(test(?f, "dir/sub2/postprocess"),
 	    "dir/sub2/postprocess should have been created by block supplied to directory task")
     end
+    def test_directory_pre_postprocess
+	capture_std do
+	    assert_equal(0, Rant.run("dir/sub3"))
+	end
+	assert(test(?d, "dir/sub3"))
+	assert(test(?e, "dep1"), "dep1 is a prerequisite")
+	assert(test(?e, "dir/sub3/postprocess"))
+	old_mtime = File.mtime "dir/sub3"
+	assert_equal(old_mtime, File.mtime("dep1"))
+	timeout
+	capture_std do
+	    assert_equal(0, Rant.run("dir/sub3"))
+	end
+	assert_equal(old_mtime, File.mtime("dir/sub3"),
+	    "no prerequisite requires update")
+	assert_equal(old_mtime, File.mtime("dir/sub3/postprocess"))
+	capture_std do
+	    assert_equal(0, Rant.run(%w(-a dep1)))
+	    assert(File.mtime("dep1") > old_mtime)
+	    timeout
+	    assert_equal(0, Rant.run("dir/sub3"))
+	    assert(File.mtime("dir/sub3") > old_mtime)
+	    assert(File.mtime("dir/sub3/postprocess") > old_mtime)
+	end
+    end
     def test_order
 	capture_std do
 	    assert_equal(Rant.run("order"), 0)
@@ -158,7 +183,7 @@ class TestProject1 < Test::Unit::TestCase
 	assert(test(?f, "inc"))
 	assert(test(?f, "incdep"))
 	old_mtime = test(?M, "incdep")
-	sleep 2
+	timeout
 	capture_std do
 	    assert_equal(Rant.run(%w(--force-run incdep)), 0,
 		"--force-run should unconditionally run `incdep'")
@@ -185,7 +210,7 @@ class TestProject1 < Test::Unit::TestCase
 	assert(test(?e, "one_target"),
 	    "one_target should get `touched' by task_one")
 	old_mtime = test(?M, "one_target")
-	sleep 2
+	timeout
 	capture_std do
 	    assert_equal(Rant.run("task_one"), 0)
 	end

data/test/project2/buildfile

@@ -1,14 +1,14 @@
 
 file "b_f1" => ["r_f4", "b_f2"] do |t|
-    touch t.name
+    sys.touch t.name
 end
 
 file "b_f2" do |t|
-    touch t.name
+    sys.touch t.name
 end
 
 task :clean do |t|
-    rm_f Dir["b_f*"]
+    sys.rm_f Dir["b_f*"]
 end
 
 subdirs %w(sub1 sub2)

data/test/project2/sub1/Rantfile

@@ -1,12 +1,12 @@
 
 task :create_s1f1 do
-    touch "sub1/s1f1"
+    sys.touch "s1f1"
 end
 
 task :insub1_s1f1 do
-    touch "s1f1"
+    sys.touch "s1f1"
 end
 
 task :clean do
-    rm_f %w(sub1/s1f1 s1f1)
+    sys.rm_f %w(s1f1)
 end

data/test/project2/test_project.rb

@@ -6,13 +6,14 @@ require 'tutil'
 # which would cause the rant.rb (which is ment as a Rantfile)
 # to be loaded!
 require 'rant/rantlib'
-include Rant
-include ::Rant::Sys
 
 # Ensure we run in testproject directory.
 $testProject2Dir = File.expand_path(File.dirname(__FILE__))
 
 class TestProject2 < Test::Unit::TestCase
+    include Rant
+    include ::Rant::Sys
+
     def app *args
 	@app = ::Rant::RantApp.new(*args)
     end
@@ -21,7 +22,7 @@ class TestProject2 < Test::Unit::TestCase
     end
     def teardown
 	capture_std do
-	    assert_equal(app(%w(-f rantfile.rb -f buildfile clean)).run, 0)
+	    assert_equal(app(%w(-f rantfile.rb -f buildfile clean sub1/clean)).run, 0)
 	end
 	assert(Dir["r_f*"].empty?,
 	    "r_f* files should have been removed by `clean'")
@@ -49,6 +50,7 @@ class TestProject2 < Test::Unit::TestCase
     def test_load_rantfile
 	capture_std do
 	    app("b_f2")
+	    @app.rootdir = $testProject2Dir
 	    assert(@app.source("buildfile"),
 		"source should return a true value on success")
 	    assert_equal(@app.run, 0)
@@ -57,7 +59,7 @@ class TestProject2 < Test::Unit::TestCase
     end
     def test_subdirs
 	capture_std do
-	    assert_equal(app(%w(-f buildfile create_s1f1)).run, 0)
+	    assert_equal(0, app(%w(-f buildfile sub1/create_s1f1)).run)
 	end
 	assert(File.exist?("sub1/s1f1"))
     end

data/test/project_rb1/test_project_rb1.rb

@@ -46,12 +46,12 @@ class TestProjectRb1 < Test::Unit::TestCase
     end
     def test_test
 	capture_std do
-	    assert_equal(Rant.run(%w(test)), 0)
+	    assert_equal(0, Rant.run(%w(test)))
 	end
     end
     def test_package
 	capture_std do
-	    assert_equal(Rant.run(%w(pkg)), 0)
+	    assert_equal(0, Rant.run(%w(pkg)))
 	end
 	assert(test(?d, "packages"),
 	    "task `pkg' should create dir `packages'")