ruby_ex 0.1.2 → 0.2.0

data/lib/random_generators.rb

@@ -1,29 +1,16 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: random_generators.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: random_generators.rb 339 2005-09-06 23:27:27Z ertai $
 
-require 'ruby_ex'
-require 'module/autoload_tree'
-require 'abstract'
+require 'active_support/module_attribute_accessors'
 
-module RandomGenerators
-
-  autoloaded_module(__FILE__)
-
-  module_function
+RandomGenerators.import!
 
-  def default
-    class << self
-      def default
-        @@default
-      end
-    end
-    @@default = Ruby.new
-  end
+module RandomGenerators
 
-  def default= ( aClass )
-    @@default = aClass
-  end
+  mattr_accessor :default
 
 end # module RandomGenerators
+
+require 'random_generators/ruby'

data/lib/random_generators/random_generator.rb

@@ -1,14 +1,12 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: random_generator.rb 279 2005-06-05 17:46:53Z ertai $
-
-require 'random_generators'
+# Revision::  $Id: random_generator.rb 339 2005-09-06 23:27:27Z ertai $
 
 module RandomGenerators
 
   class RandomGenerator
-    abstract
+    include Abstract # FIXME perhaps `is Abstract' `act_as Abstract'
 
     def check_choose_integer ( n )
       unless n.is_a? Integer

data/lib/random_generators/ruby.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: ruby.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: ruby.rb 339 2005-09-06 23:27:27Z ertai $
 
-require 'random_generators'
+RandomGenerators.import!
 
 module RandomGenerators
 
@@ -22,4 +22,6 @@ module RandomGenerators
 
   end # class Ruby
 
+  self.default = Ruby.new
+
 end # module RandomGenerators

data/lib/regex_path.rb

@@ -0,0 +1,124 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: regex_path.rb 339 2005-09-06 23:27:27Z ertai $
+
+
+class RegexPath
+
+
+  class Segment
+
+    attr_reader :re
+
+    def initialize ( re, starred=false )
+      @re = Regexp.new(re)
+      @starred = starred
+    end
+
+    def =~ ( value )
+      @re.match(value)
+    end
+
+    def starred?
+      @starred
+    end
+
+    def eql? ( rhs )
+      @re.eql?(rhs.re) and @starred.eql?(rhs.starred?)
+    end
+
+    def == ( rhs )
+      eql?(rhs)
+    end
+
+  end # class Segment
+
+
+
+  attr_reader :segments
+
+  def initialize ( str )
+    raise ArgumentError, 'Argument must be a string' unless str.is_a?(String)
+    @segments = []
+    @root = (str[0] == ?/)
+    str = '/' + str unless @root
+    @final = (str[-1] == ?\Z)
+    str.sub!(/\\Z$/, '')
+    while str =~ /^\/(\*?)((?:(?:\\.)|[^\\\/])+)?/
+      sep, key, = $1, $2
+      @segments << Segment.new((key.nil?)? '' : key, sep == "*")
+      str = $'
+    end
+  end
+
+  def initialize_copy ( rhs )
+    @segments = rhs.segments.dup
+    @root = rhs.root?
+  end
+
+  def starred?
+    ! @segments.empty? and @segments.first.starred?
+  end
+
+  def root?
+    @root
+  end
+
+  def final?
+    @final
+  end
+
+  def empty?
+    @segments.empty?
+  end
+
+  def split
+    copy = dup
+    [copy.segments.shift, copy]
+  end
+
+end # class RegexPath
+
+
+
+test_section __FILE__ do
+
+  class RegexPathTest < Test::Unit::TestCase
+
+    Seg = RegexPath::Segment
+
+    def compare(str, tab)
+      tab.collect! do |e|
+        (e.is_a? Seg)? e : Seg.new(e)
+      end
+      desc = "Compare #{str} with #{tab}."
+      assert_equal(tab, RegexPath.new(str).segments, desc)
+    end
+    
+    def testit
+      compare('mho', [ 'mho' ])
+      compare('mho\\', [ 'mho' ])
+      compare('/mho', [ 'mho' ])
+      compare('/mho/42', [ 'mho', '42' ])
+      compare('/mho/[0-9]+', [ 'mho', '[0-9]+' ])
+      compare('m\/ho', [ 'm\/ho' ])
+      compare('mho/foo', [ 'mho', 'foo' ])
+      compare('mho/35/foo/test', [ 'mho', '35', 'foo' , 'test' ])
+      compare('test/*status/PASS', [ 'test', Seg.new('status', true), 'PASS' ])
+      compare('/*mho', [ Seg.new('mho', true) ])
+      compare('mho/*', [ 'mho', Seg.new('', true) ])
+      compare('/*mho/*', [ Seg.new('mho', true), Seg.new('', true) ])
+    end
+
+    def test_final?
+      assert(RegexPath.new('/foo/bar\Z').final?)
+      assert(! RegexPath.new('/foo/bar').final?)
+    end
+    
+    def test_errors
+      assert_raise(ArgumentError) { RegexPath.new(42) }
+    end
+
+  end # class RegexPathTest
+end

