sportdb 1.11.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886a0bdc6a00bb3234b705426f9db53c600565a1
-  data.tar.gz: ebc23b026e143fc05b2a5d30f1a08c10f823858d
+  metadata.gz: 2822d777bf115f37ad952b7af8df4e6ef32f9606
+  data.tar.gz: cc7c85d6f3abeb13274c889b6700d5c66bce1107
 SHA512:
-  metadata.gz: 5da3426056c20253ded21166e06758909451000d2fbea4a5d27d62972b1056770117afdf39c6e854e8367189f24bccd9bc419f3febec6b479cbe5854412027e7
-  data.tar.gz: 8edb316f7b958f35dd5cde45a93025759b94fec1eae141bf62093a3ebd530b5dbede0f1b0b4c0ff6550599ac43598c1dbee1db88fd23a9d28fc3e1a2c5622ef8
+  metadata.gz: 363740f98a77fc813dc763db17c28f955404285438f6ca33158c2d5da1a07b89df1f30be837577fdcb2735329aea7b1b4377da11c5248a5134836ff04c3a7fd3
+  data.tar.gz: 57b53de7d5550722eb3da670cff255fd2a940e97a268787cc5ef294056bd5b61a52647b9834211595cb6ddf71315d27af87ccdbc270c5674e6713214f421b8ab

data/Manifest.txt

@@ -1,10 +1,10 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-bin/sportdb
-lib/sportdb.rb
-lib/sportdb/cli/main.rb
-lib/sportdb/cli/opts.rb
-lib/sportdb/cli/version.rb
-lib/sportdb/console.rb
+CHANGELOG.md
+Manifest.txt
+README.md
+Rakefile
+bin/sportdb
+lib/sportdb.rb
+lib/sportdb/cli/main.rb
+lib/sportdb/cli/opts.rb
+lib/sportdb/cli/version.rb
+lib/sportdb/console.rb

data/README.md

