datafile 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d39f9bca67fd30470e40bd1b4985594eb2697326
-  data.tar.gz: 6e9fd82ae31c9507194dfd61e9d8112f66fdf0ea
+  metadata.gz: f9f0a43352a4989c9765d93fe542af5da3cbda95
+  data.tar.gz: c820968abf2f69166d53769bd751fd4148ea69b8
 SHA512:
-  metadata.gz: 799c1587b0fea635d95d3cd28c0ed4fe0b6bfbdfbecf7b4805c126daded83e79791bdffc859adccb5c6321ccb4d336999ea915d9f2781ee4bd54cf14ff6fb6a3
-  data.tar.gz: ff6a33747c7ee59fd3bc6d41b1aa277b36982f4e14a5df9fa802f86b270d6bd366e914dfa9c36001a982e5e2cbd8d3a329e0ad7a3bc37a1f440ac6e7efdc318c
+  metadata.gz: faa87526560edf1e71ea81f6bcef56ed69cae4a817feaedaa61d9245161f9c5aa9099659d2533b605db5c24e0248d3b3fe1ab22b976a916fb626505a12b568f7
+  data.tar.gz: 24e5c266da7b42fa76248c4f0a2e7e0b566117fd834ed299273602045fa688d55dbdcb82f9046b08af294e8bcf7134a8ea6588f061596441d80839889597d9db

data/lib/datafile/datafile.rb

@@ -58,7 +58,11 @@ class Datafile
 
     # Note: return datafile (of course, NOT the builder)
     #  if you want a builder use Datafile::Builder ;-)
-    builder.datafile   
+    datafile = builder.datafile
+    ## check for auto-configure (just guessing)
+    ##   zip or file worker
+    datafile.guess_file_or_zip_worker
+    datafile
   end
 
 
@@ -83,6 +87,18 @@ class Datafile
     end
   end
 
+  def guess_file_or_zip_worker   ## change/rename to configure_file_or_zip_worker - why? why not??
+    ## if opts file or zip exists do NOT change (assume set manually)
+    return  if @opts[:file] || @opts[:zip]
+
+    ## for now only change if single (just 1) dataset and it's present
+    if @datasets.size == 1 && @datasets[0].file?
+      puts "  bingo!! assume (in-situ) datafile; use file workers"
+      @worker = FileWorker.new( self )
+    end
+  end
+
+
   attr_reader   :datasets
   attr_reader   :scripts    ## calc(ulation) scripts (calc blocks)
   attr_reader   :inlines    ## inline script blocks  -- use before?? run before datasets

data/lib/datafile/datasets/dataset.rb

@@ -34,9 +34,34 @@ class Dataset
     value = @opts[:setup] || 'all'
     "setups/#{value}"
   end
+
+  def file?                    # note: use file? (not exit? might use zip? later to check if zip exists? -why? why not?)
+    ## hack/convenience shortcut:
+    ##   1) check if dataset exists as local (in situ) file dataset
+    ##    e.g. working folder  == name of dataset
+    ##
+    ##   todo/fix: 2) also check
+    ##                   via (file)registry - why, why not??
+
+    ## split name in org/user + project (e.g. openfootball/at-austria)
+    parts = @name.split( '/' )
+
+    basename = parts[1]
+    ##  e.g.
+    ##  ./ (working folder) => at-austria
+    ##  openfootball/at-austria  
+    if File.basename( Dir.getwd ) == basename
+      puts "  bingo!! working folder >#{basename}< matches dataset"
+      true     ## return true
+    else
+      false    ## return false
+    end
+  end  ## file?
+
 end # class Dataset
 
 
+
 class WorldDataset < Dataset
   def initialize( name_easy, opts={} )
 

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 = 3
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

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

@@ -20,6 +20,17 @@ class FileDataset < DatasetNode
   end
 
   def repo_dir     ### check: use (rename to) include dir (or local_repo_dir) - why, why not ??? 
+    ## note: for easy testing allow "in situ" datasets
+    ##   e.g.  ./ (e.g. mu-mauritius)  is openfootball/mu-mauritius
+    ## split name in org/user + project (e.g. openfootball/at-austria)
+    parts = name.split( '/' )
+
+    basename = parts[1]
+    if File.basename( Dir.getwd ) == basename
+      puts "  bingo!! working folder >#{basename}< matches dataset"
+      return Dir.getwd     ## assume working directory/folder is repo dir
+    end
+
     registry.lookup( name )
   end
 

metadata

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