laborantin 0.0.8 → 0.0.9

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
         s.name = 'laborantin'
-        s.version = '0.0.8'
+        s.version = '0.0.9'
         s.platform = Gem::Platform::RUBY
         s.summary = "A measurement batch facilitator"
 

data/bin/files/environments/environment.rb.erb

@@ -3,11 +3,8 @@
 class <%= e.camelize %> < Laborantin::Environment
 
   describe "Place your description here"
-
-  verify :good_platform?
-
-  def good_platform?
-    RUBY_PLATFORM =~ /linux/
-  end
+  #verify :instance_meth1, ...
+  #setup :instance_meth2, ...
+  #teardown :instance_meth3, ...
 
 end

data/bin/files/scenarii/scenario.rb.erb

@@ -2,4 +2,12 @@
 
 class <%= s.camelize %> < Laborantin::Scenario
   describe "put your decription here"
+  # parameter(:param_name) do
+  #   values 1, 2, 3, 4, ...
+  #   describe "put your parameter description here"
+  # end
+  #
+  # setup :instance_meth1, ...
+  # teardown :instance_meth2, ...
+  # produces :instance_meth3, ...
 end

data/bin/labor

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require	'optparse'
-#require 'rubygems'
+require 'rubygems'
 require 'laborantin'
 #require '../lib/laborantin'
 require	'fileutils'
@@ -162,34 +162,9 @@ Command.new('scan', "scan a laborantin's dir for results") do |c|
       require f if File.extname(f) == '.rb'
     end
 
-    envs = []
-    scs  = []
-
-    Dir.entries('results').each do |f| 
-      envklass = Laborantin::Environment.all.find{|e| e.name.duck_case == f} #TODO: pass that in the class
-      if envklass
-        Dir.entries(envklass.envdir).each do |e|
-          if e =~ /\d+-\w+-\d+_\d+-\d+-\d+/
-            env = envklass.new #XXX: don't prepare! it hence don't overwrite logs
-            envs << env
-            env.rundir = File.join(envklass.envdir, e)
-            Dir.entries(env.rundir).each do |s|
-              scklass = Laborantin::Scenario.all.find{|t| t.name.duck_case == s}
-              if scklass
-                Dir.entries(scklass.scenardir(env)).each do |r|
-                  if r =~ /\d+-\w+-\d+_\d+-\d+-\d+/
-                    scenar = scklass.new(env)
-                    scs << scenar
-                    scenar.rundir = File.join(scklass.scenardir(env), r)
-                    YAML.load_file(File.join(scenar.rundir, 'config.yaml'))
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end #Dir
+    envs = Laborantin::Environment.scan_resdir('results')
+
+    scs = envs.map{|env| env.populate }.flatten
 
     puts "Laborantin' summary:"
     Laborantin::Environment.all.each do |envklass|
@@ -240,7 +215,7 @@ Command.new('run', 'actually perform measurements') do |c|
 
     envs.each do |eklass|
       env = eklass.new
-      unless eklass.verifications.find{|v| not env.send(v)} #TODO: pass into class, rescue errors
+      if env.valid?
         env.prepare!
         env.log "Running matching scenarii", :info #TODO: pass the logging+running in the env
         scii.each do |sklass|
@@ -253,7 +228,6 @@ Command.new('run', 'actually perform measurements') do |c|
             sc.analyze!
           end
         end
-        env.analyze!
         env.teardown!
         env.log "Scenarii performed", :info
       end

data/lib/laborantin.rb

@@ -28,7 +28,7 @@ require File.join(File.dirname(__FILE__), 'laborantin', 'core', 'environment')
 require File.join(File.dirname(__FILE__), 'laborantin', 'core', 'monkey_patches')
 
 module Laborantin
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
   AUTHORS = ['Lucas Di Cioccio']
   WEBSITE = 'http://dicioccio.fr'
   LICENSE = 'GNU GPL version 3'

data/lib/laborantin/core/environment.rb

@@ -29,6 +29,24 @@ module Laborantin
   class Environment
     @@all = []
     @@rootdir = '.'
+
+    def self.scan_resdir(dir)
+      ret = []
+      Dir.entries(dir).each do |f| 
+	envklass = Laborantin::Environment.all.find{|e| e.name.duck_case == f} 
+	if envklass
+	  Dir.entries(envklass.envdir).each do |e|
+	    if e =~ /\d+-\w+-\d+_\d+-\d+-\d+/
+	      env = envklass.new #XXX don't prepare! it hence don't overwrite logs
+	      env.rundir = File.join(envklass.envdir, e)
+	      ret << env
+	    end
+	  end
+	end
+      end
+      ret
+    end
+
     class << self
       attr_accessor :verifications, :description, :envdir, :hooks
 
