core_ex 0.1.3 → 0.2.0

data/NEWS

@@ -1,6 +1,20 @@
+= New in 0.2, ...:
+
+  * Yaml:
+      Great  improvement  of  the  Yaml  extension,  new  Yaml  types  are  now
+      absolutly easy and clean to define.
+
+  * PathList:
+      PathList   is  based  on  the  Rake  FileList  class.  PathList  contains
+      pathnames, and some interestings improvements.
+
+  * DumpableProc:
+      You  can  simply  initialize  a DumpableProc with a String, and keep this
+      String to allow the dump of that proc.
+
 = New in 0.1, 2005-05-31:
 
-  CoreEx  is  designed  to provides a simple but quite useful extension of the
+  CoreEx  is  designed  to  provides a simple but quite useful extension of the
   standard  library  of  Ruby. So some classes and modules like Pathname, Time,
   Enumerable,  Exception,  FileUtils,  String,  and YAML are extended. There is
   also   some   new   features   like   attr_once,  DTime,  TempPath,  Version,

data/SPEC.dyn.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:OpenStruct 
 table: 
-  :date: "Sun, 05 Jun 2005"
+  :date: "Thu, 23 Jun 2005"
   :version: !ruby/object:Version 
-    build: 3
+    build: 0
     major: 0
-    minor: 1
-    revision: 281
-  :version_id: ''
+    minor: 2
+    revision: 307
   :url: svn://svn.feydakins.org/ruby_ex/trunk/core_ex
+  :version_id: ''

data/SPEC.yml

@@ -37,5 +37,6 @@ pkg_files: !filelist
   - test/**/*
   - '[A-Z]*'
 
-#dependencies:
-#  ttk:           ~> 0.2.0
+autorequire: core_ex
+
+ttk_version: ~> 0.3.0

data/lib/core_ex/dumpable_proc.rb

@@ -0,0 +1,47 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: dumpable_proc.rb 299 2005-06-19 10:47:10Z ertai $
+
+require 'core_ex'
+
+class DumpableProc < Proc
+
+  def self.new ( str )
+    pr = super(&eval("proc { #{str} }"))
+    pr.instance_eval { @str = str.freeze }
+    pr
+  end
+
+  def _dump ( depth )
+    Marshal.dump([self.class, @str])
+  end
+
+  def self._load ( data )
+    klass, str = Marshal.load(data)
+    klass.new(str)
+  end
+
+  def to_s
+    @str
+  end
+
+end
+
+test_section __FILE__ do
+
+class DumpableProcTest < Test::Unit::TestCase
+
+  def test_simple
+    p = DumpableProc.new('|x| 3 + x')
+    assert_equal(7, p[4])
+    str = nil
+    assert_nothing_raised { str = Marshal.dump(p) }
+    p2 = nil
+    assert_nothing_raised { p2 = Marshal.load(str) }
+    assert_equal(9, p2[6])
+  end
+
+end
+
+end

data/lib/core_ex/embedded_tests.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: embedded_tests.rb 249 2005-05-31 13:23:42Z ertai $
+# Revision::  $Id: embedded_tests.rb 298 2005-06-18 21:56:51Z ertai $
 
 require 'set'
 
@@ -31,3 +31,7 @@ module Kernel
   end
 
 end # module Kernel
+
+if defined? EMBEDDED_TEST_MODE
+  test_mode EMBEDDED_TEST_MODE
+end

data/lib/core_ex/{filelist.rb → pathlist.rb}

@@ -1,5 +1,7 @@
-# Revision::  $Id: filelist.rb 249 2005-05-31 13:23:42Z ertai $
-
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: pathlist.rb 295 2005-06-18 11:22:24Z ertai $
 #--
 # Copyright (c) 2003, 2004 Jim Weirich
 #
@@ -24,26 +26,26 @@
 #++
 #
 
-# Contributons by Nicolas Pouillard  <ertai@lrde.epita.fr>.
-
 # Some objects are dupable, some are not.  So we define a version of
 # dup (called rake_dup) that returns self on the handful of classes
 # that are not dupable.
 
-module Kernel
-  # Duplicate an object if it can be duplicated.  If it can not be
-  # cloned or duplicated, then just return the original object.
-  def rake_dup()
-    dup
-  end
-end
-
-[NilClass, FalseClass, TrueClass, Fixnum, Symbol].each do |clazz|
-  clazz.class_eval {
+unless respond_to? :rake_dup
+  module Kernel
     # Duplicate an object if it can be duplicated.  If it can not be
     # cloned or duplicated, then just return the original object.
-    def rake_dup() self end
-  }
+    def rake_dup()
+      dup
+    end
+  end
+
+  [NilClass, FalseClass, TrueClass, Fixnum, Symbol].each do |clazz|
+    clazz.class_eval {
+      # Duplicate an object if it can be duplicated.  If it can not be
+      # cloned or duplicated, then just return the original object.
+      def rake_dup() self end
+    }
+  end
 end
 
 ######################################################################
