ruby_ex 0.3.0 → 0.4.1.2

data/lib/uri/generic_ex.rb

@@ -0,0 +1,158 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/uri/generic_ex.rb 22203 2006-02-23T23:23:37.370101Z pouillar  $
+
+module URI
+
+  class CheckoutError < Exception
+  end
+
+  class CommitError < Exception
+  end
+
+  class SaveError < Exception
+  end
+
+  class << self
+    alias_method :static_parse, :parse
+    def parse ( anObject )
+      str = anObject.to_s
+      if str =~ /^(\w+):\/\//
+        "uri/#$1".camelize.constantize
+      end
+      static_parse(str)
+    end
+  end
+
+  class Generic
+    have YamlExtension, :uri, :url
+
+    #
+    # To make all uris command verbose you can change or modify the global
+    # command runner: URI::Generic.runner.make_verbose!
+    #
+    cattr_accessor :runner
+
+    self.runner = Commands::Runners::System.new.raise_on_failures
+    self.runner.command_data_factory.command_data_class = Commands::Datas::Temp
+
+    def pathname
+      Pathname.new(path)
+    end
+
+    def pathname= ( path )
+      self.path = path.to_s
+    end
+
+    def to_yaml_string
+      to_s
+    end
+
+    def to_uri
+      self
+    end
+    alias_method :to_url, :to_uri
+
+    def checkout
+      raise CheckoutError, "Can't checkout a #{self.class}"
+    end
+
+    def commit
+      raise CommitError, "Can't commit a #{self.class}"
+    end
+
+    def save
+      raise SaveError, "Can't save a #{self.class}"
+    end
+
+    def add_query ( arg )
+      if query.nil?
+        self.query = arg
+      else
+        self.query += ',' + arg
+      end
+    end
+
+
+    def mk_custom_opts
+      opts = []
+      return opts if @query.nil?
+      @query.split(/,/).map do |x|
+        k, v = x.split(/=/)
+        k = URI.decode(k)
+        if k.size == 1
+          opts << "-#{k}"
+        else
+          opts << "--#{k}"
+        end
+        opts << URI.decode(v) unless v.nil?
+      end
+      opts
+    end
+
+    def self.yaml_load ( val )
+      URI.parse(val)
+    end
+
+  end # class Generic
+
+  class GenericEx < Generic
+
+    test_section __FILE__ do
+      class Test < 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 teardown
+          URI::Generic.remove_subclasses
+        end
+
+        def test_uri_inflections
+          assert_equal 'URI', 'uri'.camelize
+          assert_equal 'Security', 'security'.camelize 
+          assert_equal 'Sec::URI::Ty', 'sec/uri/ty'.camelize
+        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
+
+        def test_lazy_loading_one
+          assert_nothing_raised do
+            assert_equal 'URI::DRuby', URI::DRuby.name
+            assert_equal URI::GenericEx, URI::DRuby.superclass
+          end
+        end
+
+        def test_lazy_loading_one2
+          assert_equal 'File', ::File.name
+          assert_nothing_raised do
+            assert_equal 'URI::File', 'URI::File'.constantize.name
+            assert_equal URI::GenericEx, 'URI::File'.constantize.superclass
+          end
+        end
+
+        def test_lazy_loading_full
+          PathList[__FILE__.to_path.dirname.parent + '(uri/**/*).rb'].each do |full, path|
+            assert_nothing_raised do
+              class_name = path.to_s.camelize.gsub(/Ex$/, '')
+              class_object = class_name.constantize
+              assert_equal class_name, class_object.name
+              assert_match(/URI::Generic(Ex)?/, class_object.superclass.name)
+            end
+          end
+        end
+
+      end # class Test
+    end
+
+  end # class GenericEx
+
+end # module URI

data/lib/uri/http_ex.rb

@@ -2,15 +2,15 @@
 # Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: http_ex.rb 385 2005-10-02 17:05:35Z ertai $
+# $LastChangedBy: pouillar $
+# $Id: /w/fey/ruby_ex/trunk/lib/uri/http_ex.rb 22058 2006-02-20T21:41:08.060925Z pouillar  $
 
-require 'uri_ex'
 require 'uri/http'
 require 'net/http'
 
 module URI
 
+  GenericEx.import!
   class HTTP
 
     def checkout
