laborantin 0.0.12 → 0.0.13

data/Rakefile

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

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

data/lib/laborantin/core/environment.rb

@@ -26,7 +26,7 @@ require 'logger'
 require 'fileutils'
 
 module Laborantin
-  
+
   # An Environment represents the surrounding of an experiment. Basically, it
   # should only contains things that are hard to change during an experiment.
   # Let's say you have two computers, A and B. A can be a server and B a client
@@ -45,16 +45,16 @@ module Laborantin
     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
+        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
@@ -77,46 +77,46 @@ module Laborantin
 
       # Prepares attributes' default values whenever a subclass is created.
       def inherited(klass)
-	klass.verifications = []
-	klass.description = ''
-	klass.hooks = {:setup => [], :teardown => []}
-	@@all << klass
+        klass.verifications = []
+        klass.description = ''
+        klass.hooks = {:setup => [], :teardown => []}
+        @@all << klass
       end
 
       # Registers new verifiers.
       def verify(*args)
-	self.verifications = [*args].flatten
+        self.verifications = [*args].flatten
       end
 
       # Sets the description.
       def describe(str)
-	self.description = str
+        self.description = str
       end
 
       # Registers setup hooks, called before any scenario is instantiated.
       def setup(*args)
-	self.hooks[:setup] = [*args].flatten
+        self.hooks[:setup] = [*args].flatten
       end
 
       # Registers teardown hooks, called after every scenarii has been 
       # performed and analyzed.
       def teardown(*args)
-	self.hooks[:teardown] = [*args].flatten
+        self.hooks[:teardown] = [*args].flatten
       end
-      
+
       def to_s
-	"#{self.name}:\n\t#{self.description}"
+        "#{self.name}:\n\t#{self.description}"
       end
 
       # Returns all the known subklasses of Environment.
       def all
-	@@all
+        @@all
       end
 
       # The path where the results for instance of a subklass of Environment
       # are stored (needs the Laborantin.resultdir).
       def envdir
-	File.join(Laborantin.resultdir, self.name.duck_case)
+        File.join(Laborantin.resultdir, self.name.duck_case)
       end
     end
 
@@ -142,6 +142,10 @@ module Laborantin
       self.class.verifications.find{|v| not send(v)}.nil?
     end
 
+    def logfile_path
+      File.join(rundir, 'environment.log')
+    end
+
     # In the following order:
     # * Creates the envdir if needed.
     # * Adds some loggers.
@@ -151,7 +155,7 @@ module Laborantin
     #
     def prepare!
       FileUtils.mkdir_p(rundir) #TODO: ensure unicity
-      @loggers << Logger.new(File.join(rundir, 'environment.log'))
+      @loggers << Logger.new(logfile_path)
       @loggers << Logger.new(STDOUT)
       log(self.class.description, :info) unless self.class.description.empty?
       log "Directories prepared"
@@ -174,6 +178,10 @@ module Laborantin
       Laborantin::Scenario.scan_env(self)
     end
 
+    def date_str
+      date.strftime("%Y-%h-%d_%H-%M-%S")
+    end
+
     private
 
     def call_hooks(name)
@@ -181,9 +189,5 @@ module Laborantin
       self.class.hooks[name].each{|sym| send sym}
     end
 
-    def date_str
-      date.strftime("%Y-%h-%d_%H-%M-%S")
-    end
-
   end # class
 end # module

data/lib/laborantin/core/scenario.rb

@@ -58,7 +58,7 @@ module Laborantin
               scs << scenar
               scenar.rundir = File.join(scklass.scenardir(env), r)
               tst, params = YAML.load_file(File.join(scenar.rundir, 'config.yaml'))
-	      scenar.params = params
+              scenar.params = params
             end
           end
         end
@@ -226,6 +226,10 @@ module Laborantin
       end
     end
 
+    def date_str
+      date.strftime("%Y-%h-%d_%H-%M-%S")
+    end
+
     private
 
     def call_hooks(name)
@@ -233,10 +237,6 @@ module Laborantin
       self.class.hooks[name].each{|sym| send sym}
     end
 
-    def date_str
-      date.strftime("%Y-%h-%d_%H-%M-%S")
-    end
-
     def log(*args)
       environment.log *args
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laborantin
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Di Cioccio Lucas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 +00:00
+date: 2009-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,8 @@ files:
 - lib/laborantin/core/monkey_patches.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/laborantin
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -62,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: laborantin
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A measurement batch facilitator
 test_files: []