@@ -67,23 +69,26 @@ class String
   end
 end
 
+#
+# PathList is essentially based on FileList from Rake.
+#
 
 ####################################################################
-# A FileList is essentially an array with a few helper methods
+# A PathList is essentially an array with a few helper methods
 # defined to make file manipulation a bit easier.
 #
-# FileLists are lazy.  When given a list of glob patterns for
+# PathLists are lazy.  When given a list of glob patterns for
 # possible files to be included in the file list, instead of
-# searching the file structures to find the files, a FileList holds
+# searching the file structures to find the files, a PathList holds
 # the pattern for latter use.
 #
-# This allows us to define a number of FileList to match any number of
-# files, but only search out the actual files when then FileList
+# This allows us to define a number of PathList to match any number of
+# files, but only search out the actual files when then PathList
 # itself is actually used.  The key is that the first time an
-# element of the FileList/Array is requested, the pending patterns
+# element of the PathList/Array is requested, the pending patterns
 # are resolved into a real list of file names.
 #
-class FileList 
+class PathList 
 
   def clone
     sibling = self.class.new
@@ -97,7 +102,7 @@ class FileList
 
   # == Method Delegation
   #
-  # The lazy evaluation magic of FileLists happens by implementing
+  # The lazy evaluation magic of PathLists happens by implementing
   # all the array specific methods to call +resolve+ before
   # delegating the heavy lifting to an embedded array object
   # (@items).
@@ -106,11 +111,11 @@ class FileList
   # regular kind delegates to the @items array and returns the
   # result directly.  Well, almost directly.  It checks if the
   # returned value is the @items object itself, and if so will
-  # return the FileList object instead.
+  # return the PathList object instead.
   #
   # The second kind of delegation call is used in methods that
   # normally return a new Array object.  We want to capture the
-  # return value of these methods and wrap them in a new FileList
+  # return value of these methods and wrap them in a new PathList
   # object.  We enumerate these methods in the +SPECIAL_RETURN+ list
   # below.
 
@@ -143,7 +148,7 @@ class FileList
         def #{sym}(*args, &block)
           resolve if @pending
           result = @items.send(:#{sym}, *args, &block)
-          FileList.new.import(result)
+          PathList.new.import(result)
         end
       }, __FILE__, ln
     else
@@ -163,9 +168,9 @@ class FileList
   # time, use the "yield self" pattern.
   #
   # Example:
-  #   file_list = FileList.new['lib/**/*.rb', 'test/test*.rb']
+  #   file_list = PathList.new['lib/**/*.rb', 'test/test*.rb']
   #
-  #   pkg_files = FileList.new['lib/**/*'] do |fl|
+  #   pkg_files = PathList.new['lib/**/*'] do |fl|
   #     fl.exclude(/\bCVS\b/)
   #   end
   #
@@ -210,14 +215,14 @@ class FileList
   # will not exclude the file.
   #
   # Examples:
-  #   FileList['a.c', 'b.c'].exclude("a.c") => ['b.c']
-  #   FileList['a.c', 'b.c'].exclude(/^a/)  => ['b.c']
+  #   PathList['a.c', 'b.c'].exclude("a.c") => ['b.c']
+  #   PathList['a.c', 'b.c'].exclude(/^a/)  => ['b.c']
   #
   # If "a.c" is a file, then ...
-  #   FileList['a.c', 'b.c'].exclude("a.*") => ['b.c']
+  #   PathList['a.c', 'b.c'].exclude("a.*") => ['b.c']
   #
   # If "a.c" is not a file, then ...
-  #   FileList['a.c', 'b.c'].exclude("a.*") => ['a.c', 'b.c']
+  #   PathList['a.c', 'b.c'].exclude("a.*") => ['a.c', 'b.c']
   #
   def exclude(*patterns)
     patterns.each do |pat| @exclude_patterns << pat end
@@ -259,7 +264,7 @@ class FileList
     result = @items * other
     case result
     when Array
-      FileList.new.import(result)
+      PathList.new.import(result)
     else
       result
     end
@@ -330,36 +335,36 @@ class FileList
     self
   end
 
-  # Return a new FileList with the results of running +sub+ against
+  # Return a new PathList with the results of running +sub+ against
   # each element of the oringal list.
   #
   # Example:
-  #   FileList['a.c', 'b.c'].sub(/\.c$/, '.o')  => ['a.o', 'b.o']
+  #   PathList['a.c', 'b.c'].sub(/\.c$/, '.o')  => ['a.o', 'b.o']
   #
