ruby_ex 0.1.2 → 0.2.0

data/lib/commands.rb

@@ -1,10 +1,9 @@
 # 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 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: commands.rb 343 2005-09-08 01:32:57Z ertai $
 
-require 'ruby_ex'
-require 'module/autoload_tree'
+AutoloadTree.import!
 require 'abstract'
 require 'hookable'
 require 'hooker'

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 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: command.rb 341 2005-09-07 00:01:43Z ertai $
 
 require 'commands'
 
@@ -15,6 +15,7 @@ module Commands
     attr_accessor :output
     attr_accessor :error
     attr_accessor :args
+    attr_accessor :open_mode
 
     #
     # Construction methods.
@@ -23,6 +24,8 @@ module Commands
     def initialize ( command_name, *args )
       @command = command_name
       @args = args.dup
+      @open_mode = :w
+      @input, @output, @error = nil, nil, nil
     end
 
     #
@@ -66,18 +69,21 @@ module Commands
 
 
     # Use Kernel#system() but with a string to have the shell expansion.
+    # FIXME make me a runner
     def sh
       Kernel.system(to_sh)
     end
 
 
     # Use Kernel#exec() but with a string to have the shell expansion.
+    # FIXME make me a runner
     def sh!
       Kernel.exec(to_sh)
     end
 
 
     # Use Kernel#` and return the resulting string.
+    # FIXME make me a runner
     def expand
       `#{to_sh}`
     end
@@ -93,12 +99,16 @@ module Commands
 
 
     # FIXME design me!
+    # FIXME make me a runner
     def ruby
     end
 
 
     # Use a Commands::Runners::Runner and return a Commands::Datas::Data.
     def run ( runner=@runner )
+      unless runner.respond_to? :run
+        raise ArgumentError, "need a runner not: #{runner.inspect}"
+      end
       runner.run(self)
     end
 
@@ -142,14 +152,10 @@ module Commands
     end
 
 
-    def add_outputs ( out, err, mode )
+    def add_outputs ( out, err )
       cmd = dup
-      cmd.output = out.dup
-      cmd.output.open_mode = mode if cmd.output.is_a? Pathname
-      if err
-        cmd.error = err.dup
-        cmd.error.open_mode = mode if cmd.error.is_a? Pathname
-      end
+      cmd.output = out.dup if out
+      cmd.error = err.dup if err
       cmd
     end
     protected :add_outputs
@@ -158,14 +164,15 @@ module Commands
     # Return a new command with the given command output.
     def > ( arg )
       out, err = (arg.is_a?(Array))? arg : [arg, nil]
-      add_outputs(out, err, 'w')
+      add_outputs(out, err)
     end
 
 
     # Like > but open the output in append mode.
     def >> ( arg )
       out, err = (arg.is_a?(Array))? arg : [arg, nil]
-      add_outputs(out, err, 'a')
+      @open_mode = :a
+      add_outputs(out, err)
     end
 
 
@@ -206,9 +213,30 @@ module Commands
 
 
     def to_sh
-      "#{to_s}#{sh_args}"
+      cmd = instanciate_args
+      "#{cmd.to_s}#{cmd.sh_args}"
+    end
+
+    def instanciate_args!
+      if defined? @input and @input and @args.include? '%i'
+        @args.map! { |a| (a == '%i')? @input : a }
+        @input = nil
+      end
+      if defined? @output and @output and @args.include? '%o'
+        @args.map! { |a| (a == '%o')? @output : a }
+        @output = nil
+      end
+      if defined? @error and @error and @args.include? '%e'
+        @args.map! { |a| (a == '%e')? @error : a }
+        @error = nil
+      end
     end
 
+    def instanciate_args
+      copy = dup
+      copy.instanciate_args!
+      copy
+    end
 
     def sh_args
       args = ''
@@ -262,6 +290,7 @@ module Commands
 
       def test_system_dne
         @dne.system
+        assert_equal(127, $?.exitstatus)
       end
 
       def test_system
