ruby_ex 0.1.2 → 0.2.0

data/lib/timeout_ex.rb

@@ -3,10 +3,9 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: timeout_ex.rb 279 2005-06-05 17:46:53Z ertai $
+# $Id: timeout_ex.rb 339 2005-09-06 23:27:27Z ertai $
 
 
-require 'ruby_ex'
 require 'thread'
 
 

data/lib/trace.rb

@@ -1,12 +1,9 @@
-# Copyright: Copyright (c) 2004  Nicolas Despres. All rights reserved.
-# Author: Nicolas Despres  <polrop@lrde.epita.fr>.
-# License: Gnu General Public License.
+# Copyright:: Copyright (c) 2004, 2005  Nicolas Despres. All rights reserved.
+# Author::    Nicolas Despres  <polrop@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: trace.rb 339 2005-09-06 23:27:27Z ertai $
 
-# $LastChangedBy: ertai $
-# $Id: trace.rb 279 2005-06-05 17:46:53Z ertai $
-
-
-module Kernel
+module Trace
 
   def trace_on
     set_trace_func proc { |event, file, line, id, binding, classname|
@@ -23,4 +20,8 @@ module Kernel
     set_trace_func nil
   end
 
+end # module Trace
+
+module Kernel
+  include Trace
 end # module Kernel

data/lib/uri/druby.rb

@@ -3,8 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: druby.rb 279 2005-06-05 17:46:53Z ertai $
-
+# $Id: druby.rb 339 2005-09-06 23:27:27Z ertai $
 
 require 'uri_ex'
 

data/lib/uri/file.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: file.rb 279 2005-06-05 17:46:53Z ertai $
+# $Id: file.rb 258 2005-06-01 00:22:51Z ertai $
 
 require 'uri_ex'
 

data/lib/uri/ftp_ex.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: ftp_ex.rb 279 2005-06-05 17:46:53Z ertai $
+# $Id: ftp_ex.rb 258 2005-06-01 00:22:51Z ertai $
 
 require 'uri_ex'
 require 'uri/ftp'

data/lib/uri/http_ex.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: http_ex.rb 279 2005-06-05 17:46:53Z ertai $
+# $Id: http_ex.rb 258 2005-06-01 00:22:51Z ertai $
 
 require 'uri_ex'
 require 'uri/http'

data/lib/uri/mysql.rb

@@ -0,0 +1,121 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: mysql.rb 310 2005-06-27 07:14:36Z ertai $
+
+require 'uri_ex'
+
+module URI
+
+  class MySQL < Generic
+
+    SCHEME = 'mysql'.freeze
+    DEFAULT_HOST = 'localhost'.freeze
+    DEFAULT_PORT = 3306
+    DEFAULT_QUERY = ''.freeze
+    DUMP = 'mysqldump'.to_cmd.freeze
+
+    COMPONENT = [
+      :scheme,
+      :userinfo,
+      :host,
+      :path,
+      :query
+    ].freeze
+
+
+    def self.build ( args )
+      tmp = Util::make_components_hash(self, args)
+      return super(tmp)
+    end
+
+
+    def mk_connection_opts
+      opts = []
+      opts << '-h' << @host
+      opts << '-P' << @port if @port != DEFAULT_PORT
+      opts << '-p' << @password if @password
+      opts << '-u' << @user if @user
+      opts
+    end
+
+
+    def mk_dump_opts ( out=nil )
+      opts = %w[ -C ]
+      opts << '-r' << out if out
+      base, table = pathname.split
+      base, table = base.to_s, table.to_s
+      if base =~ /[\.\/]/
+        opts << table
+      else
+        if base =~ /\//
+          raise ArgumentError, "Use database/table not #{pathname}"
+        end
+        opts << base << table
+      end
+      opts
+    end
+
+
+    def save
+      out = TempPath.new('dump', pathname.basename.to_s)
+      cmd = DUMP + mk_connection_opts + mk_dump_opts(out) + mk_custom_opts
+      cmd.run(self.runner)
+      out
+    end
+
+  end # class MySQL
+
+  @@schemes[MySQL::SCHEME.upcase] = MySQL
+
+  test_section __FILE__ do
+    class MySQLTest < Test::Unit::TestCase
+
+      def setup
+        assert_nothing_raised do
+          @foo = URI.parse('mysql://foo/qux/bar')
+          @foo_at_bar = URI.parse('mysql://foo:baz@bar/baz/ben')
+          @foo_at_bar_42 = URI.parse('mysql://foo@bar:42/bing')
+          @cmplx = URI.parse('mysql://foo@bar/qux/bob?a=b,c,d=e,f,ghi,jkl=mno')
+        end
+        @all = [ @foo, @foo_at_bar, @foo_at_bar_42, @cmplx ]
+      end
+
+      def test_0_parse_basic
+        @all.each do |uri|
+          assert_kind_of(MySQL, uri)
+        end
+      end
+
+      def test_with_query
+        ref = %w[-h bar -u foo -C -r out bob -a b -c -d e -f --ghi --jkl mno]
+        assert_equal(ref, @cmplx.mk_connection_opts +
+                          @cmplx.mk_dump_opts('out') +
+                          @cmplx.mk_custom_opts)
+      end
+
+      def test_mk_connection_opts
+        assert_equal(['-h', 'foo'], @foo.mk_connection_opts)
+        assert_equal(%w[-h bar -p baz -u foo], @foo_at_bar.mk_connection_opts)
+        assert_equal(%w[-h bar -P]+[42, '-u', 'foo'],
+                     @foo_at_bar_42.mk_connection_opts)
+        assert_equal(["-h", "bar", "-u", "foo"], @cmplx.mk_connection_opts)
+      end
+
+      
+      def test_mk_dump_opts
+        base = %w[-C -r out]
+        assert_equal(%w[ -C bar ], @foo.mk_dump_opts())
+        assert_equal(base + ['bar'], @foo.mk_dump_opts('out'))
+        assert_equal(base + ['ben'], @foo_at_bar.mk_dump_opts('out'))
+        assert_equal(base + ['bing'], @foo_at_bar_42.mk_dump_opts('out'))
+        assert_equal(base + ['bob'], @cmplx.mk_dump_opts('out'))
+      end
+
+      def test_save
+        # FIXME
+      end
+    end # class MySQLTest
+  end
+
+end # module URI

data/lib/uri/pgsql.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: pgsql.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: pgsql.rb 310 2005-06-27 07:14:36Z ertai $
 
 require 'uri_ex'
 
@@ -13,7 +13,7 @@ module URI
     DEFAULT_HOST = 'localhost'.freeze
     DEFAULT_PORT = 5432
     DEFAULT_QUERY = ''.freeze
-    PG_DUMP = 'pg_dump'.to_cmd.freeze
+    DUMP = 'pg_dump'.to_cmd.freeze
 
     COMPONENT = [
       :scheme,
@@ -39,25 +39,9 @@ module URI
     end
 
 
-    def mk_custom_opts
-      opts = []
-      return opts if @query.nil?
-      @query.split(/,/).map do |x|
-        k, v = x.split(/=/)
-        if k.size == 1
-          opts << "-#{k}"
-        else
-          opts << "--#{k}"
-        end
-        opts << v unless v.nil?
-      end
-      opts
-    end
-
-
-    def mk_pg_dump_opts ( out )
-      opts = %w[ -F c -Z 9 -C -f ]
-      opts << out
+    def mk_dump_opts ( out=nil )
+      opts = %w[ -F c -Z 9 -C ]
+      opts << '-f' << out if out
       base, table = pathname.split
       base, table = base.to_s, table.to_s
       if base =~ /[\.\/]/
@@ -74,7 +58,7 @@ module URI
 
     def save
       out = TempPath.new('dump', pathname.basename.to_s)
-      cmd = PG_DUMP + mk_connection_opts + mk_pg_dump_opts(out) + mk_custom_opts
+      cmd = DUMP + mk_connection_opts + mk_dump_opts(out) + mk_custom_opts
       cmd.run(self.runner)
       out
     end
@@ -87,21 +71,25 @@ module URI
     class PgSQLTest < Test::Unit::TestCase
 
       def setup
-        assert_nothing_raised { @foo = URI.parse('pgsql://foo/qux/bar') }
-        assert_nothing_raised { @foo_at_bar = URI.parse('pgsql://foo@bar/baz/ben') }
-        assert_nothing_raised { @foo_at_bar_42 = URI.parse('pgsql://foo@bar:42/bing') }
         assert_nothing_raised do
+          @foo = URI.parse('pgsql://foo/qux/bar')
+          @foo_at_bar = URI.parse('pgsql://foo@bar/baz/ben')
+          @foo_at_bar_42 = URI.parse('pgsql://foo@bar:42/bing')
           @cmplx = URI.parse('pgsql://foo@bar/qux/bob?a=b,c,d=e,f,ghi,jkl=mno')
         end
+        @all = [ @foo, @foo_at_bar, @foo_at_bar_42, @cmplx ]
       end
 
       def test_0_parse_basic
+        @all.each do |uri|
+          assert_kind_of(PgSQL, uri)
+        end
       end
 
       def test_with_query
         ref = %w[-h bar -U foo -F c -Z 9 -C -f out bob -a b -c -d e -f --ghi --jkl mno]
         assert_equal(ref, @cmplx.mk_connection_opts +
-                          @cmplx.mk_pg_dump_opts('out') +
+                          @cmplx.mk_dump_opts('out') +
                           @cmplx.mk_custom_opts)
       end
 
@@ -112,19 +100,12 @@ module URI
         assert_equal(["-h", "bar", "-U", "foo"], @cmplx.mk_connection_opts)
       end
 
-      def test_mk_custom_opts
-        assert_equal([], @foo.mk_custom_opts)
-        assert_equal([], @foo_at_bar.mk_custom_opts)
-        assert_equal([], @foo_at_bar_42.mk_custom_opts)
-        assert_equal(%w[-a b -c -d e -f --ghi --jkl mno], @cmplx.mk_custom_opts)
-      end
-
-      def test_mk_pg_dump_opts
+      def test_mk_dump_opts
         base = %w[-F c -Z 9 -C -f out]
-        assert_equal(base + ['bar'], @foo.mk_pg_dump_opts('out'))
-        assert_equal(base + ['ben'], @foo_at_bar.mk_pg_dump_opts('out'))
-        assert_equal(base + ['bing'], @foo_at_bar_42.mk_pg_dump_opts('out'))
-        assert_equal(base + ['bob'], @cmplx.mk_pg_dump_opts('out'))
+        assert_equal(base + ['bar'], @foo.mk_dump_opts('out'))
+        assert_equal(base + ['ben'], @foo_at_bar.mk_dump_opts('out'))
+        assert_equal(base + ['bing'], @foo_at_bar_42.mk_dump_opts('out'))
+        assert_equal(base + ['bob'], @cmplx.mk_dump_opts('out'))
       end
 
       def test_save

data/lib/uri/svn.rb

@@ -3,10 +3,9 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: svn.rb 279 2005-06-05 17:46:53Z ertai $
+# $Id: svn.rb 339 2005-09-06 23:27:27Z ertai $
 
 require 'uri_ex'
-require 'abstract'
 
 module URI
 

data/lib/uri_ex.rb

@@ -1,12 +1,12 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: uri_ex.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: uri_ex.rb 339 2005-09-06 23:27:27Z ertai $
 
 require 'uri'
-require 'ruby_ex'
-require 'commands'
 
+module UriEx
+end # module UriEx
 
 module URI
 
@@ -66,6 +66,48 @@ module URI
       end
     end
 
+
+    def mk_custom_opts
+      opts = []
+      return opts if @query.nil?
+      @query.split(/,/).map do |x|
+        k, v = x.split(/=/)
+        if k.size == 1
+          opts << "-#{k}"
+        else
+          opts << "--#{k}"
+        end
+        opts << v unless v.nil?
+      end
+      opts
+    end
+
+
   end # module Generic
 
+
+
+  test_section __FILE__ do
+    class GenericTest < Test::Unit::TestCase
+
+      def setup
+        assert_nothing_raised { @foo = URI.parse('http://foo/qux/bar') }
+        assert_nothing_raised do
+          @cmplx = URI.parse('http://foo@bar/qux/bob?a=b,c,d=e,f,ghi,jkl=mno')
+        end
+      end
+
+      def test_mk_custom_opts
+        assert_equal([], @foo.mk_custom_opts)
+        assert_equal(%w[-a b -c -d e -f --ghi --jkl mno], @cmplx.mk_custom_opts)
+      end
+
+    end # class GenericTest
+  end
+
+  PathList[__FILE__.to_path.dirname + 'uri/**/*.rb'].each do |path|
+    require path.to_s
+  end
+
 end # module URI
+

data/lib/verbose_object.rb

@@ -1,70 +1,213 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: verbose_object.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: verbose_object.rb 339 2005-09-06 23:27:27Z ertai $
 
-require 'ruby_ex'
+require 'blank_slate'
+require 'method_call'
 
 module Verbosify
 
-  SKIP_METHODS = %w[ instance_eval ]
+  attr_accessor :verbose_object_reference
+  attr_reader   :verbose_object_options
 
-  def self.extend_object ( anObject )
-    anObject.methods.each do |meth|
-      next if meth =~ /__.*__/
-      next if SKIP_METHODS.include? meth
-      anObject.instance_eval %Q{
-        def #{meth} ( *a, &b )
-          __log__(:#{meth}, *a, &b)
-          super
-        end
-      }
+  def initialize ( anObject, opts=nil )
+    @verbose_object_reference = anObject
+    self.verbose_object_options = opts
+  end
+
+  def verbose_object_options= ( opts )
+    @verbose_object_reference ||= nil
+    @verbose_object_options = opts || {}
+    unless @verbose_object_options.is_a? Hash
+      raise ArgumentError,
+            "Need a hash of options not a #@verbose_object_options"
     end
-    anObject.instance_eval do
-      def verbose_object?
-        true
-      end
-      def __log__ ( *a )
-        STDERR.puts "LOG: #{a.inspect}"
+    if @verbose_object_options[:logger].nil?
+      logger = @verbose_object_options[:logger] = Object.new
+      def logger.log ( obj, *a )
+        STDERR.puts "LOG: #{obj.__id__}: #{a.inspect}"
       end
     end
   end
 
-end # module Verbosify
+  def verbose_object?
+    true
+  end
 
+  def verbose_object_send ( m, *a, &b )
+    if @verbose_object_reference.nil?
+      __send__("__blank_slate_#{m}", *a, &b)
+    else
+      @verbose_object_reference.__send__(m, *a, &b)
+    end
+  end
 
-class VerboseObject
+  def method_missing ( m, *a, &b )
+    super($1.to_sym) if m.to_s =~ /^__blank_slate_(.+)/
+    verbose_object_method_missing(m, *a, &b)
+  end
 
-  def initialize ( anObject )
-    @obj = anObject
+  def verbose_object_method_missing ( m, *a, &b )
+    begin
+      @verbose_object_options[:logger].log(self, m, *a)
+    rescue NoMethodError => ex
+      STDERR.puts "No valid logger (#{m}) (#{ex})"
+    end
+    res = verbose_object_send(m, *a, &b)
+    return res if @verbose_object_options[:no_rec]
+    call = MethodCall.new(m, *a, &b)
+    opts = @verbose_object_options.merge(:call => call, :last => self)
+    res.verbosify(opts)
   end
 
-  instance_methods.each do |meth|
-    next if meth =~ /__.*__/
-    module_eval %Q{
-      def #{meth} ( *a, &b )
-        method_missing(:#{meth}, *a, &b)
-      end
-    }
+  def verbose_object_trace ( action=nil )
+    call = @verbose_object_options[:call]
+    last = @verbose_object_options[:last]
+    return verbose_object_empty_trace(action) if call.nil?
+    if last.__blank_slate_eql? self
+      last = verbose_object_empty_trace(action)
+    else
+      last = last.verbose_object_trace(action)
+    end
+    call.to_ruby(last)
   end
 
-  def verbose_object?
-    true
+  def verbose_object_empty_trace ( action )
+    inspect # FIXME
+  end
+
+end # module Verbosify
+
+
+class VerboseObject
+  def self.blank_slate_ignore ( name )
+    super or name =~ /^(verbos(ify|e_object)|(nil\?|inspect|send)$)/
   end
+  include BlankSlate
+  include Verbosify
+end # class VerboseObject
 
-  def __log__ ( *a )
-    STDERR.puts "LOG: #{a.inspect}"
+
+class Class
+
+  def verbosify! ( opts=nil )
+    raise TypeError
   end
 
-  def method_missing ( *a, &b )
-    __log__(*a)
-    @obj.__send__(*a, &b)
+  alias_method :old_class_equal, :==
+  def == ( rhs )
+    return object_id == rhs.object_id
   end
 
-end # class VerboseObject
+end # class Class
+
 
 class Object
+
   def verbose_object?
     false
   end
+
+  def verbosify ( opts=nil )
+    begin
+      verbosify!(opts)
+    rescue TypeError => ex
+      VerboseObject.new(self, opts)
+    end
+  end
+
+  def verbosify! ( opts=nil )
+    unless blank_slate?
+      class << self
+        def self.blank_slate_ignore ( name )
+          VerboseObject.blank_slate_ignore(name)
+        end
+      end
+      extend BlankSlate unless blank_slate?
+    end
+    __blank_slate_extend Verbosify unless verbose_object?
+    self.verbose_object_options = opts
+    self
+  rescue TypeError => ex
+    raise TypeError, "can't make a verbose object from #{self} (#{ex})"
+  end
+
 end # class Object
+
+test_section __FILE__ do
+  require 'mocks'
+
+  class TestVerboseObject < ::Test::Unit::TestCase
+    include Mocks::Assertions
+
+    def assert_verbosify ( anObject )
+      assert_nothing_raised { return anObject.verbosify(@opts) }
+    end
+
+    def assert_same_result ( myVerboseObject, refObject, aMethod, *args, &block )
+      assert_nothing_raised do
+        my = myVerboseObject.__send__(aMethod, *args, &block)
+        ref = refObject.__send__(aMethod, *args, &block)
+        assert_equal(ref, my)
+      end
+    end
+
+    def setup
+      @mock_object = Mocks::Object.new
+      @opts = { :logger => @mock_object, :no_rec => false }
+      @str = "foo"
+      @arr = [1, 3, @str.dup, [1, 2]]
+      @hash = { :foo => @arr.dup, :bar => "value" }
+      @num = 42
+      @objs = [@str, @arr, @hash, @num]
+    end
+
+    def teardown
+    end
+
+    def assert_same_result_many ( meth, *args, &block )
+      @objs.each do |element|
+        assert_same_result(assert_verbosify(element.try_dup), element, meth, *args, &block)
+      end
+    end
+
+    def test_simple
+      assert_same_result_many :size
+      assert_mock [@str,  :size], [3, :==, 3],
+                  [@arr,  :size], [4, :==, 4],
+                  [@hash, :size], [2, :==, 2],
+                  [@num,  :size], [4, :==, 4]
+    end
+
+    def test_class
+      assert_same_result_many :class
+      mock_object.mock_freeze
+      args = mock_object.mock_args.delete_if { |x, y, z| y == :== }
+      assert_equal [[@str,  :class], [String, :object_id],
+                    [@arr,  :class], [Array, :object_id],
+                    [@hash, :class], [Hash, :object_id],
+                    [@num,  :class], [Fixnum, :object_id]], args
+    end
+
+    def test_with_class
+      @class = String
+      @vclass = assert_verbosify @class
+      assert_same_result @vclass, @class, :name
+      mock_object.mock_freeze
+      assert_mock [@class, :name]
+    end
+
+    def test_trace
+      @vrange = assert_verbosify 1..3
+      assert_nothing_raised do
+        @res = (@vrange.map{|x| x + 1}.join(',').size * -4).abs
+      end
+      assert_equal 20, @res
+      assert_equal '(1..3.each { ... }.map { ... }.join(",").size * -4).abs',
+                   @res.verbose_object_trace
+    end
+
+  end # class TestVerboseObject
+
+end