-  def sub(pat, rep)
-    inject(FileList.new) { |res, fn| res << fn.sub(pat,rep) }
+  def sub(*args, &block)
+    inject(PathList.new) { |res, fn| res << fn.sub(*args, &block) }
   end
 
-  # Return a new FileList with the results of running +gsub+ against
+  # Return a new PathList with the results of running +gsub+ against
   # each element of the original list.
   #
   # Example:
-  #   FileList['lib/test/file', 'x/y'].gsub(/\//, "\\")
+  #   PathList['lib/test/file', 'x/y'].gsub(/\//, "\\")
   #      => ['lib\\test\\file', 'x\\y']
   #
-  def gsub(pat, rep)
-    inject(FileList.new) { |res, fn| res << fn.gsub(pat,rep) }
+  def gsub(*args, &block)
+    inject(PathList.new) { |res, fn| res << fn.gsub(*args, &block) }
   end
 
   # Same as +sub+ except that the oringal file list is modified.
-  def sub!(pat, rep)
-    each_with_index { |fn, i| self[i] = fn.sub(pat,rep) }
+  def sub!(*args, &block)
+    each_with_index { |fn, i| self[i] = fn.sub(*args, &block) }
     self
   end
 
   # Same as +gsub+ except that the original file list is modified.
-  def gsub!(pat, rep)
-    each_with_index { |fn, i| self[i] = fn.gsub(pat,rep) }
+  def gsub!(*args, &block)
+    each_with_index { |fn, i| self[i] = fn.gsub(*args, &block) }
     self
   end
 
@@ -376,23 +381,28 @@ class FileList
   end
 
 
-  # FileList version of partition.  Needed because the nested arrays
-  # should be FileLists in this version.
+  # PathList version of partition.  Needed because the nested arrays
+  # should be PathLists in this version.
   def partition(&block)	# :nodoc:
     resolve
     result = @items.partition(&block)
     [
-      FileList.new.import(result[0]),
-      FileList.new.import(result[1]),
+      PathList.new.import(result[0]),
+      PathList.new.import(result[1]),
     ]
   end
   
-  # Convert a FileList to a string by joining all elements with a space.
+  # Convert a PathList to a string by joining all elements with a space.
   def to_s
     resolve if @pending
     self.join(' ')
   end
 
+  def to_yaml ( opts={} )
+    resolve if @pending
+    to_a.to_yaml(opts)
+  end
+
   # Add matching glob patterns.
   def add_matching(pattern)
 # <<<<
@@ -401,7 +411,9 @@ class FileList
       self << fn unless exclude?(fn)
     end
   end
-  private :add_matching
+# <<<<
+  protected :add_matching
+# >>>>
 
   # Should the given file name be excluded?
   def exclude?(fn)
@@ -429,7 +441,7 @@ class FileList
   class << self
     # Create a new file list including the files listed. Similar to:
     #
-    #   FileList.new(*args)
+    #   PathList.new(*args)
     def [](*args)
       new(*args)
     end
@@ -459,6 +471,9 @@ class FileList
   def require
     each { |x| x.require }
   end
+
+  def to_strings
+    map { |path| path.to_s }
+  end
 # >>>>
 end
-

data/lib/core_ex/rakefile_base.rf

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: rakefile_base.rf 280 2005-06-05 20:52:26Z ertai $
+# Revision::  $Id: rakefile_base.rf 301 2005-06-23 20:57:05Z ertai $
 
 require 'core_ex'
 require 'ostruct'
@@ -73,10 +73,17 @@ task :default => [ :check ]
 
 
 # desc 'Setup the ttk command'
-task :ttk do
-  # FIXME search a valid ttk
-  def ttk ( *a )
-    sh 'ttk', *a
+task :ttk => [ :spec ] do
+  alias highline_ask ask
+  require_gem 'ttk', SPEC.ttk_version
+  alias ruby_ex_ask ask
+  alias ask highline_ask
+  def ttk ( *a, &b )
+    cmd = TTK.bin[*a]
+    cmd.input = b[] if b
+    cmd.output = STDOUT
+    cmd.error = STDERR
+    raise unless cmd.system.status == 0
   end
 end
 
@@ -98,22 +105,19 @@ task :distcheck => [ :ttk, :package ] do
   urls = []
   Pathname.glob('pkg/*') do |path|
     next unless path.file?
-    next if path.to_s =~ /\.gem$/ # FIXME
     urls << "file://#{path.expand_path}"
   end