data/lib/ruby_ex.rb

@@ -1,124 +1,54 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: ruby_ex.rb 279 2005-06-05 17:46:53Z ertai $
+# Revision::  $Id: ruby_ex.rb 359 2005-09-16 10:05:22Z ertai $
 
-begin
-  require 'rubygems'
-  require_gem 'core_ex' # FIXME version
-  require 'core_ex'
-rescue LoadError => ex
-  core_ex = @@dir.parent + 'core_ex/lib/core_ex'
-  if core_ex.exists? and not $".include? 'core_ex.rb'
-    require core_ex.to_s
-  else
-    raise ex
-  end
-end
-  
+require 'pathname'
 
 module DRb
 end
 
-module Algorithms
-end
-
 module RubyEx
 
-  @@dir = Pathname.new(__FILE__).dirname.expand_path
-  $: << @@dir.to_s
-
   module_function
 
-  def sources
-    @@contents ||= Hash.new([].freeze)
-    %[
-      abstract.rb                        Abstract Concrete Class
-      abstract_node.rb                   AbstractNode
-      algorithms.rb                      Algorithms
-      attributed_class.rb                AttributedClass
-      cache.rb                           Cache
-      config_file.rb                     ConfigFile
-      const_regexp.rb                    ConstRegexp
-      daemon.rb                          Daemon
-      diff.rb                            Diff
-      dlogger.rb                         DLogger
-      drb.rb                             DRb
-      dumpable_proc.rb                   DumpableProc
-      filetype.rb                        FileType
-      histogram.rb                       Histogram
-      hookable.rb                        Hookable
-      hooker.rb                          Hooker
-      inactive_timeout.rb                InactiveTimeout
-      indexed_node.rb                    IndexedNode
-      ioo.rb                             IOO IOOTCPSocket
-      killall.rb                         KillAll
-      labeled_node.rb                    LabeledNode
-      node.rb                            Node
-      object_monitor.rb                  ObjectMonitor
-      object_monitor_activity.rb         ObjectMonitorActivity
-      observable.rb                      Observable
-      observable_pool.rb                 ObservablePool
-      orderedhash.rb                     OrderedHash_ext OHash
-      pseudo_cache.rb                    PseudoCache
-      random_generators.rb               RandomGenerators
-      timeout_ex.rb                      TimeoutEx
-      verbose_object.rb                  VerboseObject
-      spring.rb                          Spring
-      spring_set.rb                      SpringSet
-      symtbl.rb                          SymTbl
-      synflow.rb SynFlowFactory          SynFlow
-      safe_eval.rb                       SafeEval
-      sendmail.rb                        Sendmail
-      service_manager.rb                 ServiceManager
-      test/unit/ui/yaml/testrunner.rb    Test::Unit::UI::Yaml::TestRunner
-      # drb/session_manager.rb             DRb::SessionManager
-      # drb/dispatcher.rb                  DRb::Dispatcher
-    ].split(/\n/).each do |line|
-      line.sub!(/#.*$/, '')
-      line.strip!
-      next if line =~ /^\s*$/
-      file, *names = line.split(/\s+/)
-      @@contents[@@dir + file] = names
-    end
-    @@contents.freeze
-
-    @@sources = FileList[@@dir + '**/*.rb'].exclude(/\bsession\/error.rb\b/)
-
-    class << self
-      def sources
-        @@sources
-      end
-    end
-    @@sources
+  def file_list
+    @@file_list ||= PathList[dir + '(**/*).rb'].exclude(/\bsession\/error.rb\b/)
   end
 
   def dir
-    @@dir
+    @@dir ||= Pathname.new(__FILE__).dirname.expand_path
   end
 
   def each ( &block )
-    sources.each do |file|
-      block[file, @@contents[file]]
-    end
+    file_list.each(&block)
     self
   end
 
-  def autoload
-    each do |file, names|
-      names.each do |name|
-        name = name.split(/::/).first
-        Kernel.autoload(name, file.to_s)
-      end
-    end
+  def import_all!
+    file_list.import!
   end
 
-  def require
-    each { |file, names| file.require }
+  def skip ( file )
+    file.to_s =~ /drb/
   end
 
-end # module RubyEx
 
-# RubyEx.each { |*a| p a }
-# RubyEx.require
-# RubyEx.autoload
+  unless defined? CoreEx
+    file = Pathname.glob("#{dir}/../{core_ex/lib/core_ex,vendor/core_ex*/lib/core_ex}").first
+    if file.nil?
+      require 'rubygems'
+      require_gem 'core_ex'
+      require 'core_ex'
+    else
+      require file
+    end
+  end
+  suppress(LoadError) { core_ex_require 'highline' }
+
+  dir.load_path!
+  (dir + 'module').load_path!
+
+  Controllers::Algorithms.import!
+
+end # module RubyEx

data/lib/safe_eval.rb

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

data/lib/sendmail.rb

@@ -7,17 +7,13 @@
 require 'pathname'
 require 'ostruct'
 require 'optparse'
+Yaml::ChopHeader.import!
 
 
 class Sendmail
 
   MAIL_FILE = Pathname.new(',mail')
 
-  def initialize
-    require 'ruby_ex'
-    require 'yaml/chop_header'
-  end
-
   def parse_mail_options ( *args )
     email = (defined? EMAIL)? EMAIL : ENV['EMAIL']
     full_name = (defined? FULLNAME)? FULLNAME : ENV['FULLNAME']
@@ -57,8 +53,8 @@ class Sendmail
       opts.on('--passphrase FILE', 'the passphrase file') do |aFile|
 	options.pass = Pathname.new(aFile)
       end
-      opts.on('-a', '--[no-]ask', 'Ask a confirmation before sending') do |ask|
-        options.ask = ask
+      opts.on('-a', '--[no-]confirm', 'Ask a confirmation before sending') do |confirm|
+        options.confirm = confirm
       end
       opts.on('--comment STRING', 'Choose a comment for GPG') do |aComment|
         options.comment = aComment
@@ -103,17 +99,17 @@ class Sendmail
     STDERR.puts "Smtp Server: #{server}"
 
     #
-    # Ask the user
+    # confirm the user
     #
-    if opts.ask
-      require 'ask'
+    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}
         |  #{(opts.signed.nil?)? 'not signed !' : 'signed by ' + opts.from}
