laborantin 0.0.10 → 0.0.12

data/Rakefile

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

data/bin/labor

@@ -9,12 +9,24 @@ require 'find'
 require 'erb'
 require	'yaml'
 require 'net/ftp'
+require 'logger'
 
 class Command
   attr_accessor :name, :description, :parser, :block, :options, :args
 
   @@all = []
 
+  def find_and_require(dir, filter=[])
+    Find.find(dir) do |f|
+      test = if filter.empty?
+               File.extname(f) == '.rb'
+             else
+               filter.include? File.basename(f)
+             end
+      require f if test
+    end
+  end
+
   def initialize(name, description='')
     @@all << self
     @name = name
@@ -66,9 +78,9 @@ Command.new('create', 'prepares a dir for laborantin measurements') do |c|
   c.options[:environments] = []
   c.options[:force] = false
   c.opts do |o|
-    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|c.options[:scenarii]|}
-    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|c.options[:environments]|}
-    o.on_tail('-f', '--force', 'force overwrite') {|c.options[:force]|}
+    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|val| c.options[:scenarii] = val}
+    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|val| c.options[:environments] = val}
+    o.on_tail('-f', '--force', 'force overwrite') {|val| c.options[:force] = val}
     o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
   end
 
@@ -136,14 +148,19 @@ end
 # Describe
 
 Command.new('describe', "describes a laborantin's work") do |c|
+  c.options[:environments] = []
+  c.options[:scenarii] = []
   c.opts do |o|
+    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|val| c.options[:scenarii] = val}
+    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|val| c.options[:environments] = val}
     o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
   end
   c.execute do
     FileUtils.cd(args.first || '.')
-    Find.find('environments', 'scenarii') do |f|
-      require f if File.extname(f) == '.rb'
-    end
+    loaded_envs = c.options[:environments].map{|e| "#{e}.rb"}
+    loaded_scii = c.options[:scenarii].map{|e| "#{e}.rb"}
+    find_and_require('environments', loaded_envs)
+    find_and_require('scenarii', loaded_scii)
 
     Laborantin::Environment.all.each {|e| p e}
     Laborantin::Scenario.all.each {|s| p s}
@@ -153,14 +170,21 @@ end
 # Scan
 
 Command.new('scan', "scan a laborantin's dir for results") do |c|
+  c.options[:filter] = ''
+  c.options[:environments] = []
+  c.options[:scenarii] = []
   c.opts do |o|
+    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|val| c.options[:scenarii] = val}
+    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|val| c.options[:environments] = val}
+    o.on('-p', '--parameters=OPTIONAL', 'filter parameters (ruby hash format)', String) {|val| c.options[:filter] = val}
     o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
   end
   c.execute do
     FileUtils.cd(args.first || '.')
-    Find.find('environments', 'scenarii') do |f|
-      require f if File.extname(f) == '.rb'
-    end
+    loaded_envs = c.options[:environments].map{|e| "#{e}.rb"}
+    loaded_scii = c.options[:scenarii].map{|e| "#{e}.rb"}
+    find_and_require('environments', loaded_envs)
+    find_and_require('scenarii', loaded_scii)
 
     envs = Laborantin::Environment.scan_resdir('results')
 
@@ -177,6 +201,70 @@ Command.new('scan', "scan a laborantin's dir for results") do |c|
   end
 end
 
+# Find
+
+Command.new('find', "find the results dir for a set of params/env") do |c|
+  c.options[:filter] = ''
+  c.options[:environments] = []
+  c.options[:scenarii] = []
+  c.opts do |o|
+    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|val| c.options[:scenarii] = val}
+    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|val| c.options[:environments] = val}
+    o.on('-p', '--parameters=OPTIONAL', 'filter parameters (ruby hash format)', String) {|val| c.options[:filter] = val}
+    o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
+  end
+  c.execute do
+
+    FileUtils.cd(args.first || '.')
+    loaded_envs = c.options[:environments].map{|e| "#{e}.rb"}
+    loaded_scii = c.options[:scenarii].map{|e| "#{e}.rb"}
+    find_and_require('environments', loaded_envs)
+    find_and_require('scenarii', loaded_scii)
+    
+    envs = Laborantin::Environment.scan_resdir('results')
+
+    params = eval @options[:filter] unless @options[:filter].empty?
+    params.each_key{|k| params[k] = [params[k]].flatten} if params
+    params ||= {}
+
+    scs = envs.map{|env| env.populate }.flatten
+
+    scs.each do |sc|
+	to_filter = params.keys.find{|k| not params[k].include?(sc.params[k])}
+	unless to_filter
+		puts sc.rundir
+		puts sc.params.inspect
+	end
+    end
+  end
+end
+
+# Replay
+
+Command.new('replay', 'scan existing runs, keep their raw results but rebuild all the products') do |c|
+  c.opts do |o|
+    o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
+  end
+  c.execute do
+    FileUtils.cd(args.first || '.')
+    Find.find('environments', 'scenarii') do |f|
+      require f if File.extname(f) == '.rb'
+    end
+
+    envs = Laborantin::Environment.scan_resdir('results')
+    envs.each{|env| env.loggers << Logger.new(STDOUT)}
+
+    scs = envs.map{|env| env.populate }.flatten
+
+    puts "Replaying everything"
+
+    scs.each do |sc|
+      sc.environment.log "Replaying products #{sc.params.inspect}"
+      sc.analyze!
+    end
+  end
+end
+
 # Run
 
 Command.new('run', 'actually perform measurements') do |c|
@@ -184,9 +272,9 @@ Command.new('run', 'actually perform measurements') do |c|
   c.options[:environments] = []
   c.options[:filter] = ''
   c.opts do |o|
-    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|c.options[:scenarii]|}
-    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|c.options[:environments]|}
-    o.on('-p', '--parameters=OPTIONAL', 'filter parameters (ruby hash format)', String) {|c.options[:filter]|}
+    o.on('-s', '--scenarii=OPTIONAL', 'scenarii to build, comma separated', Array) {|val| c.options[:scenarii] = val}
+    o.on('-e', '--environments=OPTIONAL', 'environments to prepare, comma separated', Array) {|val| c.options[:environments] = val}
+    o.on('-p', '--parameters=OPTIONAL', 'filter parameters (ruby hash format)', String) {|val| c.options[:filter] = val}
     o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
   end
   c.execute do 
@@ -235,6 +323,9 @@ Command.new('run', 'actually perform measurements') do |c|
   end
 end
 
+# Run missing
+# TODO scan existing params + filter
+
 # FTP
 
 Command.new('ftp-up', 'upload results via FTP') do |c|

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.10'
+  VERSION = '0.0.12'
   AUTHORS = ['Lucas Di Cioccio']
   WEBSITE = 'http://dicioccio.fr'
   LICENSE = 'GNU GPL version 3'

data/lib/laborantin/core/scenario.rb

@@ -57,7 +57,8 @@ module Laborantin
               scenar = scklass.new(env)
               scs << scenar
               scenar.rundir = File.join(scklass.scenardir(env), r)
-              YAML.load_file(File.join(scenar.rundir, 'config.yaml'))
+              tst, params = YAML.load_file(File.join(scenar.rundir, 'config.yaml'))
+	      scenar.params = params
             end
           end
         end

metadata

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