-  inp = { # FIXME use a Each strategy
-    'Check generated packages' => {
-      'strategy' => 'Suite',
-      'attributes' => {
-        'strategy' => 'Import',
-        'import'   => SPEC.root_test_suite
-      },
-      'contents' => urls.map { |url| { url => { 'symbols' => {'url'=>url} } } }
-    }
-  }
-  TempPath.new do |tmp|
-    tmp.open('w') { |f| f.write inp.to_yaml }
-    ttk '-l', 'distcheck-log.yml', tmp
+  ttk '-l', 'distcheck-log.yml' do %Q[
+    Check generated packages:
+      strategy: Iterate
+      over    : #{urls.inspect}
+      iter    : url
+      test    :
+        'Check the package: <<url>>':
+          strategy: Import
+          symbols : { url: <<url>> }
+          import  : #{SPEC.root_test_suite}
+    ]
   end
 end
 clean_task :distcheck do
@@ -203,7 +207,7 @@ task :rdoc_spec => [ :spec ] do
     rdoc.main = SPEC.rdoc_files.first
     tail = SPEC.rdoc_tail_files || []
     fl = SPEC.rdoc_files - tail + tail
-    rdoc.rdoc_files.include(fl)
+    rdoc.rdoc_files.include(fl.to_strings)
   end
 end
 
@@ -222,8 +226,9 @@ file GEM_SPEC.to_s => [ :spec, :dyn_spec, :rdoc_spec ] do
     s.executables = Pathname.glob(bin + '*').select do |path|
       path.executable? and not path.directory?
     end.map { |path| path.basename.to_s }
-    s.files = SPEC.pkg_files.to_a
+    s.files = SPEC.pkg_files.to_strings
     s.require_path = 'lib'
+    s.autorequire = SPEC.autorequire if SPEC.autorequire
 
     if SPEC.dependencies
       SPEC.dependencies.each do |name, version|
@@ -231,9 +236,11 @@ file GEM_SPEC.to_s => [ :spec, :dyn_spec, :rdoc_spec ] do
       end
     end
 
-    s.has_rdoc = true
-    s.extra_rdoc_files = SPEC.rdoc.rdoc_files.to_a
-    s.rdoc_options = SPEC.rdoc.option_list.map { |x| x[/^'?(.*?)'?$/, 1] }
+    if SPEC.has_rdoc
+      s.has_rdoc = true 
+      s.extra_rdoc_files = SPEC.rdoc.rdoc_files.map { |x| x.to_s }
+      s.rdoc_options = SPEC.rdoc.option_list.map { |x| x[/^'?(.*?)'?$/, 1] }
+    end
 
     authors_file = YAML::load(AUTHORS.read).values.first
     list = authors_file.map { |x| /^(.*?)\s*<(.*)>/.match(x.keys.first)[1..2] }
@@ -263,7 +270,7 @@ task :gem_spec => [ GEM_SPEC.to_s ] do
     p.gem_spec = spec
     p.need_tar_gz = true
     p.need_tar_bz2 = true
-    p.package_files = SPEC.pkg_files.to_a
+    p.package_files = SPEC.pkg_files.map { |x| x.to_s }
   end
   gtask.instance_eval { $gem = 'pkg'.to_path + gem_file }
 end
@@ -411,7 +418,7 @@ task :publish_package => [ :spec, :package ] do
   type_map.default = 9999
 
   pkg = 'pkg'.to_path
-  files = FileList[pkg/"*{#{type_map.keys.join(',')}}"]
+  files = PathList[pkg/"*{#{type_map.keys.join(',')}}"]
 
   rubyforge_user = SPEC.rubyforge_user || SPEC.user || ENV['USER']
   rubyforge_project = SPEC.rubyforge_project || SPEC.name

data/lib/core_ex/require.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: require.rb 278 2005-06-05 16:30:48Z ertai $
+# Revision::  $Id: require.rb 297 2005-06-18 21:51:39Z ertai $
 
 require 'core_ex/pathname'
 require 'set'
@@ -55,9 +55,20 @@ class RequireSystem
   private :cannot_found
 
 
+  def add_to_required ( aString )
+    return if $".include? aString
+    $" << aString
+  end
+
+
+  def required_include? ( aString )
+    $".include? aString
+  end
+
+
   def load ( aPathname )
     check_pathname(aPathname)
-    abs = aPathname.expand_path_with($:, EXTENSIONS)
+    abs = aPathname.expand_path_with($:, EXTENSIONS + [aPathname.extname])
     cannot_found(aPathname) if abs.nil?
     @loaded << abs
     Kernel.__load__(abs)
@@ -146,17 +157,18 @@ class RequireSystem
     cannot_found(aPathname) if abs.nil?
     feature = aPathname.to_s
     feature += abs.extname if aPathname.extname.empty?
-    if $".include? feature or $".include? abs.to_s
+    if required_include? feature or required_include? abs.to_s
       return false
     else
       if abs.extname =~ /^(\.rb)?$/
-        $" << feature
+        add_to_required feature
+        add_to_required abs.to_s
         res = Kernel.__load__(abs)
       else
         res = Kernel.__require__(abs.extsplit.first.to_s)
