ttk 0.1.580 → 0.2.0

data/lib/ttk/dumpers/Basic.rb

@@ -0,0 +1,23 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 TTK Team. All rights reserved.
+# License::   LGPL
+# $Id$
+
+
+module TTK
+
+  module Dumpers
+
+    class Basic < Dumper
+      include Concrete
+
+      def update ( *a, &b )
+        super
+        @io.puts "NOTIFICATION: #{a.inspect} block_given: #{block_given?}"
+      end
+
+    end # class Basic
+
+  end # module Dumpers
+
+end # module TTK

data/lib/ttk/dumpers/Dumper.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Dumper.rb 578 2005-04-14 20:46:09Z ertai $
+# $Id: Dumper.rb 598 2005-06-03 09:35:10Z ertai $
 
 
 module TTK
@@ -40,6 +40,7 @@ module TTK
 
       def initialize ( output=STDOUT )
         @io = output
+	@flushable = @io.respond_to?(:flush)
       end
 
 
@@ -58,6 +59,11 @@ module TTK
       protected :up
 
 
+      def flush
+        @io.flush if @flushable and (not @io.closed?)
+      end
+
+
       #FIXME: There is some problems with the close notification.
       def close
 #         @io.close unless @io.closed?

data/lib/ttk/dumpers/Notif.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Notif.rb 571 2005-04-13 14:41:22Z polrop $
+# $Id: Notif.rb 603 2005-06-03 16:42:32Z ertai $
 
 
 module TTK
@@ -11,19 +11,14 @@ module TTK
     class Notif < Dumper
       include Concrete
 
-      def initialize ( output=STDOUT )
-	@io = output
-	@saver = Filters::Saver.new
-      end
-
       def update ( *args, &block )
-        @saver.update(*args, &block)
-        close if args[0] == :close
-      end
-
-      def close
-        @io.puts @saver.to_yaml(:ttk => true)
-        super
+        msg, path, node, type = args
+        a = [msg]
+        a << path.last.first if msg == :new_node
+        a << node unless node.nil?
+        a << type unless type.nil?
+        @io.puts a.to_yaml
+        flush
       end
 
     end # class Notif

data/lib/ttk/dumpers/Yaml.rb

@@ -1,10 +1,10 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Yaml.rb 578 2005-04-14 20:46:09Z ertai $
+# $Id: Yaml.rb 598 2005-06-03 09:35:10Z ertai $
 
 
-class Symbol # :nodoc:
+class Symbol
   alias_method :old_to_yaml, :to_yaml
   def to_yaml ( opts={} )
     # FIXME
@@ -16,14 +16,14 @@ class Symbol # :nodoc:
   end
 end
 
-class Class # :nodoc:
+class Class
   alias_method :old_to_yaml, :to_yaml
   def to_yaml ( opts={} )
     self.to_s.sub(/^TTK::Strategies::/, '').to_yaml(opts)
   end
 end
 
-class Regexp # :nodoc:
+class Regexp
   alias_method :old_to_yaml_type, :to_yaml_type
   alias_method :old_to_yaml, :to_yaml
   def to_yaml_type
@@ -36,11 +36,7 @@ class Regexp # :nodoc:
   end
 end
 
-YAML.add_builtin_type('!re') do |type, val|
-  Regexp.new(val.to_s)
-end
-
-class Pathname # :nodoc:
+class Pathname
   alias_method :old_to_yaml, :to_yaml
   def to_yaml ( opts={} )
     if opts[:ttk]
@@ -51,11 +47,7 @@ class Pathname # :nodoc:
   end
 end
 
-YAML.add_builtin_type('!path') do |type, val|
-  Pathname.new(val.to_s)
-end
-
-class OHash # :nodoc:
+class OHash
   def to_yaml ( opts={} )
     if opts[:ttk]
       YAML::quick_emit(self.object_id, opts) do |out|
@@ -87,7 +79,6 @@ module TTK
 	@indent = ''
         @stack_indent = []
 	@endl = true
-	@flushable = @io.respond_to?(:flush)
         @io.puts '---'
         @opts = {:ttk => true}
       end
@@ -150,7 +141,7 @@ module TTK
 
       def update ( *a, &b )
         super
-        @io.flush if @flushable and (not @io.closed?)
+        flush
       end
 
     end # class Yaml

data/lib/ttk/fetchers/client/receiver.rb

