rant 0.4.2 → 0.4.4

data/test/subdirs/test_subdirs.rb

@@ -102,15 +102,6 @@ class TestSubdirs < Test::Unit::TestCase
 	    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"))

data/test/test_examples.rb

@@ -3,8 +3,9 @@ require 'test/unit'
 require 'rant/rantlib'
 require 'tutil'
 
-$examplesDir ||= File.expand_path(
-    File.join(File.dirname(File.dirname(__FILE__)), "doc", "examples"))
+$examplesDir ||= File.join(
+    File.dirname(File.dirname(File.expand_path(__FILE__))),
+    "doc", "examples")
 
 $cc_is_gcc ||= Rant::Env.find_bin("cc") && Rant::Env.find_bin("gcc")
 class TestExamples < Test::Unit::TestCase
@@ -31,6 +32,27 @@ class TestExamples < Test::Unit::TestCase
 	assert(!test(?e, "src/lib.o"))
 	assert(!test(?e, "src/main.o"))
     end
+    def test_myprog_md5
+	Dir.chdir "myprog"
+	assert_match(/Build myprog.*\n.*Remove compiler products/,
+	    run_rant("-imd5", "--tasks"))
+	assert(!test(?f, "myprog"))
+	if $cc_is_gcc
+	    # Warning: we're assuming cc is actually gcc
+	    run_rant("-imd5")
+	    assert(test(?f, "myprog"))
+	else
+	    $stderr.puts "*** cc isn't gcc, less example testing ***"
+	    # less myprog testing
+	end
+	run_rant("-imd5", "clean")
+	assert(!test(?e, "myprog"))
+	assert(!test(?e, "src/myprog"))
+	assert(!test(?e, "src/lib.o"))
+	assert(!test(?e, "src/main.o"))
+    ensure
+        FileUtils.rm_f Dir["**/.rant.meta"]
+    end
     def test_directedrule
 	Dir.chdir "directedrule"
 	assert_match(/Build foo/, run_rant("-T"))
@@ -42,6 +64,18 @@ class TestExamples < Test::Unit::TestCase
 	run_rant("clean")
 	Dir["**/*.o"].each { |f| assert(!test(?e, f)) }
     end