-        |Are you sure?].head_cut!
-      raise 'Aborting' if ask(question, :y) == :n
+        |Are you sure? (y/n)].head_cut!
+      raise 'Aborting' unless HighLine.new.agree question, true
     end
 
     require 'net/smtp'
@@ -127,8 +123,8 @@ class Sendmail
             mail_body.open('w') do |out|
               if opts.mime
                 out.puts '
-                  |Content-Type: text/plain; charset=ISO-8859-1; format=flowed
-                  |Content-Transfer-Encoding: 8bit
+                  |Content-Type: text/plain; charset="us-ascii"
+                  |Content-Transfer-Encoding: 7bit
                   |
                   |'.head_cut!
               end
@@ -151,7 +147,7 @@ class Sendmail
 
 
   def sign_wrap ( opts, body )
-    id = "===============#{new_id 10}==" if opts.mime
+    id = "===============Vcs#{new_id 10}==" if opts.mime
 
     TempPath.new do |tmp_name|
       tmp_name.open('w') do |tmp|
@@ -160,8 +156,9 @@ class Sendmail
             |MIME-Version: 1.0
             |Content-Type: multipart/signed; micalg=pgp-sha1;
             | protocol="application/pgp-signature";
-            | boundary="#{id}"
-            |Content-Transfer-Encoding: 8bit
+            | boundary="#{id}";
+            | charset="us-ascii"
+            |Content-Transfer-Encoding: 7bit
             |
             |This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
             |--#{id}

data/lib/service_manager.rb

@@ -3,9 +3,8 @@
 # License: Gnu General Public License.
 
 # $LastChangedBy: ertai $
-# $Id: service_manager.rb 279 2005-06-05 17:46:53Z ertai $
+# $Id: service_manager.rb 339 2005-09-06 23:27:27Z ertai $
 
-require 'ruby_ex'
 require 'drb/drb'
 
 # A service must implement at least: