datafile 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42277d01f83ab3de43b42c67bd360d8e33a4ec96
-  data.tar.gz: 0dbac9ee1f7dd981b82c661846b99fa4870fffb0
+  metadata.gz: d39f9bca67fd30470e40bd1b4985594eb2697326
+  data.tar.gz: 6e9fd82ae31c9507194dfd61e9d8112f66fdf0ea
 SHA512:
-  metadata.gz: dfdf41d1c6110b5581b50e46b215bee08a92f0fefb5fbcdc8c7730f2bfdb00cd0f2c4934083996aed2a60a823a0b545240487e08e4909f6eb3612513fffb06db
-  data.tar.gz: 8ab664e96b5fa743818a45c80411618dd5dd245cbaad81270a1b27471320b47cd4f0eb3181d33a0f98def76fb2c6ee8a264827b97acbbd4c0af148f44089738d
+  metadata.gz: 799c1587b0fea635d95d3cd28c0ed4fe0b6bfbdfbecf7b4805c126daded83e79791bdffc859adccb5c6321ccb4d336999ea915d9f2781ee4bd54cf14ff6fb6a3
+  data.tar.gz: ff6a33747c7ee59fd3bc6d41b1aa277b36982f4e14a5df9fa802f86b270d6bd366e914dfa9c36001a982e5e2cbd8d3a329e0ad7a3bc37a1f440ac6e7efdc318c

data/lib/datafile/builder.rb

@@ -24,6 +24,16 @@ class Builder     ## "simple" builder (one file, one datafile)
 
   attr_reader :datafile
 
+  ## "special" datasets
+
+  def inline( &block )
+    logger.info( "[builder] add inline script-block" )
+    @datafile.inlines << Inline.new( block )
+  end
+
+
+  ## "classic" standard datasets
+
   def beer( name, opts={} )
     logger.info( "[builder] add beer-dataset '#{name}'" )
     @datafile.datasets << BeerDataset.new( name, opts )

data/lib/datafile/builder2.rb

@@ -4,7 +4,7 @@ module Datafile
 
 
 ###
-##  check/todo: ename to BatchBuilder, MultiBuilder,etc - find better name - why, why not??
+##  check/todo: rename to BatchBuilder, MultiBuilder,etc - find better name - why, why not??
 
 class BuilderEx
 

data/lib/datafile/datafile.rb

@@ -20,6 +20,29 @@ class Script
 end  ## class Script
 
 
+### todo/check: use Script for Inline too?? - why, why not???
+###  - use setup/pre/before and post/after or something??
+##  - note: for now always is pre/before
+
+class Inline
+  include LogUtils::Logging
+
+  def initialize( proc )
+    @proc = proc
+  end
+
+  def call
+    logger.info( "[inline] calling script block" )
+    @proc.call
+  end
+
+  def dump
+    puts "  script: #{@proc.inspect}"
+  end
+end  ## class Inline
+
+
+
 class Datafile
 
   ## convenience method - use like Datafile.load_file()
@@ -45,6 +68,7 @@ class Datafile
     @opts     = opts
     @datasets = []
     @scripts  = []   ## calculation scripts (calc blocks)
+    @inlines  = []   ## inline (setup) scripts (run before reading datasets)
 
     ## (target)name - return nil if noname (set/defined/assigned)
     @name  = opts[:name] || nil
@@ -61,6 +85,7 @@ class Datafile
 
   attr_reader   :datasets
   attr_reader   :scripts    ## calc(ulation) scripts (calc blocks)
+  attr_reader   :inlines    ## inline script blocks  -- use before?? run before datasets
   attr_reader   :name
   attr_reader   :deps       ## dep(endencies)
 
@@ -70,7 +95,7 @@ class Datafile
   def run
     logger.info( "[datafile] begin - run" )
     download     # step 1 - download zips for datasets
-    read         # step 2 - read in datasets from zips
+    read         # step 2 - read in datasets from zips  - note: includes running inlines
     calc         # step 3 - run calc(ulations) scripts
     logger.info( "[datafile] end - run" )
   end

data/lib/datafile/version.rb

@@ -4,7 +4,7 @@ module Datafile
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 2
-  PATCH = 2
+  PATCH = 3
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/datafile/workers/file/worker.rb

@@ -15,6 +15,11 @@ class FileWorker   ## check: rename to FileDatafileWorker?? or FileDatafile  -wh
   end
 
   def read
+    ## note: also run inlines (setup script) before
+    @datafile.inlines.each do |inline|
+      inline.call
+    end
+
     @datafile.datasets.each do |dataset|
       dataset.file_worker.read
     end
@@ -27,6 +32,11 @@ class FileWorker   ## check: rename to FileDatafileWorker?? or FileDatafile  -wh
   end
 
   def dump
+    ## also dump inlines
+    @datafile.inlines.each do |inline|
+      inline.dump
+    end
+
     @datafile.datasets.each do |dataset|
       dataset.file_worker.dump
     end

data/lib/datafile/workers/zip/worker.rb

@@ -17,6 +17,11 @@ class ZipWorker   ## check: rename to ZipDatafileWorker?? or ZipDatafile  -why,
   end
 
   def read
+    ## note: also run inlines (setup script) before
+    @datafile.inlines.each do |inline|
+      inline.call
+    end
+
     @datafile.datasets.each do |dataset|
       dataset.zip_worker.read
     end
@@ -29,6 +34,10 @@ class ZipWorker   ## check: rename to ZipDatafileWorker?? or ZipDatafile  -why,
   end
 
   def dump
+    ## also dump inlines
+    @datafile.inlines.each do |inline|
+      inline.dump
+    end
     @datafile.datasets.each do |dataset|
       dataset.zip_worker.dump
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datafile
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils