sportdb 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2822d777bf115f37ad952b7af8df4e6ef32f9606
-  data.tar.gz: cc7c85d6f3abeb13274c889b6700d5c66bce1107
+  metadata.gz: 462f64e48cea18e67436574ea602fb33b00c233f
+  data.tar.gz: 547a07bb677135cbc245e317ddc2c30d619e5346
 SHA512:
-  metadata.gz: 363740f98a77fc813dc763db17c28f955404285438f6ca33158c2d5da1a07b89df1f30be837577fdcb2735329aea7b1b4377da11c5248a5134836ff04c3a7fd3
-  data.tar.gz: 57b53de7d5550722eb3da670cff255fd2a940e97a268787cc5ef294056bd5b61a52647b9834211595cb6ddf71315d27af87ccdbc270c5674e6713214f421b8ab
+  metadata.gz: 2640177ec4c7f3c9ff4743f365755adddaf915cb4b05772b2885e5c878c3a2fc70e375ba328226581c664efa0ee26cfcd4c4df05ada239a2608166337da8c440
+  data.tar.gz: 4874fa7df01d41799af5ac192ba362f3136712e5ff594b2c0601fbf68d5bb4348f49e79c7842972d7d3f90d667b071f9eb554f32b433d148e5ef8b57b3582a20

data/README.md

@@ -14,7 +14,8 @@
 
 ## Usage
 
-The sportdb gem lets you read datasets in plain text into your sports database
+The sportdb tool lets you read in (parse) datasets (e.g. leagues, clubs, match schedules, etc.) 
+in plain text into your sports SQL database of choice (e.g. SQLite, PostgreSQL, etc.)
 
 ```
 SYNOPSIS
@@ -95,6 +96,18 @@ Just install the gem:
     $ gem install sportdb
 
 
+
+## More Documentation / Getting Started Guides
+
+See the **[football.db League Starter Sample - Mauritius Premier League](https://github.com/openfootball/league-starter)**
+if you want to start from scratch (zero) with your very own league.
+
+See the **[football.db Quick Starter Datafile Templates](https://github.com/openfootball/quick-starter)** if you want to read in ready-to-use /
+ready-to-fork dataset packages incl. the English Premier League, the German
+Bundesliga, the Spanish Primera División and some more.
+
+
+
 ## License
 
 ![](https://publicdomainworks.github.io/buttons/zero88x31.png)

data/Rakefile

@@ -20,11 +20,13 @@ Hoe.spec 'sportdb' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['sportdb-models',  '>= 1.18.2'],
-    ['sportdb-readers', '>= 0.3.3'],
+    ['sportdb-models',     '>= 1.18.2'],
+    ['sportdb-readers',    '>= 0.3.6'],
+    ['footballdb-leagues', '>= 2019.11.22' ],     ## add minimum for datasets
+    ['footballdb-clubs',   '>= 2019.11.22' ],
 
-    ['fetcher', '>= 0.4.5'],    ## check if included already in datafil ??
-    ['datafile', '>= 0.3.0'],
+    ['fetcher',  '>= 0.4.5'],    ## check if included already in datafil ??
+    ['datafile', '>= 0.3.1'],
 
     ### sportdb addons
     ## ['sportdb-keys'],
@@ -44,13 +46,13 @@ Hoe.spec 'sportdb' do
     required_ruby_version: '>= 2.2.2'
   }
 
-  self.post_install_message =<<EOS
+  self.post_install_message =<<TXT
 ******************************************************************************
 
 Questions? Comments? Send them along to the mailing list.
 https://groups.google.com/group/opensport
 
 ******************************************************************************
-EOS
+TXT
 
 end

data/lib/sportdb/cli/main.rb

@@ -47,26 +47,9 @@ program_desc 'sport.db command line tool'
 version SportDbCli::VERSION
 
 
-=begin
-### add to help use new sections
-
-Examples:
-    sportdb cl/teams cl/2012_13/cl                     # import champions league (cl)
-    sportdb --create                                   # create database schema
-
-More Examples:
-    sportdb                                            # show stats (table counts, table props)
-    sportdb -i ../sport.db/db cl/teams cl/2012_13/cl   # import champions league (cl) in db folder
-
-Further information:
-  http://geraldb.github.com/sport.db
-=end
-
-
 ### global option (required)
 ## todo: add check that path is valid?? possible?
 
-
 desc 'Database path'
 arg_name 'PATH'
 default_value opts.db_path
@@ -103,14 +86,25 @@ command [:build,:b] do |c|
 
   c.action do |g,o,args|
 
-    datafile = Datafile::Datafile.load_file( './Datafile' )
-    datafile.download  # datafile step 1 - download all datasets/zips
+    ## check if datafile exists, if NOT assume working dir (./) is a package
+    if File.file?( './Datafile' )   ## note use file? (exist? will also check for directory/folder!!)
+      datafile = Datafile::Datafile.load_file( './Datafile' )
+      datafile.download  # datafile step 1 - download all datasets/zips
 
-    connect_to_db( opts )
+      connect_to_db( opts )
 
-    SportDb.create_all
+      SportDb.create_all
 
-    datafile.read  # datafile step 2 - read all datasets
+      datafile.read  # datafile step 2 - read all datasets
+    else
+      puts "no ./Datafile found; try local build in >#{Dir.pwd}<"
+
+      connect_to_db( opts )
+
+      SportDb.create_all
+      pack = SportDb::DirPackage.new( Dir.pwd )  ## note: pass in full path for now (and NOT ./) - why? why not?
+      pack.read   # read all datasets
+    end
 
     puts 'Done.'
   end # action
@@ -122,15 +116,26 @@ command [:read,:r] do |c|
 
   c.action do |g,o,args|
 
-    connect_to_db( opts )
+    ## check if datafile exists, if NOT assume working dir (./) is a package
+    if File.file?( './Datafile' )   ## note use file? (exist? will also check for directory/folder!!)
+      connect_to_db( opts )
 
-    datafile = Datafile::Datafile.load_file( './Datafile' )
-    datafile.read
+      datafile = Datafile::Datafile.load_file( './Datafile' )
+      datafile.read
+    else
+      puts "no ./Datafile found; try local read in >#{Dir.pwd}<"
+
+      connect_to_db( opts )
+
+      pack = SportDb::DirPackage.new( Dir.pwd )  ## note: pass in full path for now (and NOT ./) - why? why not?
+      pack.read   # read all datasets
+    end
 
     puts 'Done.'
   end # action
 end  # command setup
 
+
 desc "Download datasets; use ./Datafile - zips get downloaded to ./tmp"
 command [:download,:dl] do |c|
 

data/lib/sportdb/cli/version.rb

@@ -2,11 +2,11 @@
 
 # Note: SportDb::VERSION gets used by core, that is, sportdb-models
 
-
+## todo/fix: yes, rename to SportDbTool
 module SportDbCli    # todo/check - rename to SportDbTool or SportDbCommands or SportDbShell ??
 
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-models
@@ -30,14 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: footballdb-leagues
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2019.11.22
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2019.11.22
+- !ruby/object:Gem::Dependency
+  name: footballdb-clubs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2019.11.22
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2019.11.22
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sportdb-service
   requirement: !ruby/object:Gem::Requirement