rant 0.5.0 → 0.5.2

data/test/test_filelist.rb

@@ -1,14 +1,20 @@
 
 require 'test/unit'
 require 'tutil'
+require 'rant/import/filelist/std'
+require 'rant/import/sys/more'
 
 $testDir ||= File.expand_path(File.dirname(__FILE__))
 
 class TestFileList < Test::Unit::TestCase
     include Rant::TestUtil
 
+    def assert_entries(entry_ary, fl)
+        assert_equal entry_ary.size, fl.size
+        entry_ary.each { |entry| assert fl.include?(entry) }
+    end
     def fl(*args, &block)
-	Rant::FileList.new(*args, &block)
+	Rant::FileList.glob(*args, &block)
     end
     def touch_temp(*args)
 	files = args.flatten
@@ -22,9 +28,76 @@ class TestFileList < Test::Unit::TestCase
     def setup
 	# Ensure we run in test directory.
 	Dir.chdir($testDir) unless Dir.pwd == $testDir
+        @rant = Rant::RantApp.new
+        @cx = @rant.cx
+        @sys = @cx.sys
     end
     def teardown
     end
+    def test_create_new
+        @sys.ignore %r{_}
+        fl = @sys.filelist
+        assert fl.kind_of?(Rant::FileList)
+        assert fl.empty?
+        fl.concat ["ab", "c_d"]
+        assert_equal ["ab"], fl.entries
+    end
+    def test_create_bracket_op
+        in_local_temp_dir do
+            Rant::Sys.touch ["a.t", ".a.t"]
+            fl = @sys["*.t"]
+            assert_entries(["a.t"], fl)
+        end
+    end
+    def test_create_glob
+        in_local_temp_dir do
+            Rant::Sys.touch ["a.t", ".a.t"]
+            fl = @sys.glob("*.t")
+            assert_entries(["a.t"], fl)
+            fl = @sys.glob(".*.t")
+            # note: no "." and ".." entries
+            assert_entries([".a.t"], fl)
+            fl = @sys.glob("*.t") do |fl|
+                fl.glob ".*.t"
+            end
+            assert_equal ["a.t", ".a.t"], fl.entries
+        end
+    end
+    def test_create_glob_all
+        in_local_temp_dir do
+            Rant::Sys.touch ["a.t", ".a.t"]
+            fl = @sys.glob_all("*.t")
+            assert_entries(["a.t", ".a.t"], fl)
+            fl = @sys.glob_all(".*.t")
+            # note: no "." and ".." entries
+            assert_entries([".a.t"], fl)
+            fl = @sys.glob_all("*.t") do |fl|
+                fl.keep(".")
+            end
+            assert_entries ["a.t", ".a.t", "."], fl
+        end
+    end
+    def test_conversion_from_filelist
+        fl1 = @sys.filelist
+        fl2 = @sys.filelist(fl1)
+        assert fl1.equal?(fl2)  # same object
+    end
+    def test_conversion_from_ary
+        @sys.ignore "foo"
+        fl = @sys.filelist(["foo", "bar"])
+        assert fl.kind_of?(Rant::FileList)
+        assert_equal ["bar"], fl.entries
+    end
+    def test_conversion_type_error
+        assert_raise_kind_of(TypeError) do
+            fl = @sys.filelist(Object.new)
+        end
+    end
+    def test_conversion_type_error_nil
+        assert_raise_kind_of(TypeError) do
+            fl = @sys.filelist(nil)
+        end
+    end
     def test_in_flatten
 	touch_temp %w(1.t 2.t) do
 	    assert(test(?f, "1.t"))	# test touch_temp...
@@ -35,7 +108,7 @@ class TestFileList < Test::Unit::TestCase
 	    assert_equal(2, [fl("*.t")].flatten.size)
 	end
     end
-    def test_exclude_all
+    def test_exclude_name
 	l = fl
 	inc_list = %w(
 	    CVS_ a/b a
@@ -44,7 +117,7 @@ class TestFileList < Test::Unit::TestCase
 	    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)
-	l.exclude_all "CVS"
+	l.exclude_name "CVS"
 	inc_list.each { |f|
 	    assert(l.include?(f))
 	}
@@ -92,9 +165,9 @@ class TestFileList < Test::Unit::TestCase
 	    assert(l.include?("2.tt"))
 	end
     end
