uttk 0.3.6.1 → 0.4.5.0

data/lib/uttk/generators/templates/strategy-command.rb

@@ -0,0 +1,72 @@
+# Author::    <%= fullname %>  <<%= email %>>.
+# Copyright:: Copyright (c) <%= year %> Uttk Team. All rights reserved.
+# License::   LGPL
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/generators/templates/strategy-command.rb 24395 2006-07-10T07:52:32.589929Z ertai  $
+
+
+module Uttk
+
+  module Strategies
+
+    class <%= class_name %> < Strategy
+      include Concrete
+
+      #
+      # Methods
+      #
+
+      def prologue
+        super
+        @runner = mk_system_runner
+        @command = 'a_command...'.to_ocmd
+        # ...
+      end
+      protected :prologue
+
+
+      def run_impl
+        @my_data = @command.run @runner
+      end
+      protected :run_impl
+
+
+      def assertion
+        assert_cmd UM::StreamMatcher, @my_data,
+                   :output => ...,
+                   :error  => ...,
+                   :exit   => ...
+        # ...
+        pass
+      end
+      protected :assertion
+
+
+      def abort_hook
+        @runner.abort @my_data if @runner and defined? @my_data
+        super
+      end
+      protected :abort_hook
+
+
+      def epilogue
+        @my_data.clean if defined? @my_data
+        super
+      end
+      protected :epilogue
+
+
+      #
+      # Attributes
+      #
+
+      # Contains the OCmd::Datas::Data object, the result of the command running.
+      attr_reader :my_data
+
+      attribute :an_attribute, 'a description', THE_CLASS, DEFAULT_VALUE,
+                                                :mandatory, :invisible
+
+    end # class <%= class_name %>
+
+  end # module Strategies
+
+end # module Uttk

data/lib/uttk/generators/templates/strategy.rb

@@ -1,7 +1,7 @@
 # Author::    <%= fullname %>  <<%= email %>>.
 # Copyright:: Copyright (c) <%= year %> Uttk Team. All rights reserved.
 # License::   LGPL
-# Revision::  $Id: /fey/uttk/trunk/lib/uttk/generators/templates/strategy.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/generators/templates/strategy.rb 24396 2006-07-10T08:23:37.784417Z ertai  $
 
 
 module Uttk
@@ -24,7 +24,7 @@ module Uttk
 
       def run_impl
         # ...
-        super
+        super # useless when subclassing Strategy
         # ...
       end
       protected :run_impl
@@ -32,7 +32,8 @@ module Uttk
 
       def assertion
         # ...
-        super
+        fail('the reason') if ...
+        pass
       end
       protected :assertion
 

data/lib/uttk/generators/templates/unit_test.rb

@@ -1,7 +1,7 @@
 # Author::    <%= fullname %>  <<%= email %>>.
 # Copyright:: Copyright (c) <%= year %> Uttk Team. All rights reserved.
 # License::   LGPL
-# Revision::  $Id: /fey/uttk/trunk/lib/uttk/generators/templates/unit_test.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/generators/templates/unit_test.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 test_section __FILE__ do
 

data/lib/uttk/loaders/Loader.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/loaders/Loader.rb 8788 2005-09-27T14:23:19.686215Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/loaders/Loader.rb 8788 2005-09-27T14:23:19.686215Z ertai  $
 
 
 module Uttk

data/lib/uttk/loaders/Ruby.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despr�s  <nicolas.despres@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Uttk Team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/loaders/Ruby.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/loaders/Ruby.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/loaders/Yaml.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/loaders/Yaml.rb 21931 2006-02-19T14:37:25.597406Z pouillar  $
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/loaders/Yaml.rb 24396 2006-07-10T08:23:37.784417Z ertai  $
 
 
 require 'yaml'
@@ -36,7 +36,7 @@ module YAML
 
   module BaseNode
 