@@ -410,7 +439,7 @@ module Commands
         assert_equal('foo', @cat.input)
         cmd = @cat < 'bar'
         assert_equal('bar', cmd.input)
-        assert_not_equal(cmd.object_id, @bar.object_id)
+        assert_not_equal(cmd.object_id, @cat.object_id)
       end
 
       def test_add_output # test_>
@@ -420,14 +449,13 @@ module Commands
         assert_equal('bar', cmd.output)
         cmd = @cat > @file
         assert_equal(@file, cmd.output)
-        assert_equal('w', cmd.output.open_mode)
-        assert_not_equal(cmd.object_id, @bar.object_id)
+        assert_equal(:w, cmd.open_mode)
+        assert_not_equal(cmd.object_id, @cat.object_id)
         cmd = @cat > [ 'outbar', 'errbar' ]
         assert_equal('outbar', cmd.output)
         assert_equal('errbar', cmd.error)
         cmd = @cat > [ @file, @file ]
-        assert_equal('w', cmd.output.open_mode)
-        assert_equal('w', cmd.error.open_mode)
+        assert_equal(:w, cmd.open_mode)
       end
 
       def test_append_output # test_>>
@@ -435,16 +463,15 @@ module Commands
         assert_equal('foo', @cat.output)
         cmd = @cat >> 'bar'
         assert_equal('bar', cmd.output)
-        assert_not_equal(cmd.object_id, @bar.object_id)
+        assert_not_equal(cmd.object_id, @cat.object_id)
         cmd = @cat >> @file
         assert_equal(@file, cmd.output)
-        assert_equal('a', cmd.output.open_mode)
+        assert_equal(:a, cmd.open_mode)
         cmd = @cat >> [ 'outbar', 'errbar' ]
         assert_equal('outbar', cmd.output)
         assert_equal('errbar', cmd.error)
         cmd = @cat >> [ @file, @file ]
-        assert_equal('a', cmd.output.open_mode)
-        assert_equal('a', cmd.error.open_mode)
+        assert_equal(:a, cmd.open_mode)
       end
 
       def test_args

data/lib/commands/datas.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: datas.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: datas.rb 255 2005-06-01 00:08:46Z ertai $
 
 require 'commands'
 

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 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: composite.rb 358 2005-09-16 09:54:04Z ertai $
 
 require 'commands'
 
@@ -12,6 +12,7 @@ module Commands
     class Composite < Data
 
       def initialize ( *cmd )
+        super()
         @commands = cmd.flatten
       end
 
@@ -23,6 +24,9 @@ module Commands
         each { |x| x.waitpid }
       end
 
+      def kill ( *a, &b )
+        each { |x| x.kill(*a, &b) }
+      end
 
     end # class Composite
 

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 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: data.rb 360 2005-09-16 12:17:16Z ertai $
 
 require 'commands'
 
@@ -23,22 +23,38 @@ module Commands
     class Data
 
       attr_accessor :pid
-      attr_accessor :input
-      attr_accessor :output
-      attr_accessor :error
+      attr_reader   :input
+      attr_reader   :output
+      attr_reader   :error
       attr_accessor :status
+      attr_reader   :open_mode
+
+      @@datas ||= Set.new
+
+      def initialize
+        @open_mode = :w
+        @status, @pid = nil, nil
+        @@datas << self
+      end
 
 
       def waitpid
         return @status unless @status.nil?
+        return if @pid.nil?
         Process.waitpid(@pid)
         @status = $?
+        @@datas.delete(self)
+        self
       end
 
 
       def | ( rhs ) # FIXME CHECK ME
         raise unless rhs.is_a? Command
-        rhs < output
+        case output
+        when Pathname then rhs < output
+        when File     then rhs < output.path.to_path
+        else raise "Unexpected class #{rhs.class}"
+        end
       end
 
 
@@ -57,6 +73,87 @@ module Commands
         err.print @error.read
       end
 
