ruby_ex 0.3.0 → 0.4.1.2

data/lib/commands/command.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: command.rb 365 2005-09-24 17:24:01Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/command.rb 8052 2006-01-01T16:29:27.129829Z ertai  $
 
 module Commands
 
@@ -41,30 +39,46 @@ module Commands
     # Running methods.
     #
 
-    # Simulate Kernel#system() to run the command (No shell expansion).
-    def system
-      unless defined? @@system_runner
-        @@system_runner = Runners::System.new
+    @@default_runners = {}
+    @@running_options =
+    {
+      :verbose => :make_verbose,
+      :v       => :make_verbose,
+      :raise   => :raise_on_failures,
+      :r       => :raise_on_failures,
+      :debug   => :make_debug,
+      :d       => :make_debug,
+      :mock    => :make_mock,
+      :m       => :make_mock,
+    }
+    def run_with_options ( runner_class, options )
+      if options.empty?
+        runner = @@default_runners[runner_class] ||= runner_class.new
+      else
+        runner = runner_class.new
+        options.each do |k|
+          runner.send(@@running_options[k])
+        end
       end
-      run(@@system_runner)
+      run(runner)
+    end
+
+
+    # Simulate Kernel#system() to run the command (No shell expansion).
+    def system ( *options )
+      run_with_options(Runners::System, options.flatten)
     end
 
 
     # Use the ExecRunner.
-    def exec
-      unless defined? @@exec_runner
-        @@exec_runner = Runners::Exec.new
-      end
-      run(@@exec_runner)
+    def exec ( *options )
+      run_with_options(Runners::Exec, options.flatten)
     end
 
 
     # FIXME test me
-    def sys
-      unless defined? @@sys_runner
-        @@sys_runner = Runners::System.new.make_verbose.raise_on_failures
-      end
-      run(@@sys_runner)
+    def sys ( *options )
+      run_with_options(Runners::System, [:v, :r] + options.flatten)
     end
 
 
@@ -89,13 +103,14 @@ module Commands
     end
 
 
-    def popen
-      unless defined? @@fork_runner
-        @@fork_runner = Runners::Fork.new
-      end
-      run(@@fork_runner)
+    def popen ( *options )
+      run_with_options(Runners::Popen, options.flatten)
+    end
+
+
+    def fork ( *options )
+      run_with_options(Runners::Fork, options.flatten)
     end
-    alias :fork :popen
 
 
     # FIXME design me!
@@ -121,7 +136,7 @@ module Commands
 
     # Pipe two commands.
     def | ( rhs )
-      Pipe.new(self, rhs)
+      Commands::Pipe.new(self, rhs)
     end
 
 
@@ -257,6 +272,8 @@ module Commands
 
   end # class Command
 
+  Commands::Helpers.import!
+
   test_section __FILE__ do
 
     class CommandTest < Test::Unit::TestCase
@@ -300,6 +317,13 @@ module Commands
         assert(@tmp.exist?)
       end
 
+      def test_system_raise_on_failures
+        assert_raise(Runners::Runner::FailureHooker::Error) do
+          'false'.to_cmd.system(:r)
+        end
+        assert_not_equal(0, $?)
+      end
+
       def test_sh_and_pipe
         ((@cat | @wc) < @file > @tmp).sh
         assert_equal(0, $?)
@@ -381,6 +405,7 @@ module Commands
         assert_match(/\s*2\s*4\s*17\s+/, str)
       end
 
+      # FIXME
       def test_popen
         cmd = (@touch + @tmp) + (@sleep + 1)
         diff = DTime.diff { @data = cmd.popen }
@@ -391,12 +416,13 @@ module Commands
       end
 
       def test_fork
-        cmd = (@touch + @tmp) + (@sleep + 1)
+        sleep_arg = 2
+        cmd = (@touch + @tmp) + (@sleep + sleep_arg)
         diff = DTime.diff { @data = cmd.fork }
         assert(@tmp.exist?)
         @data.waitpid
         assert(@tmp.exist?)
-        assert(diff.to_f < 1)
+        assert(diff.to_f < sleep_arg, "#{diff} should be < #{sleep_arg}")
       end
 
       def test_ruby

data/lib/commands/datas/composite.rb

@@ -1,15 +1,13 @@
 # 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 365 2005-09-24 17:24:01Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/datas/composite.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Commands
 
   module Datas
 
-    class Composite < Data
+    class Composite < self::Data
 
       attr_accessor :contents
 

data/lib/commands/datas/data.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: data.rb 365 2005-09-24 17:24:01Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/datas/data.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Commands
 
@@ -108,26 +106,22 @@ module Commands
       have YamlExtension, :'commands::data'
 
       def to_yaml_string
-        out = output.read
-        err = error.read
+        suppress(IOError) { out = output.read }
+        suppress(IOError) { err = error.read }
         out ||= ''
         err ||= ''
 
         msg = []
         msg << "exit: #{status.exitstatus}" unless status.nil?
