rant 0.3.2 → 0.3.4

data/rantmethods.rb

@@ -12,6 +12,11 @@ task :rant_methods do
     puts "*** total: #{ml.size} methods ***"
 end
 
+desc "Print constants introduced by Rant."
+task :constants do
+    puts ((self.class.constants - Object.constants).sort)
+end
+
 desc "Print all attribute writers of a Gem::Specification."
 task :gem_attrs do
     require 'rubygems'
@@ -24,8 +29,8 @@ end
 
 file "bench-rant" do |t|
     c = 500
-    if ENV["TC"]
-	c = Integer(ENV["TC"])
+    if var["TC"]
+	c = Integer(var["TC"])
     end
     File.open(t.name, "w") { |f|
 	f.puts "$tc_run = 0"
@@ -49,8 +54,8 @@ end
 
 file "bench-depsearch" do |t|
     c = 500
-    if ENV["TC"]
-	c = Integer ENV["TC"]
+    if var["TC"]
+	c = Integer var["TC"]
     end
     File.open(t.name, "w") { |f|
 	f.puts "$tc_run = 0"

data/run_rant

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/local/bin/ruby
 # Run rant in current development directory.
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "lib"))

data/test/Rantfile

@@ -1,2 +1,18 @@
 
 task :do_nothing
+
+file "auto.rf" do |t|
+    open(t.name, "w") { |f|
+	f << <<-EOF
+	    task "auto.t" do |t|
+		sys.touch t.name
+	    end
+	EOF
+    }
+end
+
+source "auto.rf"
+
+task :clean do
+    sys.rm_f %w(auto.t auto.rf)
+end

data/test/plugin/csharp/test_csharp.rb

@@ -9,7 +9,8 @@ $have_csc ||= Rant::Env.find_bin("csc") ||
     Rant::Env.find_bin("cscc") || Rant::Env.find_bin("mcs")
 
 class TestPluginCsharp < Test::Unit::TestCase
-    include Rant
+    Assembly = Rant::Generators::Assembly
+    Env = Rant::Env
 
     def setup
 	# Ensure we run in test directory.

data/test/plugin/rantfile

@@ -1,4 +1,5 @@
 
+var.env "csc", "target"
 conf = plugin :Configure do |conf|
     conf.init_modes = [:explicit]
     conf.override_modes = [:env]

data/test/project1/Rantfile

@@ -1,4 +1,6 @@
 
+require 'tutil'
+
 file "test_touch" do |t|
     sys.touch t.name
 end
@@ -68,12 +70,12 @@ end
 
 file "tbe" => :dep1 do |t|
     sys.touch t.name
-    sleep 2
+    timeout
 end
 
 enhance :tbe => "dep2" do |t|
     sys.touch "tbe2"
-    sleep 2
+    timeout
 end
 
 # should generate warning because there is no existing task called
@@ -82,12 +84,12 @@ enhance :nothing
 
 task :order do |t|
     sys.touch t.name + "1"
-    sleep 2
+    timeout
 end
 
 task :order do |t|
     sys.touch t.name + "2"
-    sleep 2
+    timeout
 end
 
 file "incdep" do |t|
@@ -129,3 +131,5 @@ task :force_clean do
 	).find_all { |e| test(?e, e) }
     sys.rm_rf %w(dir)
 end
+
+# vim:ft=ruby

data/test/rule.rf

@@ -0,0 +1,27 @@
+gen Rule, '.o' => '.c' do |t|
+    sys "cc -c -o #{t.name} #{t.source}"
+end
+
+gen Rule, :tt => :t do |t|
+    t.source =~ /\.t$/ or t.fail
+    sys.touch t.name
+end
+
+gen Rule, :t do |t|
+    test(?e, t.name) && t.fail
+    sys.touch t.name
+end
+
+src = lambda { |target| [target.sub_ext("t"), target.sub_ext("tt")] }
+gen Rule, :lt => src do |t|
+    t.prerequisites[0] =~ /\.t$/ or t.fail
+    t.prerequisites[1] =~ /\.tt$/ or t.fail
+    sys.touch t.name
+end
+
+src = lambda { |target| target + "t" }
+gen Rule, :rt => src do |t|
+    t.prerequisites[0] =~ /\.rtt$/ or t.fail
+    t.source =~ /\.rtt$/ or t.fail
+    sys.touch t.name
+end

