laborantin 0.0.6 → 0.0.7

data/Rakefile

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

data/TODO

@@ -1,11 +1,8 @@
 replay / pause / restart
 
-exploit raw results, wrt to values
-
 => interaction with rubydrill?
 => or direct stats
 
 export results via ftp
 
-app to parse through results
-
+creation of a script that doesn't depends on laborantin for export?

data/bin/labor

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
 require	'optparse'
-#require 'rubygems'
-require 'laborantin'
-#require '../lib/laborantin'
+require 'rubygems'
+#require 'laborantin'
+require '../lib/laborantin'
 require	'fileutils'
 require 'find'
 require 'erb'
+require	'yaml'
+require 'net/ftp'
 
 class Command
   attr_accessor :name, :description, :parser, :block, :options, :args
@@ -57,6 +59,8 @@ class Command
   end
 end
 
+# Create
+
 Command.new('create', 'prepares a dir for laborantin measurements') do |c|
   c.options[:scenarii] = []
   c.options[:environments] = []
@@ -73,10 +77,10 @@ Command.new('create', 'prepares a dir for laborantin measurements') do |c|
     p dir #not for debug
     unless c.options[:force]
       begin
-	FileUtils.mkdir dir
+        FileUtils.mkdir dir
       rescue Errno::EEXIST => err
-	puts "Directory already exists, use -f/--force to overwrite (will overwrite all generated files, use at your own risk)."
-	exit 
+        puts "Directory already exists, use -f/--force to overwrite (will overwrite all generated files, use at your own risk)."
+        exit 
       end
     end
     %w{environments scenarii results config scripts}.each do |w|
@@ -88,47 +92,49 @@ Command.new('create', 'prepares a dir for laborantin measurements') do |c|
       res_path = File.join(dir, w)
       p res_path #not for debug
       File.open(res_path, 'w') do |f|
-	tpl = ''
-	tpl_path = (File.join(File.dirname(__FILE__), 'files', "#{w}.erb"))
-	File.open(tpl_path) do |tf|
-	  tpl = tf.read
-	end
-	erb = ERB.new tpl
-	erb.filename = res_path
-	f.puts erb.result(binding)
+        tpl = ''
+        tpl_path = (File.join(File.dirname(__FILE__), 'files', "#{w}.erb"))
+        File.open(tpl_path) do |tf|
+          tpl = tf.read
+        end
+        erb = ERB.new tpl
+        erb.filename = res_path
+        f.puts erb.result(binding)
       end
     end
     @options[:scenarii].each do |s|
       res_path = File.join(dir, 'scenarii', "#{s}.rb")
       p res_path #not for debug
       File.open(res_path, 'w') do |f|
-	tpl = ''
-	tpl_path = (File.join(File.dirname(__FILE__), 'files', 'scenarii', 'scenario.rb.erb'))
-	File.open(tpl_path) do |tf|
-	  tpl = tf.read
-	end
-	erb = ERB.new tpl
-	erb.filename = res_path
-	f.puts erb.result(binding)
+        tpl = ''
+        tpl_path = (File.join(File.dirname(__FILE__), 'files', 'scenarii', 'scenario.rb.erb'))
+        File.open(tpl_path) do |tf|
+          tpl = tf.read
+        end
+        erb = ERB.new tpl
+        erb.filename = res_path
+        f.puts erb.result(binding)
       end
     end
     @options[:environments].each do |e|
       res_path = File.join(dir, 'environments', "#{e}.rb")
       p res_path #not for debug
       File.open(res_path, 'w') do |f|
-	tpl = ''
-	tpl_path = (File.join(File.dirname(__FILE__), 'files', 'environments', 'environment.rb.erb'))
-	File.open(tpl_path) do |tf|
-	  tpl = tf.read
-	end
-	erb = ERB.new tpl
-	erb.filename = res_path
-	f.puts erb.result(binding)
+        tpl = ''
+        tpl_path = (File.join(File.dirname(__FILE__), 'files', 'environments', 'environment.rb.erb'))
+        File.open(tpl_path) do |tf|
+          tpl = tf.read
+        end
+        erb = ERB.new tpl
+        erb.filename = res_path
+        f.puts erb.result(binding)
       end
     end
   end
 end
 
+# Describe
+
 Command.new('describe', "describes a laborantin's work") do |c|
   c.opts do |o|
     o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
@@ -144,8 +150,59 @@ Command.new('describe', "describes a laborantin's work") do |c|
   end
 end
 
+# Scan
+
+Command.new('scan', "scan a laborantin's dir for results") 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 = []
+    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
 
+    puts "Laborantin' summary:"
+    Laborantin::Environment.all.each do |envklass|
+      puts "#{envklass.name.duck_case} => #{envs.count{|e| e.is_a? envklass}}"
+      Laborantin::Scenario.all.each do |scklass|
+        puts "\t#{scklass.name.duck_case} => #{scs.count{|s| s.is_a? scklass and s.environment.is_a? envklass}}"
+      end
+    end
+
+  end
+end
+
+# Run
 
 Command.new('run', 'actually perform measurements') do |c|
   c.options[:scenarii] = []
