ttk 0.1.580 → 0.2.0

data/lib/ttk/strategies/Streams.rb

@@ -0,0 +1,72 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 TTK team. All rights reserved.
+# License::   LGPL
+# Revision::  $Id: Streams.rb 602 2005-06-03 16:11:12Z ertai $
+
+module TTK
+
+  module Streams
+
+    #
+    # Internal classes
+    #
+
+    autoloaded_module(__FILE__)
+
+  end # module Streams
+
+end # module TTK
+
+class Object
+  def compare_stream ( stream )
+    to_s.compare_stream(stream)
+  end
+  def to_s_for_ttk_log
+    to_s
+  end
+end
+
+class NilClass
+  def compare_stream ( stream )
+    true
+  end
+  def to_s_for_ttk_log
+    false
+  end
+end
+
+class Regexp
+  def compare_stream ( stream )
+    stream.read =~ self
+  end
+  def to_s_for_ttk_log
+    "/#{source.sub(/\//, '\\/')}/"
+  end
+end
+
+class String
+  def compare_stream ( stream )
+    self == stream.read
+  end
+end
+
+class Pathname
+  def compare_stream ( stream )
+    read.compare_stream(stream)
+  end
+  def to_s_for_ttk_log
+    read
+  end
+end
+
+class IO
+  def compare_stream ( stream )
+    rewind
+    read.compare_stream(stream)
+  end
+  def to_s_for_ttk_log
+    rewind
+    read
+  end
+end
+

data/lib/ttk/strategies/Streams/Pipe.rb

@@ -0,0 +1,49 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 TTK team. All rights reserved.
+# License::   LGPL
+# $Id$
+
+module TTK
+
+  module Streams
+
+    class Pipe < Stream
+
+      class PipeWrapper
+        # attr_reader :rd, :wr
+        def initialize ( input )
+          # @input = input
+          @rd, @wr = IO.pipe
+        end
+        def open ( mode='r' )
+          case mode
+          when 'r' then @rd
+          when 'w' then @wr
+          else
+            raise
+          end
+        end
+        def exist?
+          true
+        end
+        def read
+          @rd.read
+        end
+      end
+
+      #
+      # Constructor
+      #
+
+      def initialize ( name, ref=nil )
+        super
+        if name != :input
+          @my = PipeWrapper.new(@my)
+        end
+      end
+
+    end # class Pipe
+
+  end # module Streams
+
+end # module TTK

data/lib/ttk/strategies/Streams/Stream.rb

@@ -1,26 +1,13 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: Stream.rb 567 2005-04-13 08:00:06Z polrop $
-
-
-require 'mktemp'
+# $Id: Stream.rb 602 2005-06-03 16:11:12Z ertai $
 
 
 module TTK
 
   module Streams
 
-    #
-    # Internal classes
-    #
-
-    Pathname.glob(SRC_DIR + 'strategies' + 'Streams' + '*.rb') do |path|
-      name = path.basename.to_s.sub(/\.rb$/, '')
-      autoload(name.to_sym, "ttk/strategies/Streams/#{name}")
-    end
-
-
     class Stream
 
       #
@@ -35,7 +22,7 @@ module TTK
       #
 
       def initialize ( name, ref=nil )
-        @name, @my, @ref = name.to_s, TempPath.new("#{ME}-#{name}"), ref
+        @name, @my, @ref = name.to_s, TempPath.new(name), ref
       end
 
 
@@ -77,57 +64,3 @@ module TTK
   end # module Streams
 
 end # module TTK
-
-class Object
-  def compare_stream ( stream )
-    to_s.compare_stream(stream)
-  end
-  def to_s_for_ttk_log
-    to_s
-  end
-end
-
-class NilClass
-  def compare_stream ( stream )
-    true
-  end
-  def to_s_for_ttk_log
-    false
-  end
-end
-
-class Regexp
-  def compare_stream ( stream )
-    stream.read =~ self
-  end
-  def to_s_for_ttk_log
-    "/#{source.sub(/\//, '\\/')}/"
-  end
-end
-
-class String
-  def compare_stream ( stream )
-    self == stream.read
-  end
-end
-
-class Pathname
-  def compare_stream ( stream )
-    read.compare_stream(stream)
-  end
-  def to_s_for_ttk_log
-    read
-  end
-end
-
-class IO
-  def compare_stream ( stream )
-    rewind
-    read.compare_stream(stream)
-  end
-  def to_s_for_ttk_log
-    rewind
-    read
-  end
-end
-