data/test/subdirs/Rantfile

@@ -1,4 +1,6 @@
 
+var "param" => "param_default.t"
+
 file "t" => "sub1/t" do |t|
     sys.touch t.name
 end

data/test/subdirs/sub2/sub/rantfile

@@ -8,7 +8,24 @@ file "rootref.t" => "#t" do |t|
     sys.touch t.name
 end
 
+gen Directory, "dt/dt"
+
+gen Task, "gt" => "dt" do |t|
+    t.needed { !test(?f, t.name) }
+    t.act { sys.touch t.name }
+end
+
+gen LightTask, "lt" do |lt|
+    lt.needed { !test(?f, lt.name) }
+    lt.act { sys.touch lt.name }
+end
+
+task :create_param do
+    sys.touch var[:param]
+end
+
 task :clean do
+    sys.rm_rf %w(dt)
     sys.rm_f Dir["*t"]
 end
 

data/test/subdirs/test_subdirs.rb

@@ -13,7 +13,7 @@ class TestSubdirs < Test::Unit::TestCase
     end
     def teardown
 	capture_std do
-	    assert_equal(Rant.run("clean"), 0)
+	    assert_equal(0, Rant.run("clean"))
 	end
 	created = Dir["**/*t"]
 	assert(created.empty?)
@@ -80,7 +80,7 @@ class TestSubdirs < Test::Unit::TestCase
 	assert(test(?f, "t"))
     end
     def test_import
-	run_import %w(--auto ant)
+	run_import %w(-q --auto ant)
 	assert_equal($?, 0)
 	capture_std do
 	    assert_nothing_raised {
@@ -93,4 +93,48 @@ class TestSubdirs < Test::Unit::TestCase
     ensure
 	File.delete "ant" if File.exist? "ant"
     end
+    def test_directory
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/dt/dt"))
+	end
+	assert(test(?d, "sub2/sub/dt"))
+	assert(test(?d, "sub2/sub/dt/dt"))
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/dt/dt"))
+	end
+    end
+    def test_lighttask
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/lt"))
+	end
+	assert(test(?f, "sub2/sub/lt"))
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/lt"))
+	end
+    end
+    def test_gen_task
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/gt"))
+	end
+	assert(test(?f, "sub2/sub/gt"))
+	assert(test(?d, "sub2/sub/dt"))
+	assert(!test(?d, "sub2/sub/dt/dt"))
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/gt"))
+	end
+	assert(!test(?d, "sub2/sub/dt/dt"))
+    end
+    def test_param_default
+	capture_std do
+	    assert_equal(0, Rant.run("sub2/sub/create_param"))
+	end
+	assert(test(?f, "sub2/sub/param_default.t"))
+    end
+    def test_param_override
+	capture_std do
+	    assert_equal(0, Rant.run(
+		%w(sub2/sub/create_param param=param.t)))
+	end
+	assert(test(?f, "sub2/sub/param.t"))
+    end
 end

data/test/test_dirtask.rb

@@ -0,0 +1,33 @@
+
+require 'test/unit'
+require 'rant/rantlib'
+require 'tutil'
+require 'fileutils'
+
+# Ensure we run in testproject directory.
+$testDir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestDirTask < Test::Unit::TestCase
+    Directory = Rant::Generators::Directory
+    def setup
+	Dir.chdir($testDir) unless Dir.pwd == $testDir
+	@rac = Rant::RantApp.new
+	@cx = @rac.context
+    end
+    def teardown
+	FileUtils.rm_rf Dir["*.t"]
+    end
+    def args(*args)
+	@rac.args.replace(args.flatten)
+    end
+    def test_return
+	dt = @cx.gen Directory, "a.t/b.t"
+	assert(Rant::Worker === dt)
+	assert_equal("a.t/b.t", dt.name,
+	    "`gen Directory' should return task for last directory")
+	args "--quiet", "a.t/b.t"
+	@rac.run
+	assert(test(?d, "a.t"))
+	assert(test(?d, "a.t/b.t"))
+    end
+end

data/test/test_filelist.rb

@@ -52,6 +52,37 @@ class TestFileList < Test::Unit::TestCase
 	    assert(!l.include?(f))
 	}
     end