-        $" << feature unless $".include? feature
+        add_to_required feature
+        add_to_required abs.to_s
       end
-      $" << abs.to_s
       return true
     end
   end
@@ -186,7 +198,7 @@ class RequireSystem
     cannot_found(aPathname) if abs.nil?
     feature = aPathname.to_s
     feature += abs.extname if aPathname.extname.empty?
-    return $".include?(feature) || $".include?(abs)
+    return required_include?(feature)
   end
 
 
@@ -280,13 +292,16 @@ test_section __FILE__ do
       @p_so = @s_so.to_path
       @p_rb = @s_rb.to_path
       @ls = [ @s, @s_dne, @s_so, @s_rb ]
-      @lp = [ @p, @p_dne, @p_so, @p_rb ]
+      @lp = [ @p, @p_dne, @p_rb ] # FIXME @p_so on mac
       @l = @ls + @lp
       $:.replace @@save_dirs.dup
-      $".replace @@save_files.dup
       @mr = MockRequirable
     end
 
+    def teardown
+      $".delete_if { |x| x =~ /test_require/ }
+    end
+
     def test_0_initialize
       %w[
         load require
@@ -310,11 +325,6 @@ test_section __FILE__ do
     end
 
     def test_1_search
-      @ls.each do |x|
-        assert_raise(LoadError) do
-          x.expand_path_with($:, RequireSystem::EXTENSIONS)
-        end
-      end
       @lp.each { |x| assert_search(x, nil) }
     end
 
@@ -375,4 +385,3 @@ test_section __FILE__ do
 
   end # RequireSystemTest
 end
-

data/lib/core_ex/temp_path.rb

@@ -2,8 +2,8 @@
 # Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: temp_path.rb 283 2005-06-05 23:02:30Z ertai $
+# $LastChangedBy: polrop $
+# $Id: temp_path.rb 287 2005-06-10 13:25:50Z polrop $
 
 require 'core_ex'
 require 'tempfile'
@@ -30,10 +30,10 @@ class TempPath < Pathname
   #    tmp.clean
   #
   #  - # You can choose the basename and an extension.
-  #    TmpPath.new('the_base_file_name', 'rb')
+  #    TempPath.new('the_base_file_name', 'rb')
   #
   #  - # You can supply a block (recomended).
-  #    TmpPath.new('foo') do |tmp|
+  #    TempPath.new('foo') do |tmp|
   #      tmp.open('w') { |f| << 'foo' }
   #      tmp.exist? == true
   #      $tmp = tmp
@@ -41,7 +41,7 @@ class TempPath < Pathname
   #    $tmp.exist? == false
   #
   #  - # You can make a temporary directory.
-  #    TmpPath.new('adirectory') do |tmpdir|
+  #    TempPath.new('adirectory') do |tmpdir|
   #      tmpdir.mkpath
   #      $file = tmpdir + 'foo'
   #      $file.open('w') { |f| f << 'foo' }
@@ -126,7 +126,7 @@ class TempPath < Pathname
       block[] if block_given?
     ensure
       if @@tmpdir.exist?
-        @@tmpdir.rmtree 
+        @@tmpdir.rmtree
         @@initialized = false
       end
     end

data/lib/core_ex/version.rb

@@ -2,8 +2,8 @@
 # Author: Nicolas Despres  <polrop@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: version.rb 252 2005-05-31 23:41:42Z ertai $
+# $LastChangedBy: polrop $
+# $Id: version.rb 290 2005-06-11 06:48:17Z polrop $
 
 require 'core_ex'
 
@@ -20,7 +20,19 @@ class Version
   end
 
   def <=>(other)
-    to_a <=> other.to_a
+    if @major == other.major
+      if @minor == other.minor
+        if @build == other.build
+          @revision <=> other.revision
+        else
+          @build <=> other.build
+        end
+      else
+        @minor <=> other.minor
+      end
+    else
+      @major <=> other.major
+    end
   end
 
   def pp
@@ -31,6 +43,10 @@ class Version
     "#@major.#@minor.#@build"
   end
 
+  def inspect
+    "#@major.#@minor.#@build-r#@revision"
+  end
+
   def to_a
     [ @major, @minor, @build, @revision ]
   end

data/lib/core_ex/yaml.rb

@@ -1,24 +1,216 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: yaml.rb 249 2005-05-31 13:23:42Z ertai $
+# Revision::  $Id: yaml.rb 300 2005-06-23 20:45:47Z ertai $
 
 require 'yaml'
+require 'core_ex'
+
+
+class Class
+  
+  def yaml_extension ( theYamlType=nil )
+    case theYamlType
+    when NilClass
+      theYamlType = "!#{self.name.downcase}"
+    when String
+      theYamlType = theYamlType
+    when Symbol
+      theYamlType = "!#{theYamlType}"
+    else
+      raise ArgumentError, "Expect a symbol or a string not: #{theYamlType}"
+    end
+
+    class_eval do
+      undef to_yaml_type
+      undef to_yaml
+      def to_yaml ( opts={} )
+        YAML::quick_emit(self.object_id, opts) do |out|
+          out << "#{to_yaml_type} #{to_yaml_string}"
+        end
+      end
+    end
+
+    class_eval %{
+      def to_yaml_type
+        '#{theYamlType}'
+      end
+    }
+
+    theClass = self
+    YAML.add_builtin_type(theYamlType) do |type, val|
+      theClass.yaml_load val
+    end
+  end
+
+end # class Class
+
+
+
+class Regexp
+  yaml_extension :re
+
+  def to_yaml_string
+    source
+  end
+
+  @@options =
+  {
+    'm' => MULTILINE,
+    'i' => IGNORECASE,
+    'x' => EXTENDED
+  }
+
+  def self.yaml_load ( val )
+    if val.is_a? Array and val.size == 2
+      options = 0
+      val.last.split(//).each do |opt|
+        options |= @@options[opt]
+      end
+      new(val.first, options)
+    else
+      new(val.to_s)
+    end
+  end
+
+end # class Regexp
+
+
+
+class Range
+  yaml_extension
+
+  def to_yaml_string
+    to_s
+  end
+
+  def self.yaml_load ( val )
+    range = eval(val.to_s)
+    raise ArgumentError, "need a range not #{val}" unless range.is_a? Range
+    range
+  end
+
+end # class Range
+
+
+
+class Proc
+  yaml_extension
+
+  def self.yaml_load ( val )
+    DumpableProc.new(val.to_s)
+  end
+
+  def to_yaml_string
+    to_s
+  end
+
+end # class Proc
 
-YAML.add_builtin_type('!re') do |type, val|
-  Regexp.new(val.to_s)
-end
 
-YAML.add_builtin_type('!path') do |type, val|
-  Pathname.new(val.to_s)
-end
 
-YAML.add_builtin_type('!proc') do |type, val|
-  require 'dumpable_proc'
-  DumpableProc.new(val.to_s)
+class PathList
+  yaml_extension :filelist
+
+  def self.yaml_load ( val )
+    new(val)
+  end
+
+  undef to_yaml
+  def to_yaml ( opts={} )
+    to_a.to_yaml(opts)
+  end
+
+end # class PathList
+
+
+class Pathname
+  yaml_extension :path
+
+  def to_yaml_string
+    to_s
+  end
+
+  def self.yaml_load ( val )
+    new(val.to_s)
+  end
+
+end # class Pathname
+
+
+
+YAML.add_builtin_type('!ruby') do |type, val|
+  eval val.to_s
 end
 
-YAML.add_builtin_type('!filelist') do |type, val|
-  require 'rake'
-  FileList.new(val)
+
+
+test_section __FILE__ do
+
+  class YamlExTest < Test::Unit::TestCase
+
+    def assert_yaml_load ( aString, aClass, anObject=nil ) 
+      assert_nothing_raised { @val = YAML::load(aString) }
+      assert_kind_of(aClass, @val)
+      assert_equal(anObject, @val) unless anObject.nil?
+      @ref = aString
+    end
+
+    def assert_yaml_dump ( anObject, aString ) 
+      assert_nothing_raised { @str = anObject.to_yaml }
+      assert_equal(aString, @str)
+    end
+
+
+
+    def test_regexp
+      @re = /a.*[bc]$/
+      assert_yaml_load '--- !re a.*[bc]$', Regexp, @re
+      assert_match(@val, 'afffc')
+      assert_no_match(@val, 'afffC')
+      assert_no_match(@val, 'fffb')
+      assert_no_match(@val, "af\nffb")
+      assert_yaml_dump @re, @ref
+      @re = /a.*[bc]$/mi
+      assert_yaml_load '--- !re ["a.*[bc]$", mi]', Regexp, @re
+      assert_match(@val, 'afffc')
+      assert_match(@val, 'afffC')
+      assert_no_match(@val, 'fffb')
+      assert_match(@val, "af\nffb")
+    end
+
+    def test_pathname
+      str = 'foo/bar/baz.rb'
+      assert_yaml_load "--- !path #{str}", Pathname, str.to_path
+      assert_equal('baz.rb', @val.basename.to_s)
+      assert_equal(str, @val.to_s)
+      assert_yaml_dump str.to_path, @ref
+    end
+
+    def test_range
+      assert_yaml_load "--- !range 0..10", Range, 0..10
+      assert_yaml_dump @val, @ref
+      assert_yaml_load "--- !range 0...10", Range, 0...10
+      assert_yaml_dump @val, @ref
+    end
+
+    def test_proc
+      assert_yaml_load "--- !proc 3 + 7", Proc
+      assert_yaml_dump @val, @ref
+      assert_equal(10, @val[])
+    end
+
+    def test_pathlist
+      ls = __FILE__.to_path.dirname + '*.rb'
+      assert_yaml_load "--- !filelist #{ls}", PathList, PathList[ls]
+      assert_yaml_dump @val, @val.to_a.to_yaml
+    end
+
+    def test_ruby
+      assert_yaml_load "--- !ruby 2 + 4", Integer, 6
+      assert_yaml_load "--- !ruby '[2, 4]'", Array, [2, 4]
+    end
+
+  end # class YamlExTest
+
 end

data/lib/core_ex.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: core_ex.rb 278 2005-06-05 16:30:48Z ertai $
+# Revision::  $Id: core_ex.rb 301 2005-06-23 20:57:05Z ertai $
 
 require 'pathname'
 
@@ -16,17 +16,18 @@ module CoreEx
     require "core_ex/#{aPath}"
   end
   RequireSystem.instance
-  %w[ attr_once enumerable exception string fileutils yaml ].each do |aPath|
+  %w[ attr_once enumerable exception
+      string fileutils pathlist yaml ].each do |aPath|
     (@@core_ex + aPath).require
   end
 
   def self.each ( &block )
-    @@core_list ||= FileList[@@core_ex + '**/*.rb']
+    @@core_list ||= PathList[@@core_ex + '**/*.rb']
     @@core_list.each(&block)
   end
 
   def self.require
-    @@core_list ||= FileList[@@core_ex + '**/*.rb']
+    @@core_list ||= PathList[@@core_ex + '**/*.rb']
     @@core_list.require
   end
 
@@ -40,8 +41,8 @@ core_ex = CoreEx.dir + 'core_ex'
 {
   :Time         => 'time',
   :DTime        => 'dtime',
+  :DumpableProc => 'dumpable_proc',
   :Version      => 'version',
-  :FileList     => 'filelist',
   :Test         => 'test/unit/ui/yaml/testrunner',
   :TempPath     => 'temp_path'
 }.each do |k, v|

data/test/test-unit-setup.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
+raise 'Do not load CoreEx before me' if defined? CoreEx
 require 'pathname'
-unless defined? CoreEx
-  $: << Pathname.new(__FILE__).dirname.parent + 'lib'
-  require 'core_ex'
-else
-  require 'core_ex/embedded_tests'
-end
+$VERBOSE = true
+$: << Pathname.new(__FILE__).dirname.parent + 'lib'
 args = ARGV.inject(nil) { |accu, x| (accu)? accu << x : ((x == '--')? [] : accu) } || ARGV
 path = Pathname.new(args[0]).expand_path.cleanpath
-test_mode Regexp.new(path)
+EMBEDDED_TEST_MODE = Regexp.new(path)
+require 'core_ex'
+require 'core_ex/test/unit/ui/yaml/testrunner'
 require path.to_s

data/test/unit-suite.yml

@@ -5,12 +5,10 @@ CoreEx Unit Test Suite:
   strategy: Glob
   glob    : <<pwd>>/../lib/**/*.rb
   regexp  : !re ([^/]*)\.rb$
-  symbols : { core_ex: <<pwd>>/../lib }
 
   test:
       <<match>>:
           strategy: RUnit
-          unit_file: <<pwd>>/test-unit-setup.rb
+          input: !path <<pwd>>/test-unit-setup.rb
           args: <<path>>
           verbose: true
-          core_ex: true

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: core_ex
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2005-06-06
+  version: 0.2.0
+date: 2005-06-24
 summary: CoreEx is a proposal for a standard library extension.
 require_paths: 
   - lib
@@ -19,10 +19,10 @@ description: "CoreEx  is  designed  to provides a simple but quite useful extens
   also   some   new   features   like   attr_once,  DTime,  TempPath,  Version,
   embedded_tests,  filelist  (almost  from  rake),  a  common  Rakefile, and an
   extension of the require system."
-autorequire: 
+autorequire: core_ex
 default_executable: 
 bindir: bin
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
     - 
@@ -38,11 +38,12 @@ files:
   - lib/core_ex.rb
   - lib/core_ex/attr_once.rb
   - lib/core_ex/dtime.rb
+  - lib/core_ex/dumpable_proc.rb
   - lib/core_ex/embedded_tests.rb
   - lib/core_ex/enumerable.rb
   - lib/core_ex/exception.rb
-  - lib/core_ex/filelist.rb
   - lib/core_ex/fileutils.rb
+  - lib/core_ex/pathlist.rb
   - lib/core_ex/pathname.rb
   - lib/core_ex/rakefile_base.rf
   - lib/core_ex/require.rb
@@ -73,37 +74,10 @@ files:
   - Rakefile
   - README
   - SPEC.dyn.yml
-  - SPEC.gemspec
   - SPEC.yml
 test_files: []
-rdoc_options: 
-  - "--inline-source"
-  - "--main"
-  - README
-  - "--title"
-  - "CoreEx -- A proposal for a standard library extension."
-  - "-T"
-  - html
-extra_rdoc_files: 
-  - README
-  - AUTHORS
-  - NEWS
-  - lib/core_ex.rb
-  - lib/core_ex/attr_once.rb
-  - lib/core_ex/dtime.rb
-  - lib/core_ex/embedded_tests.rb
-  - lib/core_ex/enumerable.rb
-  - lib/core_ex/exception.rb
-  - lib/core_ex/filelist.rb
-  - lib/core_ex/fileutils.rb
-  - lib/core_ex/pathname.rb
-  - lib/core_ex/require.rb
-  - lib/core_ex/string.rb
-  - lib/core_ex/temp_path.rb
-  - lib/core_ex/time.rb
-  - lib/core_ex/version.rb
-  - lib/core_ex/yaml.rb
-  - lib/core_ex/test/unit/ui/yaml/testrunner.rb
+rdoc_options: []
+extra_rdoc_files: []
 executables: []
 extensions: []
 requirements: []

data/SPEC.gemspec

@@ -1,15 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{core_ex}
-  s.version = "0.1.3"
-  s.date = %q{2005-06-06}
-  s.summary = %q{CoreEx is a proposal for a standard library extension.}
-  s.email = ["nicolas.despres@gmail.com", "ertai@feydakins.org"]
-  s.homepage = %q{http://api.feydakins.org/core_ex}
-  s.rubyforge_project = %q{core_ex}
-  s.description = %q{CoreEx  is  designed  to provides a simple but quite useful extension of the standard  library  of  Ruby. So some classes and modules like Pathname, Time, Enumerable,  Exception,  FileUtils,  String,  and YAML are extended. There is also   some   new   features   like   attr_once,  DTime,  TempPath,  Version, embedded_tests,  filelist  (almost  from  rake),  a  common  Rakefile, and an extension of the require system.}
-  s.has_rdoc = true
-  s.authors = ["Nicolas Despr\350s", "Nicolas Pouillard"]
-  s.files = ["lib/core_ex.rb", "lib/core_ex/attr_once.rb", "lib/core_ex/dtime.rb", "lib/core_ex/embedded_tests.rb", "lib/core_ex/enumerable.rb", "lib/core_ex/exception.rb", "lib/core_ex/filelist.rb", "lib/core_ex/fileutils.rb", "lib/core_ex/pathname.rb", "lib/core_ex/rakefile_base.rf", "lib/core_ex/require.rb", "lib/core_ex/string.rb", "lib/core_ex/temp_path.rb", "lib/core_ex/time.rb", "lib/core_ex/version.rb", "lib/core_ex/yaml.rb", "lib/core_ex/test/unit/ui/yaml/testrunner.rb", "test/check-core_ex.yml", "test/check-pkg-core_ex.yml", "test/resources", "test/sanity", "test/sanity-suite.yml", "test/test-unit-setup.rb", "test/unit-suite.yml", "test/resources/require", "test/resources/use-from-gems.rb", "test/resources/yaml_testrunner", "test/resources/require/test_require", "test/resources/require/test_require_rb.rb", "test/resources/require/test_require_so.so", "test/resources/yaml_testrunner/unit_test.rb", "test/sanity/multiple-requires.yml", "test/sanity/single-requires.yml", "AUTHORS", "NEWS", "Rakefile", "README", "SPEC.dyn.yml", "SPEC.gemspec", "SPEC.yml"]
-  s.rdoc_options = ["--inline-source", "--main", "README", "--title", "CoreEx -- A proposal for a standard library extension.", "-T", "html"]
-  s.extra_rdoc_files = ["README", "AUTHORS", "NEWS", "lib/core_ex.rb", "lib/core_ex/attr_once.rb", "lib/core_ex/dtime.rb", "lib/core_ex/embedded_tests.rb", "lib/core_ex/enumerable.rb", "lib/core_ex/exception.rb", "lib/core_ex/filelist.rb", "lib/core_ex/fileutils.rb", "lib/core_ex/pathname.rb", "lib/core_ex/require.rb", "lib/core_ex/string.rb", "lib/core_ex/temp_path.rb", "lib/core_ex/time.rb", "lib/core_ex/version.rb", "lib/core_ex/yaml.rb", "lib/core_ex/test/unit/ui/yaml/testrunner.rb"]
-end