rant 0.3.2 → 0.3.4

data/test/test_source.rb

@@ -0,0 +1,26 @@
+
+require 'test/unit'
+require 'rant/rantlib'
+require 'tutil'
+require 'fileutils'
+
+# Ensure we run in testproject directory.
+$testDir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestSource < Test::Unit::TestCase
+    def setup
+	Dir.chdir($testDir) unless Dir.pwd == $testDir
+    end
+    def teardown
+	capture_std do
+	    assert_equal(0, Rant.run("clean"))
+	end
+    end
+    def test_task_for_source
+	capture_std do
+	    assert_equal(0, Rant.run("auto.t"))
+	end
+	assert(test(?f, "auto.rf"))
+	assert(test(?f, "auto.t"))
+    end
+end

data/test/test_task.rb

@@ -42,7 +42,7 @@ class TestTask < Test::Unit::TestCase
 	    task.invoke
 	}
 	assert(task.fail?)
-	assert(task.run?, "although task failed, it was ran")
+	assert(task.invoked?, "although task failed, it was invoked")
     end
 
     def test_dependant
@@ -75,7 +75,7 @@ class TestTask < Test::Unit::TestCase
 
     def test_task
 	run = false
-	t = Rant.task :t do |t|
+	t = Rant.rac.task :t do |t|
 	    run = true
 	end
 	t.invoke
@@ -84,7 +84,7 @@ class TestTask < Test::Unit::TestCase
 
     def test_dep_on_self
 	run = false
-	t = Rant.task :t => "t" do |t|
+	t = Rant.rac.task :t => "t" do |t|
 	    run = true
 	end
 	th = Thread.new { t.invoke }
@@ -94,15 +94,36 @@ class TestTask < Test::Unit::TestCase
 	assert(run,
 	    "task should get run despite dependency on itself")
     end
+    def test_circular_dependency
+	t1r = false
+	t2r = false
+	t1 = Rant.rac.task :t1 => :t2 do |t|
+	    assert(t2r)
+	    t1r = true
+	end
+	t2 = Rant.rac.task :t2 => :t1 do |t|
+	    t2r = true
+	end
+	out, err = capture_std do
+	    th = Thread.new { t1.invoke }
+	    assert_equal(th, th.join(0.5),
+		"task should detect circular dependency")
+	end
+	assert(t1r)
+	assert(t2r)
+	assert_match(/\[WARNING\]/, err,
+	    "Rant should print a warning to stderr about circular" +
+	    "dependency")
+    end
     def test_dep_on_self_in_deplist
 	rl = []
-	t1 = Rant.task :t1 do |t|
+	t1 = Rant.rac.task :t1 do |t|
 	    rl << t.name
 	end
-	t2 = Rant.task :t2 do |t|
+	t2 = Rant.rac.task :t2 do |t|
 	    rl << t.name
 	end
-	t3 = Rant.task :t3 => [:t1, :t3, :t2] do |t|
+	t3 = Rant.rac.task :t3 => [:t1, :t3, :t2] do |t|
 	    rl << t.name
 	end
 	th = Thread.new { t3.invoke }

data/test/test_var.rb

