uttk 0.3.6.1 → 0.4.5.0

data/lib/uttk/strategies/Composite/contents_eval.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Despr�s  <nicolas.despres@gmail.com>.
 # Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Composite/contents_eval.rb 8788 2005-09-27T14:23:19.686215Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Composite/contents_eval.rb 8788 2005-09-27T14:23:19.686215Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Configure.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/Configure.rb 22112 2006-02-22T08:30:11.236459Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Configure.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
@@ -10,40 +10,49 @@ module Uttk
 
     # I run then check whether the configure stage of a compilation process fail.
     # I used in the _Package_ strategy to handle the configuration stage.
-    class Configure < Proxy
+    class Configure < Strategy
       include Concrete
 
       CONFIGURE = /^configure(\.sh)?$/
       CONFIGURE_INPUT = /^configure\.(ac|in)$/
 
-      def mk_command ( script )
-        cmd = script.to_s
-        cmd += " --prefix=#@prefix" if @prefix
-        if @flags.is_a? Array
-          @flags = @flags.join(' ')
-        else
-          @flags = @flags.to_s
-        end
-        symtbl_configure_flags = @symtbl[:configure_flags]
-        @flags += ' ' + symtbl_configure_flags unless symtbl_configure_flags.nil?
-        @symtbl[:configure_flags] = @flags
-        cmd + ' ' + @flags
-      end
-
       def prologue
         super
-        @dir = Pathname.new(@dir)
+        @runner = mk_system_runner
+        @dir = @dir.to_path
         if script = self.class.have_configure?(@dir)
-          create(Cmd) do |test|
-            test.name = 'command'
-            test.exit = 0
-            test.dir = @dir
-            test.command = mk_command(script)
-            test.verbose_print = true
-            test.reject :strategy, :dir
-          end
+          flags = @flags.to_ocmd_args + @symtbl[:configure_flags].to_ocmd_args
+          flags << "--prefix=#@prefix" if @prefix
+          @symtbl[:configure_flags] = flags
+          @configure = script.to_ocmd + @flags
+          @configure.dir = @dir
         end
       end
+      protected :prologue
+
+      def run_impl
+        @my_data = @configure.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 self.have_configure_input? ( dir=Pathname.new('.') )
         res = dir.entries.find { |ent| ent.to_s =~ CONFIGURE_INPUT }

data/lib/uttk/strategies/Error.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/strategies/Error.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Error.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/Fail.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/strategies/Fail.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Fail.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/HostSelector.rb