-    def test_initialize_with_yield
+    def test_glob_with_yield
 	touch_temp %w(a.t b.t a.tt b.tt) do
-	    list = fl { |l|
+	    list = Rant::FileList.glob { |l|
 		l.include "*.t", "*.tt"
 		l.exclude "a*"
 	    }
@@ -110,7 +183,7 @@ class TestFileList < Test::Unit::TestCase
 	touch_temp %w(a.t b.t c.t d.t) do
 	    list = fl "a*"
 	    list.exclude("a*", "b*").include(*%w(b* c* d*))
-	    assert(list.exclude_all("d.t").equal?(list))
+	    assert(list.exclude_name("d.t").equal?(list))
 	    assert(list.include?("b.t"))
 	    assert(list.include?("c.t"))
 	    assert(!list.include?("a.t"))
@@ -169,7 +242,7 @@ class TestFileList < Test::Unit::TestCase
                 %w(a.t1 a.t2 b.t2).each { |fn|
                     assert(l3.include(fn), "#{fn} missing")
                 }
-                l3.lazy_uniq!
+                l3.uniq!
                 assert_equal(3, l3.size)
             end
         end
@@ -181,7 +254,7 @@ class TestFileList < Test::Unit::TestCase
 	    assert_equal(2, l1.size)
 	    assert_equal(3, l2.size)
 	    assert(l2.include?("x"))
-            assert_equal("x", l2.last)
+            assert_equal("x", l2.to_a.last)
 	end
     end
     def test_2add_array
@@ -252,11 +325,16 @@ class TestFileList < Test::Unit::TestCase
 	    assert(!l.include?("fl.t/a~"))
 	    assert(!l.include?("fl.t/CVS"))
 	end
-	l[0] = "CVS"
+
+        # change in Rant 0.5.1
+	# l[0] = "CVS"
+        l.unshift "CVS"
+        
 	assert(!l.include?("CVS"))
     ensure
 	FileUtils.rm_rf "fl.t"
     end
+=begin Makes no sense since Rant 0.5.1
     def test_return_from_array_method
 	touch_temp "a.t" do
 	    l = fl("a.t", "a.t")
@@ -265,13 +343,14 @@ class TestFileList < Test::Unit::TestCase
 	    assert_equal(1, ul.size)
 	end
     end
+=end
     def test_return_self_from_array_method
 	touch_temp "a.t", "b.t" do
 	    l = fl("*.t")
 	    sl = l.sort!
 	    assert_same(l, sl)
-	    assert_equal("a.t", l.first)
-	    assert_equal("b.t", l[1])
+	    assert_equal("a.t", l.to_a.first)
+	    assert_equal("b.t", l.to_a[1])
 	end
     end
     def test_sys_with_cd
@@ -331,8 +410,13 @@ class TestFileList < Test::Unit::TestCase
     def test_sys_glob_flags
 	cx = Rant::RantApp.new.cx
 	touch_temp %w(a.t .a.t b.t .b.t) do
-	    l1 = cx.sys["*.t"]
-	    l1.glob_flags |= File::FNM_DOTMATCH
+	    l1 = cx.sys.glob
+
+            # change in Rant 0.5.1
+	    #l1.glob_flags |= File::FNM_DOTMATCH
+            l1.glob_dotfiles
+            l1.include("*.t")
+
 	    l2 = cx.sys["*.t"]
 	    assert_equal(4, l1.size)
 	    assert_equal(2, l2.size)
@@ -484,4 +568,42 @@ end
             assert_equal 2, files.size
         end
     end
+    def test_rantfile_std
+        in_local_temp_dir do
+            Rant::Sys.mkdir ["d1", "d2"]
+            Rant::Sys.touch ["a.1", "d1/a.2", "d2/b.2"]
+            Rant::Sys.write_to_file "Rantfile", <<-EOF
+                import "filelist/std"
+                task :default do
+                    fl = sys["**/*"]
+                    puts fl.dirs.join
+                    puts fl.files.join
+                    fl.no_dir
+                    puts fl.join
+                end
+            EOF
+            # Run in subprocess to check if #dirs, #files and #no_dir
+            # is defined by import "filelist/std".
+            out, err = assert_rant(:x)
+            lines = out.split(/\n/)
+            assert_entries ["d1", "d2"], lines[0].split
+            assert_entries ["a.1", "d1/a.2", "d2/b.2", "Rantfile"], lines[1].split
+            assert_entries ["a.1", "d1/a.2", "d2/b.2", "Rantfile"], lines[2].split
+        end
+    end
+    def test_rantfile_object_inspect
+        in_local_temp_dir do
+            Rant::Sys.write_to_file "Rantfile", <<-EOF
+                task :default do |t|
+                    fl = sys["**/*"]
+                    fl.object_inspect.kind_of?(String) or t.fail
+                    puts fl.object_inspect
+                end
+            EOF
+            # Run in subprocess to check if #dirs, #files and #no_dir
+            # is defined by import "filelist/std".
+            out, err = assert_rant(:x)
+            assert !out.strip.empty?
+        end
+    end
 end

data/test/test_sys.rb

@@ -63,6 +63,10 @@ class TestSys < Test::Unit::TestCase
 	assert_equal(pl.size, 1,
 	    '../ should be "split" into one element')
 	assert_equal(pl[0], "..")
+        assert_equal ["."], Rant::Sys.split_all("./")
+        assert_equal ["."], Rant::Sys.split_all(".")
+        assert_equal [".", "foo"], Rant::Sys.split_all("./foo")
+        assert_equal [], Rant::Sys.split_all("")
     end
     def test_expand_path
         in_local_temp_dir do

data/test/test_sys_methods.rb

@@ -555,4 +555,13 @@ class TestSysMethods < Test::Unit::TestCase
         end
         assert_file_content "a.t", "hello\n"
     end
+    def test_regular_filename
+        if Rant::Env.on_windows?
+            assert_equal "a/b", Rant::Sys.regular_filename('a\b')
+            assert_equal "a/b", @sys.regular_filename('a\\\\b')
+        else
+            assert_equal "a/b", Rant::Sys.regular_filename("a/b")
+            assert_equal "a/b", @sys.regular_filename("a//b")
+        end
+    end
 end

data/test/tutil.rb

@@ -11,6 +11,28 @@ require 'fileutils'
 module Test
     module Unit
 	class TestCase
+            def ext_rb_test(script, opts = {})
+                out = nil
+                Rant::TestUtil.in_local_temp_dir do
+                    script_fn = opts[:fn] || "fl.rb"
+                    dirs = (opts[:dirs] || []).dup
+                    touch = (opts[:touch] || []).dup
+                    touch.each { |fn| dirs << File.dirname(fn) }
+                    dirs.each { |dir|
+                        next if [".", "..", "/"].include?(dir)
+                        Rant::Sys.mkdir_p dir
+                    }
+                    touch.each { |fn| Rant::Sys.touch fn }
+                    Rant::Sys.write_to_file script_fn, script
+                    if opts[:return] == :stdout
+                        out = `#{Rant::Sys.sp Rant::Env::RUBY_EXE} -w -I#{Rant::Sys.sp ENV['RANT_DEV_LIB_DIR']} #{Rant::Sys.sp script_fn}`
+                    else
+                        Rant::Sys.ruby "-w", "-I", ENV["RANT_DEV_LIB_DIR"], script_fn
+                    end
+                    assert_exit(0, opts[:msg])
+                end
+                out
+            end
 	    def assert_rant(*args)
 		res = 0
 		capture = true
@@ -34,19 +56,18 @@ module Test
 			false
 		    end
 		}