@@ -0,0 +1,102 @@
+
+require 'test/unit'
+require 'rant/rantlib'
+require 'fileutils'
+require 'tutil'
+
+$testDir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestVar < Test::Unit::TestCase
+    RV = Rant::RantVar
+    RS = Rant::RantVar::Space
+    def setup
+	# Ensure we run in test directory.
+	Dir.chdir($testDir) unless Dir.pwd == $testDir
+	@rac = Rant::RantApp.new
+	@cx = @rac.context
+    end
+    def teardown
+    end
+    def test_space
+	s = nil
+	assert_nothing_raised {
+	    s = RS.new
+	    assert_nil(s[:a])
+	    s[:a] = 1
+	    assert_equal(1, s["a"])
+	    assert_equal(1, s[:a])
+	    s[:b] = "b"
+	    assert_equal("b", s.query(:b))
+	    assert_same(s[:b], s["b"])
+	    assert_same(s.query("b"), s["b"])
+	    s.query :a, :Integer, 2
+	    assert_equal(2, s[:a])
+	    s.query :c, :Integer
+	    assert_equal(0, s[:c])
+	}
+    end
+    def test_rac_var_ignore
+	assert_equal([], @cx.var(:ignore))
+	@cx.var[:ignore] = "CVS"
+	assert_equal(%w(CVS), @cx.var["ignore"])
+    end
+    def test_invalid_for_constraint
+	@cx.var :a, :Integer
+	assert_equal(0, @cx.var[:a])
+	assert_raises(Rant::RantVar::ConstraintError) {
+	    @cx.var[:a] = "x"
+	}
+	assert_equal(0, @cx.var[:a])
+    end
+    def test_env
+	ENV["RANT_TEST_VAL"] = "val"
+	@cx.var.env "RANT_TEST_VAL"
+	assert_equal("val", @cx.var["RANT_TEST_VAL"])
+	assert_equal("val", @cx.var("RANT_TEST_VAL"))
+	@cx.var[:RANT_TEST_VAL] = "new"
+	assert_equal("new", @cx.var["RANT_TEST_VAL"])
+	assert_equal("new", ENV["RANT_TEST_VAL"])
+	env_val2 = ENV["RANT_TEST_VAL2"]
+	@cx.var["RANT_TEST_VAL2"] = "val2"
+	assert_equal(env_val2, ENV["RANT_TEST_VAL2"])
+	assert_equal("val2", @cx.var("RANT_TEST_VAL2"))
+    end
+    def test_late_env
+	@cx.var "rtv3" => "val3"
+	@cx.var.env "rtv3", "rtv4"
+	assert_equal("val3", @cx.var["rtv3"])
+	assert_equal("val3", ENV["rtv3"])
+	ENV["rtv4"] = "val4"
+	assert_equal("val4", @cx.var["rtv4"])
+    end
+    def test_env_with_array
+	@cx.var "rtv6" => "val6"
+	@cx.var.env %w(rtv6 rtv7)
+	assert_equal("val6", @cx.var["rtv6"])
+	assert_equal("val6", ENV["rtv6"])
+	ENV["rtv7"] = "val7"
+	assert_equal("val7", @cx.var["rtv7"])
+    end
+    def test_defaults
+	@rac.args.replace %w(-fvar.rf)
+	capture_std do
+	    assert_equal(0, @rac.run)
+	end
+	assert(test(?f, "default_1.t"))
+	assert(test(?f, "default_2.t"))
+	capture_std do
+	    assert_equal(0, Rant::RantApp.new(%w(-fvar.rf clean)).run)
+	end
+    end
+    def test_override
+	@rac.args.replace %w(v1=val1.t v2=val2.t -fvar.rf)
+	capture_std do
+	    assert_equal(0, @rac.run)
+	end
+	assert(test(?f, "val1.t"))
+	assert(test(?f, "default_2.t"))
+	capture_std do
+	    assert_equal(0, Rant::RantApp.new(%w(-fvar.rf clean)).run)
+	end
+    end
+end

data/test/toplevel.rf

@@ -1,5 +1,5 @@
 
-include Sys
+include Rant::Sys
 
 def tf fn
     touch fn

data/test/var.rf

@@ -0,0 +1,19 @@
+
+var "v1" => "default_1.t"
+var["v2"] = "default_2.t"
+
+task :default => [var[:v1], var[:v2]]
+
+file var[:v1] do |t|
+    sys.touch t.name
+end
+
+file var[:v2] do |t|
+    sys.touch t.name
+end
+
+task :clean do
+    sys.rm_f sys["*.t"]
+end
+
+# vim:ft=ruby

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2005-04-03
+  version: 0.3.4
+date: 2005-04-17
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -33,6 +33,7 @@ files:
   - TODO
   - README
   - Rantfile
+  - install.rb
   - run_rant
   - devel-notes
   - rantmethods.rb
@@ -63,16 +64,22 @@ files:
   - test/test_lighttask.rb
   - test/Rantfile
   - test/ts_all.rb
+  - test/test_rule.rb
   - test/test_task.rb
   - test/project_rb1
+  - test/rule.rf
   - test/subdirs
   - test/test_metatask.rb
   - test/test_env.rb
   - test/toplevel.rf
+  - test/test_source.rb
   - test/plugin
   - test/test_rant_interface.rb
   - test/test_sys.rb
+  - test/test_var.rb
   - test/tutil.rb
+  - test/var.rf
+  - test/test_dirtask.rb
   - test/project1
   - test/project2
   - test/test_filelist.rb
@@ -117,6 +124,7 @@ files:
   - test/project2/sub1/Rantfile
   - doc/rantfile.rdoc
   - doc/configure.rdoc
+  - doc/advanced.rdoc
   - doc/rubyproject.rdoc
   - doc/rant.rdoc
   - doc/csharp.rdoc
@@ -142,6 +150,7 @@ rdoc_options:
 extra_rdoc_files: 
   - doc/rantfile.rdoc
   - doc/configure.rdoc
+  - doc/advanced.rdoc
   - doc/rubyproject.rdoc
   - doc/rant.rdoc
   - doc/csharp.rdoc