-        if out.empty?
-          msg << 'output: ""'
-        else
+        unless out.empty?
           out.gsub!(/^/, '    ')
           msg << "output: |\n  #{out}"
         end
-        if err.empty?
-          msg << 'error: ""'
-        else
+        unless err.empty?
           err.gsub!(/^/, '    ')
           msg << "error: |\n  #{err}"
         end
-        msg.join("\n")
+        "\n" + msg.join("\n")
       end
 
       def kill ( sig='KILL' )
@@ -141,12 +135,15 @@ module Commands
           next if stream.nil? or stream.is_a? IO
           if stream.is_a? File
             stream.close
-            stream = stream.path.to_path 
+            stream = stream.path.to_path
           end
-          unless stream.is_a? Pathname
-            raise ArgumentError, "need a pathname not #{stream}"
+          if stream.is_a? Pathname
+            stream.unlink if stream.exist? and stream.temp?
+          elsif stream.respond_to? :clean
+            stream.clean
+          else
+            raise ArgumentError, "must at least respond to :clean (#{stream})"
           end
-          stream.unlink if stream.exist? and stream.temp?
         end
       end
 

data/lib/commands/datas/factory.rb

@@ -1,15 +1,13 @@
 # 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 344 2005-09-08 01:44:18Z ertai $
-
-Commands.import!
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/datas/factory.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Commands
 
   module Datas
 
-    class Factory < Data
+    class Factory < self::Data
 
       attr_accessor :command_data_class
 

data/lib/commands/datas/pipe.rb

@@ -0,0 +1,52 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/datas/pipe.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
+
+class IOPipe
+  attr_accessor :reader, :writer, :open_mode
+  def initialize
+    @reader, @writer = IO.pipe
+    @open_mode = :w
+  end
+  def open ( mode=:r )
+    case mode.to_sym
+      when :r
+        @writer.close
+        @reader
+      when :w
+        @reader.close
+        @writer
+      else raise ArgumentError, "Bad open mode: #{mode.inspect}"
+    end
+  end
+  def close
+    @reader.close
+    @writer.close
+  end
+  alias_method :clean, :close
+  def to_io_for_commands
+    open(open_mode)
+  end
+  def read
+    open.read
+  end
+end
+
+module Commands
+
+  module Datas
+
+    class Pipe < self::Data
+
+      def initialize ( *a, &b )
+        super
+        @output = IOPipe.new
+        @error = IOPipe.new
+      end
+
+    end # class Pipe
+
+  end # module Datas
+
+end # module Commands

data/lib/commands/datas/temp.rb

@@ -1,13 +1,13 @@
 # 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 343 2005-09-08 01:32:57Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/datas/temp.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Commands
 
   module Datas
 
-    class Temp < Data
+    class Temp < self::Data
 
       def initialize ( *a, &b )
         super

data/lib/commands/datas.rb

@@ -1,16 +1,11 @@
 # 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 255 2005-06-01 00:08:46Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/datas.rb 8049 2005-12-31T16:01:12.162089Z ertai  $
 
 module Commands
 
   module Datas
-
-    autoloaded_module(__FILE__, false)
-
   end # module Datas
 
 end # module Commands

data/lib/commands/factory.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: factory.rb 255 2005-06-01 00:08:46Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/factory.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Commands
 

data/lib/commands/helpers.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: helpers.rb 255 2005-06-01 00:08:46Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/helpers.rb 8049 2005-12-31T16:01:12.162089Z ertai  $
 
-require 'commands'
+require 'shellwords'
 
 module Commands
 
@@ -22,15 +22,10 @@ module Commands
       #
       # Make a command from a String.
       #
-      # Split your command when no quotations are used.
+      # Split your command using the Shellwords module.
       #
-      # Do not touch the String and give as one argument.
       def to_cmd
-        if self =~ /['"`]/
-          Command.new(self)
-        else
-          Command.new(*split(/\s+/))
-        end
+        Shellwords.shellwords(self).to_cmd
       end
 
       def to_io_for_commands
@@ -46,7 +41,7 @@ module Commands
     class ::Array
 
       def to_cmd
-        Command.new(*self)
+        Commands::Command.new(*self)
       end
 
     end # class ::Array
@@ -66,7 +61,7 @@ module Commands
                      "foo b/ar \t \n  qu44x32".to_cmd.to_a)
 
         s = "foo 'b/ar \t' \n  qu44x32"
-        assert_equal([s], s.to_cmd.to_a)
+        assert_equal(["foo", "b/ar \t", "qu44x32"], s.to_cmd.to_a)
       end
 
       def test_array_to_cmd

data/lib/commands/pipe.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: pipe.rb 365 2005-09-24 17:24:01Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/pipe.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 class IO
 
@@ -13,7 +11,7 @@ class IO
 
   class << self
 
-    alias_method :pipe_without_pipe?, :pipe
+    alias_method :pipe_without_pipe?, :pipe unless method_defined? :pipe_without_pipe?
 
     def pipe
       ios = pipe_without_pipe?
