rant 0.3.6 → 0.3.8

data/test/test_sourcenode.rb

@@ -0,0 +1,163 @@
+
+require 'test/unit'
+require 'tutil'
+
+$testDir ||= File.expand_path(File.dirname(__FILE__))
+
+class TestSourceNode < Test::Unit::TestCase
+    def setup
+	# Ensure we run in test directory.
+	Dir.chdir $testDir
+    end
+    def teardown
+	Dir.chdir $testDir
+	FileUtils.rm_rf Dir["*.t"]
+    end
+    def tmp_rf(content = @rf, fn = "rf.t")
+	open(fn, "w") { |f| f.write content }
+	yield
+    ensure
+	FileUtils.rm_f fn
+    end
+    def test_invoke
+	@rf = <<-EOF
+	gen SourceNode, "a.t"
+	EOF
+	tmp_rf do
+	    out, err = assert_rant("-frf.t")
+	    assert(!test(?f, "a.t"))
+	    assert(out.strip.empty?)
+	    assert(err.strip.empty?)
+	end
+	tmp_rf do
+	    out, err = assert_rant("-frf.t", "a.t")
+	    assert(out.strip.empty?)
+	    assert(err.strip.empty?)
+	end
+    end
+    def test_deps_empty_array
+	@rf = <<-EOF
+	gen SourceNode, "a.t" => []
+	EOF
+	tmp_rf do
+	    assert_rant("-frf.t")
+	end
+    end
+    def test_with_deps
+	@rf = <<-EOF
+	gen SourceNode, "a.t" => %w(b.t c.t)
+	EOF
+	tmp_rf do
+	    assert_rant("-frf.t")
+	end
+	tmp_rf do
+	    assert_rant(:fail, "-frf.t", "b.t")
+	end
+    end
+    def test_as_dependency
+	@rf = <<-EOF
+	file "a.t" => "b.t" do |t|
+	    sys.touch t.name
+	end
+	gen SourceNode, "b.t" => "c.t"
+	EOF
+	tmp_rf do
+	    out, err = assert_rant(:fail, "-frf.t")
+	    assert(out.strip.empty?)
+	    assert_match(/\[ERROR\].*no such file.*b\.t/m, err)
+	end
+	assert(!test(?e, "a.t"))
+	FileUtils.touch "b.t"
+	tmp_rf do
+	    out, err = assert_rant(:fail, "-frf.t")
+	    assert(out.strip.empty?)
+	    assert_match(/\[ERROR\].*no such file.*c\.t/m, err)
+	end
+	assert(!test(?e, "a.t"))
+	FileUtils.touch "c.t"
+	tmp_rf do
+	    out, err = assert_rant("-frf.t")
+	end
+	assert(test(?f, "a.t"))
+    end
+    def test_timestamps
+	@rf = <<-EOF
+	file "a.t" => "b.t" do |t|
+	    sys.touch t.name
+	end
+	gen SourceNode, "b.t" => %w(c.t d.t)
+	EOF
+	FileUtils.touch %w(b.t c.t d.t)
+	tmp_rf do
+	    assert_rant("-frf.t")
+	    assert(test(?f, "a.t"))
+	    out, err = assert_rant("-frf.t")
+	    assert(out.strip.empty?,
+		"no source changed, no update required")
+	    old_mtime = File.mtime "a.t"
+	    timeout
+	    FileUtils.touch "b.t"
+	    assert_rant("-frf.t")
+	    assert(File.mtime("a.t") > old_mtime)
+	    old_mtime = File.mtime "a.t"
+	    timeout
+	    FileUtils.touch "c.t"
+	    assert_rant("-frf.t")
+	    assert(File.mtime("a.t") > old_mtime)
+	end
+    end
+    def test_with_block
+	@rf = <<-EOF
+	gen SourceNode, "a.t" do end
+	EOF
+	tmp_rf do
+	    out, err = assert_rant(:fail, "-frf.t")
+	    assert_match(/\[ERROR\].*SourceNode.*block/m, err)
+	end
+    end
+    def test_with_autoclean
+	@rf = <<-EOF
+	import "autoclean"
+	gen SourceNode, "a.t" => %w(b.t c.t)
+	gen AutoClean
+	EOF
+	tmp_rf do
+	    assert_rant("-frf.t", "autoclean")
+	    FileUtils.touch %w(a.t b.t c.t)
+	    assert_rant("-frf.t", "autoclean")
+	    assert(test(?f, "a.t"))
+	    assert(test(?f, "b.t"))
+	    assert(test(?f, "c.t"))
+	end
+    end
+    def test_sourcenode_depends_on_sourcenode
+	@rf = <<-EOF
+	file "a.t" => "b.t" do |t|
+	    sys.touch t.name
+	end
+	gen SourceNode, "b.t" => %w(c.t d.t)
+	gen SourceNode, "d.t" => "e.t"
+	EOF
+	FileUtils.touch %w(b.t c.t d.t e.t)
+	tmp_rf do
+	    assert_rant("-frf.t")
+	    assert(test(?f, "a.t"))
+	    timeout
+	    FileUtils.touch "e.t"
+	    old_mtime = File.mtime "a.t"
+	    assert_rant("-frf.t")
+	    assert(File.mtime("a.t") > old_mtime)
+	end
+    end
+    def test_circular_dep
+	@rf = <<-EOF
+	gen SourceNode, "a.t" => "b.t"
+	gen SourceNode, "b.t" => "a.t"
+	EOF
+	FileUtils.touch %w(a.t b.t)
+	tmp_rf do
+	    th = Thread.new{ assert_rant("-frf.t") }
+	    assert_equal(th, th.join(0.5))
+	end
+    end
+end

