facets 2.2.0 → 2.2.1

data/meta/facets.roll

@@ -0,0 +1,4 @@
+facets 2.2.1 stable 2007-12-22 facets.rb
+lib/core/facets
+lib/more/facets
+

data/meta/project.yaml

@@ -25,11 +25,8 @@ download : 'http://rubyforge.org/projects/facets'
 gem_paths:
   - lib/core
   - lib/more
-  - lib/methods
 
 document    : false
-formats     : [ gem, zip ]  #tgz
-
 manifest    : meta/MANIFEST
 exclude     : [ dev, doc, pkg ]
 

data/task/stamp

@@ -0,0 +1,33 @@
+#!/usr/bin/env ratch
+
+# update version stamps
+
+# You can change these via the command line.
+version = commandline['version'] || release.version
+status  = commandline['status']  || release.status
+
+# Update ROLLRC file.
+
+main :stamp do
+  if version != release.version or status != release.status
+    build release.file
+  end
+end
+
+#
+
+file release.file do
+  w = ''
+  w << "#{release.name} #{version} #{status} #{Time.now.strftime('%Y-%m-%d')}"
+  w << " #{release.default}" if release.default
+  w << "\n"
+  w << release.libpath.join("\n")
+
+  if dryrun?
+    puts release.file + ":"
+    puts w
+  else
+    File.open(release.file, 'w'){|f| f << w}
+    puts "#{release.file} updated."
+  end
+end

data/test/unit/binding/test_self.rb

@@ -7,7 +7,7 @@ class TC_Binding_Self < Test::Unit::TestCase
 
   def setup
     x = "hello"
-    @bind = binding; @this_line_no = __LINE__
+    @bind = binding
   end
 
   def test_self

data/test/unit/class/test_descendents.rb

@@ -14,10 +14,4 @@ class TestClassDescendents < Test::Unit::TestCase
     assert_equal( [C,B], A.descendents )
   end
 
-  def test_remove_descendents
-    assert_nothing_raised { B.remove_descendents }
-    # doesn't work despite above; not sure why
-    #assert_equal( [B], A.descendents )
-  end
-
 end

data/test/unit/class/test_remove_descendents.rb

@@ -0,0 +1,19 @@
+# Test for facets/class/remove_descendents.rb
+
+require 'facets/class/remove_descendents.rb'
+
+require 'test/unit'
+
+class TestClassDescendents < Test::Unit::TestCase
+
+  class A ; end
+  class B < A ; end
+  class C < B ; end
+
+  def test_remove_descendents
+    assert_nothing_raised { B.remove_descendents }
+    # doesn't work despite above; not sure why
+    #assert_equal( [B], A.descendents )
+  end
+
+end

data/test/unit/dir/test_parent.rb

@@ -0,0 +1,14 @@
+# Test for facets/dir/parent.rb.
+
+require 'facets/dir/parent'
+require 'test/unit'
+
+
+class TC_Dir < Test::Unit::TestCase
+
+  def test_parent
+    assert( Dir.parent?( "a/b/c", "a/b/c/d" ) )
+  end
+
+end
+

data/test/unit/dir/test_recurse.rb

@@ -0,0 +1,32 @@
+# Test for facets/dir/traverse.
+
+require 'facets/dir/recurse'
+require 'test/unit'
+
+# TODO Need to mockup dir for remarked out tests.
+
+#class TC_Dir < Test::Unit::TestCase
+#
+#   def test_ls_r
+#     td = Dir.pwd
+#     Dir.chdir $TESTDIR
+#       r = ["A", "A/B","A/B/C.txt", "A/B.txt", "A.txt"].collect{ |e|
+#         File.join( 'ls_r', e )
+#       }
+#       fs = Dir.ls_r( 'ls_r' )
+#       assert_equal( r, fs, Dir.pwd  )
+#     Dir.chdir td
+#   end
+#
+#   def test_recurse
+#     td = Dir.pwd
+#     Dir.chdir $TESTDIR
+#       r = ["A", "A/B","A/B/C.txt", "A/B.txt", "A.txt"].collect{ |e|
+#         File.join( 'ls_r', e )
+#       }
+#       fs = Dir.recurse( 'ls_r' )
+#       assert_equal( r, fs, Dir.pwd )
+#     Dir.chdir td
+#   end
+#
+#end

data/test/unit/dir/test_traverse.rb

@@ -1,38 +1,11 @@
 # Test for facets/dir/traverse.
 
-require 'test/unit'
-
 require 'facets/dir/traverse'
+require 'test/unit'
 
 # TODO Need to mockup dir for remarked out tests.
 
