ruby_ex 0.3.0 → 0.4.1.2

data/lib/sendmail.rb

@@ -4,7 +4,6 @@
 # License::   GNU General Public License (GPL).
 # Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'pathname'
 require 'ostruct'
 require 'optparse'
 Yaml::ChopHeader.import!
@@ -15,12 +14,9 @@ class Sendmail
   MAIL_FILE = Pathname.new(',mail')
 
   def parse_mail_options ( *args )
-    email = (defined? EMAIL)? EMAIL : ENV['EMAIL']
-    full_name = (defined? FULLNAME)? FULLNAME : ENV['FULLNAME']
-    full_email = (defined? FULL_EMAIL)? FULL_EMAIL : "#{full_name}  <#{email}>"
     options = OpenStruct.new(
-      :from_name => full_email,
-      :from => email,
+      :from => (defined? EMAIL)? EMAIL : ENV['EMAIL'],
+      :from_name => (defined? FULLNAME)? FULLNAME : ENV['FULLNAME'],
       :to => [],
       :server => ENV['SMTPSERVER'] || 'localhost:25',
       :header => {},
@@ -29,8 +25,21 @@ class Sendmail
     string_args, hash_args = args.partition { |x| x.is_a?(String) }
     hash_args.each do |hash|
       raise ArgumentError, "Bad argument #{hash}" unless hash.is_a?(Hash)
+      if hash[:header].is_a? String
+        options.header.merge! YAML.load(hash[:header]).symbolize_keys
+        hash.delete :header
+      end
+      if hash[:subject]
+        options.header[:Subject] = hash[:subject]
+        hash.delete :subject
+      end
       hash.each do |k,v|
-	options.send("#{k}=", v)
+        x = options.send(k)
+        case x
+        when Hash  then v.each { |kk, vv| x[kk.to_sym] = vv }
+        when Array then x.concat v
+        else options.send("#{k}=", v)
+        end
       end
     end
     OptionParser.new do |opts|
@@ -38,6 +47,9 @@ class Sendmail
       opts.on('-b', '--body FILE', 'Choose a file for the mail body') do |aFile|
 	options.body = File.open(aFile)
       end
+      opts.on('-f', '--mail-from NAME <EMAIL>', 'Choose the From address') do |aString|
+	options.from = aString
+      end
       opts.on('-t', '--mail-to NAME', 'Choose a recipient') do |aString|
 	options.to << aString
       end
@@ -46,7 +58,7 @@ class Sendmail
         options.port ||= 25
       end
       opts.on('-S', '--subject NAME', 'Choose your mail subject') do |aString|
-	options.subject = aString.sub(/\.?$/, '.')
+	options.header[:Subject] = aString.sub(/\.?$/, '.')
       end
       opts.on('--[no-]sign', 'Sign the message with gpg') do |signed|
 	options.signed = signed
@@ -61,7 +73,7 @@ class Sendmail
         options.comment = aComment
       end
       opts.on('--header STRING', 'Add some header fields (Yaml syntax)') do |s|
-        options.header = YAML.load(s)
+        options.header.merge! YAML.load(s)
       end
       opts.on('-m', '--[no-]mime', 'Choose the mime protocole') do |mime|
         options.mime = mime
@@ -71,6 +83,15 @@ class Sendmail
 	exit
       end
     end.parse!(string_args)
+    options.header[:To] ||= options.to.join ', '
+    from = options.header[:From] || options.from
+    if from.to_s =~ /<(.*)>/
+      options.header[:From] = from
+      options.from = $1
+    else
+      options.header[:From] = "#{options.from_name}  <#{from}>"
+      options.from = from
+    end
     check_mail_options(options)
     options
   end
@@ -79,7 +100,7 @@ class Sendmail
   def check_mail_options ( options )
     raise ArgumentError, 'No recipents' if options.to.empty?
     raise ArgumentError, 'No mail server' if options.server.nil?
-    raise ArgumentError, 'No mail subject' if options.subject.nil?
+    raise ArgumentError, 'No mail subject' if options.header[:Subject].nil?
   end
 
   #
@@ -98,6 +119,7 @@ class Sendmail
       opts = parse_mail_options(*args)
       body = (opts.body.nil?)? '' : opts.body.read
     end
+    opts.header.symbolize_keys!
     server, port = opts.server.split(/:/)
     port ||= 25
     STDERR.puts "Smtp Server: #{server}"
@@ -108,9 +130,9 @@ class Sendmail
     if opts.confirm
       raise 'HighLine is unavailable' unless defined? HighLine
       question = %Q[
-        |Send a mail, with this subject: #{opts.subject}
-        |  to #{opts.to.join(', ')}
-        |  from #{opts.from_name}
+        |Send a mail, with this subject: #{opts.header[:Subject]}
+        |  to #{opts.header[:To]}
+        |  from #{opts.header[:From]}
         |  #{(opts.signed)? 'signed by ' + opts.from : 'not signed !'}
         |Are you sure? (y/n)].head_cut!
       raise 'Aborting' unless HighLine.new.agree question, true
@@ -119,11 +141,13 @@ class Sendmail
     require 'net/smtp'
     Net::SMTP.start(server, port) do |smtp|
       smtp.open_message_stream(opts.from, opts.to) do |f|
-        f.print %Q[From: #{opts.from_name}
-                  |Subject: #{opts.subject}
-                  |To: #{opts.to.join(', ')}\n].head_cut!
+        f.print "From: #{opts.header[:From]}\n"
+        f.print "To: #{opts.header[:To]}\n"
+        f.print "Subject: #{opts.header[:Subject]}\n"
         opts.header.each do |k, v|
-          f.puts "#{k}: #{v}"
+          next if [:From, :To, :Subject].include? k
+          k = $1 if k.to_s =~ /^"(.*)"$/
+          f.print "#{k}: #{v}\n"
         end
         if opts.signed
           TempPath.new do |mail_body|

data/lib/service_manager.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: service_manager.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/service_manager.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 require 'drb/drb'
 

data/lib/shuffle.rb

@@ -1,7 +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: shuffle.rb 339 2005-09-06 23:27:27Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/shuffle.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
+
+Choose.import!
 
 module Shuffle
 

data/lib/spring.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: spring.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/spring.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 require 'thread'

data/lib/spring_set.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: spring_set.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/spring_set.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 

data/lib/sym_tbl.rb

@@ -3,7 +3,7 @@
 # License: Ruby license.
 
 # $LastChangedBy: ertai $
-# $Id: sym_tbl.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/sym_tbl.rb 8016 2005-10-26T18:58:00.073495Z ertai  $
 
 require 'set'
 
@@ -31,13 +31,16 @@ class SymTbl
   def [] ( aKey )
     return nil if aKey == ''
     aKey = key_convert(aKey)
-    if @local.has_key? aKey
-      @local[aKey]
-    elsif @father.nil?
-      @local.default
-    else
-      @father[aKey]
-    end
+    result =
+      if @local.has_key? aKey
+        @local[aKey]
+      elsif @father.nil?
+        @local.default
+      else
+        @father[aKey]
+      end
+    result = result[] if result.is_a? Trigger
+    result
   end
 
   def []= ( aKey, aValue )
@@ -110,6 +113,9 @@ class SymTbl
     self.class.new(self)
   end
 
+  class Trigger < Proc
+  end # class Trigger
+
 end # class SymTbl
 
 

data/lib/sym_tbl_gsub.rb

@@ -1,21 +1,53 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   Ruby License
-# Revision::  $Id: sym_tbl_gsub.rb 376 2005-09-29 21:46:32Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/sym_tbl_gsub.rb 21868 2006-02-18T18:09:17.837831Z pouillar  $
+
+module SymTblGsub
+
+  module Assertions
+
+    attr_accessor :symtbl
+
+    def assert_symtbl ( my, ref )
+      assert_equal ref, my.do_symtbl_gsub(symtbl)
+    end
+
+    def assert_symtbl_nil ( my )
+      assert_nil my.symtbl_gsub(symtbl)
+    end
+
+  end # module Assertions
+
+end # module SymTblGsub
 
-require 'sym_tbl'
 
 class Object
 
+  def symtbl_gsub! ( symtbl )
+    nil
+  end
+
   def symtbl_gsub ( symtbl )
     nil
   end
 
   def do_symtbl_gsub ( symtbl )
+    unless symtbl.is_a? SymTbl
+      raise ArgumentError, "need a SymTbl not: #{symtbl.inspect}"
+    end
     result = symtbl_gsub(symtbl)
     return (result.nil?)? self : result
   end
 
+  def do_symtbl_gsub! ( symtbl )
+    unless symtbl.is_a? SymTbl
+      raise ArgumentError, "need a SymTbl not: #{symtbl.inspect}"
+    end
+    result = symtbl_gsub!(symtbl)
+    return (result.nil?)? self : result
+  end
+
   def symtbl_to_s
     to_s
   end
@@ -67,8 +99,7 @@ class Array
 end # class Array
 
 
-
-class SymTbl
+SymTbl.class_eval do
 
   def symtbl_gsub! ( symtbl )
     new_local = @local.symtbl_gsub(symtbl)
@@ -87,9 +118,12 @@ end # class SymTbl
 
 class Pathname
 
+  def symtbl_gsub! ( symtbl )
+    self unless @path.symtbl_gsub!(symtbl).nil?
+  end
+
   def symtbl_gsub ( symtbl )
-    res = to_s.symtbl_gsub(symtbl)
-    return self.class.new(res) unless res.nil?
+    dup.symtbl_gsub!(symtbl)
   end
 
 end # class Pathname
@@ -115,6 +149,10 @@ class Symbol
     return res.to_sym unless res.nil?
   end
 
+  def symtbl_gsub! ( symtbl )
+    raise TypeError, 'can\'t modify a symbol'
+  end
+
 end # class Symbol
 
 
@@ -122,23 +160,31 @@ end # class Symbol
 class String
 
   def symtbl_gsub ( symtbl )
-    return nil unless self =~ /<<(.*)>>/
-    cur, last = self, nil
-    while cur != last
-      last = cur
-      cur = cur.gsub(/<<([^<>]*)>>/) do
+    return nil unless self =~ /<<.*>>/
+    dup.symtbl_gsub! symtbl
+  end
+
+  @@tag ||= "|#{rand.to_i}|"
+
+  def symtbl_gsub! ( symtbl )
+    have_changed = nil
+    while (
+      gsub!(/<<([^<>]*)>>/) do
         s = symtbl[$1]
-        (s.nil?)? $& : s.symtbl_to_s
+        have_changed ||= s
+        (s.nil?)? "<#{@@tag}<#$1>#{@@tag}>" : s.symtbl_to_s
       end
+    ) do
     end
-    (cur == self)? nil : cur
+    gsub! @@tag, ''
+    return nil if have_changed.nil?
+    self
   end
 
 end # class String
 
 
-PathList.import!
-class PathList
+PathList.class_eval do
   attr_accessor :symtbl
 
   alias_method :add_matching_without_expand, :add_matching
@@ -173,13 +219,33 @@ class PathList
 end # class PathList
 
 
+class File
+
+  def symtbl_gsub! ( symtbl )
+    contents = read
+    result = contents.symtbl_gsub! symtbl
+    if result
+      truncate 0
+      write contents
+    end
+    result
+  end
+  
+  def symtbl_gsub ( symtbl )
+    contents = read
+    contents.symtbl_gsub! symtbl
+  end
+  
+end # class File
+
 
 module SymTblGsub
 
   test_section __FILE__ do
     class SymTblGsubTest < Test::Unit::TestCase
+      include SymTblGsub::Assertions
       def setup
-        @s = SymTbl.new(
+        self.symtbl = SymTbl.new(
           :foo  => :bar,
           :bar  => [1, 2],
            3    => 'foo',
@@ -189,13 +255,10 @@ module SymTblGsub
           :test => '<<pwd>>/../test'
         )
       end
-      def assert_symtbl ( my, ref=nil )
-        assert_equal ref, my.symtbl_gsub(@s)
-      end
       def test_string
         assert_symtbl '<<foo>>', 'bar'
         assert_symtbl '<<foo>><<3>> >> <<', 'barfoo >> <<'
-        assert_symtbl '<<<<>>>>%%><<>>^#^#'
+        assert_symtbl_nil '<<<<>>>>%%><<>>^#^#'
         assert_symtbl '<<<<bar>>>>', '<<[1, 2]>>'
         assert_symtbl '%<<<<foo>>>>#', '%[1, 2]#'
         assert_symtbl "_\n\t\000_<<i>>__", "_\n\t\000_foo__"
@@ -205,7 +268,9 @@ module SymTblGsub
       class Foo
       end
       def test_object
-        assert_symtbl Foo.new
+        f = Foo.new
+        assert_symtbl f, f
+        assert_symtbl_nil f
       end
       def test_hash
         assert_symtbl({'<<foo>>' => '<<i>>', 'barbar' => '<<3>>' },
@@ -230,7 +295,7 @@ module SymTblGsub
         ls2 = '<<pwd>>/../test'.to_path + 'fixtures/autoload_tree/*.rb'
         ls3 = '<<test>>'.to_path + 'fixtures/foo.{tar*,bz*}'
         pathlist << ls2 << ls1 << ls3
-        my = PathList[pathlist].symtbl_gsub(@s).map! { |x| x.basename }
+        my = PathList[pathlist].symtbl_gsub(symtbl).map! { |x| x.basename }
         my.all? { |x| assert_kind_of(Pathname, x) }
         ref = %w[ bar foo A.rb B.rb foo.bz2 foo.tar foo.tar.bz2 foo.tar.gz ]
         assert_equal ref.to_set, my.map!{ |x| x.to_s }.to_set
@@ -242,7 +307,7 @@ module SymTblGsub
         pathlist << '<<test>>'.to_path + 'fixtures/foo.{tar*,bz*}'
         pathlist = PathList[pathlist]
         assert_equal(['<<foo>>'.to_path, '<<i>>'.to_path], pathlist)
-        my = pathlist.symtbl_gsub(@s).map! { |x| x.basename }
+        my = pathlist.symtbl_gsub(symtbl).map! { |x| x.basename }
         my.all? { |x| assert_kind_of(Pathname, x) }
         ref = %w[ bar foo A.rb B.rb foo.bz2 foo.tar foo.tar.bz2 foo.tar.gz ]
         assert_equal ref.to_set, my.map!{ |x| x.to_s }.to_set

data/lib/text.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: text.rb 359 2005-09-16 10:05:22Z ertai $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/text.rb 7964 2005-09-16T10:05:22.743435Z ertai  $
 
 class Text
 

data/lib/timeout_ex.rb

@@ -3,7 +3,7 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: timeout_ex.rb 339 2005-09-06 23:27:27Z ertai $
+# $Id: /w/fey/ruby_ex/trunk/lib/timeout_ex.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 
 require 'thread'

data/lib/trace.rb

@@ -1,7 +1,7 @@
 # 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 $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/lib/trace.rb 7944 2005-09-06T23:27:27.929371Z ertai  $
 
 module Trace
 

data/lib/uri/druby.rb

@@ -2,15 +2,12 @@
 # Author: Nicolas Despres  <polrop@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: druby.rb 339 2005-09-06 23:27:27Z ertai $
-
-require 'uri_ex'
-
+# $LastChangedBy: pouillar $
+# $Id: /w/fey/ruby_ex/trunk/lib/uri/druby.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
 module URI
 
-  class DRuby < Generic
+  class DRuby < GenericEx
 
     SCHEME = 'druby'
     DEFAULT_HOST = 'localhost'

data/lib/uri/file.rb

@@ -2,40 +2,37 @@
 # Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: file.rb 385 2005-10-02 17:05:35Z ertai $
+# $LastChangedBy: pouillar $
+# $Id: /w/fey/ruby_ex/trunk/lib/uri/file.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
 
-require 'uri_ex'
+
+require 'md5'
 
 module URI
 
-  class File < Generic
+  class File < GenericEx
 
     COMPONENT = [
       :scheme,
       :path
     ].freeze
-    TAR = 'tar'.to_cmd.freeze
-    GZIP = 'gzip'.to_cmd.freeze
+    cattr_reader :tar, :gzip
+    @@tar = 'tar'.to_cmd.freeze
+    @@gzip = 'gzip'.to_cmd.freeze
 
 
     def initialize ( *args )
       super
       unless @host.nil? or @host.empty?
-        raise ArgumentError, 
+        raise ArgumentError,
           "You cannot neither setup a host (#{@host}), nor a relative path"
       end
     end
 
-    def self.build ( args )
-      tmp = Util::make_components_hash(self, args)
-      return super(tmp)
-    end
-
     def checkout
-      p = self.pathname
+      p = pathname
       raise CheckoutError, to_s unless p.exist?
-      p
+      [p, nil]
     end
 
     def commit ( aPath )
@@ -43,19 +40,36 @@ module URI
     end
 
     def save
-      p = self.pathname
+      p = pathname
       raise SaveError, to_s unless p.exist?
       if p.directory?
         out = TempPath.new('save', "#{p.basename}.tar.gz")
-        cmd = TAR['czf', out, p]
+        cmd = tar['czf', out, p]
       else
         out = TempPath.new('save', "#{p.basename}.gz")
-        cmd = GZIP['-c', p] > out
+        cmd = gzip['-c', p] > out
       end
-      cmd.run(self.runner)
+      cmd.run(runner)
       [out, nil]
     end
 
+    def fingerprint
+      digest = Digest::MD5.new
+      if pathname.directory?
+        pathname.find do |path|
+          next if path.directory?
+          digest << path.read
+        end
+      else
+        digest << pathname.read
+      end
+      digest.to_s
+    end
+
+    def to_s
+      super.sub(/^(file:\/)([^\/])/, '\1//\2')
+    end
+
   end # class File
 
   @@schemes['FILE'] = File

data/lib/uri/ftp_ex.rb

@@ -2,15 +2,15 @@
 # Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License: Gnu General Public License.
 
-# $LastChangedBy: ertai $
-# $Id: ftp_ex.rb 385 2005-10-02 17:05:35Z ertai $
+# $LastChangedBy: pouillar $
+# $Id: /w/fey/ruby_ex/trunk/lib/uri/ftp_ex.rb 22058 2006-02-20T21:41:08.060925Z pouillar  $
 
-require 'uri_ex'
 require 'uri/ftp'
 require 'net/ftp'
 
 module URI
 
+  GenericEx.import!
   class FTP
 
     def checkout
@@ -33,4 +33,9 @@ module URI
 
   end # class FTP
 
+  class FtpEx
+  end
+  class FTPEx
+  end
+
 end # module URI