-    CLASS_KEY_LIST = [:strategy, :wclass, :symtbl_class]
+    CLASS_KEY_LIST = [:strategy, :wclass, :symtbl_class, :matcher]
 
     def key_transform ( t, k, v )
       k = k.uttk_loader_yaml_transform if k.is_a? BaseNode

data/lib/uttk/logger/section_node.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/logger/section_node.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/logger/section_node.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/logger/severity.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/logger/severity.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/logger/severity.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/logger/to_uttk_log.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/logger/to_uttk_log.rb 8779 2005-09-26T05:57:23.628040Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/logger/to_uttk_log.rb 24396 2006-07-10T08:23:37.784417Z ertai  $
 
 
 module Uttk
@@ -54,7 +54,7 @@ module Uttk
       end # class ::Hash
 
 
-      class ::OHash < ::Hash
+      ::OHash.class_eval do
 
         def to_uttk_log_with_key ( key, log )
           super key, log, :ordered => true

data/lib/uttk/logger/verbosity.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/logger/verbosity.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/logger/verbosity.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 #FIXME: manage "attr_once"

data/lib/uttk/logger_factory.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/logger_factory.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/logger_factory.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/status.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/status.rb 8800 2005-10-09T11:12:27.126567Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/status.rb 8800 2005-10-09T11:12:27.126567Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Abort.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despres  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Abort.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Abort.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Assert.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 Uttk Team. All rights reserved.
 # License::   LGPL
-# Revision::  $Id: /fey/uttk/trunk/lib/uttk/strategies/Assert.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Assert.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
 
 require 'test/unit'
 Test::Unit.run = true

data/lib/uttk/strategies/Authors.rb

@@ -1,7 +1,7 @@
 # Author::    Marco Tessari  <marco.tessari@epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Authors.rb 22102 2006-02-21T23:03:39.538964Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Authors.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
@@ -23,7 +23,7 @@ module Uttk
         authors = []
         IO.foreach(author) do |line|
           authors << $1 if line =~ /^\* ([-a-z]{1,6}_[-_a-zA-Z\d]).*$/
-          end
+        end
 
         unless authors.include?(@author)
           fail "AUTHORS not well formatted"

data/lib/uttk/strategies/Bootstrap.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Bootstrap.rb 22117 2006-02-22T08:56:22.146625Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Bootstrap.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
@@ -11,7 +11,7 @@ module Uttk
     # Run the bootstrap(.sh)? script or a classic autoreconf. This strategy is
     # used by the _Package_ strategy in case of the tested package does use
     # the _autotools_ or not.
-    class Bootstrap < Proxy
+    class Bootstrap < Strategy
       include Concrete
 
       BOOTSTRAP = /bootstrap(\.sh)?/
@@ -19,21 +19,48 @@ module Uttk
 
       def prologue
         super
-
+        @runner = mk_system_runner
         cmd = self.class.have_bootstrap? @dir
         if cmd.nil? and Configure.have_configure_input? @dir
           cmd = AUTORECONF
         end
-        unless cmd.nil? or Configure.have_configure?(@dir)
-          create(Cmd) do |test|
-            test.name = 'internal command'
-            test.exit = 0
-            test.dir = @dir
-            test.command = cmd
-            test.reject :strategy
-          end
+        if cmd.nil? or Configure.have_configure? @dir
+          @bootstrap = nil
+        else
+          @bootstrap = cmd.to_ocmd
+          @bootstrap.dir = @dir
         end
       end
+      protected :prologue
+
+
+      def run_impl
+        skip_pass if @bootstrap.nil?
+        @my_data = @bootstrap.run @runner
+      end
+      protected :run_impl
+
+
+      def assertion
+        assert_cmd UM::StreamMatcher, @my_data,
+                   :exit => 0, :error => nil, :output => nil
+        pass
+      end
+      protected :assertion
+
+
+      def abort_hook
+        @runner.abort @my_data if @runner and defined? @my_data
+        super
+      end
+      protected :abort_hook
+
+
+      def epilogue
+        @my_data.clean if defined? @my_data
+        super
+      end
+      protected :epilogue
 
 
       def dir= ( dir )