@@ -1,13 +1,10 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: receiver.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: receiver.rb 606 2005-06-05 16:58:30Z ertai $
 
-
-require 'dtime'
 require 'md5'
 
-
 module TTK
 
   module Fetchers

data/lib/ttk/fetchers/server/sender.rb

@@ -1,12 +1,9 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: sender.rb 567 2005-04-13 08:00:06Z polrop $
-
+# $Id: sender.rb 606 2005-06-05 16:58:30Z ertai $
 
 require 'md5'
-require 'dtime'
-
 
 module TTK
 

data/lib/ttk/loaders/Loader.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Loader.rb 575 2005-04-14 10:22:30Z polrop $
+# $Id: Loader.rb 582 2005-04-30 01:04:12Z ertai $
 
 
 module TTK
@@ -28,10 +28,10 @@ module TTK
   # To manage this you can use TTK::Loaders to add new loader easily.
   #
   # To implement a loader you just need to subclass the abstract
-  # loader (TTK::Loaders::Loader), and implement the `load_doc'
+  # loader (TTK::Loaders::Loader), and implement the `load'
   # method.
   #
-  # The `load_doc' method take an IO as argument and return
+  # The `load' method take an IO as argument and return
   # something which can be testified.
   module Loaders
 
@@ -46,13 +46,11 @@ module TTK
     class Loader
       include Abstract
 
-      # override me in subclasses
-      def load_doc(io)
-	io
-      end
-
-      def load ( anObject, &block )
-        anObject.testify(self, &block)
+      # Override this method in subclasses
+      # It must returns an object which respond
+      # to testify.
+      def load ( aString )
+        raise NotImplementedError
       end
 
     end # class Loader
@@ -65,8 +63,8 @@ end # module TTK
 
 class Pathname
 
-  def testify ( aLoader, &block )
-    strategy = open { |f| f.testify(aLoader, &block) }
+  def testify ( opts={}, &block )
+    strategy = open { |f| f.testify(opts, &block) }
     strategy.symtbl[:pwd] = self.expand_path.dirname
     strategy
   end
@@ -75,10 +73,33 @@ end
 
 
 
+class String
+
+  def testify ( opts={}, &block )
+    unless opts.has_key? :loader
+      raise ArgumentError, "No loader found in options (:loader)"
+    end
+    opts[:loader].load(self).testify(opts, &block)
+  end
+
+end
+
+
+
 class IO
 
-  def testify ( aLoader, &block )
-    aLoader.load_doc(self).testify(aLoader, &block)
+  def testify ( opts={}, &block )
+    read.testify(opts, &block)
+  end
+
+end
+
+
+
+class StringIO
+
+  def testify ( opts={}, &block )
+    read.testify(opts, &block)
   end
 
 end
@@ -87,7 +108,7 @@ end
 
 class Class
 
-  def testify ( aLoader, &block )
+  def testify ( opts=nil, &block )
     unless self < TTK::Strategies::Strategy
       raise ArgumentError, "Need a subclass of Strategy not #{name}"
     end
@@ -100,19 +121,21 @@ end
 
 class Hash
 
-  def testify ( aLoader=nil, &block )
+  def testify ( opts={}, &block )
 
     if size == 1 and (tab = to_a[0])[1].is_a? Hash
       name, doc = tab
       doc[:name] = name
-      return doc.testify(aLoader, &block)
+      return doc.testify(opts, &block)
     end
 
-    unless has_key? :strategy
+    strategy = self[:strategy] || opts[:strategy]
+
+    if strategy.nil?
       raise ArgumentError, "no strategy for this test (#{inspect})"
     end
 
-    TTK::Loaders.get_class(self[:strategy]).new do |t|
+    TTK::Loaders.get_class(strategy).new do |t|
       block[t] if block_given?
       t.assign(self)
     end

data/lib/ttk/loaders/Yaml.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Yaml.rb 567 2005-04-13 08:00:06Z polrop $
+# Revision::  $Id: Yaml.rb 592 2005-05-23 01:43:16Z ertai $
 
 
 require 'yaml'
@@ -13,62 +13,63 @@ module TTK
     class Yaml < Loader
       include Concrete
 
-      def load_doc(io)
-	tree = YAML::parse(io)
+      def load ( aString )
+	tree = YAML::parse(aString)
         return nil unless tree
         tree.ttk_loader_yaml_transform
       end
 
     end # class Yaml
 
+  end # module Loaders
+
+end # module TTK
 
