ttk 0.1.580 → 0.2.0

data/lib/ttk/logger/severity.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: severity.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: severity.rb 583 2005-04-30 01:13:44Z ertai $
 
 
 module TTK
@@ -10,14 +10,13 @@ module TTK
 
     module Severity
 
-      @@lower = DEBUG = 0
-      INFO = 1
-      WARN = 2
-      ERROR = 3
-      FATAL = 4
-      @@higher = UNKNOWN = 5
+      @@labels = %w(DEBUG VERBOSE_INFO INFO WARN ERROR FATAL UNKNOWN)
+      @@lower = 0
+      @@higher = @@labels.size - 1
 
-      @@labels = %w(DEBUG INFO WARN ERROR FATAL UNKNOWN)
+      @@labels.each_with_index do |label, i|
+        const_set(label, i)
+      end
 
       module_function
 
@@ -45,6 +44,8 @@ module TTK
         end
       end
 
+      # FIXME add the insert method
+
       def label(level)
         @@labels[level]
       end

data/lib/ttk/logger/to_ttk_log.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: to_ttk_log.rb 575 2005-04-14 10:22:30Z polrop $
+# $Id: to_ttk_log.rb 592 2005-05-23 01:43:16Z ertai $
 
 
 module TTK
@@ -18,7 +18,7 @@ module TTK
     #
     module ToTTKLog
 
-      class ::Object # :nodoc:
+      class ::Object
 
         def to_ttk_log ( log )
           log.new_leaf(self)
@@ -27,7 +27,7 @@ module TTK
       end # class ::Object
 
 
-      class ::Hash # :nodoc:
+      class ::Hash
 
         def hash_to_ttk_log ( log, type )
           each do |k,v|
@@ -52,7 +52,7 @@ module TTK
       end # class ::Hash
 
 
-      class ::OHash < ::Hash # :nodoc:
+      class ::OHash < ::Hash
 
         def to_ttk_log ( log )
           hash_to_ttk_log(log, :seq)
@@ -64,13 +64,16 @@ module TTK
       # WARNING: Do not implement Array#to_ttk_log it doesn't make sense.
 
 
-      class ::Exception # :nodoc:
+      #
+      class ::Exception
 
         def to_ttk_log ( log )
           if log.severity_level <= Severity::DEBUG
             long_pp.to_ttk_log(log)
-          else
+          elsif log.severity_level <= Severity::VERBOSE_INFO
             short_pp.to_ttk_log(log)
+          else
+            tiny_pp.to_ttk_log(log)
           end
         end
 

data/lib/ttk/logger_factory.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: logger_factory.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: logger_factory.rb 597 2005-06-03 09:20:47Z ertai $
 
 
 module TTK
@@ -22,6 +22,8 @@ module TTK
 
     attr_accessor :active_section
 
+    attr_accessor :section_tree
+
     def create(*a, &b)
       log = Logger.new(*a, &b)
       log.severity_level = @severity_level
@@ -31,14 +33,17 @@ module TTK
       log
     end
 
+    #FIXME: move in another place, in order to separate the Logger from TTK.
     #FIXME: follow the strategy hierarchy without loading all the classes
     private
     def create_section_tree
       tree = Logger::SectionNode.new('all')
       [ 'strategies' ].each do |dir|
-        (SRC_DIR + dir).each_entry do |p|
+        dir_node = Logger::SectionNode.new(dir)
+        tree << dir_node
+        (TTK_DIR + dir).each_entry do |p|
           if p.to_s =~ /^(\w+)\.rb$/
-            tree << Logger::SectionNode.new($1)
+            dir_node << Logger::SectionNode.new($1)
           end
         end
       end

data/lib/ttk/strategies/Authors.rb

@@ -1,7 +1,7 @@
 # Author::    Marco Tessari  <marco.tessari@epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Authors.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: Authors.rb 586 2005-04-30 01:28:29Z ertai $
 
 
 module TTK
@@ -20,7 +20,7 @@ module TTK
 
         authors = []
         IO.foreach(author) do |line|
-	  authors << $1 if line =~ /^\* ([-a-z]{1,6}_[-_a-z\d]).*$/
+	  authors << $1 if line =~ /^\* ([-a-z]{1,6}_[-_a-zA-Z\d]).*$/
 	end
 
         unless authors.include?(@author)

data/lib/ttk/strategies/Checkout.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: Checkout.rb 575 2005-04-14 10:22:30Z polrop $
+# $Id: Checkout.rb 586 2005-04-30 01:28:29Z ertai $
 
 
 require 'checkout'
@@ -26,6 +26,7 @@ module TTK
           @log.my_stderr = err.read unless err.nil? or err.size.zero?
           file = FileType.guess(file)
           if file.is_a? FileType::Directory
