core_ex 0.2.0 → 0.3.1

data/lib/{core_ex/pathlist.rb → path_list.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: pathlist.rb 295 2005-06-18 11:22:24Z ertai $
+# Revision::  $Id: path_list.rb 336 2005-09-06 20:32:49Z ertai $
 #--
 # Copyright (c) 2003, 2004 Jim Weirich
 #
@@ -26,48 +26,6 @@
 #++
 #
 
-# 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.
-
-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()
-      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
-
-######################################################################
-# User defined methods to be added to String.
-#
-class String
-  unless instance_methods.include? "ext"
-    # Replace the file extension with +newext+.  If there is no
-    # extenson on the string, append the new extension to the end.  If
-    # the new extension is not given, or is the empty string, remove
-    # any existing extension.
-    #
-    # +ext+ is a user added method for the String class.
-    def ext(newext='')
-      return self.dup if ['.', '..'].include? self
-      if newext != ''
- 	newext = (newext =~ /^\./) ? newext : ("." + newext)
-      end
-      dup.sub!(%r(([^/\\])\.[^./\\]*$)) { $1 + newext } || self + newext
-    end
-  end
-end
 
 #
 # PathList is essentially based on FileList from Rake.
@@ -88,17 +46,17 @@ end
 # element of the PathList/Array is requested, the pending patterns
 # are resolved into a real list of file names.
 #
-class PathList 
+class PathList
 
   def clone
     sibling = self.class.new
     instance_variables.each do |ivar|
       value = self.instance_variable_get(ivar)
-      sibling.instance_variable_set(ivar, value.rake_dup)
+      sibling.instance_variable_set(ivar, value.try_dup)
     end
     sibling
   end
-  alias dup clone
+  alias_method :dup, :clone
 
   # == Method Delegation
   #
@@ -137,9 +95,9 @@ class PathList
     compact flatten uniq values_at
     + - & |
   ]
-  
+
   DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).sort.uniq
-  
+
   # Now do the delegation.
   DELEGATING_METHODS.each_with_index do |sym, i|
     if SPECIAL_RETURN.include?(sym)
@@ -148,7 +106,7 @@ class PathList
         def #{sym}(*args, &block)
           resolve if @pending
           result = @items.send(:#{sym}, *args, &block)
-          PathList.new.import(result)
+          PathList.import result
         end
       }, __FILE__, ln
     else
@@ -203,8 +161,8 @@ class PathList
     @pending = true
     self
   end
-  alias :add :include 
-  
+  alias_method :add, :include
+
   # Register a list of file name patterns that should be excluded
   # from the list.  Patterns may be regular expressions, glob
   # patterns or regular strings.
@@ -235,7 +193,7 @@ class PathList
 
 
 
-  
+
   # Clear all the exclude patterns so that we exclude nothing.
   def clear_exclude
     @exclude_patterns = []
@@ -264,7 +222,7 @@ class PathList
     result = @items * other
     case result
     when Array
-      PathList.new.import(result)
+      PathList.import result
     else
       result
     end
@@ -305,7 +263,7 @@ class PathList
     case fn
     when Array
       fn.each { |f| self.resolve_add(f) }