data/test/test_task.rb

@@ -45,7 +45,7 @@ class TestTask < Test::Unit::TestCase
 	assert(task.invoked?, "although task failed, it was invoked")
     end
 
-    def test_dependant
+    def test_dependent
 	r1 = r2 = false
 	t1 = Rant::Task.new(nil, :t1) { r1 = true }
 	t2 = Rant::Task.new(nil, :t2) { r2 = true }
@@ -59,7 +59,7 @@ class TestTask < Test::Unit::TestCase
 	assert(!t2.needed?)
     end
 
-    def test_dependance_fails
+    def test_dependency_fails
 	t1 = Rant::Task.new(nil, :t1) { true }
 	t2 = Rant::Task.new(nil, :t2) { |t| t.fail }
 	t1 << t2

data/test/test_var.rb

@@ -85,7 +85,7 @@ class TestVar < Test::Unit::TestCase
 	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)
+	    assert_equal(0, Rant::RantApp.new.run(%w(-fvar.rf clean)))
 	end
     end
     def test_override
@@ -96,7 +96,7 @@ class TestVar < Test::Unit::TestCase
 	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)
+	    assert_equal(0, Rant::RantApp.new.run(%w(-fvar.rf clean)))
 	end
     end
     def test_is_string
@@ -273,6 +273,6 @@ class TestVar < Test::Unit::TestCase
 	assert_match(
 	    /source_err\.rf\.t.+2.*\n.*11.+constraint.+integer/i, err)
     ensure
-	assert_equal(0, Rant::RantApp.new("-fvar.rf", "clean", "-q").run)
+	assert_equal(0, Rant::RantApp.new.run("-fvar.rf", "clean", "-q"))
     end
 end

data/test/tutil.rb

@@ -8,8 +8,29 @@ module Test
     module Unit
 	class TestCase
 	    def assert_rant(*args)
-		capture_std do
-		    assert_equal(0, ::Rant::RantApp.new(*args).run)
+		res = 0
+		capture = true
+		args.flatten!
+		args.reject! { |arg|
+		    if Symbol === arg
+			case arg
+			when :fail: res = 1
+			when :v: capture = false
+			when :verbose: capture = false
+			else
+			    raise "No such option -- #{arg}"
+			end
+			true
+		    else
+			false
+		    end
+		}
+		if capture
+		    capture_std do
+			assert_equal(res, ::Rant::RantApp.new.run(*args))
+		    end
+		else
+		    assert_equal(res, ::Rant::RantApp.new.run(*args))
 		end
 	    end
 	end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
-date: 2005-05-02
+  version: 0.3.8
+date: 2005-05-15
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -44,6 +44,7 @@ files:
   - bin/rant-import
   - lib/rant
   - lib/rant.rb
+  - lib/rant/c
   - lib/rant/rantfile.rb
   - lib/rant/rantenv.rb
   - lib/rant/cs_compiler.rb
@@ -54,32 +55,40 @@ files:
   - lib/rant/plugin_methods.rb
   - lib/rant/plugin
   - lib/rant/import.rb
+  - lib/rant/c/include.rb
+  - lib/rant/import/c
   - lib/rant/import/directedrule.rb
+  - lib/rant/import/win32
   - lib/rant/import/truth.rb
   - lib/rant/import/rubydoc.rb
   - lib/rant/import/rubytest.rb
   - lib/rant/import/rubypackage.rb
+  - lib/rant/import/subfile.rb
   - lib/rant/import/package.rb
   - lib/rant/import/clean.rb
   - lib/rant/import/autoclean.rb
+  - lib/rant/import/c/dependencies.rb
+  - lib/rant/import/win32/rubycmdwrapper.rb
   - lib/rant/plugin/README
   - lib/rant/plugin/configure.rb
   - lib/rant/plugin/csharp.rb