@@ -34,8 +34,13 @@ module URI
       end
 
       [tmp, nil]
-  end
+    end
 
   end # class HTTP
 
+  class HttpEx
+  end
+  class HTTPEx
+  end
+
 end # module URI

data/lib/uri/mysql.rb

@@ -1,19 +1,18 @@
 # 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'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/uri/mysql.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module URI
 
-  class MySQL < Generic
+  class MySQL < GenericEx
 
     SCHEME = 'mysql'.freeze
     DEFAULT_HOST = 'localhost'.freeze
     DEFAULT_PORT = 3306
     DEFAULT_QUERY = ''.freeze
-    DUMP = 'mysqldump'.to_cmd.freeze
+    cattr_reader :mysqldump
+    @@mysqldump = 'mysqldump'.to_cmd.freeze
 
     COMPONENT = [
       :scheme,
@@ -24,12 +23,6 @@ module URI
     ].freeze
 
 
-    def self.build ( args )
-      tmp = Util::make_components_hash(self, args)
-      return super(tmp)
-    end
-
-
     def mk_connection_opts
       opts = []
       opts << '-h' << @host
@@ -59,9 +52,8 @@ module URI
 
     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
+      cmd = mysqldump + mk_connection_opts + mk_dump_opts(out) + mk_custom_opts
+      [out, cmd.run(runner)]
     end
 
   end # class MySQL
@@ -102,7 +94,7 @@ module URI
         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())

data/lib/uri/pgsql.rb

@@ -1,19 +1,18 @@
 # 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 310 2005-06-27 07:14:36Z ertai $
-
-require 'uri_ex'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/uri/pgsql.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module URI
 
-  class PgSQL < Generic
+  class PgSQL < GenericEx
 
     SCHEME = 'pgsql'.freeze
     DEFAULT_HOST = 'localhost'.freeze
     DEFAULT_PORT = 5432
     DEFAULT_QUERY = ''.freeze
-    DUMP = 'pg_dump'.to_cmd.freeze
+    cattr_reader :pg_dump
+    @@pg_dump = 'pg_dump'.to_cmd.freeze
 
     COMPONENT = [
       :scheme,
@@ -24,12 +23,6 @@ module URI
     ].freeze
 
 
-    def self.build ( args )
-      tmp = Util::make_components_hash(self, args)
-      return super(tmp)
-    end
-
-
     def mk_connection_opts
       opts = []
       opts << '-h' << @host
@@ -58,9 +51,8 @@ module URI
 
     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
+      cmd = pg_dump + mk_connection_opts + mk_dump_opts(out) + mk_custom_opts
+      [out, cmd.run(runner)]
     end
 
   end # class PgSQL

data/lib/uri/rsync.rb

@@ -0,0 +1,77 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/uri/rsync.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
+
+module URI
+
+  class Rsync < GenericEx
+
+    SCHEMES = ['rsync.ssh'.freeze]
+    DEFAULT_HOST = 'localhost'.freeze
+    DEFAULT_QUERY = ''.freeze
+    cattr_reader :rsync
+    @@rsync ||= 'rsync'.to_cmd.freeze
+
+    COMPONENT = [
+      :scheme,
+      :userinfo,
+      :host,
+      :path,
+      :query
+    ].freeze
+
+    def mk_opts
+      ['-va'] + mk_custom_opts
+    end
+
+    def mk_arg
+      "#@user@#@host:#{@path.gsub(/^\//, '')}"
+    end
+
+    # def checkout
+      # out = TempPath.new('checkout', pathname.basename.to_s)
+      # [out, SCP[mk_opts, mk_arg, out].run(self.runner)]
+    # end
+
+    # def save
+      # checkout.first.save
+    # end
+
+    def commit ( aPath )
+      rsync[mk_opts, aPath, mk_arg].run(runner)
+    end
+
+  end # class Rsync
+
+  Rsync::SCHEMES.each do |scheme|
+    @@schemes[scheme.upcase] = Rsync
+  end
+
+  test_section __FILE__ do
+
+    class RsyncTest < Test::Unit::TestCase
+
+      def test_mk_opts
+        assert_nothing_raised { @uri = URI.parse('rsync.ssh://foo@bar') }
+        assert_equal(['-va'], @uri.mk_opts)
+      end
+
+      def test_mk_opts_with_query
+        assert_nothing_raised do
+          @uri = URI.parse('rsync.ssh://foo@bar/baz?rsh=ssh%20-i%20foo,boo,bee=42')
+        end
+        ref = ['-va', '--rsh', 'ssh -i foo', '--boo', '--bee', '42']
+        assert_equal(ref, @uri.mk_opts)
+      end
+
+      def test_mk_arg
+        assert_nothing_raised { @uri = URI.parse('rsync.ssh://foo@bar/path') }
+        assert_equal('foo@bar:path', @uri.mk_arg)
+      end
+
+    end # class RsyncTest
+
+  end
+
+end # module URI