@@ -35,7 +33,7 @@ module Commands
       @cmds = cmds.flatten.map { |x| x.dup }
     end
 
-    def run ( runner=@runner )
+    def run ( runner=@runner, *a )
       datas = Datas::Composite.new
       runner = runner.dup
       runner.hook_trigger :display_command, self
@@ -53,7 +51,7 @@ module Commands
         wr.close
       end
       runner = runner.dup
-      datas << @cmds.last.run(runner)
+      datas << @cmds.last.run(runner, *a)
       datas.waitpid if runner.is_a? Runners::System
       datas
     end

data/lib/commands/runners/exec.rb

@@ -1,16 +1,14 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: exec.rb 255 2005-06-01 00:08:46Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/runners/exec.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Commands
 
   module Runners
 
     class Exec < Runner
-      concrete
+      include Concrete
 
       def exec ( aCommand, data )
         Kernel.exec(*aCommand.to_a)
@@ -18,8 +16,6 @@ module Commands
 
     end # class Exec
 
-
-
     test_section __FILE__ do
 
       class ExecTest < Test::Unit::TestCase

data/lib/commands/runners/fork.rb

@@ -1,16 +1,14 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: fork.rb 374 2005-09-29 19:25:47Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/runners/fork.rb 8049 2005-12-31T16:01:12.162089Z ertai  $
 
 module Commands
 
   module Runners
 
     class Fork < Exec
-      concrete
+      include Concrete
 
       #
       # Hooks declaration
@@ -19,7 +17,6 @@ module Commands
       hook_declare :exception_raised_during_exec
       hook_declare :already_killed
       hook_declare :waitpid
-      hook_declare :failure
       hook_declare :son
       hook_declare :kill
 
@@ -39,7 +36,7 @@ module Commands
         end
         hook_trigger :waitpid, data
         if data.status.nil? or not data.status.exitstatus.zero?
-          hook_trigger :failure, data
+          hook_trigger :failure, aCommand, data
         end
       end
 
@@ -69,11 +66,6 @@ module Commands
       end
 
 
-      def raise_on_failures
-        hooker_subscribe FailureHooker.new
-        self
-      end
-
       def before_exec ( command, data )
         TempPath.clean
       end
@@ -81,15 +73,6 @@ module Commands
     end # class Fork
 
 
-    class FailureHooker
-      class Error < Exception
-      end
-      def failure ( data )
-        raise Error, { 'Command failed' => data }.to_yaml
-      end
-    end
-
-
     test_section __FILE__ do
 
       class ForkTest < Test::Unit::TestCase

data/lib/commands/runners/mockable.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: mockable.rb 365 2005-09-24 17:24:01Z ertai $
-
-require 'commands'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/runners/mockable.rb 8049 2005-12-31T16:01:12.162089Z ertai  $
 
 module Commands
 
@@ -31,13 +29,12 @@ module Commands
         self
       end
 
-    end # module Mock
+    end # module Mockable
 
-    class Runner
-      include Mockable
-    end
+    Runner.include Mockable
 
     test_section __FILE__ do
+      Commands::Helpers.import!
 
       class MockTest < Test::Unit::TestCase
 

data/lib/commands/runners/no_run.rb

@@ -0,0 +1,44 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/runners/no_run.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
+
+module Commands
+
+  module Runners
+
+    # This very particular runner returns it's command instead of running it.
+    class NoRun < Runner
+      include Concrete
+
+      def run ( aCommand )
+        aCommand
+      end
+
+    end # class NoRun
+
+
+
+    test_section __FILE__ do
+
+      class NoRunTest < Test::Unit::TestCase
+
+        def setup
+          assert_nothing_raised { @runner = NoRun.new }
+        end
+
+        def test_0_initialize
+        end
+
+        def test_simple
+          cmd = 'sleep'.to_cmd[10]
+          assert_kind_of Command, cmd.run(@runner)
+        end
+
+      end # class NoRunTest
+
+    end
+
+  end # module Runners
+
+end # module Commands

data/lib/commands/runners/popen.rb

@@ -0,0 +1,49 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/commands/runners/popen.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
+
+module Commands
+
+  module Runners
+
+    class Popen < Fork
+      make Concrete
+
+      def initialize ( *a, &b )
+        super
+        @command_data_factory.command_data_class = Datas::Pipe
+      end
+
+    end # class Popen
+
+
+
+    test_section __FILE__ do
+
+      class PopenTest < Test::Unit::TestCase
+
+        def setup
+          assert_nothing_raised { @runner = Popen.new }
+        end
+
+        def test_0_initialize
+        end
+
+        # FIXME
+        def test_simple
+          # TempPath.new do |tmp|
+            # cmd = %Q[ruby -e "sleep 0.5
+                              # File.open('#{tmp}', 'w') { |f| f.puts :foo }"]
+            # @runner.run(cmd.to_cmd)
+            # assert(tmp.exist?)
+          # end
+        end
+
+      end # class PopenTest
+
+    end
+
+  end # module Runners
+
+end # module Commands