+  - test/c
   - test/test_filetask.rb
   - test/test_lighttask.rb
   - test/test_examples.rb
   - test/Rantfile
   - test/ts_all.rb
   - test/test_rule.rb
+  - test/test_sourcenode.rb
   - test/test_task.rb
   - test/project_rb1
   - test/rule.rf
   - test/subdirs
-  - test/test_metatask.rb
   - test/test_rantfile_api.rb
   - test/test_env.rb
   - test/toplevel.rf
   - test/test_source.rb
+  - test/test_autosubfiletask.rb
   - test/import
   - test/plugin
   - test/test_rac.rb
@@ -95,6 +104,8 @@ files:
   - test/test_clean.rb
   - test/test_filelist.rb
   - test/standalone.rf
+  - test/c/source.c
+  - test/c/test_parse_includes.rb
   - test/project_rb1/bin
   - test/project_rb1/lib
   - test/project_rb1/test
@@ -113,10 +124,31 @@ files:
   - test/subdirs/sub2/sub
   - test/subdirs/sub2/rantfile.rb
   - test/subdirs/sub2/sub/rantfile
+  - test/import/c
   - test/import/truth
+  - test/import/subfile
   - test/import/directedrule
+  - test/import/c/dependencies
+  - test/import/c/dependencies/src
+  - test/import/c/dependencies/bar.h
+  - test/import/c/dependencies/foo.h
+  - test/import/c/dependencies/Rantfile
+  - test/import/c/dependencies/test_on_the_fly.rb
+  - test/import/c/dependencies/test_c_dependencies.rb
+  - test/import/c/dependencies/hello.c
+  - test/import/c/dependencies/include
+  - test/import/c/dependencies/src/abc
+  - test/import/c/dependencies/src/abc.c
+  - test/import/c/dependencies/src/bar.c
+  - test/import/c/dependencies/include/sub
+  - test/import/c/dependencies/include/foo.h
+  - test/import/c/dependencies/include/with space.h
+  - test/import/c/dependencies/include/sub/sub.h
   - test/import/truth/Rantfile
   - test/import/truth/test_truth.rb
+  - test/import/subfile/Rantfile
+  - test/import/subfile/test_subfile.rb
+  - test/import/subfile/autoclean.rf
   - test/import/directedrule/Rantfile
   - test/import/directedrule/test_directedrule.rb
   - test/plugin/configure
@@ -145,6 +177,7 @@ files:
   - doc/configure.rdoc
   - doc/advanced.rdoc
   - doc/rubyproject.rdoc
+  - doc/c.rdoc
   - doc/rant.rdoc
   - doc/jamis.rb
   - doc/csharp.rdoc
@@ -152,6 +185,7 @@ files:
   - doc/examples
   - doc/examples/directedrule
   - doc/examples/myprog
+  - doc/examples/c_dependencies
   - doc/examples/directedrule/src_a
   - doc/examples/directedrule/src_b
   - doc/examples/directedrule/Rantfile
@@ -165,6 +199,13 @@ files:
   - doc/examples/myprog/src/lib.h
   - doc/examples/myprog/src/Rantfile
   - doc/examples/myprog/src/main.c
+  - doc/examples/c_dependencies/src
+  - doc/examples/c_dependencies/Rantfile
+  - doc/examples/c_dependencies/include
+  - doc/examples/c_dependencies/src/main.c
+  - doc/examples/c_dependencies/src/util.c
+  - doc/examples/c_dependencies/include/hello.h
+  - doc/examples/c_dependencies/include/util.h
 test_files: []
 rdoc_options: 
   - "-S"
@@ -179,6 +220,7 @@ extra_rdoc_files:
   - doc/configure.rdoc
   - doc/advanced.rdoc
   - doc/rubyproject.rdoc
+  - doc/c.rdoc
   - doc/rant.rdoc
   - doc/csharp.rdoc
   - doc/rant-import.rdoc

data/test/test_metatask.rb

@@ -1,29 +0,0 @@
-
-require 'test/unit'
-require 'rant/rantlib'
-require 'tutil'
-
-class TestMetaTask < Test::Unit::TestCase
-    def setup
-	@app = Rant::RantApp.new %w()
-    end
-    def teardown
-    end
-    def test_with_single_task
-	run = false
-	t = @app.task :t do run = true end
-	mt = Rant::MetaTask.for_task t
-	assert_equal(t.name, mt.name,
-	    "MetaTask should have name of contained task(s).")
-	if t.needed?
-	    assert(mt.needed?,
-		"MetaTask should be needed? if only contained task is needed?")
-	    mt.invoke
-	    assert(run,
-		"only contained task was needed?, so it should get invoked")
-	else
-	    assert(!mt.needed?,
-		"MetaTask should return false from needed? because the only contained task does also.")
-	end
-    end
-end