data/lib/uri/ssh.rb

@@ -3,17 +3,17 @@
 # License::   Gnu General Public License.
 # Revision::  $Id$
 
-require 'uri_ex'
-
 module URI
 
-  class Ssh < Generic
+  class Ssh < GenericEx
 
     SCHEME = 'ssh'.freeze
     DEFAULT_HOST = 'localhost'.freeze
     DEFAULT_PORT = 22
     DEFAULT_QUERY = ''.freeze
-    SCP = 'scp'.to_cmd.freeze
+    cattr_reader :ssh, :scp
+    @@ssh = 'ssh'.to_cmd.freeze
+    @@scp = 'scp'.to_cmd.freeze
 
     COMPONENT = [
       :scheme,
@@ -23,44 +23,72 @@ module URI
       :query
     ].freeze
 
-    def self.build ( args )
-      tmp = Util::make_components_hash(self, args)
-      return super(tmp)
-    end
-
     def mk_opts
-      opts = []
-      opts << '-q'
+      opts = ['-q']
       opts << '-P' << @port if @port != DEFAULT_PORT
-      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
+      opts + mk_custom_opts
+    end
+
+    def mk_scp_arg
+      "#{mk_ssh_arg}:#{@path.gsub(/^\//, '')}"
     end
 
-    def mk_arg
-      "#@user@#@host:#{@path.gsub(/^\//, '')}"
+    def mk_ssh_arg
+      result = ''
+      result << @user << '@' if @user
+      result + @host
     end
 
     def checkout
       out = TempPath.new('checkout', pathname.basename.to_s)
-      [out, SCP[mk_opts, mk_arg, out].run(self.runner)]
+      [out, scp[mk_opts, mk_scp_arg, out].run(runner)]
     end
 
     def save
-      checkout.save
+      checkout.first.save
     end
 
     def commit ( aPath )