+    def test_ignore
+	l = fl
+	r = l.ignore "CVS"
+	assert_same(l, r)
+	inc_list = %w(
+	    CVS_ a/b a
+	    ).map! { |f| f.tr "/", File::SEPARATOR }
+	not_inc_list = %w(
+	    CVS a/CVS a/CVS/b CVS/CVS //CVS /CVS/ /a/b/CVS/c
+	    ).map! { |f| f.tr "/", File::SEPARATOR }
+	l.concat(not_inc_list + inc_list)
+	inc_list.each { |f|
+	    assert(l.include?(f))
+	}
+	not_inc_list.each { |f|
+	    assert(!l.include?(f))
+	}
+    end
+    def test_ignore_more
+	FileUtils.mkdir "fl.t"
+	l = fl "fl.t/*", "fl.t", "*.t"
+	touch_temp %w(a.t fl.t/CVS fl.t/a~) do
+	    l.ignore(/\~$/, "CVS")
+	    assert(l.include?("fl.t"))
+	    assert(l.include?("a.t"))
+	    assert(!l.include?("fl.t/a~"))
+	    assert(!l.include?("fl.t/CVS"))
+	end
+    ensure
+	FileUtils.rm_rf "fl.t"
+    end
     def test_initialize
 	touch_temp %w(1.t 2.tt) do
 	    assert(fl("*.t").include?("1.t"),
@@ -121,6 +152,10 @@ class TestFileList < Test::Unit::TestCase
 	    l = l1 + l2
 	    assert(l.include?("1.ta"))
 	    assert_equal(3, l.size)
+	    assert(!l1.include?("1.tb"))
+	    assert_equal(2, l1.size)
+	    assert(!l2.include?("2.t"))
+	    assert_equal(1, l2.size)
 	end
     end
     def test_glob
@@ -140,4 +175,50 @@ class TestFileList < Test::Unit::TestCase
 	    assert(l.include?("t.t2"))
 	end
     end
+    def test_rac_sys_glob
+	rac = Rant::RantApp.new
+	cx = rac.context
+	FileUtils.mkdir "fl.t"
+	l = cx.sys.glob "fl.t/*", "fl.t", "*.t"
+	touch_temp %w(a.t fl.t/CVS fl.t/a~) do
+	    assert(l.include?("fl.t"))
+	    assert(l.include?("a.t"))
+	    assert(l.include?("fl.t/a~"))
+	    assert(l.include?("fl.t/CVS"))
+	end
+    ensure
+	FileUtils.rm_rf "fl.t"
+    end
+    def test_rac_sys_glob_ignore
+	rac = Rant::RantApp.new
+	cx = rac.context
+	cx.var["ignore"] = ["CVS", /\~$/]
+	FileUtils.mkdir "fl.t"
+	l = cx.sys.glob "fl.t/*", "fl.t", "*.t"
+	touch_temp %w(a.t fl.t/CVS fl.t/a~) do
+	    assert(l.include?("fl.t"))
+	    assert(l.include?("a.t"))
+	    assert(!l.include?("fl.t/a~"))
+	    assert(!l.include?("fl.t/CVS"))
+	end
+    ensure
+	FileUtils.rm_rf "fl.t"
+    end
+    def test_sys_glob_late_ignore
+	rac = Rant::RantApp.new
+	cx = rac.context
+	FileUtils.mkdir "fl.t"
+	l = cx.sys["fl.t/*", "fl.t", "*.t"]
+	touch_temp %w(a.t fl.t/CVS fl.t/a~) do
+	    cx.var["ignore"] = ["CVS", /\~$/]
+	    assert(l.include?("fl.t"))
+	    assert(l.include?("a.t"))
+	    assert(!l.include?("fl.t/a~"))
+	    assert(!l.include?("fl.t/CVS"))
+	end
+	l[0] = "CVS"
+	assert(!l.include?("CVS"))
+    ensure
+	FileUtils.rm_rf "fl.t"
+    end
 end

data/test/test_filetask.rb

@@ -20,7 +20,7 @@ class TestFileTask < Test::Unit::TestCase
     end
     def test_needed_no_dep
 	run = false
-	t = Rant.file $test_filetask_file do
+	t = Rant.rac.file $test_filetask_file do
 	    run = true
 	end
 	assert(!t.needed?,
@@ -29,11 +29,11 @@ class TestFileTask < Test::Unit::TestCase
     end
     def test_single_dep
 	tr = false
-	t = Rant.task :t do
+	t = Rant.rac.task :t do
 	    tr = true
 	end
 	run = false
-	f = Rant.file "testfile" => :t do
+	f = Rant.rac.file "testfile" => :t do
 	    run = true
 	end
 	f.invoke
@@ -41,13 +41,13 @@ class TestFileTask < Test::Unit::TestCase
 	assert(run)
     end
     def test_prerequisites
-	Rant.file "a" do
+	Rant.rac.file "a" do
 	    true
 	end
-	Rant.file "b" do
+	Rant.rac.file "b" do
 	    true
 	end
-	f = Rant.file "c" => %w(a b) do |t|
+	f = Rant.rac.file "c" => %w(a b) do |t|
 	    assert_equal(t.prerequisites, %w(a b),
 		"prerequisites should always be an array of _strings_")
 	    true

data/test/test_rant_interface.rb

@@ -29,15 +29,16 @@ class TestRantInterface < Test::Unit::TestCase
     end
     def test_envvar_on_cmdline
 	@app = Rant::RantApp.new("VAR=VAL")
+	@app.context.var.env "VAR"
 	assert_equal(@app.run, 0)
 	assert_equal(ENV["VAR"], "VAL",
-	    "rant should set arguments of form VAR=VAL in ENV")
+	    "rant should set arguments of form VAR=VAL in var")
     end
     def test_envvar_on_cmdline_lc
 	@app = Rant::RantApp.new("var2=val2")
 	assert_equal(@app.run, 0)
-	assert_equal(ENV["var2"], "val2",
-	    "rant should set arguments of form var2=val2 in ENV")
+	assert_equal(@app.context.var["var2"], "val2",
+	    "rant should set arguments of form var2=val2 in var")
     end
     def test_opt_targets
 	@app = Rant::RantApp.new("--tasks")

data/test/test_rule.rb

@@ -0,0 +1,67 @@
+
+require 'test/unit'
+require 'rant/rantlib'
+require 'tutil'
+require 'fileutils'
+
+# Ensure we run in testproject directory.
+$testDir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestRule < Test::Unit::TestCase
+    def setup
+	Dir.chdir($testDir) unless Dir.pwd == $testDir
+    end
+    def teardown
+	FileUtils.rm_rf Dir["*.t*"]
+	FileUtils.rm_rf Dir["*.lt"]
+	FileUtils.rm_rf Dir["*.rt"]
+	FileUtils.rm_rf Dir["*.rtt"]
+    end
+    def test_target_and_source_as_symbol
+	FileUtils.touch "r.t"
+	FileUtils.touch "r2.t"
+	capture_std do
+	    assert_equal(0, Rant.run("-frule.rf", "r.tt", "r2.tt"))
+	end
+	assert(test(?f, "r.t"))
+	assert(test(?f, "r2.t"))
+    end
+    def test_rule_depends_on_rule
+	capture_std do
+	    assert_equal(0, Rant.run("-frule.rf", "r.tt", "r2.tt"))
+	end
+	assert(test(?f, "r.t"))
+	assert(test(?f, "r2.t"))
+    end
+    def test_src_block
+	FileUtils.touch "r.rtt"
+	capture_std do
+	    assert_equal(0, Rant.run("-frule.rf", "r.rt"))
+	end
+	assert(test(?f, "r.rtt"))
+	assert(test(?f, "r.rt"))
+    end
+    def test_src_block_multiple_deps
+	capture_std do
+	    assert_equal(0, Rant.run("-frule.rf", "r.lt"))
+	end
+	assert(test(?f, "r.t"))
+	assert(test(?f, "r.tt"))
+	assert(test(?f, "r.lt"))
+    end
+if Rant::Env.find_bin("cc") && Rant::Env.find_bin("gcc")
+    # Note: we are assuming that "cc" invokes "gcc"!
+    def test_cc
+	FileUtils.touch "a.t.c"
+	capture_std do
+	    assert_equal(0, Rant.run("a.t.o", "-frule.rf"))
+	end
+	assert(test(?f, "a.t.o"))
+    end
+else
+    $stderr.puts "*** cc/gcc not available, less rule tests ***"
+    def test_dummy
+	assert(true)
+    end
+end
+end