+      def input= ( anObject )
+        if anObject.is_a? Pathname
+          anObject = anObject.dup
+          anObject.open_mode = :r
+        end
+        @input = anObject
+      end
+
+      def output= ( anObject )
+        if anObject.is_a? Pathname
+          anObject = anObject.dup
+          anObject.open_mode = @open_mode 
+        end
+        @output = anObject
+      end
+
+
+      def error= ( anObject )
+        if anObject.is_a? Pathname
+          anObject = anObject.dup
+          anObject.open_mode = @open_mode 
+        end
+        @error = anObject
+      end
+
+
+      def open_mode= ( mode )
+        raise ArgumentError, "bad mode #{mode} need :w or :a" if mode == :r
+        @open_mode = mode
+      end
+
+
+      have YamlExtension, :'commands::data'
+
+      def to_yaml_string
+        out = output.read
+        err = error.read
+        out ||= ''
+        err ||= ''
+
+        msg = []
+        msg << "exit: #{status.exitstatus}" unless status.nil?
+        if out.empty?
+          msg << 'output: ""'
+        else
+          out.gsub!(/^/, '    ')
+          msg << "output: |\n  #{out}"
+        end
+        if err.empty?
+          msg << 'error: ""'
+        else
+          err.gsub!(/^/, '    ')
+          msg << "error: |\n  #{err}"
+        end
+        msg.join("\n")
+      end
+
+      def kill ( sig='KILL' )
+        Process.kill sig, @pid if @status.nil? and not @pid.nil?
+        waitpid
+      end
+
+      def clean
+        kill
+        [@input, @output, @error].each do |stream|
+          if stream.is_a? File
+            stream.close
+            stream = stream.path.to_path 
+          end
+          unless stream.is_a? Pathname
+            raise ArgumentError, "need a pathname not #{stream}"
+          end
+          stream.unlink if stream.exist? and stream.temp?
+        end
+      end
+
+      def self.clean_all
+        @@datas.dup.each { |data| data.kill }
+      end
+
+      at_exit { clean_all }
 
     end # class Data
 

data/lib/commands/datas/factory.rb

@@ -1,9 +1,9 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: factory.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: factory.rb 344 2005-09-08 01:44:18Z ertai $
 
-require 'commands'
+Commands.import!
 
 module Commands
 
@@ -13,21 +13,28 @@ module Commands
 
       attr_accessor :command_data_class
 
-      def initialize
-        @command_data_class = Temp
+      def initialize ( values={}, *a, &b )
+        super(*a, &b)
+        values.each do |k, v|
+          send("#{k}=", v)
+        end
+        @command_data_class ||= Temp
       end
 
       def new_command_data ( *a, &b )
         data = @command_data_class.new(*a, &b)
         instance_variables.each do |var|
-          next if var =~ /command_data_class/
+          next if var == '@command_data_class'
+          next if var =~ /^@__/
           val = instance_variable_get(var)
           data.send(var[1..-1] + '=', val) unless val.nil?
         end
         data
       end
 
-      alias :create :new_command_data
+      def create ( *a, &b )
+        new_command_data(*a, &b)
+      end
 
     end # class Factory
 

data/lib/commands/datas/temp.rb

@@ -1,9 +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: temp.rb 279 2005-06-05 17:46:53Z ertai $
-
-require 'commands'
+# Revision::  $Id: temp.rb 343 2005-09-08 01:32:57Z ertai $
 
 module Commands
 
@@ -14,9 +12,9 @@ module Commands
       def initialize ( *a, &b )
         super
         @output = TempPath.new('cmd-output')
-        @output.open_mode = 'w'
+        @output.open_mode = :w
         @error = TempPath.new('cmd-error')
-        @error.open_mode = 'w'
+        @error.open_mode = :w
       end
 
     end # class Temp

data/lib/commands/factory.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: factory.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: factory.rb 255 2005-06-01 00:08:46Z ertai $
 
 require 'commands'