@@ -0,0 +1,143 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 TTK Team. All rights reserved.
+# License::   LGPL
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/strategies/HostSelector.rb 29680 2006-09-13T07:36:54.996888Z ertai  $
+
+module Uttk
+
+  module Strategies
+
+    #
+    # Example:
+    #   root: !S::Suite
+    #     contents:
+    #       - selector: !S::HostSelector
+    #           hosts:                         # The list of hosts.
+    #             - ssh://joe:tux@foo.com      # Via ssh on foo.com.
+    #             - druby://bar.fr:4242/ttk    # Another custom protocol.
+    #             - ...                        # Hosts can also be specified
+    #                                          # with a file containing hosts
+    #                                          # or an url.
+    #           static_select: |               # Performed just one time.
+    #             reject! { |x| not x.alive? } # Example of static cleaning.
+    #             shuffle!                     # Shuffle the hosts.
+    #           dynamic_select: |              # Called to elect an host.
+    #             roll                         # Move the first host to the
+    #                                          # end of the list and return it
+    #                                          # Other examples:
+    #                                          #   - first (take the first)
+    #                                          #   - choose (randomly)
+    #       - big suite: !S::Pool
+    #           attribute: !S::Jump
+    #             to: !url <<host_selector.elect>>
+    #             test: !S::Suite
+    #               ... something long ...
+    #           contents:
+    #             - ...
+    #             - ...
+    #
+    class HostSelector < Strategy
+      include Concrete
+
+      #
+      # Methods
+      #
+      def elect_host
+        do_dynamic_select
+      end
+
+      def call ( selector, argument )
+        if selector.arity == 1
+          selector[argument]
+        else
+          argument.instance_eval(&selector)
+        end
+      end
+      protected :call
+
+      def do_static_select
+        @hosts_pool = @hosts.dup
+        result = call(@static_select, @hosts_pool)
+        @hosts_pool = result unless result.nil?
+      end
+      protected :do_static_select
+
+      def do_dynamic_select
+        call(@dynamic_select, @hosts_pool)
+      end
+      protected :do_dynamic_select
+
+      #
+      # Suppose that we have URI::Generic#load_average which returns the current
+      # load average of the targeted host.
+      #
+      # With dynamic select you can simply do that
+      #
+      # dynamic_select:
+      #   min { |x, y| x.load_average <=> y.load_average }
+      #
+      # dynamic_min:
+      #   load_average
+      #
+      # dynamic_min:
+      #   ((alive?)? 0 : Float::MAX) + 3 * load_average.first + 5 * current_jobs_count
+      def do_dynamic_min
+        @hosts_pool.min { |x, y| call(dynamic_min, x) <=> call(dynamic_min, y) }
+      end
+      protected :do_dynamic_min
+
+      def prologue
+        super
+        @static_select = @static_select.to_proc
+        @dynamic_select = @dynamic_select.to_proc if @dynamic_select
+        @dynamic_min = @dynamic_min.to_proc if @dynamic_min
+        unless @dynamic_select or @dynamic_min
+          raise ArgumentError, "Need at least dynamic_select or dynamic_min"
+        end
+        @symtbl[:host_selector] = self
+        @symtbl[:'host_selector.elect'] = SymTbl::Trigger.new { elect }
+        # ...
+      end
+      protected :prologue
+
+      def run_impl
+        do_static_select
+        # ...
+        super
+        # ...
+      end
+      protected :run_impl
+
+      def assertion
+        pass
+        # ...
+        super
+      end
+      protected :assertion
+
+      def epilogue
+        # ...
+        super
+      end
+      protected :epilogue
+
+      #
+      # Attributes
+      #
+      attribute :hosts,
+                'hosts to distribute',
+                Object, [], :mandatory
+
+      attribute :static_select,
+                'static block for selection (called once)',
+                [String, Proc], 'shuffle'
+
+      attribute :dynamic_select,
+                'dynamic block for selection (called for each election)',
+                [String, Proc], 'roll'
+
+    end # class HostSelector
+
+  end # module Strategies
+
+end # module Uttk

data/lib/uttk/strategies/Import.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/Import.rb 22102 2006-02-21T23:03:39.538964Z pouillar  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Import.rb 53986 2007-01-14T15:03:21.549822Z ertai  $
 
 
 module Uttk
@@ -32,7 +32,7 @@ module Uttk
 
       def epilogue
         @symtbl[:loader] = @save_loader unless @loader.nil?
-        @symtbl[:pwd] = @old_pwd
+        @symtbl[:pwd] = @old_pwd if defined? @old_pwd
         super
       end
       protected :epilogue

data/lib/uttk/strategies/Iterate.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/Iterate.rb 8813 2005-10-12T08:41:50.904292Z ertai  $
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Iterate.rb 8813 2005-10-12T08:41:50.904292Z ertai  $
 
 
 module Uttk

data/lib/uttk/strategies/JUnit.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/JUnit.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/JUnit.rb 8778 2005-09-26T04:34:48.103938Z ertai  $
 
 
 #FIXME: adapt me

data/lib/uttk/strategies/Jump.rb

@@ -0,0 +1,81 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2005 TTK Team. All rights reserved.
+# License::   LGPL
+# Revision::  $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Jump.rb 53986 2007-01-14T15:03:21.549822Z ertai  $
+
+module Uttk
+
+  module Strategies
+
+    # Jump to a specific url and run a strategy.
+    class Jump < Strategy
+      include Concrete
+
+      #
+      # Methods
+      #
+
+
+      def run_impl
+        super
+        @status = @to.jump_and_eval mk_input do |output|
+          @log.new_node 'Remote execution' do
+            YAML.load_from_io(output.open) do |notif|
+              @log.send(*notif)
+            end
+          end
+          # @log.up
+        end
+        if @status.is_a? Status
+          raise @status
+        else
+          raise_error "Bad status: `#{@status.inspect}'"
+        end
+      end
+      protected :run_impl
+
+
+      def mk_input
+        dumpable_symtbl = SymTbl.new
+        dumpable_symtbl.merge!(@symtbl)
+        dumpable_symtbl.local.delete :log
+        dumpable_symtbl[:master_pwd] = @symtbl[:pwd]
+        marshaled_input = Marshal.dump([@test, dumpable_symtbl]).dump
+        input = "
+          # require 'rubygems'
+          # require_gem 'uttk'
+          # require 'uttk'
+          uttk_dir = '#{Uttk.dir.expand_path}'
+          require \"\#{uttk_dir}\"
+          # FIXME Move the getopts in lib and make it lazy loaded
+          require \"\#{uttk_dir.to_path.parent.parent/'bin'/'getopts'/'uttk'}\"
+          
+          test, root_symtbl = Marshal.load #{marshaled_input}
+          opts = Uttk::Getopts::Uttk.parse(['-F', 'Notif'])
+          root_symtbl.merge! opts
+          symtbl = Uttk.default_symtbl(root_symtbl).new_child
+          test.uttk_testify(symtbl).run
+        "
+      end
+      protected :mk_input
+
+
+      def to= ( anObject )
+        @to = anObject
+        @url = anObject.to_url
+      end
+
+      #
+      # Attributes
+      #
+      attribute :to,   'the destination url', [String, URI::Generic], :mandatory
+
+      attribute :test, 'the test to run on the destination url',
+                       :mandatory, :invisible, :dont_expand
+
+
+    end # class Jump
+
+  end # module Strategies
+
+end # module Uttk