data/lib/uttk/strategies/Checkout.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Checkout.rb 21881 2006-02-19T01:33:18.844638Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Checkout.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 module Uttk
 
@@ -16,9 +16,10 @@ module Uttk
       end
 
       def run_impl
+        FileType.import!
         begin
           file, data = @url.checkout
-          if data.is_a? Commands::Datas::Data
+          if data.is_a? OCmd::Datas::Data
             out, err = data.output, data.error
             @log.my_stdout = out.read unless out.nil? or out.size.zero?
             @log.my_stderr = err.read unless err.nil? or err.size.zero?

data/lib/uttk/strategies/Clean.rb

@@ -1,7 +1,7 @@
 # Author::    Marco Tessari  <marco.tessari@epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Clean.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Clean.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Collection.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Collection.rb 22102 2006-02-21T23:03:39.538964Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Collection.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
@@ -28,9 +28,9 @@ module Uttk
       # collection.
       def create ( anObject=strategyclass, &block )
         super do |t|
-          @log.debug{"assign collection attributes #{@attributes.size}"}
+          # @log.debug{"assign collection attributes #{@attributes.size}"}
           @attributes.each do |k,v|
-            @log.debug{"assign attribute: #{k}"}
+            # @log.debug{"assign attribute: #{k}"}
             next if k == :contents
             t.assign_one(k, v, true)
           end

data/lib/uttk/strategies/Command.rb

@@ -0,0 +1,95 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2006 Uttk team. All rights reserved.
+# License::   LGPL
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Command.rb 24393 2006-07-10T07:38:49.140737Z ertai  $
+
+
+module Uttk
+
+  module Strategies
+
+    # I can check many interaction with a command line based program, such as:
+    # its standard output, exit status, standard error. I can specify to a
+    # given command its arguments, environment variables and standard input.
+    #
+    # A tutorial introduces how to use this strategy at
+    # http://uttk.org/shelf/documentation
+    class Command < Strategy
+      include Concrete
+
+      #
+      # Methods
+      #
+
+      def prologue
+        super
+        @runner = mk_system_runner @env
+        @command = @command.to_ocmd
+        @command += @args.to_ocmd_args
+        @command.dir = @dir
+        @command.input = @input
+      end
+
+
+      def run_impl
+        @my_data = @command.run @runner
+      end
+      protected :run_impl
+
+
+      def assertion
+        assert_cmd @matcher, @my_data,
+                   :output => @output,
+                   :error  => @error,
+                   :exit   => @exit
+        pass
+      end
+      protected :assertion
+
+
+      def abort_hook
+        @runner.abort @my_data if @runner and defined? @my_data
+        super
+      end
+      protected :abort_hook
+
+
+      def epilogue
+        @my_data.clean if defined? @my_data
+        super
+      end
+      protected :epilogue
+
+
+      #
+      # Attributes
+      #
+
+      # Contains the OCmd::Datas::Data object, the result of the command running.
+      attr_reader :my_data
+
+      # The OCmd::Runners::Runner used to run the command.
+      attr_accessor :runner
+
+      attribute :command, 'the command to execute', :mandatory,
+                          [String, Pathname, Array]
+      attribute :dir,     'the directory where to launch the command',
+                          [String, Pathname]
+      attribute :args,    'the arguments for the command',
+                          [Array, String, Numeric]
+
+      attribute :input,   'the input reference',  :invisible, nil
+      attribute :output,  'the output reference', :invisible, nil
+      attribute :error,   'the error reference',  :invisible, nil
+
+      attribute :exit,    'the exit status reference', Integer
+      attribute :env,     'environment variables', Hash do {} end
+
+      attribute :matcher, 'the matcher class (< UM::UnfiedMatcher)',
+                          [Class, UM::UnifiedMatcher], UM::StreamMatcher.new
+
+    end # class Command
+
+  end # module Strategies
+
+end # module Uttk