@@ -165,18 +222,18 @@ Command.new('run', 'actually perform measurements') do |c|
     end
 
     envs = if c.options[:environments].empty?
-	     Laborantin::Environment.all
-	   else
-	     c.options[:environments].map!{|e| e.camelize}
-	     Laborantin::Environment.all.select{|e| c.options[:environments].include? e.name}
-	   end
+             Laborantin::Environment.all
+           else
+             c.options[:environments].map!{|e| e.camelize}
+             Laborantin::Environment.all.select{|e| c.options[:environments].include? e.name}
+           end
 
     scii = if c.options[:scenarii].empty?
-	     Laborantin::Scenario.all
-	   else
-	     c.options[:scenarii].map!{|e| e.camelize}
-	     Laborantin::Scenario.all.select{|e| c.options[:scenarii].include? e.name}
-	   end
+             Laborantin::Scenario.all
+           else
+             c.options[:scenarii].map!{|e| e.camelize}
+             Laborantin::Scenario.all.select{|e| c.options[:scenarii].include? e.name}
+           end
 
     params = eval @options[:filter] unless @options[:filter].empty?
     params.each_key{|k| params[k] = [params[k]].flatten} if params
@@ -184,28 +241,64 @@ 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
-	env.prepare!
-	env.log "Running matching scenarii", :info #TODO: pass the logging+running in the env
-	scii.each do |sklass|
-	  sklass.parameters.merge! params if params
-	  env.log sklass.parameters.inspect
-	  sklass.parameters.each_config do |cfg|
-	    sc = sklass.new(env, cfg)
-	    sc.prepare!
-	    sc.perform!
-	    sc.analyze!
-	  end
-	end
-	env.log "Scenarii performed", :info
-	env.analyze!
+        env.prepare!
+        env.log "Running matching scenarii", :info #TODO: pass the logging+running in the env
+        scii.each do |sklass|
+          sklass.parameters.merge! params if params
+          env.log sklass.parameters.inspect
+          sklass.parameters.each_config do |cfg|
+            sc = sklass.new(env, cfg)
+            sc.prepare!
+            sc.perform!
+            sc.analyze!
+          end
+        end
+        env.log "Scenarii performed", :info
+        env.analyze!
       end
     end
   end
 end
 
-=begin
-TODO: replay, scan, push, pull
-=end
+# FTP
+
+Command.new('ftp-up', 'upload results via FTP') do |c|
+  c.opts do |o|
+    o.on_tail('-h', '--help', 'shows this help and exit') {puts o; exit}
+  end
+  c.execute do 
+    dir = args.first || '.'
+    FileUtils.cd(dir)
+    cfg_file = File.join('config', 'ftp.yaml')
+    puts "Reading config file from #{cfg_file}"
+    cfg = YAML.load_file cfg_file
+    if cfg[:enable]
+      #TODO: port
+      #      optimize that
+      ftp = Net::FTP.open(cfg[:host], cfg[:nick], cfg[:pass]) do |ftp|
+        Find.find('results') do |f|
+          if File.directory? f
+            ftp.chdir '/'
+            begin
+              ftp.mkdir f
+            rescue Net::FTPPermError
+            end
+            ftp.chdir f
+          elsif File.file? f
+            begin
+              ftp.putbinaryfile f
+            rescue Net::FTPPermError
+            end
+          end
+        end
+      end #ftp
+    else
+      p "Disabled, please edit #{cfg_file}"
+    end
+  end
+end
+
+# Actually run the commands
 
 cmd = Command.for_name ARGV.first
 
@@ -217,10 +310,12 @@ else
     puts %{#{$0} v.#{Laborantin::VERSION}: No command given
 
       Usage: #{$0} <command> [options ...]
-      <command> among: #{Command.all.map{|c| c.name}.join(', ')} 
 
-      use #{$0} <command> --help for help on a specific command}
+      <command> among: #{Command.all.map{|c| c.name}.join(", ")} 
+
+      use #{$0} <command> --help for help on a specific command
+    }
   else
-    print "unknown command #{ARGV.first}"
+    puts "Unknown command #{ARGV.first}. \nKnown commands: #{Command.all.map{|c| c.name}.join(', ')} "
   end
 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.4'
+  VERSION = '0.0.7'
   AUTHORS = ['Lucas Di Cioccio']
   WEBSITE = 'http://dicioccio.fr'
   LICENSE = 'GNU GPL version 3'

data/lib/laborantin/core/environment.rb

@@ -72,6 +72,7 @@ module Laborantin
 
     end
 
+    #XXX: rundir is the easier way to override the rundir (instead of parsing a date)
     attr_accessor :rundir, :date, :loggers
 
     def initialize(dir='.')

data/lib/laborantin/core/scenario.rb

@@ -79,7 +79,7 @@ module Laborantin
       end
     end # class << 
 
-    attr_reader :params, :environment, :date, :rundir
+    attr_accessor :params, :environment, :date, :rundir
     
     def initialize(env, params={})
       @environment = env

metadata

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