-                if newproc
-                    if capture
-                        # TODO: stderr
-                        `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.join(' ')}`
-                    else
-                        system("#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} " +
-                            "#{Rant::Sys.sp(RANT_BIN)} " +
-                            "#{args.flatten.join(' ')}")
-                    end
-                    assert_equal(res, $?.exitstatus)
-                end
                 action = lambda {
-                    if capture
+                    if newproc
+                        if capture
+                            # TODO: stderr
+                            out = `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.join(' ')}`
+                        else
+                            system("#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} " +
+                                "#{Rant::Sys.sp(RANT_BIN)} " +
+                                "#{args.flatten.join(' ')}")
+                        end
+                        assert_equal(res, $?.exitstatus)
+                    elsif capture
                         out, err = capture_std do
                             assert_equal(res, ::Rant::RantApp.new.run(*args))
                         end
@@ -66,9 +87,10 @@ module Test
                 end
                 return out, err
 	    end
-            def assert_exit(status = 0)
-                assert_equal(status, $?.exitstatus,
-                    "exit status expected to be #{status} but is #{$?.exitstatus}")
+            def assert_exit(status = 0, msg = nil)
+                msg ||= "exit status expected to be " +
+                    "#{status} but is #{$?.exitstatus}"
+                assert_equal(status, $?.exitstatus, msg)
             end
             def assert_file_content(fn, content, *opts)
                 assert(test(?f, fn), "`#{fn}' doesn't exist")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2005-11-22 00:00:00 +01:00
+  version: 0.5.2
+date: 2005-12-12 00:00:00 +01:00
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -33,19 +33,19 @@ authors:
 files: 
   - NEWS
   - README
+  - INSTALL
+  - COPYING
   - Rantfile
   - install.rb
+  - setup.rb
   - run_rant
   - run_import
-  - setup.rb
-  - INSTALL
-  - COPYING
   - bin/rant
   - bin/rant-import
   - lib/rant
   - lib/rant.rb
   - lib/rant/c
-  - lib/rant/rantenv.rb
+  - lib/rant/filelist.rb
   - lib/rant/cs_compiler.rb
   - lib/rant/rantlib.rb
   - lib/rant/progress.rb
@@ -60,6 +60,7 @@ files:
   - lib/rant/archive
   - lib/rant/metautils.rb
   - lib/rant/import.rb
+  - lib/rant/init.rb
   - lib/rant/c/include.rb
   - lib/rant/import/c
   - lib/rant/import/sys
@@ -94,7 +95,10 @@ files:
   - lib/rant/import/nodes/default.rb
   - lib/rant/import/nodes/signed.rb
   - lib/rant/import/win32/rubycmdwrapper.rb
+  - lib/rant/import/filelist/core.rb
   - lib/rant/import/filelist/more.rb
+  - lib/rant/import/filelist/std.rb
+  - lib/rant/import/filelist/inspect.rb
   - lib/rant/import/package/tgz.rb
   - lib/rant/import/package/zip.rb
   - lib/rant/import/archive/tgz.rb
@@ -110,6 +114,7 @@ files:
   - lib/rant/archive/rubyzip/ioextras.rb
   - lib/rant/archive/rubyzip/tempfile_bugfixed.rb
   - test/c
+  - test/lib
   - test/test_dyn_dependencies.rb
   - test/test_filetask.rb
   - test/test_examples.rb
@@ -150,6 +155,7 @@ files:
   - test/standalone.rf
   - test/c/source.c
   - test/c/test_parse_includes.rb
+  - test/lib/test_filelist.rb
   - test/project_rb1/bin
   - test/project_rb1/lib
   - test/project_rb1/test
@@ -280,7 +286,6 @@ files:
   - test/subdirs2/sub1/sub.rant
   - test/subdirs2/sub00/sub.rant
   - test/deprecated/README
-  - test/deprecated/test_0_5_2.rb
   - test/deprecated/test_0_5_4.rb
   - test/deprecated/test_0_6_0.rb
   - doc/rantfile.rdoc
@@ -289,7 +294,9 @@ files:
   - doc/advanced.rdoc
   - doc/subdirs.rdoc
   - doc/rubyproject.rdoc
+  - doc/filelist.rdoc
   - doc/c.rdoc
+  - doc/rubylib.rdoc
   - doc/homepage
   - doc/sys.rdoc
   - doc/rant.rdoc
@@ -297,6 +304,7 @@ files:
   - doc/rant_vs_rake.rdoc
   - doc/rant.1
   - doc/csharp.rdoc
+  - doc/sys_filelist.rdoc
   - doc/rant-import.rdoc
   - doc/examples
   - doc/package.rdoc
@@ -387,11 +395,14 @@ extra_rdoc_files:
   - doc/advanced.rdoc
   - doc/subdirs.rdoc
   - doc/rubyproject.rdoc
+  - doc/filelist.rdoc
   - doc/c.rdoc
+  - doc/rubylib.rdoc
   - doc/sys.rdoc
   - doc/rant.rdoc
   - doc/rant_vs_rake.rdoc
   - doc/csharp.rdoc
+  - doc/sys_filelist.rdoc
   - doc/rant-import.rdoc
   - doc/package.rdoc
   - doc/command.rdoc