ruby_ex 0.2.0 → 0.3.0

data/lib/commands/pipe.rb

@@ -1,36 +1,61 @@
 # 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 341 2005-09-07 00:01:43Z ertai $
+# Revision::  $Id: pipe.rb 365 2005-09-24 17:24:01Z ertai $
 
 require 'commands'
 
+class IO
+
+  def pipe?
+    false
+  end
+
+  class << self
+
+    alias_method :pipe_without_pipe?, :pipe
+
+    def pipe
+      ios = pipe_without_pipe?
+      ios.each do |io|
+        io.send(:define_singleton_method, :pipe?) { true }
+      end
+      ios
+    end
+
+  end # class << self
+
+end # class IO
+
 module Commands
 
   class Pipe < Command
 
     def initialize ( *cmds )
-      @cmds = cmds.map { |x| x.dup }
-      @input, @output, @error = nil, nil, nil
+      @cmds = cmds.flatten.map { |x| x.dup }
     end
 
-    def run ( *a )
-      pids = []
+    def run ( runner=@runner )
+      datas = Datas::Composite.new
+      runner = runner.dup
+      runner.hook_trigger :display_command, self
+      runner.disable_hook :display_command
+      runner.disable_hook :waitpid
       ([nil] + @cmds).zip(@cmds + [nil]).each do |cmd1, cmd2|
         next if cmd1.nil? or cmd2.nil?
         rd, wr = IO.pipe
+        cmd1_runner = runner.dup
+        cmd1_runner.disable_hook :waitpid
+        cmd1_runner.subscribe_hook(:son) { rd.close }
         cmd1.output = wr
         cmd2.input = rd
-        pids << Kernel.fork do
-          rd.close
-          cmd1.exec
-        end
+        datas << cmd1.run(cmd1_runner)
         wr.close
       end
-      pids << Kernel.fork do
-        @cmds.last.exec
-      end
-      pids.each { |pid| Process.waitpid pid }
+      runner = runner.dup
+      datas << @cmds.last.run(runner)
+      datas.waitpid if runner.is_a? Runners::System
+      datas
     end
 
     def input= ( arg )
@@ -65,11 +90,27 @@ module Commands
       }
     end
 
+    def [] ( *args )
+      new_cmds = @cmds.dup
+      new_cmds[-1] = new_cmds.last[*args]
+      Pipe.new(*new_cmds)
+    end
+
+    #
+    # Conversion methods
+    #
+
     def to_sh
       strs = @cmds.map { |cmd| "(#{cmd.to_sh})" }
-      "(#{strs.join(' | ')})#{sh_args}"
+      "#{strs.join(' | ')}"
     end
 
+    def to_s
+      to_sh
+    end
+
+
+
   end # class Pipe
 
 end # module Commands

data/lib/commands/runners/fork.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: fork.rb 358 2005-09-16 09:54:04Z ertai $
+# Revision::  $Id: fork.rb 374 2005-09-29 19:25:47Z ertai $
 
 require 'commands'
 
@@ -30,7 +30,7 @@ module Commands
       def run_impl ( aCommand, data )
         data.pid = Kernel.fork do
           begin
-            TempPath.fork_init
+            TempPath.fork_init true
             hook_trigger :son, aCommand, data
             super
           rescue Exception => ex
@@ -74,6 +74,10 @@ module Commands
         self
       end
 
+      def before_exec ( command, data )
+        TempPath.clean
+      end
+
     end # class Fork
 
 

