core_ex 0.3.1 → 0.4.0

data/ChangeLog

@@ -0,0 +1,79 @@
+2005-10-03  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Bump to 0.4.
+
+	* SPEC.dyn.yml: Update.
+	* SPEC.yml: Just use ci.
+	* NEWS: Add the 0.4 section.
+
+2005-10-03  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Some fixes before the release.
+
+	* lib/core_ex/rakefile_base.rf: Fix a missing uttk renaming.
+	Make vendor_dev recursive for vcs based dependencies.
+	* lib/core_ex.rb: Change a default value in core_ex_require.
+	* SPEC.yml: Remove the 'commit_dir: ..'.
+
+2005-10-02  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Improve rakefile_base.rf to support developper version of vendor.
+
+	* lib/core_ex/rakefile_base.rf: Add vendor_dev, revendor_dev,
+	clobber_vendor_dev. Dependencies in SPEC.yml can now be hashes.
+	* SPEC.yml: Update to the hash mode for dependencies.
+
+2005-10-02  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	CoreEx now support YAML in ruby 1.8.3.
+
+	* lib/yaml_extension.rb,
+	* lib/core_ex/pathname.rb,
+	* lib/core_ex/yaml.rb,
+	* lib/core_ex/proc.rb,
+	* lib/core_ex.rb: Adapt to taguri and add some dynamic fixes.
+	Use a global variable for CORE_EX_VENDORS.
+
+2005-10-02  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Two fixes in object extensions.
+
+	* lib/core_ex/object/the_first_time.rb: Rename just_one_time to
+	just_once.
+	* lib/core_ex/object/singleton_class.rb: Adapt the test to the new
+	behavior of superclass in ruby 1.8.3.
+
+2005-10-02  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Add a module extension to ease the use of in place methods.
+
+	* lib/core_ex/module/in_place.rb: New. Simply make a new method which
+	dup the object and call the in place method on it.
+
+2005-09-29  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Rename TTK to Uttk.
+
+	* lib/core_ex.rb: Raise a LoadError if rubygems cannot be really loaded.
+
+	* test/check-pkg-core_ex.yml,
+	* lib/core_ex/rakefile_base.rf,
+	* vcs/vcs_core_ex.rb: Renaming.
+
+2005-09-25  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Use <<ruby>> instead of ruby.
+
+	* test/sanity/multiple-requires.yml: Update.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Some packaging changes.
+
+	* ChangeLog: New.
+	* vcs/vcs_core_ex.rb: New. Methods are cxci, core_ex_commit but
+        just commit or ci works too (Vcs 0.4).
+
+	* test/sanity/single-requires.yml: Use <<ruby>> instead of ruby.
+
+See ../ChangeLog for previous entries.

data/NEWS

@@ -1,3 +1,10 @@
+= New in 0.4, 2005-10-03:
+
+  This release is mainly a bugfix release compatible with ruby 1.8.3!
+
+  * CoreEx::Module::InPlace:
+      Add a module extension to ease the use of in place methods.
+
 = New in 0.3, 2005-09-15:
 
   * Architecture:
@@ -53,8 +60,8 @@
 = New in 0.1, 2005-05-31:
 
   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
+  standard  library of Ruby. Thus some classes and modules like Pathname, Time,
+  Enumerable,  Exception,  FileUtils,  String, and YAML are extended. There are
   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.

data/README

@@ -1 +1,7 @@
+CoreEx  is  designed  to  provides  a  simple but quite useful extension of the
+standard  library  of  Ruby.  Thus  some  classes  and  modules  like Pathname,
+Enumerable,  Exception,  FileUtils,  String, YAML, Module, Class and Object are
+extended.  There  are  also  some  new  features like DTime, TempPath, Version,
+embedded_tests, FileList (almost from rake), and a common Rakefile.
+
 Coming Soon.

data/Rakefile

@@ -3,5 +3,6 @@
 # License::   Ruby License
 # Revision::  $Id$
 
-$: << 'lib'
-load 'core_ex/rakefile_base.rf'
+core_ex = File.join(File.dirname(__FILE__), 'lib', 'core_ex')
+require core_ex
+load "#{core_ex}/rakefile_base.rf"

data/SPEC.dyn.yml

@@ -1,10 +1,10 @@
 --- !ruby/object:OpenStruct 
 table: 
-  :url: svn://svn.feydakins.org/ruby_ex/trunk/core_ex
   :version_id: ''
+  :date: "Mon, 03 Oct 2005"
   :version: !ruby/object:Version 
-    build: 1
+    build: 0
     major: 0