-    when %r{[*?]}
+    when %r{[*?\{]}
       add_matching(fn)
     else
 # >>>>
@@ -368,7 +326,7 @@ class PathList
     self
   end
 
-  # Return a new array with <tt>String#ext</tt> method applied to
+  # Return a new array with <tt>Pathname#ext</tt> method applied to
   # each member of the array.
   #
   # This method is a shortcut for:
@@ -383,32 +341,61 @@ class PathList
 
   # PathList version of partition.  Needed because the nested arrays
   # should be PathLists in this version.
-  def partition(&block)	# :nodoc:
+  def partition(&block) # :nodoc:
     resolve
     result = @items.partition(&block)
     [
-      PathList.new.import(result[0]),
-      PathList.new.import(result[1]),
+      PathList.import(result[0]),
+      PathList.import(result[1]),
     ]
   end
-  
+
   # Convert a PathList to a string by joining all elements with a space.
   def to_s
     resolve if @pending
     self.join(' ')
   end
 
+  have YamlExtension, :pathlist, :filelist
+
+  def self.yaml_load ( val )
+    new(val)
+  end
+
   def to_yaml ( opts={} )
     resolve if @pending
     to_a.to_yaml(opts)
   end
 
+  class PathAndMatchData < Pathname
+    attr_reader :match
+    def initialize ( path, match )
+      super(path)
+      @match = match
+    end
+  end
+
   # Add matching glob patterns.
   def add_matching(pattern)
 # <<<<
+    pattern = pattern.to_s
+    re = Regexp.quote(pattern)
+    re.gsub!(/\\\{([^}]+)\\\}/) do
+      '(?:' + $1.gsub(/,/, '|') + ')'
+    end
+    re.gsub!(/\\\*\\\*\//, '(?:.+/)?')
+    re.gsub!(/\\\*/, '[^/]*')
+    re.gsub!(/\\\?/, '[^/]')
+    re.gsub!(/\\([()])/, '\1')
+    pattern.gsub!(/[()]/, '')
     Pathname.glob(pattern) do |fn|
 # >>>>
-      self << fn unless exclude?(fn)
+      next if exclude?(fn)
+      if match_data = Regexp.new(re).match(fn.to_s)
+        self << PathAndMatchData.new(fn, match_data)
+      else
+        self << fn
+      end
     end
   end
 # <<<<
@@ -446,6 +433,10 @@ class PathList
       new(*args)
     end
 
+    def import(array)
+      new.import(array)
+    end
+
     # Set the ignore patterns back to the default value.  The
     # default patterns will ignore files 
     # * containing "CVS" in the file path
@@ -468,12 +459,69 @@ class PathList
   end
 
 # <<<<
-  def require
-    each { |x| x.require }
+  alias_method :traditional_each, :each
+  def each ( &block )
+    traditional_each do |x|
+      if x.is_a? PathAndMatchData
+        block[x, *x.match.to_a[1..-1]]
+      else
+        block[x]
+      end
+    end
+  end
+
+  def import!
+    traditional_each { |x| x.import! }
+  end
+
+  def load_path!
+    traditional_each { |x| x.load_path! }
   end
 
-  def to_strings
+  def stringify
     map { |path| path.to_s }
   end
 # >>>>
 end
+
+test_section __FILE__ do
+
+  class PathListTest < Test::Unit::TestCase
+    include YamlExtension::Assertions
+
+    def setup
+      @r = TempPath.new
+      @r.mkpath
+      @l = PathList[]
+      @args = []
+      @mo = lambda { |*a| @args << a }
+      %w[ foo barbar bazfoo foo/a foo/b ].each do |x|
+        (@r/x).mkpath
+        @l << @r/x
+      end
+      @l2 = PathList[@r/'(f?o)', @r/'b(a*)', @r/'fo,',
+                     @r/'f.o', @r/'**/({a,b})']
+      @l3 = PathList[@r/'ba{rbar,zfoo}']
+    end
+
+    def test_each
+      @l.each(&@mo)
+      @l2.each(&@mo)
+      @l3.each(&@mo)
+      assert_equal([
+        [@r/'foo'], [@r/'barbar'], [@r/'bazfoo'], [@r/'foo/a'], [@r/'foo/b'],
+        [@r/'foo', 'foo'], [@r/'barbar', 'arbar'], [@r/'bazfoo', 'azfoo'],
+        [@r/'fo,'], [@r/'f.o'], [@r/'foo/a', 'a'], [@r/'foo/b', 'b'],
+        [@r/'barbar'], [@r/'bazfoo']
+      ], @args)
+    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
+
+  end # class PathListTest
+
+end

data/lib/{core_ex/temp_path.rb → temp_path.rb}

@@ -2,25 +2,17 @@
 # Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: polrop $
-# $Id: temp_path.rb 287 2005-06-10 13:25:50Z polrop $
+# $LastChangedBy: ertai $
+# $Id: temp_path.rb 351 2005-09-14 08:33:42Z ertai $
 
-require 'core_ex'
 require 'tempfile'
 require 'tmpdir'
-require 'set'
 require 'thread'
 
 class TempPath < Pathname
 
-  @@tmps = Set.new
-  @@mutex = Mutex.new
-  @@progname = Pathname.new($0).basename
-  @@tmpdir = Pathname.new(Dir.tmpdir) + "#{@@progname}.#{$$}"
-  @@tmpdir.freeze
   @@initialized = false
-  @@clean_planned = false
-  @@auto_clean = true
+  @@mutex = Mutex.new
 
   # You can use a temporary pathname like that:
   #
@@ -58,11 +50,12 @@ class TempPath < Pathname
   # which follow this format:
   #   => 'base.pid.uniq.ext
   #
-  def initialize ( base=@@progname, ext='' )
-    if base.to_s =~ /\//
+  def initialize ( base=nil, ext='' )
+    if base and base.to_s =~ /\//
       raise ArgumentError, "bad basename, you give me a pathname #{base}"
     end
     self.class.init
+    base ||= @@progname
     ext = ".#{ext}" unless ext.empty? or ext[0] == ?.
     res = nil
     @@mutex.synchronize do
@@ -103,42 +96,63 @@ class TempPath < Pathname
     true
   end
 
-  def self.init #:nodoc:
-    return if @@initialized
-    @@mutex.synchronize do
+  class << self
+
+    def init ( tmp_base_dir=nil ) #:nodoc:
       return if @@initialized
-      @@tmpdir.mkpath
-      @@initialized = true
-      at_exit { clean if @@auto_clean }
+      @@mutex.synchronize do
+        return if @@initialized
+        @@tmps = Set.new
+        @@progname = Pathname.new($0).basename
+        @@tmpdir = (tmp_base_dir || Dir.tmpdir).to_path + "#{@@progname}.#{$$}"
+        @@tmpdir.freeze
+        @@clean_planned = false
+        @@auto_clean = true
+        @@tmpdir.mkpath
+        @@initialized = true
+        at_exit { clean if @@auto_clean }
+      end
     end
-  end
 
-  # By default the autoclean is on.
-  # But in some case (if you use your temppaths in at_exit)
-  # You must disable the autoclean.
-  # And manually call TempPath.clean at the very of the program.
-  def self.clean ( &block )
-    @@mutex.synchronize do
-      return if @@clean_planned
-      @@clean_planned = true
+    # Call TempPath.fork_init when you want to reset the global TempPath status.
+    # For example when you make a fork and you don't want that the child have
+    # and destroy the same temporary directory as the father.
+    # This method setup a child TempPath environement where the temporary directory
+    # of the child is in the father one (unless if you set +sub_dir+ to false)
+    def fork_init ( sub_dir=true )
+      @@tmpdir ||= nil
+      @@initialized = false
+      init((sub_dir)? @@tmpdir : nil)
     end
-    begin
-      block[] if block_given?
-    ensure
-      if @@tmpdir.exist?
-        @@tmpdir.rmtree
-        @@initialized = false
+
+    # By default the autoclean is on.
+    # But in some case (if you use your temppaths in at_exit)
+    # You must disable the autoclean.
+    # And manually call TempPath.clean at the very of the program.
+    def clean ( &block )
+      @@mutex.synchronize do
+        return if @@clean_planned
+        @@clean_planned = true
+      end
+      begin
+        block[] if block_given?
+      ensure
+        if @@tmpdir.exist?
+          @@tmpdir.rmtree
+          @@initialized = false
+        end
       end
     end
-  end
 
-  def self.auto_clean= ( aBool )
-    @@auto_clean = aBool
-  end
+    def auto_clean= ( aBool )
+      @@auto_clean = aBool
+    end
+
+    def tmpdir
+      init
+      @@tmpdir
+    end
 
-  def self.tmpdir
-    init
-    @@tmpdir
   end
 
 end # class TempPath

data/lib/{core_ex/test/unit/ui/yaml/testrunner.rb → test/unit/u_i/yaml/test_runner.rb}

@@ -3,14 +3,13 @@
 # License:: Ruby license.
 
 # $LastChangedBy: ertai $
-# $Id: testrunner.rb 252 2005-05-31 23:41:42Z ertai $
+# $Id: test_runner.rb 351 2005-09-14 08:33:42Z ertai $
 
 
 require 'test/unit/autorunner'
 require 'test/unit/ui/testrunnermediator'
 require 'test/unit/ui/testrunnermediator'
 require 'test/unit/ui/testrunnerutilities'
-require 'core_ex'
 
 
 module Test
@@ -81,15 +80,13 @@ module Test
           private
           def test_started(name)
             @test_start_time = Time.now
-            @io.print("  #{name}:")
+            @io.print("  '#{name}':")
             @io.flush
           end
 
           private
           def test_finished(name)
-            #FIXME: remove the double-quote when the TTK Dumper manages oneline
-            #       feature
-            @io.puts(" \"[ #@test_outcome, #{Time.now - @test_start_time} ]\"")
+            @io.puts(" [ #@test_outcome, #{Time.now - @test_start_time} ]")
             @test_outcome = 'S'
             @io.flush
           end
@@ -101,15 +98,15 @@ module Test
 
           private
           def add_fault(fault)
-            case fault.class.to_s
-            when 'Test::Unit::Failure'
+            case fault
+            when Test::Unit::Failure
               @test_outcome = 'F'
               @failures << fault
-            when 'Test::Unit::Error'
+            when Test::Unit::Error
               @test_outcome = 'E'
               @errors << fault
             else
-              raise(Exception, 'unexpected fault!!')
+              raise(Exception, "unexpected fault (#{fault})!!")
             end
           end
 

data/lib/{core_ex/version.rb → version.rb}

@@ -1,11 +1,8 @@
-# Copyright: Copyright (c) 2004  Nicolas Despres. All rights reserved.
-# Author: Nicolas Despres  <polrop@lrde.epita.fr>.
-# License: Gnu General Public License.
+# Copyright:: Copyright (c) 2004  Nicolas Despres. All rights reserved.
+# Author::    Nicolas Despres  <polrop@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: version.rb 334 2005-09-04 14:29:40Z ertai $
 
-# $LastChangedBy: polrop $
-# $Id: version.rb 290 2005-06-11 06:48:17Z polrop $
-
-require 'core_ex'
 
 class Version
   include Comparable

data/lib/yaml_extension.rb

@@ -0,0 +1,78 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: yaml_extension.rb 355 2005-09-15 23:18:43Z ertai $
+
+require 'yaml'
+
+module YamlExtension
+
+  setup do |*aliases|
+    theYamlType = aliases.shift
+    case theYamlType
+    when NilClass
+      theYamlType = self.name.downcase
+    when String
+    when Symbol
+    else
+      raise ArgumentError, "Expect a symbol or a string not: #{theYamlType}"
+    end
+
+    yamlTypes = aliases.dup
+    yamlTypes << theYamlType
+    yamlTypes.map! { |x| x.to_s.sub(/^!/, '') }
+
+    undef_method :to_yaml_type
+    old_to_yaml = :"#{theYamlType}_to_yaml"
+    alias_method old_to_yaml, :to_yaml
+    suppress(NoMethodError, NameError) { remove_method :to_yaml }
+
+    define_method(:to_yaml_type) { "!#{theYamlType}" }
+
+    theClass = self
+    yamlTypes.each do |yamlType|
+      YAML.add_builtin_type(yamlType) do |type, val|
+        theClass.yaml_load val
+      end
+    end
+  end
+
+  def to_yaml ( opts={} )
+    if respond_to? :to_yaml_string
+      YAML::quick_emit(self.object_id, opts) do |out|
+        out << "#{to_yaml_type} #{to_yaml_string}"
+      end
+    else
+      send(old_to_yaml, opts)
+    end
+  end
+
+
+  module Assertions
+
+    # @val is here to receive the result of YAML::load,
+    # @str receives the result of X.to_yaml,
+    # @ref is the reference string
+    attr_accessor :val, :str, :ref
+
+    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, ref, options={} )
+      assert_nothing_raised { @str = anObject.to_yaml(options) }
+      if ref.is_a? Regexp
+        assert_match(ref, @str)
+      else
+        assert_equal(ref, @str)
+      end
+    end
+
+  end # module Assertions
+
+
+end # module YamlExtension
+