-      SCP[mk_opts, aPath, mk_arg].run(self.runner)
+      scp[mk_opts, aPath, mk_scp_arg].run(runner)
+    end
+
+    def jump_and_eval ( aString, ruby='ruby', ruby_opts=[], &block )
+      tag = "=== RESULT ===\n"
+      TempPath.new do |tmp|
+        tmp.open('w') do |f|
+          f.print "
+            aProc = proc { #{aString} }
+            result =
+              begin
+                [true, aProc[]]
+              rescue Exception => ex
+                [false, ex]
+              end
+            STDERR.print '#{tag}'
+            STDERR.print Marshal.dump(result)
+          "
+        end
+        cmd = ssh[mk_opts, mk_ssh_arg, ruby, *ruby_opts] < tmp
+        data = cmd.popen
+        block[data.output]
+        data.waitpid
+        if data.status.success?
+          err = data.error.read
+          err, result = err.split(tag)
+          STDERR.print err
+          st, obj = Marshal.load(result)
+          if st
+            return obj
+          else
+            raise obj
+          end
+        else
+          data.display
+          raise "Command failed #{cmd}"
+        end
+      end
     end
+    alias_method :remote_eval, :jump_and_eval
 
   end # class Ssh
 

data/lib/uri/svn.rb

@@ -2,37 +2,42 @@
 # Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: svn.rb 363 2005-09-24 17:15:50Z ertai $
-
-require 'uri_ex'
+# $LastChangedBy: pouillar $
+# $Id: /w/fey/ruby_ex/trunk/lib/uri/svn.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module URI
 
-  class Svn < Generic
+  class Svn < GenericEx
 
     COMPONENT = [
       :scheme,
       :host,
       :path
     ].freeze
-    SVN = 'svn'.to_cmd.freeze
-    SVNADMIN = 'svnadmin'.to_cmd.freeze
 
+    cattr_reader :svn, :svnadmin
+
+    @@svn      = 'svn'.to_cmd.freeze
+    @@svnadmin = 'svnadmin'.to_cmd.freeze
+
+
+    def svn_uri_string
+      to_s.sub(/^svn\./, '')
+    end
+
+    def to_s
+      super.sub(/^(svn\.file:\/)([^\/])/, '\1//\2')
+    end
 
-    def self.build ( args )
-      tmp = Util::make_components_hash(self, args)
-      return super(tmp)
+    def fingerprint
+      svn['info', svn_uri_string].system(:r).output.read[/Revision: (\d+)/, 1]
     end
 
     def checkout
-      # klass = SvnSchemes.guess(scheme)
-      # klass.new
       tmp = TempPath.new('svn-checkout')
       tmp.mkpath
-      target = to_s.sub(/^svn\./, '')
       tmp += pathname.basename
-      [tmp, SVN['checkout', target, tmp].run(self.runner)]
+      [tmp, svn['checkout', svn_uri_string, tmp].run(runner)]
     end
 
     def save
@@ -40,72 +45,13 @@ module URI
       repos = pathname
       raise SaveError unless (repos + 'format').exist?
       out = TempPath.new('save', "#{repos.basename}.svndump")
-      cmd = SVNADMIN['dump', repos, '--incremental', '--quiet'] > out
-      cmd.run(self.runner)
+      cmd = svnadmin['dump', repos, '--incremental', '--quiet', '--deltas'] > out
+      [out, cmd.run(runner)]
     end
 
   end # class Svn
 
-  module SvnSchemes
-
-    def self.guess ( aScheme )
-      init
-      @@svn_schemes[aScheme]
-    end
-
-    def self.init
-      return if defined? @@svn_schemes
-      @@svn_schemes = {}
-      constants.each do |const|
-        klass = const_get(const)
-        next if klass.abstract?
-        @@svn_schemes[klass.scheme] = klass
-      end
-      @@svn_schemes.freeze
-    end
-
-    def self.svn_schemes
-      init
-      @@svn_schemes
-    end
-
-    class AbstractSvnScheme
-      include Abstract
-
-      def self.scheme
-        const_get(:SCHEME)
-      end
-
-    end
-
-    class SvnScheme < AbstractSvnScheme
-      include Concrete
-      SCHEME = 'SVN'
-    end
-
-    class SvnSshScheme < AbstractSvnScheme
-      include Concrete
-      SCHEME = 'SVN+SSH'
-    end
-
-    class SvnHttpScheme < AbstractSvnScheme
-      include Concrete
-      SCHEME = 'SVN.HTTP'
-    end
-
-    class SvnHttpsScheme < AbstractSvnScheme
-      include Concrete
-      SCHEME = 'SVN.HTTPS'
-    end
-
-    class SvnFileScheme < AbstractSvnScheme
-      include Concrete
-      SCHEME = 'SVN.FILE'
-    end
-
-  end
-
-  SvnSchemes.svn_schemes.each_key do |name|
+  ['SVN', 'SVN+SSH', 'SVN.HTTP', 'SVN.HTTPS', 'SVN.FILE'].each do |name|
     @@schemes[name] = Svn
   end
 

data/lib/verbose_object.rb

@@ -1,10 +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: verbose_object.rb 339 2005-09-06 23:27:27Z ertai $
-
-require 'blank_slate'
-require 'method_call'
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/verbose_object.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module Verbosify
 
@@ -136,7 +133,6 @@ class Object
 end # class Object
 
 test_section __FILE__ do
-  require 'mocks'
 
   class TestVerboseObject < ::Test::Unit::TestCase
     include Mocks::Assertions

data/lib/yaml/transform.rb

@@ -3,7 +3,7 @@
 # License:: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: transform.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/yaml/transform.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 # TODO: Raised exception must be completed with a descritpion
 # TODO: Fix bug on Array see test_higher_level_on_array

data/lib/yaml/yregexpath.rb

@@ -3,7 +3,7 @@
 # License:: Ruby license.
 
 # $LastChangedBy: ertai $
-# $Id: yregexpath.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/yaml/yregexpath.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 module YAML