-    minor: 3
-    revision: 356
-  :date: "Fri, 16 Sep 2005"
+    minor: 4
+    revision: 387
+  :url: svn://svn.feydakins.org/ruby_ex/trunk/core_ex

data/SPEC.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = %q{core_ex}
-  s.version = "0.3.1"
-  s.date = %q{2005-09-16}
+  s.version = "0.4.0"
+  s.date = %q{2005-10-03}
   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.authors = ["Nicolas Despr\350s", "Nicolas Pouillard"]
-  s.files = ["lib/core_ex.rb", "lib/d_time.rb", "lib/dumpable_proc.rb", "lib/path_list.rb", "lib/temp_path.rb", "lib/version.rb", "lib/yaml_extension.rb", "lib/core_ex/embedded_tests.rb", "lib/core_ex/enumerable.rb", "lib/core_ex/exception.rb", "lib/core_ex/file_utils.rb", "lib/core_ex/pathname.rb", "lib/core_ex/proc.rb", "lib/core_ex/rakefile_base.rf", "lib/core_ex/require.rb", "lib/core_ex/string.rb", "lib/core_ex/time.rb", "lib/core_ex/try_dup.rb", "lib/core_ex/yaml.rb", "lib/core_ex/dependencies_ext/constant_load_path.rb", "lib/core_ex/module/attr_once.rb", "lib/core_ex/module/import.rb", "lib/core_ex/module/mix_in_with_args.rb", "lib/core_ex/object/instance_eval_with_args.rb", "lib/core_ex/object/singleton_class.rb", "lib/core_ex/object/the_first_time.rb", "lib/test/unit/u_i/yaml/test_runner.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.files = ["lib/core_ex.rb", "lib/d_time.rb", "lib/dumpable_proc.rb", "lib/path_list.rb", "lib/temp_path.rb", "lib/version.rb", "lib/yaml_extension.rb", "lib/core_ex/embedded_tests.rb", "lib/core_ex/enumerable.rb", "lib/core_ex/exception.rb", "lib/core_ex/file_utils.rb", "lib/core_ex/pathname.rb", "lib/core_ex/proc.rb", "lib/core_ex/rakefile_base.rf", "lib/core_ex/require.rb", "lib/core_ex/string.rb", "lib/core_ex/time.rb", "lib/core_ex/try_dup.rb", "lib/core_ex/yaml.rb", "lib/core_ex/dependencies_ext/constant_load_path.rb", "lib/core_ex/module/attr_once.rb", "lib/core_ex/module/import.rb", "lib/core_ex/module/in_place.rb", "lib/core_ex/module/mix_in_with_args.rb", "lib/core_ex/object/instance_eval_with_args.rb", "lib/core_ex/object/singleton_class.rb", "lib/core_ex/object/the_first_time.rb", "lib/test/unit/u_i/yaml/test_runner.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", "ChangeLog", "NEWS", "Rakefile", "README", "SPEC.dyn.yml", "SPEC.gemspec", "SPEC.yml"]
   s.add_dependency(%q<activesupport>, ["~> 1.1.1"])
 end

data/SPEC.yml

@@ -22,8 +22,7 @@ root_test_suite: test/check-pkg-core_ex.yml
 rdoc_dir: doc/html
 tags_url: svn://svn.feydakins.org/ruby_ex/tags
 
-commit_command: rxci
-commit_dir: ..
+commit_command: ci
 
 rdoc_files: !filelist
   - README
@@ -37,6 +36,8 @@ pkg_files: !filelist
   - '[A-Z]*'
 
 dependencies:
-  activesupport: [~> 1.1.1, 5161/activesupport-1.1.1.tgz]
+  activesupport:
+    gem: ~> 1.1.1
+    tarball: 5161/activesupport-1.1.1.tgz
 
 ttk_version: ~> 0.3.0

data/lib/core_ex/module/in_place.rb

@@ -0,0 +1,28 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: in_place.rb 381 2005-10-02 14:34:28Z ertai $
+
+module CoreEx
+
+  module Module
+
+    module InPlace
+
+      def in_place ( *syms )
+        syms.each do |sym|
+          sym = sym.to_s.sub(/!*$/, '')
+          module_eval "
+            def #{sym} ( *a, &b )
+              dup.#{sym}!(*a, &b)
+            end
+          "
+        end
+      end
+
+    end # module InPlace
+
+  end # module Module
+
+end # module CoreEx
+

data/lib/core_ex/object/singleton_class.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: singleton_class.rb 332 2005-09-04 14:01:01Z ertai $
+# Revision::  $Id: singleton_class.rb 382 2005-10-02 14:49:42Z ertai $
 
 
 module CoreEx
@@ -54,7 +54,8 @@ module CoreEx
           end
           assert_equal @string.singleton_class.object_id,
                        @string.singleton_class.object_id, 'not the same object id'
-          assert_equal ::String, @string.singleton_class.superclass, 'bad super class'
+          assert_equal ::String, @string.singleton_class.ancestors.first,
+                       'bad super class'
         end
 
         def test_define_and_undef_singleton_method

data/lib/core_ex/object/the_first_time.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: the_first_time.rb 332 2005-09-04 14:01:01Z ertai $
+# Revision::  $Id: the_first_time.rb 382 2005-10-02 14:49:42Z ertai $
 
 
 module CoreEx
@@ -19,7 +19,7 @@ module CoreEx
         block[]
       end
 
-      alias_method :just_one_time, :the_first_time
+      alias_method :just_once, :the_first_time
 
     end # module TheFirstTime
 
@@ -29,4 +29,4 @@ end # module CoreEx
 
 test_section __FILE__ do
 
-end
+end

data/lib/core_ex/pathname.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: pathname.rb 351 2005-09-14 08:33:42Z ertai $
+# $Id: pathname.rb 383 2005-10-02 16:48:09Z ertai $
 
 
 
@@ -291,7 +291,7 @@ test_section __FILE__ do
 
       def test_yaml
         str = 'foo/bar/baz.rb'
-        assert_yaml_load "--- !path #{str}", ::Pathname, str.to_path
+        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

data/lib/core_ex/proc.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: proc.rb 334 2005-09-04 14:29:40Z ertai $
+# Revision::  $Id: proc.rb 383 2005-10-02 16:48:09Z ertai $
 
 
 module CoreEx
@@ -65,7 +65,7 @@ module CoreEx
       end
 
       def test_yaml
-        assert_yaml_load "--- !proc 3 + 7", Proc
+        assert_yaml_load "!proc 3 + 7", Proc
         assert_yaml_dump @val, @ref
         assert_equal(10, @val[])
       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 352 2005-09-15 01:43:03Z ertai $
+# Revision::  $Id: rakefile_base.rf 386 2005-10-03 00:02:16Z ertai $
 
 require 'core_ex'
 require 'ostruct'
@@ -80,16 +80,19 @@ task :default => [ :check ]
 task :ruby_ex => [ :spec ] do
   require_gem('ruby_ex', SPEC.ruby_ex_version || '~> 0.2.0')
   require 'ruby_ex'
+  Commands.import!
+  $runner = Commands::Runners::System.new
+  $runner.raise_on_failures
+  $runner.make_verbose
 end
 
 
-# desc 'Setup the ttk command'
-task :ttk => [ :spec, :ruby_ex ] do
-  require_gem('ttk', SPEC.ttk_version || '~> 0.3.0')
-  require 'ttk'
-  Commands.import!
-  def ttk ( *a, &b )
-    cmd = TTK.bin[*a]
+# desc 'Setup the uttk command'
+task :uttk => [ :spec, :ruby_ex ] do
+  require_gem('uttk', SPEC.uttk_version || '~> 0.3.0')
+  require 'uttk'
+  def uttk ( *a, &b )
+    cmd = Uttk.bin[*a]
     cmd.input = b[] if b
     cmd.output = STDOUT
     cmd.error = STDERR
@@ -100,8 +103,8 @@ end
 
 
 desc 'Launch all test suites'
-task :check => [ :ttk, :spec, :dyn_spec ] do
-  ttk '-l', 'check-log', '-S', 'url: file://<<pwd>>', '-C',
+task :check => [ :uttk, :spec, :dyn_spec ] do
+  uttk '-l', 'check-log', '-S', 'url: file://<<pwd>>', '-C',
       SPEC.root_test_suite
 end
 clean_task :check do
@@ -111,22 +114,20 @@ end
 
 
 desc 'Check generated packages'
-task :distcheck => [ :ttk, :package ] do
+task :distcheck => [ :uttk, :package ] do
   urls = []
   Pathname.glob('pkg/*') do |path|
     next unless path.file?
     urls << "file://#{path.expand_path}"
   end
-  ttk '-l', 'distcheck-log' 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}
+  uttk '-l', 'distcheck-log' do %Q[
+    Check generated packages: !S::Iterate
+      over: #{urls.inspect}
+      iter: url
+      test:
+        'Check the package: <<url>>': !S::Import
+          symbols: { url: <<url>> }
+          import : #{SPEC.root_test_suite}
     ]
   end
 end