@@ -90,6 +108,10 @@ module Laborantin
       @loggers = []
     end
 
+    def valid?
+      self.class.verifications.find{|v| not send(v)}.nil?
+    end
+
     def prepare!
       FileUtils.mkdir_p(rundir) #TODO: ensure unicity
       @loggers << Logger.new(File.join(rundir, 'environment.log'))
@@ -103,14 +125,14 @@ module Laborantin
       call_hooks :teardown
     end
 
-    def analyze!
-      #TODO
-    end
-
     def log(str, lvl=:debug)
       @loggers.each{|l| l.send(lvl, str)}
     end
 
+    def populate
+      Laborantin::Scenario.scan_env(self)
+    end
+
     private
 
     def call_hooks(name)

data/lib/laborantin/core/scenario.rb

@@ -30,57 +30,76 @@ require 'yaml'
 module Laborantin
   class Scenario
     @@all = []
+
+    def self.scan_env(env)
+      scs = []
+      Dir.entries(env.rundir).each do |s|
+        scklass = Laborantin::Scenario.all.find{|t| t.name.duck_case == s}
+        if scklass
+          Dir.entries(scklass.scenardir(env)).each do |r|
+            if r =~ /\d+-\w+-\d+_\d+-\d+-\d+/
+              scenar = scklass.new(env)
+              scs << scenar
+              scenar.rundir = File.join(scklass.scenardir(env), r)
+              YAML.load_file(File.join(scenar.rundir, 'config.yaml'))
+            end
+          end
+        end
+      end
+      scs
+    end
+
     class << self
       attr_accessor :description, :parameters, :products, :hooks
 
       def inherited(klass)
-	klass.parameters = ParameterHash.new
-	klass.description = ''
-	klass.products = []
-	klass.hooks = {:setup => [], :teardown => []}
-	@@all << klass
+        klass.parameters = ParameterHash.new
+        klass.description = ''
+        klass.products = []
+        klass.hooks = {:setup => [], :teardown => []}
+        @@all << klass
       end
 
       def describe(str)
-	self.description = str
+        self.description = str
       end
 
       def setup(*args)
-	self.hooks[:setup] = [*args].flatten
+        self.hooks[:setup] = [*args].flatten
       end
 
       def teardown(*args)
-	self.hooks[:teardown] = [*args].flatten
+        self.hooks[:teardown] = [*args].flatten
       end
 
 
       def parameter(name, &blk)
-	raise ArgumentError.new("Parameter #{name} already exists") if self.parameters[name]
-	param = ParameterRange.new(name)
-	param.instance_eval &blk
-	self.parameters[name] = param
+        raise ArgumentError.new("Parameter #{name} already exists") if self.parameters[name]
+        param = ParameterRange.new(name)
+        param.instance_eval &blk
+        self.parameters[name] = param
       end
 
       def produces(*args)
-	self.products = [*args].flatten
+        self.products = [*args].flatten
       end
 
       def to_s
-	"#{self.name}:\n\t#{self.description}\n#{self.parameters}"
+        "#{self.name}:\n\t#{self.description}\n#{self.parameters}"
       end
 
       def all
-	@@all
+        @@all
       end
 
       def scenardir(env=nil)
-	envdir = env.rundir || '.'
-	File.join(envdir, self.name.duck_case)
+        envdir = env.rundir || '.'
+        File.join(envdir, self.name.duck_case)
       end
     end # class << 
 
     attr_accessor :params, :environment, :date, :rundir
-    
+
     def initialize(env, params={})
       @environment = env
       @params = params
@@ -101,9 +120,9 @@ module Laborantin
       call_hooks :setup
       log "Starting measurement"
       raw_result_file('w') do |f|
-	run do |l|
-	  f.puts l
-	end
+        run do |l|
+          f.puts l
+        end
       end
       log "Measurement finished"
       call_hooks :teardown
@@ -111,13 +130,13 @@ module Laborantin
 
     def analyze!
       self.class.products.each do |name|
-	log "Producing #{name}"
-	product_file(name.to_s, 'w') do |f|
-	  send name do |l|
-	    f.puts l
-	  end
-	end
-	log "Product #{name} done"
+        log "Producing #{name}"
+        product_file(name.to_s, 'w') do |f|
+          send name do |l|
+            f.puts l
+          end
+        end
+        log "Product #{name} done"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laborantin
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Di Cioccio Lucas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 +02:00
+date: 2009-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: []