data/lib/uttk/strategies/Make.rb

@@ -1,85 +1,55 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright:: Copyright (c) 2004, 2005 Uttk team. All rights reserved.
+# Copyright:: Copyright (c) 2004, 2005, 2006 Uttk team. All rights reserved.
 # License::   LGPL
-# $Id: /fey/uttk/trunk/lib/uttk/strategies/Make.rb 8789 2005-09-27T14:49:49.088376Z ertai  $
+# $Id: /w/fey/uttk/trunk/lib/uttk/strategies/Make.rb 24394 2006-07-10T07:38:58.276210Z ertai  $
 
 
 module Uttk
 
   module Strategies
 
-    class Make < Proxy
+    class Make < Strategy
       include Concrete
 
-      def mk_make_cmd
-        @symtbl[:make] || ENV['MAKE'] || 'make'
-      end
-
-      def mk_cmd ( target, continue_mode, jobs=nil, options='' )
-        make = mk_make_cmd()
-        unless options.empty?
-          case options
-          when Array
-            options = ' ' + options.join(' ')
-          when String
-            options = " #{options}"
-          end
-        end
-        opts = ''
-        opts += ' -k' if continue_mode
-        opts += " -j#{jobs}" if jobs
-        "#{make} #{target}#{opts}#{options}"
-      end
-
       def prologue
         super
-        cmd = mk_cmd(@target.target, @continue_mode, @jobs, @options)
-        create(Cmd) do |test|
-          test.name = 'internal command'
-          test.exit = 0
-          test.dir = @dir
-          test.command = cmd
-          test.reject :strategy, :exit, :fatal, :dir
-          # test.reject :status
-        end
-      end
-
-      class Target
-        include Abstract
-        def target
-          self.class.target
-        end
-        def self.target
-          name.downcase.sub(/^.*:/, '')
-        end
-      end
-
-      class Default < Target
-        include Concrete
-        def self.target
-          ''
-        end
+        @runner = mk_system_runner
+        @make = (@symtbl[:make] || ENV['MAKE'] || 'make').to_ocmd
+        @make.dir = @dir
+        @make += @options.to_ocmd_args
+        @make << '-k' if @continue_mode
+        @make << "-j#@jobs" if @jobs
+        @make << @target unless @target.blank?
       end
+      protected :prologue
 
-      class All < Target
-        include Concrete
+      def run_impl
+        @my_data = @make.run(@runner)
       end
+      protected :run_impl
 
-      class Check < Target
-        include Concrete
+      def abort_hook
+        @runner.abort @my_data if @runner and defined? @my_data
+        super
       end
+      protected :abort_hook
 
-      class DistCheck < Target
-        include Concrete
+      def assertion
+        assert_cmd UM::StreamMatcher, @my_data,
+                   :exit => 0, :error => nil, :output => nil
+        pass
       end
+      protected :assertion
 
-      class Install < Target
-        include Concrete
+      def epilogue
+        @my_data.clean if defined? @my_data
+        super
       end
+      protected :epilogue
 
       attribute :dir,           'building directory', :mandatory
 
-      attribute :target,        'select a target', Class, Default, :invisible
+      attribute :target,        'select a target', String, '', :invisible
 
       attribute :continue_mode, 'use the -k option of make', false