data/lib/ttk/strategies/SubCmd.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: SubCmd.rb 578 2005-04-14 20:46:09Z ertai $
+# $Id: SubCmd.rb 607 2005-06-05 17:02:43Z ertai $
 
 
 module TTK
@@ -12,7 +12,8 @@ module TTK
       include Concrete
 
       def prologue
-        @command = ABS_ME
+        @command = @symtbl[:ttk]
+        @dir = @symtbl[:pwd]
         super
       end
       protected :prologue
@@ -20,20 +21,35 @@ module TTK
 
       def run_impl
         super
-        raise_error "bad exit status #@my_exit" unless @my_exit.zero?
         raise_error 'no ttk output' unless @output.my.exist?
-        stream = YAML::load_stream(@output.my.read)
-        raise_error 'bad ttk output' if stream.nil?
-        doc, @status = stream[0], stream[1]
-        raise_error 'bad doc output' unless doc.is_a? Filters::Saver
-        raise_error 'bad status output' unless @status.is_a? Status
-        doc.repeat(@log)
-#         raise_error 'ttk stderr not empty' unless @error.my.zero?
+        status = nil
+        @output.my.open do |out|
+          YAML::each_document(out) do |notification|
+            case notification
+            when Array
+              @log.send(*notification)
+            when Status
+              status = notification
+            else 
+              raise_error 'bad sub commad output' if stream.nil?
+            end
+          end
+        end
+        raise_error 'bad status output' unless status.is_a? Status
+        raise_error 'ttk stderr not empty' unless @error.my.zero?
+        @status = status
         raise_status @status
       end
       protected :run_impl
 
 
+      def assertion
+        raise_error "bad exit status #@my_exit" unless [0, 2].include? @my_exit
+        super
+      end
+      protected :assertion
+
+
       def error_hook
         @log.my_stdout = @output.my.read if @output and @output.my.exist?
         @log.my_stderr = @error.my.read if @error and @error.my.exist?

data/lib/ttk/strategies/Suite.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: Suite.rb 567 2005-04-13 08:00:06Z polrop $
+# $Id: Suite.rb 585 2005-04-30 01:21:03Z ertai $
 
 
 module TTK
@@ -20,7 +20,7 @@ module TTK
     #  include TTK
     #
     #  symtbl = TTK::SymTbl.new
-    #  symtbl[:loader] = Loaders::OYaml.new
+    #  symtbl[:loader] = Loaders::Yaml.new
     #  aSuite = Strategies::Suite.new({
     #            :name   => 'A set of tests',
     #            :symtbl => symtbl,
@@ -69,50 +69,3 @@ module TTK
 
 end # module TTK
 
-#FIXME: adapt me to a real unit test suite
-# if __FILE__ == $0
-#   require 'ttk'
-#   include TTK
-
-#   symtbl = TTK::SymTbl.new
-#   symtbl[:loader] = Loaders::OYaml.new
-#   aSuite = Strategies::Suite.new({
-#              :name   => 'A set of tests',
-#              :symtbl => symtbl,
-#              :wclass => Weights::WFloat,
-#              :attributes => {
-#                 :strategy => Strategies::Cmd,
-#                 :exit  => 0
-#               },
-#               :contents => OHash[
-#                 "I'm suppose to pass 1", { :command => "true" },
-#                 "I'm suppose to fail 2", { :command => "false", :weight => -1 },
-#                 "I'm suppose to pass 3", { :command => "false",
-#                                            :exit    => 1 }
-#               ]
-#            })
-#   aSuite.run(Logger.new(Dumpers::Yaml.new(STDOUT)))
-
-#   aSuite = Strategies::Suite.new
-#   aSuite.name = 'A set of tests'
-#   aSuite.symtbl = symtbl
-#   aSuite.wclass = Weights::WFloat
-#   aSuite.strategyclass = Strategies::Cmd
-#   aSuite.exit = 0    # a sugar when its unambiguous.
-#   t1 = aSuite.create
-#   t1.name = "I'm suppose to pass 4"
-#   t1.command = "true"
-#   aSuite.create({ :name    => "I'm suppose to fail 5",
-#                   :command => "false",
-#                   :weight  => -1 })
-#   io = Tempfile.new('ttk-example')
-#   io << <<EOF
-# ---
-# name: I'm suppose to pass 6
-# command: false
-# exit: 1
-# EOF
-#   io.rewind
-#   aSuite.create(io)
-#   aSuite.run(Logger.new(Dumpers::Yaml.new(STDOUT)))
-# end

