sportdb 1.9.13 → 1.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70333f8ef87129ac463a0de95e5fd4f62ce41973
-  data.tar.gz: 9faa5a8b97ea68c87357b33bdb3c20e6e6b1969d
+  metadata.gz: d2db12336a3fae247a22d4efee7d6c180b28d942
+  data.tar.gz: 26987264b067348f1e273e9f2ad37ccc90184de2
 SHA512:
-  metadata.gz: be98bcc80a8cde4861aa47e0b57727861a45c24416b8670176bfd427156bf1e5162d926865d1184d0d25d30797da6480c6b2dee49bcafb3fd82d2f8cf942cc52
-  data.tar.gz: 21f91987bb7b9c9ee12eb7c3532bdeccd5ce33e75029dab892112a4598b45747d1d8c96988a6b3392be675c4260e51c16eab6c116fdaa934a4f9ecd39aa06416
+  metadata.gz: db796999c6b36d8cda1ab638a3e271cfebe6bdb3872632a2d6d0185a0a0761859a4d84d552a20e781c5e7cb6585eb6757d22ee72bdf76f1e25929a96c031a551
+  data.tar.gz: d16a231df7b59e3916e8aab32732b082784406adb78b36b91cc62515d3c65d94360534532b2a93210f02da3371a7042907980e97a28a97baaf698a64be5ef184

data/Manifest.txt

@@ -13,8 +13,6 @@ config/fixtures/ro.yml
 data/seasons.txt
 data/setups/all.txt
 lib/sportdb.rb
-lib/sportdb/builder/builder.rb
-lib/sportdb/builder/dataset.rb
 lib/sportdb/calc.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
@@ -127,7 +125,6 @@ test/data/world-cup/teams_1962.txt
 test/data/world-cup/teams_1974.txt
 test/helper.rb
 test/test_assoc_reader.rb
-test/test_builder.rb
 test/test_changes.rb
 test/test_cursor.rb
 test/test_date.rb

data/Rakefile

@@ -33,6 +33,7 @@ Hoe.spec 'sportdb' do
     ['persondb'],     # persons (people) table
     ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
     ['fetcher', '>= 0.3'],
+    ['datafile'],
 
     ### sportdb addons
     ['sportdb-keys'],

data/lib/sportdb.rb

@@ -113,10 +113,6 @@ require 'sportdb/deleter'
 require 'sportdb/stats'
 
 
-require 'sportdb/builder/dataset'
-require 'sportdb/builder/builder'
-
-
 module SportDb
 
   def self.config_path

data/lib/sportdb/cli/main.rb

@@ -17,8 +17,10 @@ include GLI::App
 
 require 'logutils/db'
 require 'sportdb/cli/opts'
-  
- 
+
+require 'datafile'   ## lets us use Datafile::Builder,Datafile etc.
+
+
 program_desc 'sport.db command line tool'
 
 version SportDb::VERSION
@@ -79,6 +81,14 @@ def connect_to_db( options )
     :database => "#{options.db_path}/#{options.db_name}"
   }
 
+  ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
+  if RUBY_PLATFORM =~ /java/ && db_config[:adapter] == 'sqlite3' 
+    # quick hack for JRuby sqlite3 support via jdbc
+    require 'jdbc/sqlite3'
+    ## todo: check if require for activerecord jdbc adapter for sqlite is required to
+  end
+
+
   puts "Connecting to db using settings: "
   pp db_config
 
@@ -113,8 +123,9 @@ command [:build,:b] do |c|
 
   c.action do |g,o,args|
 
-    builder = SportDb::Builder.load_file( './Datafile' )
-    builder.download  # builder step 1 - download all datasets/zips 
+    builder = Datafile::Builder.load_file( './Datafile' )
+    datafile = builder.datafile
+    datafile.download  # datafile step 1 - download all datasets/zips 
 
     connect_to_db( opts )
 