-class TC_Dir < Test::Unit::TestCase
-
-  def test_ancestor
-    assert( Dir.ancestor?( "a/b/c", "a/b/c/d" ) )
-  end
-
-#   def test_ls_r
-#     td = Dir.pwd
-#     Dir.chdir $TESTDIR
-#       r = ["A", "A/B","A/B/C.txt", "A/B.txt", "A.txt"].collect{ |e|
-#         File.join( 'ls_r', e )
-#       }
-#       fs = Dir.ls_r( 'ls_r' )
-#       assert_equal( r, fs, Dir.pwd  )
-#     Dir.chdir td
-#   end
-#
-#   def test_recurse
-#     td = Dir.pwd
-#     Dir.chdir $TESTDIR
-#       r = ["A", "A/B","A/B/C.txt", "A/B.txt", "A.txt"].collect{ |e|
-#         File.join( 'ls_r', e )
-#       }
-#       fs = Dir.recurse( 'ls_r' )
-#       assert_equal( r, fs, Dir.pwd )
-#     Dir.chdir td
-#   end
+#class TC_Dir < Test::Unit::TestCase
 #
 #   def test_ascend_01
 #     c = []
@@ -52,5 +25,6 @@ class TC_Dir < Test::Unit::TestCase
 #     assert_equal( 'this/path', c[0] )
 #     assert_equal( 'this', c[1] )
 #   end
+#
+#end
 
-end

data/test/unit/file/test_null.rb

@@ -0,0 +1,12 @@
+# Test for facets/file/null.rb.
+
+require 'facets/file/null.rb'
+require 'test/unit'
+
+class TC_File < Test::Unit::TestCase
+
+  def test_null
+     # TODO
+  end
+
+end

data/test/unit/file/{test_topath.rb → test_sanitize.rb}

@@ -1,10 +1,10 @@
-# Test for facets/file/topath.rb
+# Test for facets/file/sanitize.rb.
 
-require 'facets/file/topath.rb'
+require 'facets/file/sanitize.rb'
 
 require 'test/unit'
 
-class TestFile < Test::Unit::TestCase
+class TC_File_Sanitize < Test::Unit::TestCase
 
   # mock file
 
@@ -49,9 +49,4 @@ class TestFile < Test::Unit::TestCase
     assert_equal( "_....", MockFile.sanitize('....') )
   end
 
-  def test_split_all
-    fp = "this/is/test"
-    assert_equal( ['this', 'is', 'test'], MockFile.split_all(fp) )
-  end
-
 end

data/test/unit/file/test_split_all.rb

@@ -0,0 +1,32 @@
+# Test for facets/file/topath.rb
+
+require 'facets/file/split_all.rb'
+
+require 'test/unit'
+
+
+class TC_File_Split_All < Test::Unit::TestCase
+
+  # mock file
+
+  class MockFile < File
+    def self.open( fname, mode, &blk )
+      blk.call(self)
+    end
+    def self.read( fname=nil )
+      @mock_content.clone
+    end
+    def self.write( str )
+      @mock_content = str
+    end
+    def self.<<( str )
+      (@mock_content ||="") << str
+    end
+  end
+
+  def test_split_all
+    fp = "this/is/test"
+    assert_equal( ['this', 'is', 'test'], MockFile.split_all(fp) )
+  end
+
+end

data/test/unit/hash/test_alias.rb

@@ -0,0 +1,18 @@
+# Test for facets/hash/alias
+
+require 'facets/hash/alias.rb'
+
+require 'test/unit'
+
+class TestHashRekey < Test::Unit::TestCase
+
+  def test_alias!
+    foo = { 'a'=>1, 'b'=>2 }
+    assert_equal( { 'a'=>1, 'b'=>2, 'c'=>2 }, foo.alias!('c','b') )
+    foo = { 'a'=>1, 'b'=>2 }
+    assert_equal( { :a=>1, 'a'=>1, 'b'=>2 }, foo.alias!(:a,'a') )
+    foo = { :a=>1, :b=>2 }
+    assert_equal( { :a=>1, :b=>2 }, foo.alias!('bar','foo') )
+  end
+
+end

data/test/unit/hash/test_autonew.rb

@@ -0,0 +1,13 @@
+# Test for facets/hash/new
+
+require 'facets/hash/autonew.rb'
+
+require 'test/unit'
+
+class TestHashNew < Test::Unit::TestCase
+
+  def test_autonew
+    # TODO
+  end
+
+end

data/test/unit/hash/test_collate.rb

@@ -0,0 +1,31 @@
+require 'test/unit'
+
+class TestHashCollation < Test::Unit::TestCase
+
+    def setup
+      @a = { :a=>1, :b=>2, :z=>26, :all=>%w|a b z|, :stuff1=>%w|foo bar|, :whee=>%w|a b| }
+      @b = { :a=>1, :b=>4, :c=>9,  :all=>%w|a b c|, :stuff2=>%w|jim jam|, :whee=>%w|a b| }
+      @c = { :a=>1, :b=>8, :c=>27 }
+    end
+
+    def test_defaults
+      collated = @a.collate(@b)
+      assert_equal( 8, collated.keys.length, "There are 7 unique keys" )
+      assert_equal( [1,1], collated[ :a ] )
+      assert_equal( [2,4], collated[ :b ] )
+      assert_equal( [9],   collated[ :c ] )
+      assert_equal( [26],  collated[ :z ] )
+      assert_equal( %w|a b z a b c|,  collated[ :all ], "Arrays are merged by default." )
+      assert_equal( %w|foo bar|,  collated[ :stuff1 ] )
+      assert_equal( %w|jim jam|,  collated[ :stuff2 ] )
+      assert_equal( %w|a b a b|,  collated[ :whee ] )
+    end
+
+    def test_multi_collate
+      collated = @a.collate(@b).collate(@c)
+      assert_equal( [1,1,1], collated[ :a ] )
+      assert_equal( [2,4,8], collated[ :b ] )
+      assert_equal( [9,27],  collated[ :c ] )
+    end
+
+  end