+            @symtbl[:checkout_dir] = file.path
             @symtbl[:extract_dir] = file.path
             pass
           end

data/lib/ttk/strategies/CmdBase.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: CmdBase.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: CmdBase.rb 605 2005-06-03 16:48:03Z ertai $
 
 
 module TTK
@@ -35,7 +35,7 @@ module TTK
           end
 
 	  @pid = Kernel.fork do
-            STDIN.reopen(@input.ref.to_io) unless @input.ref.nil?
+            STDIN.reopen(@input.my.open('r')) unless @input.nil?
             STDOUT.reopen(@output.my.open('w')) unless @output.nil?
             STDERR.reopen(@error.my.open('w')) unless @error.nil?
             begin
@@ -46,6 +46,7 @@ module TTK
               exit! 127
             end
           end
+          father_hook
 	  Process.waitpid(@pid)
 	  @my_status = $?
 	  @my_exit = @my_status.exitstatus
@@ -60,6 +61,11 @@ module TTK
       protected :son_hook
 
 
+      def father_hook
+      end
+      protected :father_hook
+
+
       def abort_hook
         if defined? @pid
           begin

data/lib/ttk/strategies/Collection.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: Collection.rb 572 2005-04-13 14:53:54Z ertai $
+# $Id: Collection.rb 586 2005-04-30 01:28:29Z ertai $
 
 
 module TTK
@@ -20,11 +20,11 @@ module TTK
 
       # Create a new test, using the current loader,
       # and add it to the collection.
-      def create ( anObject, &block )
+      def create ( anObject=strategyclass, &block )
 	super do |t|
-          @log.log_debug{"assign collection attributes #{@attributes.size}"}
+          @log.debug{"assign collection attributes #{@attributes.size}"}
           @attributes.each do |k,v|
-            @log.log_debug{"assign attribute: #{k}"}
+            @log.debug{"assign attribute: #{k}"}
             next if k == :contents
             t.assign_one(k, v, true)
           end
@@ -109,6 +109,12 @@ module TTK
       end
 
 
+      def testify_options
+        super.merge(:strategy => strategyclass)
+      end
+      protected :testify_options
+
+
       def method_missing(key, val=nil, *a) # :nodoc:
         super unless a.empty?
 	key = key.to_s

data/lib/ttk/strategies/Composite.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: Composite.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: Composite.rb 586 2005-04-30 01:28:29Z ertai $
 
 
 module TTK
@@ -26,7 +26,7 @@ module TTK
 
 
       def create ( anObject, &block )
-        res = @symtbl[:loader].load(anObject) do |aTest|
+        res = anObject.testify(testify_options) do |aTest|
           initialize_test(aTest)
           block[aTest] if block_given?
         end
@@ -140,6 +140,12 @@ module TTK
       protected :assign_at_last
 
 
+      def testify_options
+        { :loader => @symtbl[:loader] }
+      end
+      protected :testify_options
+
+
       attribute :contents, 'an array of tests', :invisible, :dont_expand do
         []
       end

data/lib/ttk/strategies/IOBased.rb

@@ -1,8 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: IOBased.rb 572 2005-04-13 14:53:54Z ertai $
-
+# $Id: IOBased.rb 602 2005-06-03 16:11:12Z ertai $
 
 module TTK
 
@@ -11,12 +10,6 @@ module TTK
     class IOBased < Strategy
       include Abstract
 
-      #
-      # Internal classes
-      #
-
-      autoload(:Streams, 'ttk/strategies/Streams/Stream')
-
 
       #
       # Constructor
@@ -37,7 +30,11 @@ module TTK
       def prologue
         super
         make_streams
-        @input.my = nil unless @input.nil?
+        unless @input.nil?
+          @input.my.open('w') do |my|
+            my.print @input.ref.to_s_for_ttk_log
+          end
+        end
       end
       protected :prologue
 

data/lib/ttk/strategies/PackageCollection.rb

@@ -1,13 +1,18 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: PackageCollection.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: PackageCollection.rb 592 2005-05-23 01:43:16Z ertai $
 
 
 module TTK
 
   module Strategies
 
+    # This strategy takes a set of packages with their dependencies, it
+    # computes the topological sort, and make all packages in the right order.
+    #
+    # * Dependencies are given as a Yaml file.
+    # * Installation directories are propagated by with configure options.
     class PackageCollection < Composite
       include Concrete
 
@@ -43,6 +48,7 @@ end # module TTK
 require 'tsort'
 
 class Hash
+
   include TSort
   
   alias tsort_each_node each_key
@@ -69,4 +75,4 @@ class Hash
     result
   end
 
-end
+end # class Hash