+    def test_directedrule_md5
+	Dir.chdir "directedrule"
+	assert_match(/Build foo/, run_rant("-imd5", "-T"))
+	assert(!test(?f, "foo"))
+	if $cc_is_gcc
+	    run_rant("-imd5")
+	    assert(test(?f, "foo"))
+	end
+	run_rant("-imd5", "clean")
+        assert(!test(?e, ".rant.meta"))
+	Dir["**/*.o"].each { |f| assert(!test(?e, f)) }
+    end
     def test_c_dependencies
 	Dir.chdir "c_dependencies"
 	assert_match( /\bhello\b.*\n.*\bclean\b.*\n.*\bdistclean\b/,
@@ -66,6 +100,31 @@ class TestExamples < Test::Unit::TestCase
 	assert(!test(?f, "c_dependencies"))
 	assert(!test(?f, "hello"))
     end
+    def test_c_dependencies_md5
+	Dir.chdir "c_dependencies"
+	assert_match( /\bhello\b.*\n.*\bclean\b.*\n.*\bdistclean\b/,
+	    run_rant("-imd5", "-T"))
+	assert(!test(?f, "hello"))
+	if $cc_is_gcc
+	    run_rant("-imd5")
+	    assert(test(?f, "hello"))
+	else
+	    run_rant("-imd5", "c_dependencies")
+	end
+	run_rant("-imd5", "clean")
+	assert(Dir["**/*.o"].empty?)
+	assert(!test(?f, "hello"))
+	assert(test(?f, "c_dependencies"))
+	if $cc_is_gcc
+	    run_rant("-imd5")
+	    assert(test(?f, "hello"))
+	end
+	run_rant("-imd5", "distclean")
+        assert(!test(?e, ".rant.meta"))
+	assert(Dir["**/*.o"].empty?)
+	assert(!test(?f, "c_dependencies"))
+	assert(!test(?f, "hello"))
+    end
     def test_c_cpp_examples
         Dir.chdir "c_cpp_examples"
         proj_pwd = Dir.pwd
@@ -97,7 +156,7 @@ EOF
         if Rant::Env.find_bin("gcc") && Rant::Env.find_bin("g++")
             out = run_rant
             assert_exit
-            assert_equal(2, out.scan("Hello, world!").size)
+            assert_equal(2, out.scan(/Hello\, world\!/).size)
             out, err = assert_rant("build")
             assert(out.empty?)
             assert(err.empty?)
@@ -133,4 +192,73 @@ EOF
         FileUtils.rm_f "c/problem_1_1/Rantfile"
         FileUtils.rm_f "c++/problem_1_1/Rantfile"
     end
+    def test_c_cpp_examples_md5
+        Dir.chdir "c_cpp_examples"
+        proj_pwd = Dir.pwd
+        out, err = assert_rant("-imd5", "--tasks")
+        # TODO: replace with a not-so-strict regex
+op = <<EOF
+rant run                      # Run all C and C++ tests.
+rant build                    # Build all.
+rant autoclean                # Remove all autogenerated files.
+rant pkg/c_cpp_exercises.tgz  # Create source package.
+EOF
+        assert_equal(op, out)
+        assert(err.empty?)
+        gen_files = %w(
+            c/problem_1_1/Rantfile
+            c++/problem_1_1/Rantfile
+            c/problem_1_1/c_dependencies
+            c++/problem_1_1/c_dependencies
+            c/problem_1_1/test
+            c++/problem_1_1/test
+            c/problem_1_1/main.o
+            c++/problem_1_1/main.o
+            c/problem_1_1/test.o
+            c++/problem_1_1/test.o
+            c/problem_1_1/another_test.o
+            c++/problem_1_1/another_test.o
+            pkg
+        )
+        if Rant::Env.find_bin("gcc") && Rant::Env.find_bin("g++")
+            out = run_rant("-imd5")
+            assert_exit
+            assert_equal(2, out.scan(/Hello\, world\!/).size)
+            out, err = assert_rant("-imd5", "build")
+            assert(out.empty?)
+            assert(err.empty?)
+        else
+            STDERR.puts "*** gcc and/or g++ not available, less example testing ***"
+        end
+        assert_rant("-imd5", "pkg/c_cpp_exercises.tgz")
+        # TODO: check archive contents
+        assert(test(?f, "pkg/c_cpp_exercises.tgz"))
+        out, err = assert_rant("-imd5", "pkg/c_cpp_exercises.tgz")
+        assert(out.empty?)
+        assert(err.empty?)
+        assert_rant("-imd5", "autoclean")
+        gen_files.each { |f|
+            assert(!test(?e, f),
+                "#{f} should have been removed by autoclean")
+        }
+        assert(Dir["**/.rant.meta"].empty?)
+        if Rant::Env.find_bin("gcc")
+            FileUtils.cp "c/template.rf", "c/problem_1_1/Rantfile"
+            Dir.chdir "c/problem_1_1"
+            out = run_rant("-imd5")
+            assert(out.include?("Hello, world!"))
+            assert_rant("-imd5", "autoclean")
+            FileUtils.rm_f "Rantfile"
+            Dir.chdir proj_pwd
+            gen_files.each { |f|
+                assert(!test(?e, f),
+                    "#{f} should have been removed by autoclean")
+            }
+            assert(Dir["**/.rant.meta"].empty?)
+        end
+    ensure
+        Dir.chdir proj_pwd
+        FileUtils.rm_f "c/problem_1_1/Rantfile"
+        FileUtils.rm_f "c++/problem_1_1/Rantfile"
+    end
 end

data/test/test_filelist.rb

@@ -158,6 +158,20 @@ class TestFileList < Test::Unit::TestCase
 	    assert_equal(1, l2.size)
 	end
     end
+    def test_3addition
+        cx = Rant::RantApp.new.cx
+        touch_temp %w(a.t1 a.t2 b.t2) do
+            l1 = cx.sys["a*"]
+            l1.exclude "*.t2"
+            l2 = cx.sys["*.t2"]
+            l3 = l1 + l2
+            %w(a.t1 a.t2 b.t2).each { |fn|
+                assert(l3.include(fn), "#{fn} missing")
+            }
+            l3.lazy_uniq!
+            assert_equal(3, l3.size)
+        end
+    end
     def test_add_array
 	touch_temp %w(1.t 2.t) do
 	    l1 = fl "*.t"
@@ -165,8 +179,19 @@ class TestFileList < Test::Unit::TestCase
 	    assert_equal(2, l1.size)
 	    assert_equal(3, l2.size)
 	    assert(l2.include?("x"))
+            assert_equal("x", l2.last)
 	end
     end
+    def test_2add_array
+        touch_temp %w(a.t) do
+            l1 = fl("*.t")
+            l1.resolve
+            a = %w(x)
+            l2 = l1 + a
+            a << "y"
+            assert_equal(%w(a.t x), l2.to_ary)
+        end
+    end
     def test_glob
 	touch_temp %w(t.t1 t.t2) do
 	    l = fl "*.t1"
@@ -341,6 +366,15 @@ class TestFileList < Test::Unit::TestCase
             assert(fl.include?("a.t"))
         end
     end
+    def test_ignore_and_shift_op
+        cx = Rant::RantApp.new.cx
+        cx.var[:ignore] << /CVS/
+        touch_temp %w(CVS.t a.t a.tt) do
+            fl = cx.sys["*.t"] << "CVS"
+            fl.include "*.tt"
+            assert_equal(%w(a.t CVS a.tt), fl.to_a)
+        end
+    end
     def test_map
         cx = Rant::RantApp.new.cx
         touch_temp %w(a.t b.t) do
@@ -369,6 +403,16 @@ class TestFileList < Test::Unit::TestCase
         assert_equal("a b", cx.sys[].concat(%w(a b)).to_s)
         assert_equal("", "#{cx.sys[]}")
     end
+    def test_var_ignore_and_dup
+        cx = Rant::RantApp.new.cx
+        cx.var[:ignore] << "a.t"
+        touch_temp %w(a.t b.t a.tt) do
+            fl = cx.sys["*.t"] + cx.sys["*.tt"]
+            assert_equal(2, fl.size)
+            assert(fl.include?("b.t"))
+            assert(fl.include?("a.tt"))
+        end
+    end
 if Rant::Env.on_windows?
     def test_to_s_quoting_spaces_win
         cx = Rant::RantApp.new.cx

data/test/test_sys.rb

@@ -61,7 +61,25 @@ class TestSys < Test::Unit::TestCase
     # ...
     def test_standalone
 	out = `#{Rant::Sys.sp(Rant::Env::RUBY)} -I#{Rant::Sys.sp(RANT_DEV_LIB_DIR)} standalone.rf`
-	assert(0, $?)
+        assert_exit
 	assert_match(/^t_standalone/, out)
     end
+    def test_cp_with_filelist
+        rac = Rant::RantApp.new
+        rac[:quiet] = true
+        open "a.t", "w" do |f|
+            f.puts "a"
+        end
+        open "b.t", "w" do |f|
+            f.puts "b"
+        end
+        FileUtils.mkdir "cp.t"
+        assert_nothing_raised {
+            rac.cx.sys.cp rac.cx.sys["a.t","b.t"], "cp.t"
+            assert_equal("a\n", File.read("cp.t/a.t"))
+            assert_equal("b\n", File.read("cp.t/b.t"))
+        }
+    ensure
+        FileUtils.rm_rf %w(cp.t a.t b.t)
+    end
 end

data/test/test_task.rb

@@ -138,7 +138,7 @@ class TestTask < Test::Unit::TestCase
 	enhance_run = false
 	t_run = false
 	t2_run = false
-	app.gen Rant::Task, :t do |t|
+	app.gen Rant::Generators::Task, :t do |t|
 	    t.needed { true }
 	    t.act {
 		assert(t2_run,
@@ -146,7 +146,7 @@ class TestTask < Test::Unit::TestCase
 		t_run = true
 	    }
 	end
-	app.gen Rant::Task, :t2 do |t|
+	app.gen Rant::Generators::Task, :t2 do |t|
 	    t.needed { true }
 	    t.act { t2_run = true }
 	end

data/test/tutil.rb

@@ -49,9 +49,14 @@ module Test
             def assert_exit(status = 0)
                 assert_equal(status, $?.exitstatus)
             end
-	end
-    end
-end
+            if RUBY_VERSION < "1.8.1"
+                def assert_raise(*args, &block)
+                    assert_raises(*args, &block)
+                end
+            end
+	end # class TestCase
+    end # module Unit
+end # module Test
 
 RANT_BIN = File.expand_path(
     File.join(File.dirname(__FILE__), "..", "run_rant"))
@@ -193,6 +198,7 @@ def unpack_archive(atype, archive)
     end
 end
 def minitar_unpack(archive)
+    require 'zlib'
     require 'rant/archive/minitar'
     tgz = Zlib::GzipReader.new(File.open(archive, 'rb'))
     # unpack closes tgz

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2005-07-18 00:00:00 +02:00
+  version: 0.4.4
+date: 2005-07-29 00:00:00 +02:00
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -44,7 +44,6 @@ files:
   - lib/rant
   - lib/rant.rb
   - lib/rant/c
-  - lib/rant/rantfile.rb
   - lib/rant/rantenv.rb
   - lib/rant/cs_compiler.rb
   - lib/rant/rantlib.rb
@@ -52,30 +51,40 @@ files:
   - lib/rant/rantvar.rb
   - lib/rant/import
   - lib/rant/plugin_methods.rb
+  - lib/rant/node.rb
   - lib/rant/plugin
   - lib/rant/tempfile.rb
+  - lib/rant/coregen.rb
   - lib/rant/archive
   - lib/rant/import.rb
   - lib/rant/c/include.rb
   - lib/rant/import/c
+  - lib/rant/import/signedfile.rb
   - lib/rant/import/directedrule.rb
+  - lib/rant/import/nodes
   - lib/rant/import/win32
+  - lib/rant/import/metadata.rb
   - lib/rant/import/truth.rb
   - lib/rant/import/rubydoc.rb
   - lib/rant/import/rubytest.rb
   - lib/rant/import/rubypackage.rb
   - lib/rant/import/archive.rb
+  - lib/rant/import/md5.rb
   - lib/rant/import/package
   - lib/rant/import/archive
   - lib/rant/import/subfile.rb
+  - lib/rant/import/signature
   - lib/rant/import/clean.rb
   - lib/rant/import/autoclean.rb
   - lib/rant/import/c/dependencies.rb
+  - lib/rant/import/nodes/default.rb
+  - lib/rant/import/nodes/signed.rb
   - lib/rant/import/win32/rubycmdwrapper.rb
   - lib/rant/import/package/tgz.rb
   - lib/rant/import/package/zip.rb
   - lib/rant/import/archive/tgz.rb
   - lib/rant/import/archive/zip.rb
+  - lib/rant/import/signature/md5.rb
   - lib/rant/plugin/README
   - lib/rant/plugin/configure.rb
   - lib/rant/plugin/csharp.rb
@@ -87,7 +96,6 @@ files:
   - lib/rant/archive/rubyzip/tempfile_bugfixed.rb
   - test/c
   - test/test_filetask.rb
-  - test/test_lighttask.rb
   - test/test_examples.rb
   - test/Rantfile
   - test/ts_all.rb
@@ -138,10 +146,14 @@ files:
   - test/subdirs/sub2/rantfile.rb
   - test/subdirs/sub2/sub/rantfile
   - test/import/c
+  - test/import/metadata
+  - test/import/nodes
   - test/import/truth
+  - test/import/signeddirectory
   - test/import/subfile
   - test/import/directedrule
   - test/import/package
+  - test/import/signedfile
   - test/import/c/dependencies
   - test/import/c/dependencies/src
   - test/import/c/dependencies/bar.h
@@ -158,8 +170,19 @@ files:
   - 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/metadata/sub
+  - test/import/metadata/test_metadata.rb
+  - test/import/metadata/Rantfile
+  - test/import/metadata/sub/Rantfile
+  - test/import/nodes/signed
+  - test/import/nodes/signed/sub1
+  - test/import/nodes/signed/Rantfile
+  - test/import/nodes/signed/test_signed.rb
+  - test/import/nodes/signed/sub1/Rantfile
   - test/import/truth/Rantfile
   - test/import/truth/test_truth.rb
+  - test/import/signeddirectory/Rantfile
+  - test/import/signeddirectory/test_signeddirectory.rb
   - test/import/subfile/Rantfile
   - test/import/subfile/test_subfile.rb
   - test/import/subfile/autoclean.rf
@@ -169,6 +192,7 @@ files:
   - test/import/package/deep
   - test/import/package/sub2
   - test/import/package/Rantfile
+  - test/import/package/md5.rf
   - test/import/package/test_package.rb
   - test/import/package/MANIFEST
   - test/import/package/sub/f1
@@ -176,6 +200,10 @@ files:
   - test/import/package/deep/sub/sub
   - test/import/package/deep/sub/sub/f1
   - test/import/package/sub2/f1
+  - test/import/signedfile/sub1
+  - test/import/signedfile/Rantfile
+  - test/import/signedfile/test_signedfile.rb
+  - test/import/signedfile/sub1/Rantfile
   - test/plugin/configure
   - test/plugin/csharp
   - test/plugin/rantfile
@@ -199,6 +227,7 @@ files:
   - test/rant-import/Rantfile
   - test/rant-import/test_rant-import.rb
   - doc/rantfile.rdoc
+  - doc/md5.rdoc
   - doc/configure.rdoc
   - doc/advanced.rdoc
   - doc/rubyproject.rdoc
@@ -267,6 +296,7 @@ rdoc_options:
   - README
 extra_rdoc_files: 
   - doc/rantfile.rdoc
+  - doc/md5.rdoc
   - doc/configure.rdoc
   - doc/advanced.rdoc
   - doc/rubyproject.rdoc