data/lib/ttk/symtbl.rb

@@ -1,12 +1,10 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 TTK team. All rights reserved.
 # License::   LGPL
-# $Id: symtbl.rb 567 2005-04-13 08:00:06Z polrop $
-
+# $Id: symtbl.rb 601 2005-06-03 16:02:25Z ertai $
 
 require 'symtbl'
 
-
 module TTK
 
   class SymTbl < SymTbl
@@ -110,6 +108,8 @@ end
 
 class String
   def symtbl_gsub ( symtbl )
-    return gsub(/<<(.*?)>>/) { symtbl[$1.to_sym] || $& } if self =~ /<<(.*)>>/
+    return nil unless self =~ /<<(.*)>>/
+    str = gsub(/<<(.*?)>>/) { symtbl[$1.to_sym] || $& }
+    (str == self)? nil : str
   end
 end

data/template/README

@@ -0,0 +1,29 @@
+= How to use these templates
+
+== Requirements:
+
+- ERB:
+    ERB  is  in the standard library, but some distributions has split this
+    standard library.
+
+  - debian users:
+      apt-get install liberb-ruby
+
+- Environment:
+
+    Check that you have exported these variables:
+
+  - EMAIL: e.g. ertai@lrde.epita.fr
+  - FULLNAME: e.g. Nicolas Pouillard
+
+- Usage:
+
+    ./misc/template.rb template/A_TEMPLATE.rb args...
+
+- Examples:
+
+  - Create a new startegy:
+      ./misc/template.rb template/new_strategy.rb MyBrandNewStartegy
+
+  - Create a file with just the header:
+      ./misc/template.rb template/new_header.rb > your_output_file_name

data/test/{ttk-dist-suite.yml → dist-suite.yml}

@@ -15,6 +15,7 @@ Distributed TTK test suite:
           stderr: ""
           weight: 0
           fatal: true
+          # FIXME make me uncachable, to force the server launching.
         contents:
           - slave00: { args: -l ttkd_slave00.log -n 'slave00' -t 'druby://localhost:42100' -m 'druby://localhost:42104' Slave & }
           - slave01: { args: -l ttkd_slave01.log -n 'slave01' -t 'druby://localhost:42110' -m 'druby://localhost:42114' Slave & }
@@ -41,4 +42,5 @@ Distributed TTK test suite:
     - clean:
         strategy: KillAll
         weight: -1
+        # FIXME uncachable
         regexp: !re ruby <<pwd>>/\.\./bin/ttkd

data/test/pkg-suite.yml

@@ -0,0 +1,10 @@
+---
+
+Test suite for TTK packages:
+  strategy: Glob
+  glob: <<pwd>>/ttk-pkg/*.yml
+  regexp: !re /([^/]+).yml$
+  test:
+    Test <<match>>:
+      strategy: Import
+      import: !path <<path>>

data/test/pool-suite.yml

@@ -0,0 +1,10 @@
+---
+
+Pool Test Suite for TTK:
+  strategy: Glob
+  glob: <<pwd>>/pool-tests/*.yml
+  regexp: !re /([^/]+\.yml)
+  test:
+    Test <<match>>:
+       strategy: Import
+       import: <<path>>

data/test/ressources/runit/bad.rb

@@ -7,9 +7,7 @@ class Bad
 end
 
 
-if __FILE__ == $0
-
-require 'test/unit/ui/yaml/testrunner'
+test_section __FILE__ do
 
 class BadTest < Test::Unit::TestCase
 
@@ -23,8 +21,6 @@ class BadTest < Test::Unit::TestCase
 
 end
 
-Test::Unit::UI::Yaml::TestRunner.run(BadTest)
-
 end