data/lib/ttk/strategies/RUnit.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: RUnit.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: RUnit.rb 608 2005-06-05 17:03:55Z ertai $
 
 
 require 'yaml'
@@ -105,11 +105,18 @@ module TTK
         ruby_bin = Config::CONFIG["RUBY_INSTALL_NAME"]
         @cmd = "cd #@work_dir && #{ruby_bin} "
         @cmd += '-w ' if @verbose
-        @cmd += "-I#{ABS_RUBY_EX_DIR} "
+
+        if @core_ex
+          core_ex_dir = @symtbl[:core_ex]
+          @cmd += "-I#{core_ex_dir} "
+          @cmd += "-rcore_ex "
+        end
         @load_path.each { |x| @cmd += "-I#{x} " }
         @cmd += "#@unit_file "
+        @cmd += "--runner yaml "
+        @cmd += "-- #@args "
         @cmd += "> #@outfile 2> #@errfile"
-        @log.log_debug{@cmd}
+        @log.debug { @cmd }
       end
 
       protected
@@ -157,6 +164,8 @@ module TTK
                             '.', :invisible
       attribute :load_path, 'directories to add to the $LOAD_PATH variable',
                             :invisible do [] end
+      attribute :args,      'other final arguments for the unit_file', String, ''
+      attribute :core_ex,   'pre require core_ex if true', false
       attribute :verbose,   'turn on/off the ruby verbose mode',
                             false, :invisible
 

data/lib/ttk/strategies/RemoteCmd.rb

@@ -1,11 +1,9 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: RemoteCmd.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: RemoteCmd.rb 592 2005-05-23 01:43:16Z ertai $
 
 
-require 'ttk/Tools/HostDispatcher'
-
 module TTK
 
   module Strategies
@@ -13,6 +11,39 @@ module TTK
     # I'm not maintained any more, don't use me.
     class RemoteCmd < Cmd
 
+      class HostDispatcher
+
+        require 'singleton'
+        include Singleton
+
+        attr_reader :hosts
+
+        def initialize
+          @hosts = []
+        end
+
+        def << ( aConf )
+          unless aConf.is_a? Hash
+            raise ArgumentError, "not a valid conf: `#{aConf}:#{aConf.class}'"
+          end
+          @hosts << aConf
+        end
+
+        def hosts= ( anArray )
+          @hosts.clear
+          anArray.each { |x| self << x }
+        end
+
+        def aConf
+          aConf = hosts.shift
+          hosts.push aConf
+          aConf
+        end
+
+      end # class HostDispatcher
+
+
+
       def prologue
 	if @dispatcher
 	  conf = @dispatcher.aConf
@@ -31,7 +62,7 @@ module TTK
 
       def dispatcher=(doc)
         raise ArgumentError, "require a `hosts' attribute" if doc[:hosts].nil?
-	@dispatcher = TTK::Tools::HostDispatcher.instance
+	@dispatcher = HostDispatcher.instance
 	@dispatcher.hosts = doc[:hosts]
       end
 

data/lib/ttk/strategies/Strategy.rb

@@ -1,7 +1,7 @@
 # Author::    The TTK Team.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Strategy.rb 575 2005-04-14 10:22:30Z polrop $
+# $Id: Strategy.rb 597 2005-06-03 09:20:47Z ertai $
 
 
 require 'set'
@@ -239,7 +239,7 @@ module TTK
           if respond_to?(meth) or respond_to?(:method_missing)
             send(meth, val)
           elsif not silent
-            @log.log_warn { "Attribute #{key} not found for #{self.class}"}
+            @log.warn { "Attribute #{key} not found for #{self.class}" }
           end
 	end
       end
@@ -347,7 +347,7 @@ module TTK
       def clean_instance_variables
         attrs = Set.new(self.class.attributes.map { |a| "@#{a.name}" })
         vars = Set.new(instance_variables)
-        exceptions = Set.new(%w[ @status @thread ])
+        exceptions = Set.new(%w[ @status @thread @symtbl ])
         (vars - attrs - exceptions).each do |var|
           remove_instance_variable var
         end
@@ -531,7 +531,7 @@ module TTK
       # Build methods
       #
 
-      def testify ( aLoader=nil )
+      def testify ( opts=nil )
         self
       end
 
@@ -552,12 +552,11 @@ module TTK
       end
 
       def display_unexpected_exc ( exc )
-        STDERR.puts 'unexpected exception'
-        STDERR.puts exc.long_pp
+        @log.error_unexpected_exception = exc.long_pp
       end
 
       def display_unexpected_synflow_exc ( exc, arg )
-        STDERR.puts "unexpected synflow exception (#{arg})"
+        @log.error_unexpected_synflow_exception = arg
       end
 
       # FIXME: I'm not well dumped