-    module ::YAML
 
-      module BaseNode
 
-        CLASS_KEY_LIST = [:strategy, :wclass, :symtbl_class]
+module YAML
 
-        def key_transform ( t, k, v )
-          k = k.to_s.to_sym unless k.is_a? Symbol or k.is_a? Integer
-          if CLASS_KEY_LIST.include?(k) and (val = v.value) =~ /^[A-Z]/
-            t[k] = TTK::Loaders.get_class(val)
-          else
-            t[k] = v.ttk_loader_yaml_transform
-          end
+  module BaseNode
+
+    CLASS_KEY_LIST = [:strategy, :wclass, :symtbl_class]
+
+    def key_transform ( t, k, v )
+      k = k.to_s.to_sym unless k.is_a? Symbol or k.is_a? Integer
+      if CLASS_KEY_LIST.include?(k) and (val = v.value) =~ /^[A-Z]/
+        t[k] = TTK::Loaders.get_class(val)
+      else
+        t[k] = v.ttk_loader_yaml_transform
+      end
+    end
+    private :key_transform
+
+    def ttk_loader_yaml_transform
+      @type_id = nil unless defined? @type_id
+      t = nil
+      if @value.is_a? Hash
+        t = Hash.new
+        children_with_index.each do |v, k|
+          key_transform(t, k, v)
         end
-        private :key_transform
-
-        def ttk_loader_yaml_transform
-          @type_id = nil unless defined? @type_id
-          t = nil
-          if @value.is_a? Hash
-            t = Hash.new
-            children_with_index.each do |v, k|
-              key_transform(t, k, v)
-            end
-          elsif @value.is_a? Array
-            if not @value.empty? and @value.all? { |x| x.is_a? Hash and x.size == 1 }
-              t = OHash.new
-              @value.each do |x|
-                k, v = x.to_a
-                key_transform(t, k, v)
-              end
-            else
-              t = Array.new
-              @value.each do |v|
-                t.push v.ttk_loader_yaml_transform
-              end
-            end
-          else
-            t = @value
+      elsif @value.is_a? Array
+        if not @value.empty? and @value.all? { |x| x.is_a? Hash and x.size == 1 }
+          t = OHash.new
+          @value.each do |x|
+            k, v = x.to_a
+            key_transform(t, k, v)
+          end
+        else
+          t = Array.new
+          @value.each do |v|
+            t.push v.ttk_loader_yaml_transform
           end
-          YAML.transfer(@type_id, t)
         end
+      else
+        t = @value
+      end
+      YAML.transfer(@type_id, t)
+    end
 
-      end # module BaseNode
-
-    end # module ::YAML
-
-  end # module Loaders
+  end # module BaseNode
 
-end # module TTK
+end # module YAML

data/lib/ttk/logger.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: logger.rb 578 2005-04-14 20:46:09Z ertai $
+# $Id: logger.rb 597 2005-06-03 09:20:47Z ertai $
 
 
 require 'observer'
@@ -95,9 +95,13 @@ module TTK
     end
 
     def format_log_message(severity_level, section_names, &block)
-      new_node("log_#@nb_log_msg") do
+      message = block[]
+      return if message.nil?
+      name = Severity.label(severity_level)
+      name += "_#@nb_log_msg" unless @nb_log_msg.zero?
+      new_node(name) do
         if @verbosity_level == 0
-          block[].to_ttk_log(self)
+          message.to_ttk_log(self)
         else
           for i in 1..@verbosity_level do
             @verbosity.class.level_fields(i).each do |field|
@@ -106,7 +110,7 @@ module TTK
                                             section_names)
             end
           end
-          self['message'] = block[]
+          self['message'] = message
         end
       end
       @nb_log_msg += 1
@@ -155,10 +159,9 @@ module TTK
 
     def method_missing ( key, *a, &b )
       str = key.to_s
-      case str
-      when /^(.*)=$/
+      if str =~ /^(.*)=$/
         self[$1.to_sym] = a[0]
-      when /^log_/
+      elsif block_given?
         begin
           args = make_log_arguments(str)
           args.concat([ *a ])
@@ -172,7 +175,7 @@ module TTK
     end
 
     def make_log_arguments(str)
-      if str =~ /^log_([A-Za-z0-9]+)(.*)$/
+      if str =~ /^([A-Za-z0-9]+)(.*)$/
         args = []
         begin
           args << Severity.const_get($1.upcase)