@@ -256,7 +257,11 @@ file GEM_SPEC.to_s => [ :spec, :spec_pkg_files, :dyn_spec, :rdoc_spec ] do
 
     if SPEC.dependencies
       SPEC.dependencies.each do |name, version|
-        s.add_dependency(name, (version.is_a? Array)? version.first : version)
+        case version
+          when Array then version = version.first
+          when Hash  then version = version['gem']
+        end
+        s.add_dependency(name, version)
       end
     end
 
@@ -351,7 +356,7 @@ end
 # desc 'Common tasks for a release'
 task :common_release =>
   [
-    :ttk,
+    :uttk,
     :vcs,
 
     :release_confirm,
@@ -565,23 +570,41 @@ clean_task :publish_package do
 end
 
 
-
 task :vendor => [ :spec, :ruby_ex ] do
+  dev = $developpement_mode
+  $developpement_mode = false
   unless VENDOR.directory?
-    say "Creating the vendor directory..."
+    say "Creating the #{(dev)? 'developpement ' : ''}vendor directory..."
     VENDOR.mkpath
     require 'uri_ex'
     if SPEC.dependencies
       SPEC.dependencies.each do |name, version|
-        next unless version.is_a? Array
-        url = version.last
+        url = nil
+        case version
+          when Array then url = version.last
+          when Hash
+            if dev and version['vcs']
+              url = version['vcs']
+            else
+              url = version['tarball']
+            end
+          else next
+        end
+        next if url.nil?
         if url =~ /^\d+\/[^\/]+$/
           url = "http://rubyforge.org/frs/download.php/#{url}"
         end
         url = URI.parse(url)
-        dest = VENDOR + url.pathname.basename.ext.to_s.sub(/\.tar$/, '').to_path
+        dest = VENDOR + name
         STDERR.puts "#{url} => #{dest}"
-        FileType.guess(url.checkout).extract.path.mv(dest)
+        out = FileType.guess(url.checkout.first)
+        out = out.extract if out.extractable?
+        out.path.mv(dest)
+        if dev and version['vcs'] and (dest + 'SPEC.yml').exist?
+          cmd = $0.to_cmd['vendor_dev'] > [STDOUT, STDERR]
+          cmd.dir = dest
+          data = cmd.run($runner)
+        end
       end
     end
   end
@@ -591,4 +614,17 @@ clean_task :vendor do
   VENDOR.rm_rf
 end
 
-task :revendor => [:clobber_vendor, :vendor]
+task :revendor => [:clobber_vendor, :vendor]
+
+
+
+task :vendor_dev => [ :set_developpement_mode, :vendor ]
+
+clean_task :vendor_dev => [:clobber_vendor]
+
+task :revendor_dev => [:clobber_vendor_dev, :vendor_dev]
+
+$developpement_mode ||= false
+task :set_developpement_mode do
+  $developpement_mode = true
+end

data/lib/core_ex/yaml.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: yaml.rb 342 2005-09-08 01:12:48Z ertai $
+# Revision::  $Id: yaml.rb 383 2005-10-02 16:48:09Z ertai $
 
 
 module CoreEx
@@ -62,29 +62,43 @@ class Array
 
   alias_method :old_to_yaml, :to_yaml
 
-  def to_yaml ( opts={} )
-    em = opts[:Emitter]
-    if (opts[:Inline] or (em and em.options[:Inline])) and not is_complex_yaml?
-      YAML::quick_emit(self.object_id, opts) do |out|
-        out << '['
-        first = true
-        each do |x|
-          if first
-            first = false
-          else
-            out << ', '
+  if HAVE_YAML_TAGURI
+    def to_yaml ( opts={} )
+      inline = nil
+      if not opts.is_a?(YAML::Syck::Emitter) and opts[:Inline] and not is_complex_yaml?
+        inline = :inline
+      end
+      YAML::quick_emit(object_id, opts) do |out|
+        out.seq( taguri, to_yaml_style || inline ) do |seq|
+          each { |x| seq.add x }
+        end
+      end
+    end
+  else
+    def to_yaml ( opts={} )
+      em = (opts.is_a? YAML::Syck::Emitter)? opts : opts[:Emitter]
+      if (opts[:Inline] or (em and em.options[:Inline])) and not is_complex_yaml?
+        YAML::quick_emit(self.object_id, opts) do |out|
+          out << '['
+          first = true
+          each do |x|
+            if first
+              first = false
+            else
+              out << ', '
+            end
+            x.to_yaml(:Emitter => out)
           end
-          x.to_yaml(:Emitter => out)
+          out << ']'
         end
-        out << ']'
+      else
+        old_to_yaml(opts)
       end
-    else
-      old_to_yaml(opts)
     end
   end
 
 
-  undef_method :is_complex_yaml?
+  suppress(NoMethodError, NameError) { undef_method :is_complex_yaml? }
 
   def is_complex_yaml?
     any? { |x| x.is_complex_yaml? } or inspect.size > 80
@@ -98,31 +112,45 @@ class Hash
 
   alias_method :old_to_yaml, :to_yaml
 
-  def to_yaml ( opts={} )
-    em = opts[:Emitter]
-    if (opts[:Inline] or (em and em.options[:Inline])) and not is_complex_yaml?
-      YAML::quick_emit(self.object_id, opts) do |out|
-        out << '{'
-        first = true
-        each do |k, v|
-          if first
-            first = false
-          else
-            out << ', '
+  if HAVE_YAML_TAGURI
+    def to_yaml ( opts={} )
+      inline = nil
+      if not opts.is_a?(YAML::Syck::Emitter) and opts[:Inline] and not is_complex_yaml?
+        inline = :inline
+      end
+      YAML::quick_emit(object_id, opts) do |out|
+        out.map(taguri, to_yaml_style || inline) do |map|
+          each { |k, v| map.add k, v }
+        end
+      end
+    end
+  else
+    def to_yaml ( opts={} )
+      em = (opts.is_a? YAML::Syck::Emitter)? opts : opts[:Emitter]
+      if (opts[:Inline] or (em and em.options[:Inline])) and not is_complex_yaml?
+        YAML::quick_emit(self.object_id, opts) do |out|
+          out << '{'
+          first = true
+          each do |k, v|
+            if first
+              first = false
+            else
+              out << ', '
+            end
+            k.to_yaml(:Emitter => out)
+            out << ': '
+            v.to_yaml(:Emitter => out)
           end
-          k.to_yaml(:Emitter => out)
-          out << ': '
-          v.to_yaml(:Emitter => out)
+          out << '}'
         end
-        out << '}'
+      else
+        old_to_yaml(opts)
       end
-    else
-      old_to_yaml(opts)
     end
   end
 
 
-  undef_method :is_complex_yaml?
+  suppress(NoMethodError, NameError) { undef_method :is_complex_yaml? }
 
   def is_complex_yaml?
     any? { |x| x.is_complex_yaml? } or inspect.size > 80
@@ -132,7 +160,7 @@ end # class Hash
 
 
 
-YAML.add_builtin_type('!ruby') do |type, val|
+YAML.add_builtin_type('ruby') do |type, val|
   eval val.to_s
 end
 
@@ -146,14 +174,14 @@ test_section __FILE__ do
 
     def test_regexp
       @re = /a.*[bc]$/
-      assert_yaml_load '--- !re a.*[bc]$', Regexp, @re
+      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_yaml_load '!re ["a.*[bc]$", mi]', Regexp, @re
       assert_match(@val, 'afffc')
       assert_match(@val, 'afffC')
       assert_no_match(@val, 'fffb')
@@ -161,55 +189,68 @@ test_section __FILE__ do
     end
 
     def test_range
-      assert_yaml_load "--- !range 0..10", Range, 0..10
+      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_load "!range 0...10", Range, 0...10
       assert_yaml_dump @val, @ref
     end
 
     def test_ruby
-      assert_yaml_load "--- !ruby 2 + 4", Integer, 6
-      assert_yaml_load "--- !ruby '[2, 4]'", Array, [2, 4]
+      assert_yaml_load "!ruby 2 + 4", Integer, 6
+      assert_yaml_load "!ruby '[2, 4]'", Array, [2, 4]
+    end
+
+    class A < String
+      have YamlExtension, :core_ex_yaml_test_a
+      def is_complex_yaml?
+        true
+      end
+      def to_yaml_string
+        to_s
+      end
+      def self.yaml_load ( val )
+        A.new(val)
+      end
     end
 
     def test_array
       opts = { :Inline => true }
-      assert_yaml_load '--- [2, "4"]', Array, [2, '4']
+      assert_yaml_load '[2, "4"]', Array, [2, '4']
       assert_yaml_dump @val, @ref, opts
-      assert_yaml_load '--- [2, "4"]', Array, [2, '4']
-      assert_yaml_dump @val, "--- \n- 2\n- \"4\""
-      assert_yaml_load "--- [2, [!range 1..4]]", Array, [2, [1..4]]
-      assert_yaml_dump @val, "--- \n- 2\n- \n  - !range 1..4", opts
+      assert_yaml_load '[2, "4"]', Array, [2, '4']
+      assert_yaml_dump @val, "- 2\n- \"4\""
+      assert_yaml_load "[2, [!core_ex_yaml_test_a x]]", Array, [2, [A.new('x')]]
+      assert_yaml_dump @val, /- 2\n- (\n  )?- !core_ex_yaml_test_a x/, opts
       arr = (0 .. 25).to_a
       str = arr.join(', ')
       str2 = arr.join("\n- ")
-      assert_yaml_load "--- [#{str}]", Array, arr
-      assert_yaml_dump @val, "--- \n- #{str2}", opts
-      assert_yaml_load '--- [2, {a: 4}]', Array, [2, {'a' => 4}]
+      assert_yaml_load "[#{str}]", Array, arr
+      assert_yaml_dump @val, "- #{str2}", opts
+      assert_yaml_load '[2, {a: 4}]', Array, [2, {'a' => 4}]
       assert_yaml_dump @val, @ref, opts
     end
 
     def test_hash
       opts = { :Inline => true }
-      assert_yaml_load '--- {a: "4"}', Hash, { 'a' => '4' }
+      assert_yaml_load '{a: "4"}', Hash, { 'a' => '4' }
       assert_yaml_dump @val, @ref, opts
-      assert_yaml_load '--- {a: "4"}', Hash, { 'a' => '4' }
-      assert_yaml_dump @val, "--- \na: \"4\""
-      assert_yaml_load "--- {a: [4]}", Hash, { 'a' => [4] }
+      assert_yaml_load '{a: "4"}', Hash, { 'a' => '4' }
+      assert_yaml_dump @val, "a: \"4\""
+      assert_yaml_load "{a: [4]}", Hash, { 'a' => [4] }
       assert_yaml_dump @val, @ref, opts
       hash = Hash[*(0 .. 23).to_a]
       arr = hash.map{|k,v| "#{k}: #{v}"}.sort
       str = arr.join(', ')
       str2 = arr.join('|')
-      assert_yaml_load "--- {#{str}}", Hash, hash
-      assert_yaml_dump @val, /\A--- \n(?:(?:#{str2})\n)*(?:#{str2})\Z/, opts
+      assert_yaml_load "{#{str}}", Hash, hash
+      assert_yaml_dump @val, /\A(?:(?:#{str2})\n)*(?:#{str2})\Z/, opts
     end
 
     def test_no_inline
       opts = { :Inline => false }
       hash = Hash[*(0 .. 3).to_a]
       tree = [hash.dup, hash.dup, hash.dup, hash.dup]
-      @no_inline = "--- \n- \n  0: 1\n  2: 3\n- \n  0: 1\n  2: 3\n- \n  0: 1\n  2: 3\n- \n  0: 1\n  2: 3"
+      @no_inline = /- (\n  )?0: 1\n  2: 3\n- (\n  )?0: 1\n  2: 3\n- (\n  )?0: 1\n  2: 3\n- (\n  )?0: 1\n  2: 3/
       assert_yaml_dump tree, @no_inline, opts
       assert_yaml_dump tree, @no_inline
     end

data/lib/core_ex.rb

@@ -1,10 +1,11 @@
 # 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 352 2005-09-15 01:43:03Z ertai $
+# Revision::  $Id: core_ex.rb 386 2005-10-03 00:02:16Z ertai $
 
 unless defined? CORE_EX_LOADED and CORE_EX_LOADED
   CORE_EX_LOADED = true
+  require 'English'
   $LOADED_FEATURES << 'core_ex.rb' unless $LOADED_FEATURES.include? 'core_ex.rb'
 
   require 'pathname'
@@ -15,23 +16,23 @@ unless defined? CORE_EX_LOADED and CORE_EX_LOADED
   core_ex_long = (CORE_EX_DIR + 'core_ex.rb').to_s
   $LOADED_FEATURES << core_ex_long unless $LOADED_FEATURES.include? core_ex_long
 
-  CORE_EX_VENDORS = [] unless defined? CORE_EX_VENDORS
-  CORE_EX_VENDORS << CORE_EX_DIR.parent + 'vendor'
+  $CORE_EX_VENDORS ||= []
+  $CORE_EX_VENDORS << CORE_EX_DIR.parent + 'vendor'
 
   def core_ex_debug ( &block )
     # STDERR.puts block[].inspect
   end
 
-  def core_ex_vendor_require ( dir_name, dir_version='*' )
-    if CORE_EX_VENDORS.any? { |dir| dir.exist? }
-      dir = Pathname.glob("{#{CORE_EX_VENDORS.join(',')}}/#{dir_name}#{dir_version}/{lib,}").first
+  def core_ex_vendor_require ( dir_name, sub_dir='lib' )
+    if $CORE_EX_VENDORS.any? { |dir| dir.exist? }
+      dir = Pathname.glob("{#{$CORE_EX_VENDORS.join(',')}}/#{dir_name}/{#{sub_dir},}").first
       if dir and dir.directory?
         if defined? CoreEx::Pathname and Pathname.include? CoreEx::Pathname
           dir.load_path!
         else
           $LOAD_PATH << dir.to_s
         end
-        core_ex_debug { [:vendor, dir_name, dir_version] }
+        core_ex_debug { [:vendor, dir_name, sub_dir] }
       else
         raise LoadError, "no vendor dir #{dir}"
       end
@@ -41,11 +42,12 @@ unless defined? CORE_EX_LOADED and CORE_EX_LOADED
   end
 
   def core_ex_register_vendor ( dir )
-    CORE_EX_VENDORS << dir unless CORE_EX_VENDORS.include? dir
+    $CORE_EX_VENDORS << dir unless $CORE_EX_VENDORS.include? dir
   end
 
   begin
     require 'rubygems'
+    raise LoadError, 'RubyGems not loaded' unless defined? RubyGems
     def core_ex_gem_require ( gem_name, gem_version='> 0' )
       require_gem gem_name, gem_version
       core_ex_debug { [:require_gem, gem_name, gem_version] }
@@ -56,9 +58,9 @@ unless defined? CORE_EX_LOADED and CORE_EX_LOADED
     end
   end
 
-  def core_ex_require ( name, gem_name=name, dir_name=name, gem_version='> 0', dir_version='*' )
+  def core_ex_require ( name, gem_name=name, dir_name=gem_name, gem_version='> 0', sub_dir='lib' )
     begin
-      core_ex_vendor_require(dir_name, dir_version)
+      core_ex_vendor_require(dir_name, sub_dir)
     rescue LoadError => ex
       begin
         core_ex_gem_require(gem_name, gem_version)
@@ -70,7 +72,64 @@ unless defined? CORE_EX_LOADED and CORE_EX_LOADED
 
   verbose = $VERBOSE
   $VERBOSE = false
-  core_ex_require 'active_support', 'activesupport', 'activesupport', '~> 1.1.1', '-1.1.1'
+
+  # <<< Dynamic fix: bug: Ruby 1.8.3 vs active_support 1.1.1
+  require 'logger'
+  class Logger
+    Format = 42 unless defined? Format
+  end
+  # >>>
+
+  core_ex_require 'active_support', 'activesupport', 'activesupport', '~> 1.1.1'
+
+  # <<< Dynamic patch: Yaml warnings in ruby 1.8.3
+  begin
+    silence_warnings { require 'yaml/tag' }
+    class Module
+      alias yaml_as_bugged yaml_as
+      def yaml_as( tag, sc = true )
+        class_eval <<-"end;", __FILE__, __LINE__
+          attr_writer :taguri
+          def taguri
+            if respond_to? :to_yaml_type
+              YAML::tagurize( to_yaml_type[1..-1] )
+            else
+              return @taguri if defined? @taguri
+              tag = #{ tag.dump }
+              if self.class.yaml_tag_subclasses? and self.class != YAML::tagged_classes[tag]
+                tag = "\#{ tag }:\#{ self.class.yaml_tag_class_name }"
+              end
+              tag
+            end
+          end
+          def self.yaml_tag_subclasses?; #{ sc ? 'true' : 'false' }; end
+        end;
+        YAML::tag_class tag, self
+      end
+    end
+    silence_warnings { require 'yaml' }
+    module YAML
+      module Syck
+        class Parser
+          alias initialize_bugged initialize
+          def initialize ( *a, &b )
+            @input = nil
+            initialize_bugged(*a, &b)
+          end
+        end
+      end
+    end
+    class Object
+      def is_complex_yaml?
+        false
+      end
+    end
+    HAVE_YAML_TAGURI = true
+  rescue LoadError => ex
+    HAVE_YAML_TAGURI = false
+  end
+  # >>>
+
 
 # <<< little active_support patch
 module Inflector
@@ -169,6 +228,7 @@ class Module
   include CoreEx::Module::MixInWithArgs
   include CoreEx::Module::AttrOnce
   include CoreEx::Module::Import
+  include CoreEx::Module::InPlace
 end # class Module
 
 class Object
@@ -237,6 +297,9 @@ class Time
   include CoreEx::Time
 end # class Time
 
+
+CoreEx.dir.load_path!
+
 CoreEx::Yaml.import!
 CoreEx::TryDup.import!
 

data/lib/dumpable_proc.rb

@@ -1,12 +1,21 @@
 # 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 334 2005-09-04 14:29:40Z ertai $
+# Revision::  $Id: dumpable_proc.rb 362 2005-09-24 17:12:57Z ertai $
 
 
 class DumpableProc < Proc
 
   def self.new ( str )
+    # FIXME imporve prevent from ruby injections
+    if str =~ /[{}]/
+      str = str.gsub(/[^{}]/, '')
+      while str.gsub!(/\{\}/, '')
+      end
+      unless str.empty?
+        raise ArgumentError, "Bad block: bad `{' `}' equilibration"
+      end
+    end
     pr = super(&eval("proc { #{str} }"))
     pr.instance_eval { @str = str.freeze }
     pr

data/lib/yaml_extension.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: yaml_extension.rb 355 2005-09-15 23:18:43Z ertai $
+# Revision::  $Id: yaml_extension.rb 383 2005-10-02 16:48:09Z ertai $
 
 require 'yaml'
 
@@ -11,7 +11,7 @@ module YamlExtension
     theYamlType = aliases.shift
     case theYamlType
     when NilClass
-      theYamlType = self.name.downcase
+      theYamlType = self.name.demodulize.underscore
     when String
     when Symbol
     else
@@ -22,12 +22,19 @@ module YamlExtension
     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}" }
+    if HAVE_YAML_TAGURI
+      taguri_ = theYamlType.to_s
+      domain = 'yaml.org,2002' # FIXME 'feydakins.org,2005'
+      taguri_ = "tag:#{domain}:#{taguri_}" unless taguri_ =~ /^tag:/
+      define_method(:taguri) { taguri_ }
+    else
+      suppress(NoMethodError, NameError) { undef_method :to_yaml_type }
+      define_method(:to_yaml_type) { "!#{theYamlType}" }
+    end
 
     theClass = self
     yamlTypes.each do |yamlType|
@@ -37,13 +44,25 @@ module YamlExtension
     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}"
+  if HAVE_YAML_TAGURI
+    def to_yaml ( opts={} )
+      if respond_to? :to_yaml_string
+        YAML::quick_emit(object_id, opts) do |out|
+          out.scalar(taguri, to_yaml_string, :plain)
+        end
+      else
+        send(old_to_yaml, opts)
+      end
+    end
+  else
+    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
-    else
-      send(old_to_yaml, opts)
     end
   end
 
@@ -56,7 +75,7 @@ module YamlExtension
     attr_accessor :val, :str, :ref
 
     def assert_yaml_load ( aString, aClass, anObject=nil )
-      assert_nothing_raised { @val = YAML::load(aString) }
+      assert_nothing_raised { @val = YAML::load("---\n" + aString) }
       assert_kind_of(aClass, @val)
       assert_equal(anObject, @val) unless anObject.nil?
       @ref = aString
@@ -64,6 +83,8 @@ module YamlExtension
 
     def assert_yaml_dump ( anObject, ref, options={} )
       assert_nothing_raised { @str = anObject.to_yaml(options) }
+      @str.gsub!(/---\s*/, '')
+      @str.chomp!
       if ref.is_a? Regexp
         assert_match(ref, @str)
       else

data/test/check-pkg-core_ex.yml

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

data/test/sanity/multiple-requires.yml

@@ -3,7 +3,7 @@
 CoreEx Sanity Multiple Requires Test Suite: !S::Suite
 
   attributes: !S::Cmd
-    command: ruby
+    command: <<ruby>>
     exit: 0
     error: ""
     output: !re 0 failures, 0 errors$

data/test/sanity/single-requires.yml

@@ -7,7 +7,7 @@ CoreEx Sanity Single Requires Test Suite: !S::Iterate
   test:
     <<it_name>>: !S::Suite
       attributes: !S::Cmd
-        command: ruby
+        command: <<ruby>>
         exit: 0
         error: ""
         output: !re 0 failures, 0 errors$

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.10
 specification_version: 1
 name: core_ex
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2005-09-16 00:00:00 +02:00
+  version: 0.4.0
+date: 2005-10-03
 summary: CoreEx is a proposal for a standard library extension.
 require_paths: 
   - lib
@@ -31,8 +31,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
   - Nicolas Despr�s
   - Nicolas Pouillard
@@ -59,6 +57,7 @@ files:
   - lib/core_ex/dependencies_ext/constant_load_path.rb
   - lib/core_ex/module/attr_once.rb
   - lib/core_ex/module/import.rb
+  - lib/core_ex/module/in_place.rb
   - lib/core_ex/module/mix_in_with_args.rb
   - lib/core_ex/object/instance_eval_with_args.rb
   - lib/core_ex/object/singleton_class.rb
@@ -81,6 +80,7 @@ files:
   - test/sanity/multiple-requires.yml
   - test/sanity/single-requires.yml
   - AUTHORS
+  - ChangeLog
   - NEWS
   - Rakefile
   - README