@@ -1,12 +1,12 @@
-# sportdb - sport.db Command Line Tool in Ruby
+# sportdb - sport.db Command Line Tool
 
 
 <!--
 [![Build Status](https://secure.travis-ci.org/geraldb/sport.db.ruby.png?branch=master)](http://travis-ci.org/geraldb/sport.db.ruby)
 -->
 
-* home  :: [github.com/sportdb/sport.db.ruby](https://github.com/sportdb/sport.db.ruby)
-* bugs  :: [github.com/sportdb/sport.db.ruby/issues](https://github.com/sportdb/sport.db.ruby/issues)
+* home  :: [github.com/sportdb/sport.db](https://github.com/sportdb/sport.db)
+* bugs  :: [github.com/sportdb/sport.db/issues](https://github.com/sportdb/sport.db/issues)
 * gem   :: [rubygems.org/gems/sportdb](https://rubygems.org/gems/sportdb)
 * rdoc  :: [rubydoc.info/gems/sportdb](http://rubydoc.info/gems/sportdb)
 * forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)
@@ -14,14 +14,14 @@
 
 ## Usage
 
-The sportdb gem lets you load fixtures in plain text into your sports database
+The sportdb gem lets you read datasets in plain text into your sports database
 
-~~~
+```
 SYNOPSIS
     sportdb [global options] command [command options] [arguments...]
 
 VERSION
-    1.8
+    2.0
 
 GLOBAL OPTIONS
     -d, --dbpath=PATH - Database path (default: .)
@@ -30,102 +30,62 @@ GLOBAL OPTIONS
     --version         - Show version
 
 COMMANDS
+    new, n        - Build DB w/ quick starter Datafile templates
+    build, b      - Build DB (download/create/read); use ./Datafile - zips get downloaded to ./tmp
+    serve, server - Start web service (HTTP JSON API)
+
+MORE COMMANDS    
     create        - Create DB schema
-    setup, s      - Create DB schema 'n' load all world and sports data
-    update, up, u - Update all sports data
-    load, l       - Load sports fixtures
+    download, dl  - Download datasets; use ./Datafile - zips get downloaded to ./tmp
+    read, r       - Read datasets; use ./Datafile - zips required in ./tmp
     logs          - Show logs
     props         - Show props
-    pull          - Pull (auto-update) event fixtures from upstream sources  
-    serve, server - Start web service (HTTP JSON API)
     stats         - Show stats
     test          - (Debug) Test command suite
     help          - Shows a list of commands or help for one command
-~~~
+```
 
 
-### `setup` Command
+### `new` Command
 
-~~~
+```
 NAME
-    setup - Create DB schema 'n' load all world and sports data
-
+    new - Build DB w/ quick starter Datafile templates
 SYNOPSIS
-    sportdb [global options] setup [command options] NAME
-
-COMMAND OPTIONS
-    -i, --include=PATH  - Sports data path (default: .)
-    --worldinclude=PATH - World data path (default: none)
+    sportdb [global options] new NAME
 
 EXAMPLES
-    sportdb setup --include ./at-austria --worldinclude ./world.db
-    sportdb setup 2013_14 --include ./at-austria --worldinclude ./world.db
-~~~
-
-
-### `update` Command
+    sportdb new eng2019-20
+    sportdb new eng
+```
 
-~~~
-NAME
-    update - Update all sports data
-
-SYNOPSIS
-    sportdb [global options] update [command options] NAME
 
-COMMAND OPTIONS
-    --delete           - Delete all sports data records
-    -i, --include=PATH - Sports data path (default: .)
+### `build` Command
 
-EXAMPLES
-    sportdb update --include ./at-austria
-    sportdb update --include ./at-austria --delete
-    sportdb update 2013_14 --include ./at-austria --delete
-~~~
-
-### `load` Command
-
-~~~
+```
 NAME
-    load - Load sports fixtures
+    build - Build DB (download/create/read); use ./Datafile - zips get downloaded to ./tmp
 
 SYNOPSIS
-    sportdb [global options] load [command options] NAME
-
-COMMAND OPTIONS
-    --delete - Delete all sports data records
+    sportdb [global options] build
 
 EXAMPLES
-    sportdb load --include ./at-austria 2013_14/bl
-    sportdb load --include ./at-austria 2013_14/bl 2013_14/cup
-~~~
-
-
-### `pull` Command
-
-~~~
-NAME
-    pull - Pull (auto-update) event fixtures from upstream sources
-
-SYNOPSIS
-    sportdb [global options] pull
-
-EXAMPLES
-    sportdb pull
-~~~
+    sportdb build
+```
 
 
 ### `serve` Command
 
-~~~
+```
 NAME
     serve - Start web service (HTTP JSON API)
 
 SYNOPSIS
-    sportdb [global options] serve 
+    sportdb [global options] serve
 
 EXAMPLES
     sportdb serve
-~~~
+```
 
 
 ## Install
@@ -135,16 +95,10 @@ Just install the gem:
     $ gem install sportdb
 
 
-## Free Open Public Domain Datasets
-
-- [`football.db`](https://github.com/openfootball) - free open public domain football (soccer) data for use in any (programming) language
-- [`formula1.db`](https://github.com/opensport/formula1.db) - free open public domain Formula 1/Formula One data for use in any (programming) language
-- [`ski.db`](https://github.com/opensport/ski.db) - free open public domain Ski Alpin/Alpine Ski data for use in any (programming) language
-- [`american-football.db`](https://github.com/opensport/american-football.db) - free open public domain American Football data for use in any (programming) language
-
-
 ## License
 
+![](https://publicdomainworks.github.io/buttons/zero88x31.png)
+
 The `sportdb` scripts are dedicated to the public domain.
 Use it as you please with no restrictions whatsoever.
 
@@ -154,4 +108,3 @@ Use it as you please with no restrictions whatsoever.
 Send them along to the
 [Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
 Thanks!
-

data/Rakefile

@@ -9,7 +9,7 @@ Hoe.spec 'sportdb' do
   self.summary = 'sportdb - sport.db Command Line Tool'
   self.description = summary
 
-  self.urls    = ['https://github.com/sportdb/sport.db.ruby']
+  self.urls    = ['https://github.com/sportdb/sport.db']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'
@@ -17,17 +17,18 @@ Hoe.spec 'sportdb' do
   # switch extension to .markdown for gihub formatting
   #  -- Note: auto-changed when included in manifest
   self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['sportdb-models', '>= 1.10.1'],
+    ['sportdb-models',  '>= 1.18.2'],
+    ['sportdb-readers', '>= 0.3.3'],
 
-    ['fetcher', '>= 0.4.4'],    ## check if included already in datafil ??
-    ['datafile', '>= 0.1.1'],
+    ['fetcher', '>= 0.4.5'],    ## check if included already in datafil ??
+    ['datafile', '>= 0.3.0'],
 
     ### sportdb addons
     ## ['sportdb-keys'],
-    ['sportdb-update'],
+    ## ['sportdb-update'],
     ['sportdb-service'],
 
     ## 3rd party
@@ -40,7 +41,7 @@ Hoe.spec 'sportdb' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 1.9.2'
+    required_ruby_version: '>= 2.2.2'
   }
 
   self.post_install_message =<<EOS
@@ -51,5 +52,5 @@ https://groups.google.com/group/opensport
 
 ******************************************************************************
 EOS
-  
+
 end

data/lib/sportdb.rb

@@ -2,6 +2,7 @@
 
 
 require 'sportdb/models'
+require 'sportdb/readers'
 
 require 'logutils/activerecord'   ## NOTE: check - add to/include in/move to sportdb/models
 

data/lib/sportdb/cli/main.rb

@@ -8,7 +8,7 @@ module SportDb
 
   class Tool
      def initialize
-       LogUtils::Logger.root.level = :info   # set logging level to info 
+       LogUtils::Logger.root.level = :info   # set logging level to info
      end
 
      def run( args )
@@ -39,7 +39,7 @@ module SportDb
 
 
 logger = LogUtils::Logger.root
-opts   = SportDb::Opts.new 
+opts   = SportDb::Opts.new
 
 
 program_desc 'sport.db command line tool'
@@ -88,13 +88,11 @@ switch [:q, :quiet], negatable: false
 desc 'Create DB schema'
 command [:create] do |c|
   c.action do |g,o,args|
-    
+
     connect_to_db( opts )
 
     SportDb.create_all
 
-    SportDb.read_builtin   # e.g. seasons.txt etc
-    
     puts 'Done.'
   end # action
 end # command create
@@ -106,14 +104,12 @@ 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 
+    datafile.download  # datafile step 1 - download all datasets/zips
 
     connect_to_db( opts )
 
     SportDb.create_all
 
-    SportDb.read_builtin   # e.g. seasons.txt etc
-
     datafile.read  # datafile step 2 - read all datasets
 
     puts 'Done.'
@@ -156,23 +152,20 @@ command [:new,:n] do |c|
 
   c.action do |g,o,args|
 
-    ## todo: required template name (defaults to worldcup2014)
-    setup = args[0] || 'worldcup2014'
+    ## todo: required template name (defaults to eng2019-20) -- was worldcup2018
+    setup = args[0] || 'eng2019-20'
 
     worker = Fetcher::Worker.new
-    ## note: lets use http:// instead of https:// for now - lets us use person proxy (NOT working w/ https for now)
-    worker.copy( "http://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
+    worker.copy( "https://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
 
     ## step 2: same as command build (todo - reuse code)
     datafile = Datafile::Datafile.load_file( './Datafile' )
-    datafile.download  # datafile step 1 - download all datasets/zips 
+    datafile.download  # datafile step 1 - download all datasets/zips
 
     connect_to_db( opts )  ### todo: check let connect go first?? - for logging (logs) to db  ???
 
     SportDb.create_all
 
-    SportDb.read_builtin   # e.g. seasons.txt etc
-
     datafile.read  # datafile step 2 - read all datasets
 
     puts 'Done.'
@@ -181,113 +174,6 @@ end  # command setup
 
 
 
-desc "Create DB schema 'n' load all world and sports data"
-arg_name 'NAME'   # optional setup profile name
-command [:setup,:s] do |c|
-
-  c.desc 'Sports data path'
-  c.arg_name 'PATH'
-  c.default_value opts.data_path
-  c.flag [:i,:include]
-
-  c.desc 'World data path'
-  c.arg_name 'PATH'
-  c.flag [:worldinclude]   ## todo: use --world-include - how? find better name? add :'world-include' ???
-
-  c.action do |g,o,args|
-
-    connect_to_db( opts )
- 
-    ## todo: document optional setup profile arg (defaults to all)
-    setup = args[0] || 'all'
-    
-    SportDb.create_all
-
-    SportDb.read_builtin   # e.g. seasons.txt etc
-    
-    WorldDb.read_all( opts.world_data_path )
-    SportDb.read_setup( "setups/#{setup}", opts.data_path )
-    puts 'Done.'
-  end # action
-end  # command setup
-
-
-desc 'Update all sports data'
-arg_name 'NAME'   # optional setup profile name
-command [:update,:up,:u] do |c|
-
-  c.desc 'Sports data path'
-  c.arg_name 'PATH'
-  c.default_value opts.data_path
-  c.flag [:i,:include]
-
-  c.desc 'Delete all sports data records'
-  c.switch [:delete], negatable: false 
-
-  c.action do |g,o,args|
-
-    connect_to_db( opts )
-
-    ## todo: document optional setup profile arg (defaults to all)
-    setup = args[0] || 'all'
-
-    if o[:delete].present?
-      SportDb.delete! 
-      SportDb.read_builtin    # NB: reload builtins (e.g. seasons etc.)
-    end
-
-    SportDb.read_setup( "setups/#{setup}", opts.data_path )
-    puts 'Done.'
-  end # action
-end  # command setup
-
-
-desc 'Load sports fixtures'
-arg_name 'NAME'   # multiple fixture names - todo/fix: use multiple option
-command [:load, :l] do |c|
-
-  c.desc 'Delete all sports data records'
-  c.switch [:delete], negatable: false 
-
-  c.action do |g,o,args|
-
-    connect_to_db( opts )
-    
-    if o[:delete].present?
-      SportDb.delete!
-      SportDb.read_builtin    # NB: reload builtins (e.g. seasons etc.)
-    end
-
-    reader = SportDb::Reader.new( opts.data_path )
-
-    args.each do |arg|
-      name = arg     # File.basename( arg, '.*' )
-      reader.load( name )
-    end # each arg
-
-    puts 'Done.'
-  end
-end # command load
-
-
-if defined?( SportDb::Updater )   ## add only if Updater class loaded/defined
-
-desc 'Pull - Auto-update event fixtures from upstream online sources'
-command :pull do |c|
-  c.action do |g,o,args|
-
-    connect_to_db( opts )
-
-    SportDb.update!
-
-    puts 'Done.'
-  end # action
-end # command pull
-
-end  ## if defined?( SportDb::Updater )
-
-
-
 desc 'Start web service (HTTP JSON API)'
 command [:serve,:server] do |c|
 
@@ -314,9 +200,9 @@ command [:serve,:server] do |c|
     ## rack middleware might not work with multi-threaded thin web server; close it ourselfs
     SportDb::Service::Server.after do
       puts "  #{Thread.current.object_id} -- make sure db connections gets closed after request"
-      # todo: check if connection is open - how? 
+      # todo: check if connection is open - how?
       ActiveRecord::Base.connection.close
-    end    
+    end
 
     SportDb::Service::Server.run!
 
@@ -330,12 +216,12 @@ desc 'Show logs'
 command :logs do |c|
   c.action do |g,o,args|
 
-    connect_to_db( opts ) 
-    
+    connect_to_db( opts )
+
     LogDb::Model::Log.all.each do |log|
       puts "[#{log.level}] -- #{log.msg}"
     end
-    
+
     puts 'Done.'
   end
 end
@@ -346,10 +232,10 @@ command :stats do |c|
   c.action do |g,o,args|
 
     connect_to_db( opts )
-    
+
     SportDb.tables
     WorldDb.tables
-    
+
     puts 'Done.'
   end
 end
@@ -360,7 +246,7 @@ command :props do |c|
   c.action do |g,o,args|
 
     connect_to_db( opts )
-    
+
     ### fix: SportDb.props
     ##  use ConfDb.props or similar!!!
 
@@ -402,7 +288,7 @@ pre do |g,c,o,args|
     LogUtils::Logger.root.level = :debug
   end
 
-  logger.debug "Executing #{c.name}"   
+  logger.debug "Executing #{c.name}"
   true
 end
 

data/lib/sportdb/cli/opts.rb

@@ -9,9 +9,6 @@ class Opts
     @db_name   = options[:dbname]  if options[:dbname].present?
 
     @verbose = true     if options[:verbose] == true
-
-    @data_path       = options[:include]      if options[:include].present?
-    @world_data_path = options[:worldinclude] if options[:worldinclude].present? 
   end
 
 
@@ -32,20 +29,6 @@ class Opts
   def db_name
     @db_name || 'sport.db'
   end
-
-  def data_path=(value)
-    @data_path = value
-  end
-
-  def data_path
-    @data_path || '.'
-  end
-
-
-  def world_data_path
-    @world_data_path   # NB: option has no default; return nil
-  end
-
 end # class Opts
 
 end # module SportDb

data/lib/sportdb/cli/version.rb

@@ -5,8 +5,8 @@
 
 module SportDbCli    # todo/check - rename to SportDbTool or SportDbCommands or SportDbShell ??
 
-  MAJOR = 1 ## todo: namespace inside version or something - why? why not??
-  MINOR = 11
+  MAJOR = 2 ## todo: namespace inside version or something - why? why not??
+  MINOR = 0
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
@@ -23,4 +23,3 @@ module SportDbCli    # todo/check - rename to SportDbTool or SportDbCommands or
   end
 
 end # module SportDbCli
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-models
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.18.2
 - !ruby/object:Gem::Dependency
-  name: fetcher
+  name: sportdb-readers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
-  name: datafile
+  name: fetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
-  name: sportdb-update
+  name: datafile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sportdb-service
   requirement: !ruby/object:Gem::Requirement
@@ -128,25 +128,25 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: sportdb - sport.db Command Line Tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -156,7 +156,7 @@ files:
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/version.rb
 - lib/sportdb/console.rb
-homepage: https://github.com/sportdb/sport.db.ruby
+homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain
 metadata: {}
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: sportdb - sport.db Command Line Tool