data/lib/commands/runners/{mock.rb → mockable.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: mock.rb 302 2005-06-23 21:03:51Z ertai $
+# Revision::  $Id: mockable.rb 365 2005-09-24 17:24:01Z ertai $
 
 require 'commands'
 
@@ -9,41 +9,40 @@ module Commands
 
   module Runners
 
-    class Mock < Runner
-      concrete
+    module Mockable
 
-      attr_reader :log
-
-      def initialize ( *a, &b )
+      def make_mock ( &block )
         @log = []
-        @contents = b
-        super
-      end
+        @block = block
 
-      def run_impl ( aCommand, data )
-      end
+        class << self
+          attr_reader :log
+          attr_accessor :block
 
-      def run ( aCommand )
-        d = super
-        d.output.open('w', &@contents)
-        d.status = 0
-        d
-      end
+          def exec ( aCommand, aData )
+            @block[aCommand, aData]
+          end
 
-      def display_command ( m )
-        @log << m
-      end
+          def display_command ( m )
+            @log << m
+          end
+        end # class << self
 
-    end # class Mock
+        self
+      end
 
+    end # module Mock
 
+    class Runner
+      include Mockable
+    end
 
     test_section __FILE__ do
 
       class MockTest < Test::Unit::TestCase
 
         def setup
-          assert_nothing_raised { @runner = Mock.new }
+          assert_nothing_raised { @runner = System.new.make_mock }
         end
 
         def test_0_initialize

data/lib/commands/runners/runner.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: runner.rb 343 2005-09-08 01:32:57Z ertai $
+# Revision::  $Id: runner.rb 374 2005-09-29 19:25:47Z ertai $
 
 require 'commands'
 
@@ -46,6 +46,16 @@ module Commands
       end
 
 
+      def initialize_copy ( copy )
+        super
+        if defined? @hookers
+          @hookers = @hookers.dup
+        else
+          @hookers = []
+        end
+      end
+
+
       #
       # Methods.
       #
@@ -75,6 +85,8 @@ module Commands
         STDIN.reopen(data.input.to_io_for_commands) unless data.input.nil?
         STDOUT.reopen(data.output.to_io_for_commands) unless data.output.nil?
         STDERR.reopen(data.error.to_io_for_commands) unless data.error.nil?
+        STDOUT.flush
+        STDERR.flush
 
         hook_trigger :before_chdir, data
         Dir.chdir(aCommand.dir) unless aCommand.dir.nil?

data/lib/d_logger.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: d_logger.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: d_logger.rb 389 2005-10-03 00:46:17Z ertai $
 
 require 'logger'
 
@@ -29,8 +29,14 @@ class DLogger < Logger
   end
 
   Format = "%s, [%s#%d] %6s -- %s: %s\n"
-  def format_message(severity, timestamp, msg, progname)
-    Format % [severity[0..0], timestamp, $$, severity, progname, msg]
+  if Logger.const_defined? :VERSION and Logger::VERSION >= '1.2.6'
+    def format_message(severity, timestamp, progname, msg)
+      Format % [severity[0..0], timestamp, $$, severity, progname, msg]
+    end
+  else
+    def format_message(severity, timestamp, msg, progname)
+      Format % [severity[0..0], timestamp, $$, severity, progname, msg]
+    end
   end
   private :format_message
 
@@ -51,8 +57,8 @@ test_section __FILE__ do
       log.debug3 'You don\'t see me'
       log.debug2 'You see me'
       cout.rewind
-      ref = /D, \[\d+-\d+-\d+.\d+:\d+:\d+\.\d+ #\d+\]  DEBUG -- : You see me
-D, \[\d+-\d+-\d+.\d+:\d+:\d+\.\d+ #\d+\] DEBUG2 -- : You see me/
+      ref = /D, \[[\d\w: .-]+#\d+\]  DEBUG -- : You see me
+D, \[[\d\w: .-]+#\d+\] DEBUG2 -- : You see me/
       assert_match(ref, cout.readlines.join)
     end
 

data/lib/diff_tools.rb

@@ -0,0 +1,141 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: diff_tools.rb 380 2005-09-29 22:08:05Z ertai $
+
+RegexList.import!
+
+module DiffTools
+
+  class Diff
+
+    def initialize ( anObject=nil )
+      @chunks = {}
+      @path_list = PathList.new
+      case anObject
+      when String
+        anObject.split(/^Index: /m).each do |chunk|
+          self << 'Index: ' + chunk unless chunk.empty?
+        end
+      when Diff
+        merge! anObject
+      when Array
+        anObject.flatten.each { |chunk| self << chunk }
+      when NilClass
+      else
+        raise TypeError, "Unexpected type #{anObject.class}"
+      end
+    end
+
+    def << ( chunk )
+      chunk = Chunk.new(chunk) unless chunk.is_a? Chunk
+      if @path_list.include? chunk.path
+        raise ArgumentError, "Already have the path `#{chunk.path}'"
+      end
+      @chunks[chunk.path] = chunk
+      @path_list << chunk.path
+    end
+
+    def [] ( *args )
+      grep(*args)
+    end
+
+    def create ( path_list )
+      result = Diff.new
+      path_list.each do |path|
+        result << @chunks[path]
+      end
+      result
+    end
+    protected :create
+
+    def grep ( *args )
+      create @path_list.grep_with_regex_list(RegexList.new(args))
+    end
+
+    def negative ( *args )
+      create @path_list.grep_with_negative_regex_list(RegexList.new(args))
+    end
+
+    def exclude ( *args )
+      create @path_list.exclude_with_regex_list(RegexList.new(args))
+    end
+
+    def to_s
+      @chunks.values.join
+    end
+
+  end # class Diff
+
+
+
+  class Chunk
+
+    attr_reader :path, :contents
+
+    def initialize ( anObject )
+      case anObject
+      when String
+        @path = anObject[/\AIndex: (.+)$/, 1]
+        raise ArgumentError, "The path cannot be empty (#{anObject})" if @path.nil? or @path.empty?
+        @contents = anObject
+      else
+        raise TypeError, "Unexpected type #{anObject.class}"
+      end
+    end
+
+    def to_s
+      @contents
+    end
+
+    def inspect
+      "#<#{self.class}: Index: #@path>"
+    end
+
+  end # class Chunk
+
+
+
+  class App
+    def initialize ( stdin, stdout, stderr, argv )
+      gre, neg, exc = [], [], []
+      argv.each do |arg|
+        case arg
+        when /^(.*)!$/ then exc << $1
+        when /^(.*)-$/ then neg << $1
+        else gre << arg
+        end
+      end
+      stdout.puts Diff.new(stdin.read).exclude(exc).negative(neg).grep(gre)
+    end
+  end # class App
+
+end # module DiffTools
+
+
+DiffTools::App.new(STDIN, STDOUT, STDERR, ARGV) if $0 == __FILE__
+
+
+test_section __FILE__ do
+
+  class TestDiffTools < ::Test::Unit::TestCase
+
+    def setup
+      @fixtures = 'test'.to_path/'fixtures'
+      @my_diff = @fixtures/'my_diff.patch'
+      @output_diff = TempPath.new('output_diff.patch')
+      # @output_diff = '/tmp/output_diff.patch'.to_path
+    end
+
+    def teardown
+    end
+
+    def test_example
+      diff = DiffTools::Diff.new(@my_diff.read)
+      sorted = diff[/NEWS/, /^[^.]*$/, /core_ex/, /ruby_ex/, //]
+      @output_diff.open('w') { |f| f.puts sorted.to_s }
+    end
+
+  end # class TestDiffTools
+
+end

data/lib/drb/insecure_protected_methods.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: insecure_protected_methods.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: insecure_protected_methods.rb 385 2005-10-02 17:05:35Z ertai $
 
 
 require 'drb/drb'
@@ -79,7 +79,7 @@ module DRb
     # Test
     #
     def test_simple
-      assert_raises(NameError) { @drb_obj.send(:protected_resquest) }
+      assert_raises(NameError, NoMethodError) { @drb_obj.send(:protected_resquest) }
       assert_nothing_raised { @drb_obj.public_request }
     end
 

data/lib/file_type.rb

@@ -1,7 +1,9 @@
-require 'abstract'
-require 'commands'
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: file_type.rb 376 2005-09-29 21:46:32Z ertai $
+
+Commands.import!
 
 module FileType
 
@@ -133,8 +135,10 @@ module FileType
           @tmp = TempPath.new(base.path.basename, ext)
           cmd = mk_cmd(@tmp)
           data = cmd.run(self.class.runner)
+          data.waitpid if data.status.nil?
           if data.status != 0
             @tmp.rmtree if @tmp.exist?
+            STDERR.puts data.error.read if data.error and data.error.exist?
             raise ExtractError, "Cannot extract a file:
             |  path: #{to_s}
             |  type: #{self.class}
@@ -243,10 +247,7 @@ module FileType
 
   class TarBz2 < Generic
     filetype_extension(/\.(tar\.bz2|tbz2|tbz)$/)
-    # FIXME Use this pipe beacause -j is not portable
-    # extractable_dir (BZIP2 + %w[-c -d]) | (TAR + %w[xvf - -C])
-    # problem: a pipe command doesn't properly implement `[]'
-    extractable_dir TAR + %w[xvjf %i -C]
+    extractable_dir((BZIP2 + %w[-c -d %i]) | (TAR + %w[xvf - -C]))
   end # class TarBz2
 
 
@@ -340,16 +341,19 @@ end # module FileType
 
 test_section __FILE__ do
 
+  Commands::Runners::Mockable.import!
+
   class FileTypeTest < Test::Unit::TestCase
 
     def setup
       @tmp = TempPath.new
       (@tmp + 'foo').mkpath
-      @mr = Commands::Runners::Mock.new do |out|
-        out.write("#@tmp/foo/bar/baz\n#@tmp/foo\n#@tmp/foo/f/f/foo/baz\n")
+      @mr = Commands::Runners::System.new
+      @mr.make_mock do
+        puts "#@tmp/foo/bar/baz\n#@tmp/foo\n#@tmp/foo/f/f/foo/baz"
       end
       FileType::Generic.runner = @mr
-      @res_dir = __FILE__.to_path.dirname.parent + 'test/resources'
+      @fixtures = __FILE__.to_path.dirname.parent + 'test/fixtures'
     end
 
     def assert_guess ( type, *files )
@@ -366,7 +370,8 @@ test_section __FILE__ do
       assert(@inp.extractable?, "#@inp not extractable")
       assert_nothing_raised { @res = @inp.extract }
       assert_kind_of(FileType.const_get(type), @res)
-      assert_match(command, @mr.log.last.to_sh)
+      assert_match(command, @mr.log.first.to_sh)
+      assert_equal(1, @mr.log.size, "Mock log size != 1")
     end
 
     def assert_real_extract ( type, file )
@@ -424,27 +429,30 @@ test_section __FILE__ do
     end
 
     def test_extract_gz
-      assert_extract :Ruby, /^"gzip" "-d" "-c" "[^%]*" > "[^%]*"$/, 'foo.rb.gz'
+      assert_extract :Ruby, /^"gzip" "-d" "-c" "[^%]*" > "[^%]*"$/, @fixtures/'foo.rb.gz'
     end
     def test_extract_bz2
-      assert_extract :Unknown, /^"bzip2" "-d" "-c" "[^%]*" > "[^%]*"$/, 'foo.bz2'
+      assert_extract :Unknown, /^"bzip2" "-d" "-c" "[^%]*" > "[^%]*"$/, @fixtures/'foo.bz2'
     end
     def test_extract_zip
-      assert_extract :Gz, /^"unzip" "-p" "[^%]*" > "[^%]*"$/, 'foo.gz.zip'
+      assert_extract :Gz, /^"unzip" "-p" "[^%]*" > "[^%]*"$/, @fixtures/'foo.gz.zip'
     end
     def test_extract_tar_bz2
       assert_extract :Directory,
-        # /^"bzip2" -d -c "foo.tar.bz2" | "tar" "xvf" "-" "-C" "[^%]*" > "[^%]*"$/,
-        /^"tar" "xvjf" "foo.tar.bz2" "-C" "[^%]*" > "[^%]*"$/, 'foo.tar.bz2'
+        /^\("bzip2" "-c" "-d" "[^%]*foo.tar.bz2"\) \| \("tar" "xvf" "-" "-C" "[^%]*" > "[^%]*"\)$/,
+        @fixtures/'foo.tar.bz2'
+    end
+    def test_real_extract_tar_bz2
+      assert_real_extract :Directory, @fixtures/'foo.tar.bz2'
     end
     def test_extract_tar_gz
       assert_extract :Directory,
-        /^"tar" "xvzf" "foo.tar.gz" "-C" ".*foo.*" > ".*log.*"$/, 'foo.tar.gz'
-      assert_real_extract :Directory, @res_dir + 'foo.tar.gz'
+        /^"tar" "xvzf" "[^%]*foo.tar.gz" "-C" ".*foo.*" > ".*log.*"$/, @fixtures/'foo.tar.gz'
+      assert_real_extract :Directory, @fixtures/'foo.tar.gz'
     end
     def test_extract_tar
       assert_extract :Directory,
-        /^"tar" "xvf" "foo.tar" "-C" "[^%]*" > "[^%]*"$/, 'foo.tar'
+        /^"tar" "xvf" "[^%]*foo.tar" "-C" "[^%]*" > "[^%]*"$/, @fixtures/'foo.tar'
     end
 
     def test_install_gem
@@ -455,7 +463,7 @@ test_section __FILE__ do
 
     def test_longest_common_path
       assert_nothing_raised do
-        res = @res_dir + 'tar.gz.log'
+        res = @fixtures/'tar.gz.log'
         @longest = FileType::ExtractableDir.longest_common_path(res)
       end
       assert_equal(['core_ex-0.1.4'], @longest)