data/test/unit/hash/{test_iterate.rb → test_each_with_key.rb}

@@ -1,6 +1,6 @@
 # Test for lib/facets/hash/iterate
 
-require 'facets/hash/iterate.rb'
+require 'facets/hash/each_with_key.rb'
 
 require 'test/unit'
 
@@ -13,11 +13,4 @@ class TestHashIterate < Test::Unit::TestCase
     assert_equal( {1=>:a, 2=>:b}, h2 )
   end
 
-  def test_each_with_key
-    h1 = { :a=>1, :b=>2 }
-    h2 = {}
-    h1.each_with_index { |v,k| h2[v] = k }
-    assert_equal( {1=>:a, 2=>:b}, h2 )
-  end
-
 end

data/test/unit/hash/test_has_keys.rb

@@ -6,8 +6,6 @@ require 'test/unit'
 
 class TestHashHasKeys < Test::Unit::TestCase
 
-  # TODO Write test for Hash#diff.
-
   def test_has_keys?
     assert( { :a=>1,:b=>2,:c=>3 }.has_keys?(:a,:b) )
     assert( ! { :a=>1,:b=>2,:c=>3 }.has_keys?(:a,:b,:d) )

data/test/unit/hash/test_rekey.rb

@@ -6,15 +6,6 @@ require 'test/unit'
 
 class TestHashRekey < Test::Unit::TestCase
 
-  def test_alias!
-    foo = { 'a'=>1, 'b'=>2 }
-    assert_equal( { 'a'=>1, 'b'=>2, 'c'=>2 }, foo.alias!('c','b') )
-    foo = { 'a'=>1, 'b'=>2 }
-    assert_equal( { :a=>1, 'a'=>1, 'b'=>2 }, foo.alias!(:a,'a') )
-    foo = { :a=>1, :b=>2 }
-    assert_equal( { :a=>1, :b=>2 }, foo.alias!('bar','foo') )
-  end
-
   def test_rekey_01
     foo = { :a=>1, :b=>2 }
     assert_equal( { "a"=>1, "b"=>2 }, foo.rekey{|k|k.to_s} )
@@ -45,16 +36,4 @@ class TestHashRekey < Test::Unit::TestCase
     assert_equal( { :a=>1, :b=>2 }, foo )
   end
 
-  def test_swap!
-    h = { :a=>1, :b=>2 }
-    assert_equal( { :a=>2, :b=>1 }, h.swap!(:a, :b) )
-  end
-
-  def test_swapkeys!
-    foo = { :a=>1, :b=>2 }
-    assert_equal( { 'a'=>1, :b=>2 }, foo.swapkey!('a', :a) )
-    assert_equal( { 'a'=>1, 'b'=>2 }, foo.swapkey!('b', :b) )
-    assert_equal( { 'a'=>1, 'b'=>2 }, foo.swapkey!('foo','bar') )
-  end
-
 end

data/test/unit/hash/{test_merge.rb → test_reverse_merge.rb}

@@ -1,6 +1,6 @@
 # Test for facets/hash/merge
 
-require 'facets/hash/merge.rb'
+require 'facets/hash/reverse_merge.rb'
 
 require 'test/unit'
 

data/test/unit/hash/test_swap.rb

@@ -0,0 +1,21 @@
+# Test for facets/hash/swap
+
+require 'facets/hash/swap.rb'
+
+require 'test/unit'
+
+class TestHashRekey < Test::Unit::TestCase
+
+  def test_swap!
+    h = { :a=>1, :b=>2 }
+    assert_equal( { :a=>2, :b=>1 }, h.swap!(:a, :b) )
+  end
+
+  def test_swapkeys!
+    foo = { :a=>1, :b=>2 }
+    assert_equal( { 'a'=>1, :b=>2 }, foo.swapkey!('a', :a) )
+    assert_equal( { 'a'=>1, 'b'=>2 }, foo.swapkey!('b', :b) )
+    assert_equal( { 'a'=>1, 'b'=>2 }, foo.swapkey!('foo','bar') )
+  end
+
+end

data/test/unit/hash/{test_new.rb → test_zipnew.rb}

@@ -1,6 +1,6 @@
 # Test for facets/hash/new
 
-require 'facets/hash/new.rb'
+require 'facets/hash/zipnew.rb'
 
 require 'test/unit'
 

data/test/unit/integer/{test_multiples.rb → test_multiple.rb}

@@ -1,6 +1,6 @@
 # Test for facets/integer/multiples
 
-require 'facets/integer/multiples.rb'
+require 'facets/integer/multiple.rb'
 
 require 'test/unit'