@@ -127,7 +138,7 @@ command [:build,:b] do |c|
 
     SportDb.read_builtin   # e.g. seasons.txt etc
 
-    builder.read  # builder step 2 - read all datasets
+    datafile.read  # datafile step 2 - read all datasets
 
     puts 'Done.'
   end # action
@@ -141,8 +152,9 @@ command [:read,:r] do |c|
 
     connect_to_db( opts )
 
-    builder = SportDb::Builder.load_file( './Datafile' )
-    builder.read
+    builder = Datafile::Builder.load_file( './Datafile' )
+    datafile = builder.datafile
+    datafile.read
 
     puts 'Done.'
   end # action
@@ -155,8 +167,9 @@ command [:download,:dl] do |c|
 
     # note: no database connection needed (check - needed for logs?? - not setup by default???)
 
-    builder = SportDb::Builder.load_file( './Datafile' )
-    builder.download
+    builder = Datafile::Builder.load_file( './Datafile' )
+    datafile = builder.datafile
+    datafile.download
 
     puts 'Done.'
   end # action
@@ -176,8 +189,9 @@ command [:new,:n] do |c|
     worker.copy( "https://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
 
     ## step 2: same as command build (todo - reuse code)
-    builder = SportDb::Builder.load_file( './Datafile' )
-    builder.download  # builder step 1 - download all datasets/zips 
+    builder = Datafile::Builder.load_file( './Datafile' )
+    datafile = builder.datafile
+    datafile.download  # datafile step 1 - download all datasets/zips 
 
     connect_to_db( opts )  ### todo: check let connect go first?? - for logging (logs) to db  ???
 
@@ -190,8 +204,8 @@ command [:new,:n] do |c|
 
     SportDb.read_builtin   # e.g. seasons.txt etc
 
-    builder.read  # builder step 2 - read all datasets
-  
+    datafile.read  # datafile step 2 - read all datasets
+
     puts 'Done.'
   end # action
 end  # command setup

data/lib/sportdb/version.rb

@@ -3,7 +3,7 @@ module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 13
+  PATCH = 14
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.13
+  version: 1.9.14
 platform: ruby
 authors:
 - Gerald Bauer
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: datafile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sportdb-keys
   requirement: !ruby/object:Gem::Requirement
@@ -260,8 +274,6 @@ files:
 - data/seasons.txt
 - data/setups/all.txt
 - lib/sportdb.rb
-- lib/sportdb/builder/builder.rb
-- lib/sportdb/builder/dataset.rb
 - lib/sportdb/calc.rb
 - lib/sportdb/cli/main.rb
 - lib/sportdb/cli/opts.rb
@@ -374,7 +386,6 @@ files:
 - test/data/world-cup/teams_1974.txt
 - test/helper.rb
 - test/test_assoc_reader.rb
-- test/test_builder.rb
 - test/test_changes.rb
 - test/test_cursor.rb
 - test/test_date.rb
@@ -438,7 +449,6 @@ test_files:
 - test/test_round_def.rb
 - test/test_utils.rb
 - test/test_reader_from_string.rb
-- test/test_builder.rb
 - test/test_round_header.rb
 - test/test_round_auto.rb
 - test/test_goals.rb

data/lib/sportdb/builder/builder.rb

@@ -1,58 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-class Builder
-
-  include LogUtils::Logging
-
-  def initialize()
-    @datasets = []
-  end
-
-  def self.load_file( path )
-    code = File.read_utf8( path )
-    self.load( code )
-  end
-
-  def self.load( code )
-    builder = Builder.new
-    builder.instance_eval( code )
-    builder
-  end
-
-
-  def football( name, opts={} )
-    logger.info( "[builder] add football-dataset '#{@name}'" )
-    @datasets << FootballDataset.new( name, opts )
-  end
-
-  def world( name, opts={} )
-    logger.info( "[builder] add world-dataset '#{@name}'" )
-    @datasets << WorldDataset.new( name, opts )
-  end
-
-
-  def run()
-    logger.info( "[builder] begin - run" )
-    download()   # step 1 - download zips for datasets
-    read()       # step 2 - read in datasets from zips
-    logger.info( "[builder] end - run" )
-  end
-
-  def download()
-    logger.info( "[builder] dowload" )
-    @datasets.each do |dataset|
-      dataset.download()
-    end
-  end
-
-  def read()
-    logger.info( "[builder] read" )
-    @datasets.each do |dataset|
-      dataset.read()
-    end
-  end
-
-end # class Builder
-end # module SportDb

data/lib/sportdb/builder/dataset.rb

@@ -1,90 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-class Dataset
-  include LogUtils::Logging
-
-  def initialize( name, opts={} )
-    @name = name
-    @opts = opts
-  end
-
-  def setup()
-    value = @opts[:setup] || 'all'
-    "setups/#{value}"
-  end
-
-  def remote_zip_url()  # remote zip url
-    "https://github.com/#{@name}/archive/master.zip"
-  end
-
-  def local_zip_name()
-    ### note: replace / in name w/ --I--
-    ##  e.g. flatten the filename, that is, do NOT include any folders
-    @name.gsub('/', '--I--')   # note: will NOT include/return .zip extension
-  end
-
-  def local_zip_root()
-    "./tmp"
-  end
-
-  def local_zip_path()  # local zip path
-    "#{local_zip_root}/#{local_zip_name}.zip"
-  end
-
-
-  def download()
-    logger.info( "[builder] download dataset '#{@name}'" )
-    logger.info( "[builder]     from '#{remote_zip_url}'" )
-    logger.info( "[builder]     to '#{local_zip_path}'..." )
-    
-    download_blob( remote_zip_url, local_zip_path )
-  end
-
-  ####
-  # download tasks for zips
-  def download_blob( url, dest )
-    logger.info "downloading #{url} to #{dest}..."
-
-    ## make sure dest path exists
-    dest_p = File.dirname( dest )
-    FileUtils.mkdir_p( dest_p )  unless File.exists?( dest_p )   ## use Dir.exists?? why? why not??
-
-    worker = Fetcher::Worker.new
-    worker.copy( url, dest )
-    ## print some file stats
-    logger.debug "  size: #{File.size(dest)} bytes"
-  end
-
-end  # class Dataset
-
-
-class WorldDataset < Dataset
-
-  def initialize( name, opts={} )
-    super( name, opts )
-  end
-
-  def read()
-    logger.info( "[builder] read world-dataset '#{@name}', '#{setup}'" )
-
-    WorldDb.read_setup_from_zip( local_zip_name(), setup(), local_zip_root(), { skip_tags: true } )
-  end
-end  # class WorldDataset
-
-class FootballDataset < Dataset
-
-  def initialize( name, opts={} )
-    super( name, opts )
-  end
-
-  def read()
-    logger.info( "[builder] read football-dataset '#{@name}', '#{setup}'" )
-
-    SportDb.read_setup_from_zip( local_zip_name(), setup(), local_zip_root() )
-  end
-end  # class FootballDataset
-
-
-end # module SportDb

data/test/test_builder.rb

@@ -1,36 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_builder.rb
-
-require 'helper'
-
-class TestBuilder < MiniTest::Test
-
-  def test_builder
-    code =<<EOS
-## comments
-
-  world  'openmundi/world.db', setup: 'countries'
-
-  football 'openfootball/national-teams'      ## NOTE: default is setup: 'all'
-  
-  ### todo/fix: download archive only once(!!) even if included more than once
-  ## football 'openfootball/world-cup', setup: '2014_quali'
-
-  football 'openfootball/world-cup', setup: '2014'
-
-## more comments
-
-EOS
-
-    builder = SportDb::Builder.load( code )
-    ## builder.run
-    ## builder.download
-    builder.read
-
-    assert true  # if we get here - test success
-  end
-
-end # class TestBuilder