ruby_ex 0.2.0 → 0.3.0

data/ChangeLog

@@ -1,3 +1,180 @@
+2005-10-03  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Fix the SPEC.dyn.yml.
+
+	* SPEC.dyn.yml: Re-update.
+
+2005-10-03  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Bump RubyEx to 0.3.
+
+	* SPEC.dyn.yml: Update.
+	* SPEC.yml: Update CoreEx dependency to 0.4.
+	* NEWS: Add an entry.
+
+2005-10-03  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Little DLogger fix for ruby 1.8.2.
+
+	* lib/d_logger.rb: Suppress a warning with ruby 1.8.2.
+	Fix the test for ruby 1.8.2.
+
+2005-10-02  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Upgrade RubyEx to ruby 1.8.3.
+
+	* lib/uri/file.rb, lib/uri/ftp_ex.rb, lib/uri/http_ex.rb: Make checkout
+	return an array.
+	* lib/ruby_ex.rb: Update the CoreEx require.
+	* lib/d_logger.rb: Update to Logger 1.2.6 in ruby 1.8.3.
+	* lib/drb/insecure_protected_methods.rb: Update the unit test suite.
+	* SPEC.yml: Use a hash for the CoreEx dependency.
+
+2005-09-30  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Add DiffTool a module for the Diff manipulation.
+
+	* lib/diff_tools.rb: New. Provides DiffTools::Diff for set of chunks,
+	DiffTools::Chunk for diffs between just two files, and DiffTools::App
+	a basic command line application. Methods provided are: grep, negative,
+	and exclude.
+
+2005-09-30  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Add RegexList a class to handle sorting with regular expressions.
+
+	* lib/regex_list.rb: New. Provides RegexList and a PathList extension
+	for ease the PathList sorting.
+
+2005-09-29  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Rename TTK to Uttk.
+
+	* test/check-pkg-ruby_ex.yml, vcs/vcs_ruby_ex.rb: Update.
+
+2005-09-29  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Rename resources to fixtures.
+
+	* test/functional: New.
+	* test/resources: Rename to ...
+	* test/fixtures: ... this.
+	* test/fixtures/my_diff.patch: New.
+	* lib/sym_tbl_gsub.rb,
+	* lib/md5sum.rb,
+	* lib/file_type.rb,
+	* lib/cache.rb,
+	* lib/module/autoload_tree.rb: Update.
+
+2005-09-29  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Add an header option to Sendmail.
+
+	* lib/sendmail.rb: With this option you can easily add your fields to
+	the header.
+
+2005-09-29  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Two fixes in Commands.
+
+	* lib/commands/runners/fork.rb: Clean TempPath before exec.
+	* lib/commands/runners/runner.rb: Flush outputs, after reopen.
+
+2005-09-25  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	More <<ruby>>.
+
+	* test/sanity/multiple-requires.yml, test/sanity/single-requires.yml:
+        Update.
+
+2005-09-25  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Fix a test suite.
+
+	* core_ex/test/check-pkg-core_ex.yml: Add a weight 0.
+
+2005-09-25  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Fix ruby_ex test suites.
+
+	* test/check-pkg-ruby_ex.yml: Add a missing !pathlist.
+	* test/check-ruby_ex.yml: Update to !S:: and add a weight 0.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Remove the inopportunely added .DS_Store.
+
+	* test/resources/.DS_Store: Remove.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Update vcs support and add some fixtures.
+
+	* test/check-ruby_ex.yml: Upgrade to Iterate and !S::.
+	* vcs/vcs_ruby_ex.rb: Upgarde to Vcs 0.4 protocol 0.1.
+        With just Vcs 0.4 just use `commit' or `ci'.
+	* NEWS: Typo.
+
+        Add some fixtures.
+	* test/resources/foo.bz2: New.
+	* test/resources/.DS_Store: New.
+	* test/resources/foo.gz.zip: New.
+	* test/resources/foo.rb.gz: New.
+	* test/resources/foo.tar.bz2: New.
+	* test/resources/foo.tar: New.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Symtbl gsub, FileType, OHash and Yaml...
+
+	* lib/sym_tbl_gsub.rb: Keep pattern not yet expansed in a list, and
+        re-inject them when the symtbl is defined.
+	* lib/file_type.rb: Remove the FIXME concerning the pipe issue which
+        is solved. Adapt tests to Runners::Mockable.
+	* lib/ruby_ex.rb: Add a missing `lib/'.
+	* lib/ordered_hash.rb: Now have a YamlExtension.
+	* lib/yaml/chop_header.rb: Typo on variable name.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Fix the Pipe support in Commands.
+
+	* lib/commands/pipe.rb: Reimplement.
+	* lib/commands/command.rb (sh_args): Generalize.
+	* lib/commands/datas/composite.rb: More methods to make it invisble.
+	* lib/commands/datas/data.rb: Some fixes.
+	* lib/commands/runners/mock.rb: Rename to ...
+	* lib/commands/runners/mockable.rb: ... this and make it a module.
+	* lib/commands/runners/runner.rb: Add Runner#initialize_copy.
+	* lib/commands.rb: Add a documention example.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	[Hookable/Hooker] Support for hook disabling.
+
+	* lib/hookable.rb: Add Hookable#disable_hook and Hookable::disable_hook.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Fix a bug with checkout in URIs.
+
+	* lib/uri/ssh.rb, lib/uri/svn.rb: Also return the target.
+	* lib/uri_ex.rb: Use to yaml extensions.
+
+2005-09-24  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	Some portablity fixes.
+
+	* core_ex/Rakefile: More robust initialization.
+	* core_ex/lib/yaml_extension.rb: Better class conversion for the yaml
+        type, and suppress some Exceptions.
+	* core_ex/lib/core_ex/rakefile_base.rf: Use the !S:: Uttk style.
+	* core_ex/lib/core_ex/yaml.rb: Suppress some Exceptions, take care of
+        the emitter.
+	* core_ex/lib/core_ex.rb: Require 'English', load core_ex path.
+	* core_ex/lib/dumpable_proc.rb: Protect against code injection.
+	* core_ex/NEWS, core_ex/README: Typo.
+
 2005-09-16  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	Bump RubyEx to 0.2.

data/NEWS

@@ -1,14 +1,23 @@
-= New in 0.2, 2005-09-16:
+= New in 0.3, 2005-10-03:
+
+    This release make RubyEx compatible with ruby 1.8.3!
+
+    * DiffTool:
+	Add DiffTool a module for the Diff manipulation.
+    * RegexList:
+	Add RegexList a class to handle sorting with regular expressions.
+    * Sendmail:
+	Add an header option to specify header fields on the fly.
 
-  * Many many changes and new things for RubyEx.
+= New in 0.2, 2005-09-16:
 
-  * Remove many requires which are now useless, many are not yet
+  * Remove many requires which are now useless; many are not yet
     suppressed.
 
-  * Renaming to follow the camelize/underscore convention.
+  * Rename classes and modules to follow the camelize/underscore convention.
 
   * Commands:
-      Provides a object oriented way to manage, combine and run your commands.
+      Provides an object oriented way to manage, combine and run your commands.
 
       Example:
         require 'rubygems' ; require_gem 'ruby_ex' ; require 'ruby_ex'
@@ -21,13 +30,13 @@
         puts data.output.read
 
         (ls > STDOUT).system
-        
+
         cmd = ls['*.rb'] | wc['-l'] > out
         cmd.system
 
         puts out.read
 
-  * RPath: Add RPath, a basic (but powerful) way to search your ruby data.
+  * RPath: Add RPath, a simple way to search your ruby data.
 
   * BlankSlate, Mocks, VerboseObject, and AutoObject:
 
@@ -40,7 +49,7 @@
       - VerboseObject: Proxies that display received method calls and verbosify
           objects recursivly.
       - AutoObject: It's like a verbose object without a real object inside.
-  
+
   * Text:
       A little text manipulation class.
       Transformation available are:
@@ -57,19 +66,19 @@
       - Add many unit tests.
       - Add gem filetype support (with the install method).
 
-  * MetaFactory: A class that help to produce objects that
+  * MetaFactory: A class that help to produce objects which
       share the same initializion step.
 
   * Html encode: Support accent encoding for the iso latin1 charset.
 
-  * URI: Support for Mysql and Pgsql.
+  * URI: Support for MySQL and PgSQL.
 
   * HashEval:
       Provides a block in which methods name are keys and arguments/blocks
       are values.
 
   * SymTbl (Symbol Table):
-      Add symtbl_gsub methods to provide a global substitution sheme over any
+      Add symtbl_gsub methods which provide a global substitution sheme over any
       objects.
 
 = New in 0.1, 2005-05-31:

data/SPEC.dyn.yml

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

data/SPEC.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby_ex}
-  s.version = "0.2.0"
-  s.date = %q{2005-09-16}
+  s.version = "0.3.0"
+  s.date = %q{2005-10-03}
   s.summary = %q{RubyEx contains general purpose Ruby extensions.}
   s.email = ["nicolas.despres@gmail.com", "ertai@feydakins.org"]
   s.homepage = %q{http://api.feydakins.org/ruby_ex}
   s.rubyforge_project = %q{ruby_ex}
   s.description = %q{}
   s.authors = ["Nicolas Despr\350s", "Nicolas Pouillard"]
-  s.files = ["lib/abstract.rb", "lib/abstract_node.rb", "lib/attributed_class.rb", "lib/auto_object.rb", "lib/blank_slate.rb", "lib/cache.rb", "lib/choose.rb", "lib/commands.rb", "lib/config_file.rb", "lib/const_regexp.rb", "lib/d_logger.rb", "lib/daemon.rb", "lib/diff.rb", "lib/drb_ex.rb", "lib/file_type.rb", "lib/generate_id.rb", "lib/genpasswd.rb", "lib/hash_eval.rb", "lib/histogram.rb", "lib/hookable.rb", "lib/hooker.rb", "lib/html_encode.rb", "lib/indexed_node.rb", "lib/io_marshal.rb", "lib/ioo.rb", "lib/kill_all.rb", "lib/labeled_node.rb", "lib/logger_observer.rb", "lib/md5sum.rb", "lib/meta_factory.rb", "lib/method_call.rb", "lib/mocks.rb", "lib/node.rb", "lib/object_monitor.rb", "lib/object_monitor_activity.rb", "lib/observable.rb", "lib/observable_pool.rb", "lib/ordered_hash.rb", "lib/pp_hierarchy.rb", "lib/r_path.rb", "lib/random_generators.rb", "lib/regex_path.rb", "lib/ruby_ex.rb", "lib/safe_eval.rb", "lib/sendmail.rb", "lib/service_manager.rb", "lib/shuffle.rb", "lib/spring.rb", "lib/spring_set.rb", "lib/sym_tbl.rb", "lib/sym_tbl_gsub.rb", "lib/syn_flow.rb", "lib/text.rb", "lib/timeout_ex.rb", "lib/trace.rb", "lib/uri_ex.rb", "lib/verbose_object.rb", "lib/algorithms/simulated_annealing.rb", "lib/commands/command.rb", "lib/commands/datas.rb", "lib/commands/factory.rb", "lib/commands/helpers.rb", "lib/commands/pipe.rb", "lib/commands/runners.rb", "lib/commands/seq.rb", "lib/commands/datas/composite.rb", "lib/commands/datas/data.rb", "lib/commands/datas/factory.rb", "lib/commands/datas/temp.rb", "lib/commands/runners/exec.rb", "lib/commands/runners/fork.rb", "lib/commands/runners/mock.rb", "lib/commands/runners/runner.rb", "lib/commands/runners/system.rb", "lib/drb/drb_observable.rb", "lib/drb/drb_observable_pool.rb", "lib/drb/drb_service.rb", "lib/drb/drb_undumped_attributes.rb", "lib/drb/drb_undumped_indexed_object.rb", "lib/drb/insecure_protected_methods.rb", "lib/mocks/assertions.rb", "lib/mocks/method_logger.rb", "lib/mocks/mock.rb", "lib/mocks/object.rb", "lib/mocks/observer.rb", "lib/module/autoload_tree.rb", "lib/module/hierarchy.rb", "lib/module/instance_method_visibility.rb", "lib/random_generators/random_generator.rb", "lib/random_generators/ruby.rb", "lib/uri/druby.rb", "lib/uri/file.rb", "lib/uri/ftp_ex.rb", "lib/uri/http_ex.rb", "lib/uri/mysql.rb", "lib/uri/pgsql.rb", "lib/uri/ssh.rb", "lib/uri/svn.rb", "lib/yaml/chop_header.rb", "lib/yaml/transform.rb", "lib/yaml/yregexpath.rb", "test/algorithms", "test/check-pkg-ruby_ex.yml", "test/check-ruby_ex.yml", "test/resources", "test/sanity", "test/sanity-suite.yml", "test/stress-tests", "test/test-unit-setup.rb", "test/unit-suite.yml", "test/algorithms/simulated_annealing_test.rb", "test/resources/autoload_tree", "test/resources/foo.tar.gz", "test/resources/foo.txt", "test/resources/tar.gz.log", "test/resources/autoload_tree/A.rb", "test/resources/autoload_tree/B.rb", "test/resources/autoload_tree/foo", "test/resources/autoload_tree/foo/C.rb", "test/sanity/multiple-requires.yml", "test/sanity/single-requires.yml", "test/stress-tests/threads_and_exceptions.yml", "AUTHORS", "ChangeLog", "NEWS", "Rakefile", "README", "SPEC.dyn.yml", "SPEC.gemspec", "SPEC.yml"]
+  s.files = ["lib/abstract.rb", "lib/abstract_node.rb", "lib/attributed_class.rb", "lib/auto_object.rb", "lib/blank_slate.rb", "lib/cache.rb", "lib/choose.rb", "lib/commands.rb", "lib/config_file.rb", "lib/const_regexp.rb", "lib/d_logger.rb", "lib/daemon.rb", "lib/diff.rb", "lib/diff_tools.rb", "lib/drb_ex.rb", "lib/file_type.rb", "lib/generate_id.rb", "lib/genpasswd.rb", "lib/hash_eval.rb", "lib/histogram.rb", "lib/hookable.rb", "lib/hooker.rb", "lib/html_encode.rb", "lib/indexed_node.rb", "lib/io_marshal.rb", "lib/ioo.rb", "lib/kill_all.rb", "lib/labeled_node.rb", "lib/logger_observer.rb", "lib/md5sum.rb", "lib/meta_factory.rb", "lib/method_call.rb", "lib/mocks.rb", "lib/node.rb", "lib/object_monitor.rb", "lib/object_monitor_activity.rb", "lib/observable.rb", "lib/observable_pool.rb", "lib/ordered_hash.rb", "lib/pp_hierarchy.rb", "lib/r_path.rb", "lib/random_generators.rb", "lib/regex_list.rb", "lib/regex_path.rb", "lib/ruby_ex.rb", "lib/safe_eval.rb", "lib/sendmail.rb", "lib/service_manager.rb", "lib/shuffle.rb", "lib/spring.rb", "lib/spring_set.rb", "lib/sym_tbl.rb", "lib/sym_tbl_gsub.rb", "lib/syn_flow.rb", "lib/text.rb", "lib/timeout_ex.rb", "lib/trace.rb", "lib/uri_ex.rb", "lib/verbose_object.rb", "lib/algorithms/simulated_annealing.rb", "lib/commands/command.rb", "lib/commands/datas.rb", "lib/commands/factory.rb", "lib/commands/helpers.rb", "lib/commands/pipe.rb", "lib/commands/runners.rb", "lib/commands/seq.rb", "lib/commands/datas/composite.rb", "lib/commands/datas/data.rb", "lib/commands/datas/factory.rb", "lib/commands/datas/temp.rb", "lib/commands/runners/exec.rb", "lib/commands/runners/fork.rb", "lib/commands/runners/mockable.rb", "lib/commands/runners/runner.rb", "lib/commands/runners/system.rb", "lib/drb/drb_observable.rb", "lib/drb/drb_observable_pool.rb", "lib/drb/drb_service.rb", "lib/drb/drb_undumped_attributes.rb", "lib/drb/drb_undumped_indexed_object.rb", "lib/drb/insecure_protected_methods.rb", "lib/mocks/assertions.rb", "lib/mocks/method_logger.rb", "lib/mocks/mock.rb", "lib/mocks/object.rb", "lib/mocks/observer.rb", "lib/module/autoload_tree.rb", "lib/module/hierarchy.rb", "lib/module/instance_method_visibility.rb", "lib/random_generators/random_generator.rb", "lib/random_generators/ruby.rb", "lib/uri/druby.rb", "lib/uri/file.rb", "lib/uri/ftp_ex.rb", "lib/uri/http_ex.rb", "lib/uri/mysql.rb", "lib/uri/pgsql.rb", "lib/uri/ssh.rb", "lib/uri/svn.rb", "lib/yaml/chop_header.rb", "lib/yaml/transform.rb", "lib/yaml/yregexpath.rb", "test/algorithms", "test/check-pkg-ruby_ex.yml", "test/check-ruby_ex.yml", "test/fixtures", "test/functional", "test/sanity", "test/sanity-suite.yml", "test/stress-tests", "test/test-unit-setup.rb", "test/unit-suite.yml", "test/algorithms/simulated_annealing_test.rb", "test/fixtures/autoload_tree", "test/fixtures/foo.bz2", "test/fixtures/foo.gz.zip", "test/fixtures/foo.rb.gz", "test/fixtures/foo.tar", "test/fixtures/foo.tar.bz2", "test/fixtures/foo.tar.gz", "test/fixtures/foo.txt", "test/fixtures/my_diff.patch", "test/fixtures/tar.gz.log", "test/fixtures/autoload_tree/A.rb", "test/fixtures/autoload_tree/B.rb", "test/fixtures/autoload_tree/foo", "test/fixtures/autoload_tree/foo/C.rb", "test/sanity/multiple-requires.yml", "test/sanity/single-requires.yml", "test/stress-tests/threads_and_exceptions.yml", "AUTHORS", "ChangeLog", "NEWS", "Rakefile", "README", "SPEC.dyn.yml", "SPEC.gemspec", "SPEC.yml"]
   s.add_dependency(%q<highline>, ["~> 1.0.1"])
-  s.add_dependency(%q<core_ex>, ["~> 0.3.1"])
+  s.add_dependency(%q<core_ex>, ["~> 0.4.0"])
 end

data/SPEC.yml

@@ -30,7 +30,10 @@ pkg_files: !filelist
   - '[A-Z]*'
 
 dependencies:
-  core_ex:  [~> 0.3.1, 6077/core_ex-0.3.1.tar.gz]
+  core_ex:
+    gem:     ~> 0.4.0
+    tarball: 6312/core_ex-0.4.0.tar.gz
+    vcs:     svn://svn.feydakins.org/ruby_ex/trunk/core_ex
   highline: [~> 1.0.1, 5143/highline-1.0.1.tgz]
 
 ttk_version: ~> 0.3.0

data/lib/cache.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: cache.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: cache.rb 376 2005-09-29 21:46:32Z ertai $
 
 
 require 'md5sum'
@@ -215,7 +215,7 @@ class CacheTest < Test::Unit::TestCase
       assert(! cache.present?('foo'))
 
       # FIXME man printf + Tempfile + File::md5sum
-      #       resources/foo.txt + TempPath + Path#md5sum
+      #       fixtures/foo.txt + TempPath + Path#md5sum
       tmp_file = Tempfile.new('cache')
       system("man printf > #{tmp_file.path} 2> /dev/null")
       md5 = File.md5sum(tmp_file.path)

data/lib/commands.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: commands.rb 343 2005-09-08 01:32:57Z ertai $
+# Revision::  $Id: commands.rb 365 2005-09-24 17:24:01Z ertai $
 
 AutoloadTree.import!
 require 'abstract'
@@ -12,6 +12,24 @@ require 'commands/datas'
 require 'commands/runners'
 
 
+# Provides an object oriented way to manage, combine and run your commands.
+#
+# Example:
+#   require 'rubygems' ; require_gem 'ruby_ex' ; require 'ruby_ex'
+#   Commands.import!
+#   ls, wc, out = 'ls'.to_cmd, 'wc'.to_cmd, 'out'.to_path
+#
+#   data = ls.system # other runners exist (exec, fork, sh...)
+#
+#   p data.status
+#   puts data.output.read
+#
+#   (ls > STDOUT).system
+#
+#   cmd = ls['*.rb'] | wc['-l'] > out
+#   cmd.system
+# 
+#   puts out.read
 module Commands
 
   autoloaded_module(__FILE__, false)

data/lib/commands/command.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: command.rb 341 2005-09-07 00:01:43Z ertai $
+# Revision::  $Id: command.rb 365 2005-09-24 17:24:01Z ertai $
 
 require 'commands'
 
@@ -240,9 +240,9 @@ module Commands
 
     def sh_args
       args = ''
-      args += " < #{@input.to_s.dump}" if @input
-      args += " > #{@output.to_s.dump}" if @output
-      args += " 2> #{@error.to_s.dump}" if @error
+      [ ['<', input], ['>', output], ['2>', error] ].each do |str, io|
+        args += " #{str} #{io.to_s.dump}" if io and not (io.respond_to? :pipe? and io.pipe?)
+      end
       args
     end
 
@@ -496,7 +496,7 @@ module Commands
         assert_equal('"cp" > "ya"', (@cp > 'ya').to_sh)
         @cat << 'foo > bar' << '< baz'
         assert_equal(
-          '(("cat" "foo > bar" "< baz" < "yay") | ("cp" > "yoy"))',
+          '("cat" "foo > bar" "< baz" < "yay") | ("cp" > "yoy")',
           ((@cat | @cp) < 'yay' > 'yoy').to_sh)
         @wc.error = 'foo'
         assert_equal('"wc" 2> "foo"', @wc.to_sh)

data/lib/commands/datas/composite.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: composite.rb 358 2005-09-16 09:54:04Z ertai $
+# Revision::  $Id: composite.rb 365 2005-09-24 17:24:01Z ertai $
 
 require 'commands'
 
@@ -11,13 +11,15 @@ module Commands
 
     class Composite < Data
 
-      def initialize ( *cmd )
+      attr_accessor :contents
+
+      def initialize ( *contents )
         super()
-        @commands = cmd.flatten
+        @contents = contents.flatten
       end
 
       def each ( &block )
-        @commands.each(&block)
+        @contents.each(&block)
       end
 
       def waitpid
@@ -28,6 +30,26 @@ module Commands
         each { |x| x.kill(*a, &b) }
       end
 
+      def << ( data )
+        @contents << data
+      end
+
+      def status
+        @contents.last.status
+      end
+
+      def output
+        @contents.last.output
+      end
+
+      def error
+        @contents.last.error
+      end
+
+      def input
+        @contents.first.input
+      end
+
     end # class Composite
 
   end # module Datas

data/lib/commands/datas/data.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: data.rb 360 2005-09-16 12:17:16Z ertai $
+# Revision::  $Id: data.rb 365 2005-09-24 17:24:01Z ertai $
 
 require 'commands'
 
@@ -84,7 +84,7 @@ module Commands
       def output= ( anObject )
         if anObject.is_a? Pathname
           anObject = anObject.dup
-          anObject.open_mode = @open_mode 
+          anObject.open_mode = @open_mode
         end
         @output = anObject
       end
@@ -93,7 +93,7 @@ module Commands
       def error= ( anObject )
         if anObject.is_a? Pathname
           anObject = anObject.dup
-          anObject.open_mode = @open_mode 
+          anObject.open_mode = @open_mode
         end
         @error = anObject
       end
@@ -137,7 +137,8 @@ module Commands
 
       def clean
         kill
-        [@input, @output, @error].each do |stream|
+        [input, output, error].each do |stream|
+          next if stream.nil? or stream.is_a? IO
           if stream.is_a? File
             stream.close
             stream = stream.path.to_path 
@@ -150,7 +151,7 @@ module Commands
       end
 
       def self.clean_all
-        @@datas.dup.each { |data| data.kill }
+        @@datas.dup.each { |data| data.clean }
       end
 
       at_exit { clean_all }