data/test/check-core_ex.yml

@@ -1,12 +1,10 @@
 ---
 
-CoreEx Main Test Suite:
+CoreEx Main Test Suite: !S::Iterate
 
-    strategy: Glob
-    glob    : <<pwd>>/*-suite.yml
-    regexp  : !re ([^/]*)\.yml$
+  over: !pathlist <<pwd>>/(*-suite.yml)
+  iter: [it_file, it_name]
 
-    test:
-        <<match>>:
-            strategy: Import
-            import  : <<path>>
+  test:
+    <<it_name>>: !S::Import
+      import: <<it_file>>

data/test/check-pkg-core_ex.yml

@@ -1,15 +1,12 @@
 ---
 
 # Run this suite with -S 'url: scheme://the/url/to/the/ttk/package'
-CoreEx Package Test Suite:
-  strategy: Suite
+CoreEx Package Test Suite: !S::Suite
   contents:
 
-    - Checkout:
-        strategy: Checkout
+    - Checkout: !S::Checkout
         url: <<url>>
         fatal: true
 
-    - Check the package:
-        strategy: Import
+    - Check the package: !S::Import
         import: <<checkout_dir>>/test/check-core_ex.yml

data/test/sanity/multiple-requires.yml

@@ -1,20 +1,44 @@
 ---
 
-CoreEx Sanity Multiple Requires Test Suite:
+CoreEx Sanity Multiple Requires Test Suite: !S::Suite
 
-  strategy: Cmd
-  command: ruby
-  exit: 0
-  error: ""
-  output: !re 0 failures, 0 errors$
-  args: -I<<pwd>>/../../lib
-  input: |2
-    require 'core_ex'
-    CoreEx.require
-    class TC_ < Test::Unit::TestCase
-      def test_definitions
-        CoreEx.each do |file|
-          assert(RequireSystem.instance.required?(file), "#{file} not present")
-        end
-      end
-    end
+  attributes: !S::Cmd
+    command: ruby
+    exit: 0
+    error: ""
+    output: !re 0 failures, 0 errors$
+    args: -I<<pwd>>/../../lib
+
+  contents:
+    - require:
+        input: |
+          require 'core_ex'
+          require 'test/unit'
+          class TC_ < Test::Unit::TestCase
+            def test_definitions
+              path_list = PathList['<<pwd>>/../../lib/(*).rb']
+              path_list.each do |path, name|
+                path = path.cleanpath.to_s
+                require path
+                assert($LOADED_FEATURES.include?(path),
+                      "#{path} not in $LOADED_FEATURES #{$LOADED_FEATURES.inspect}")
+              end
+            end
+          end
+
+    - lazy loading:
+        input: |
+          require 'core_ex'
+          require 'test/unit'
+          class TC_ < Test::Unit::TestCase
+            def test_definitions
+              PathList['<<pwd>>/../../lib/(*).rb'].each do |path, name|
+                assert_nothing_raised("cannot camelize #{name}") do
+                  @camel = name.camelize
+                end
+                assert_nothing_raised("#@camel not defined?") do
+                  @camel.constantize
+                end
+              end
+            end
+          end