sportdb 2.1.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1db9521b6f1a63e9cfc9c1419561b9cbf40c109
-  data.tar.gz: 88f8af72961ab1b4eda1a7becf17eb45c8e60398
+  metadata.gz: 9a2eaeb80608f85c3e56cd97938b203aabd55a53
+  data.tar.gz: 875947bbad6d080c900a4e04eb0007a52e75dc3e
 SHA512:
-  metadata.gz: 172cf0501bf06b29023f227afc720d38b2f8af90b7b4152dc24f3a3011568f0f11f012a8f36583c00c5f5c67aeb1f45e242d7f81dc67464d3afcec6b0fa63a59
-  data.tar.gz: c6a30d0fb6a5bada0ed94c769c30dd2bebacaf1ebf52053638420e02bdcfceeeed0d76ab40541938bdfd79fb5d334465f6bb9a90e98484031075d121f0a75b0a
+  metadata.gz: c4952c8d6e193084214b07917bc58b9fd655f68e888cb545a1de14cdb40318b6de9141cbd35643609209a8d9a5a07155df10d7d6b745319c259c2fa335116733
+  data.tar.gz: f9f123cdb8bc3313d610a0b756d2d92e5ef3f1ac7985e8e61f283be1e8b1ea57ec9f53e1ddcbc61ab87b216a8e640535b0f5b525e224bed353f6c710a26f70e2

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-
-### 0.1.0 / 2014-12-05
-
-* Everything is new. First release
+
+### 0.1.0 / 2014-12-05
+
+* Everything is new. First release

data/README.md

@@ -1,123 +1,123 @@
-# 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](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)
-
-
-## Usage
-
-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
-    sportdb [global options] command [command options] [arguments...]
-
-VERSION
-    2.0
-
-GLOBAL OPTIONS
-    -d, --dbpath=PATH - Database path (default: .)
-    -n, --dbname=NAME - Database name (default: sport.db)
-    --verbose         - (Debug) Show debug messages
-    --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
-    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
-    stats         - Show stats
-    test          - (Debug) Test command suite
-    help          - Shows a list of commands or help for one command
-```
-
-
-### `new` Command
-
-```
-NAME
-    new - Build DB w/ quick starter Datafile templates
-SYNOPSIS
-    sportdb [global options] new NAME
-
-EXAMPLES
-    sportdb new eng2019-20
-    sportdb new eng
-```
-
-
-### `build` Command
-
-```
-NAME
-    build - Build DB (download/create/read); use ./Datafile - zips get downloaded to ./tmp
-
-SYNOPSIS
-    sportdb [global options] build
-
-EXAMPLES
-    sportdb build
-```
-
-
-### `serve` Command
-
-```
-NAME
-    serve - Start web service (HTTP JSON API)
-
-SYNOPSIS
-    sportdb [global options] serve
-
-EXAMPLES
-    sportdb serve
-```
-
-
-## Install
-
-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)
-
-The `sportdb` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.
-
-
-## Questions? Comments?
-
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+# 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](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)
+
+
+## Usage
+
+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
+    sportdb [global options] command [command options] [arguments...]
+
+VERSION
+    2.0
+
+GLOBAL OPTIONS
+    -d, --dbpath=PATH - Database path (default: .)
+    -n, --dbname=NAME - Database name (default: sport.db)
+    --verbose         - (Debug) Show debug messages
+    --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
+    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
+    stats         - Show stats
+    test          - (Debug) Test command suite
+    help          - Shows a list of commands or help for one command
+```
+
+
+### `new` Command
+
+```
+NAME
+    new - Build DB w/ quick starter Datafile templates
+SYNOPSIS
+    sportdb [global options] new NAME
+
+EXAMPLES
+    sportdb new eng2019-20
+    sportdb new eng
+```
+
+
+### `build` Command
+
+```
+NAME
+    build - Build DB (download/create/read); use ./Datafile - zips get downloaded to ./tmp
+
+SYNOPSIS
+    sportdb [global options] build
+
+EXAMPLES
+    sportdb build
+```
+
+
+### `serve` Command
+
+```
+NAME
+    serve - Start web service (HTTP JSON API)
+
+SYNOPSIS
+    sportdb [global options] serve
+
+EXAMPLES
+    sportdb serve
+```
+
+
+## Install
+
+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)
+
+The `sportdb` scripts are dedicated to the public domain.
+Use it as you please with no restrictions whatsoever.
+
+
+## Questions? Comments?
+
+Send them along to the
+[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
+Thanks!

data/Rakefile

@@ -1,58 +1,58 @@
-require 'hoe'
-require './lib/sportdb/cli/version.rb'
-
-
-Hoe.spec 'sportdb' do
-
-  self.version = SportDbCli::VERSION
-
-  self.summary = 'sportdb - sport.db Command Line Tool'
-  self.description = summary
-
-  self.urls    = ['https://github.com/sportdb/sport.db']
-
-  self.author  = 'Gerald Bauer'
-  self.email   = 'opensport@googlegroups.com'
-
-  # switch extension to .markdown for gihub formatting
-  #  -- Note: auto-changed when included in manifest
-  self.readme_file  = 'README.md'
-  self.history_file = 'CHANGELOG.md'
-
-  self.extra_deps = [
-    ['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.1'],
-
-    ### sportdb addons
-    ## ['sportdb-keys'],
-    ## ['sportdb-update'],
-    ['sportdb-service'],
-
-    ## 3rd party
-    ['gli', '>= 2.12.2'],
-
-    ## ['activerecord'],  # Note: will include activesupport,etc.
-    ['sqlite3']
-  ]
-
-  self.licenses = ['Public Domain']
-
-  self.spec_extras = {
-    required_ruby_version: '>= 2.2.2'
-  }
-
-  self.post_install_message =<<TXT
-******************************************************************************
-
-Questions? Comments? Send them along to the mailing list.
-https://groups.google.com/group/opensport
-
-******************************************************************************
-TXT
-
-end
+require 'hoe'
+require './lib/sportdb/cli/version.rb'
+
+
+Hoe.spec 'sportdb' do
+
+  self.version = SportDbCli::VERSION
+
+  self.summary = 'sportdb - sport.db Command Line Tool'
+  self.description = summary
+
+  self.urls    = { home: 'https://github.com/sportdb/sport.db' }
+
+  self.author  = 'Gerald Bauer'
+  self.email   = 'opensport@googlegroups.com'
+
+  # switch extension to .markdown for gihub formatting
+  #  -- Note: auto-changed when included in manifest
+  self.readme_file  = 'README.md'
+  self.history_file = 'CHANGELOG.md'
+
+  self.extra_deps = [
+    ['sportdb-readers', '>= 1.1.2'],
+
+    ['fetcher',    '>= 0.4.5'],    ## check if included already in datafil ??
+    ['datafile',   '>= 0.3.1'],
+    ['webservice', '>= 0.7.0'],
+
+    ### incl. sportdb addons - why? why not?
+    ## ['sportdb-keys'],
+    ## ['sportdb-update'],
+
+    ## 3rd party
+    ['gli', '>= 2.19.0'],
+
+    ## ['activerecord'],  # Note: will include activesupport,etc.
+    ['sqlite3'],
+
+    ## more tools
+    ['football-to-sqlite'],
+  ]
+
+  self.licenses = ['Public Domain']
+
+  self.spec_extras = {
+    required_ruby_version: '>= 2.2.2'
+  }
+
+  self.post_install_message =<<TXT
+******************************************************************************
+
+Questions? Comments? Send them along to the mailing list.
+https://groups.google.com/group/opensport
+
+******************************************************************************
+TXT
+
+end

data/bin/sportdb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-
-require 'sportdb'
-
-SportDb.main
+#!/usr/bin/env ruby
+
+require 'sportdb'
+
+SportDb.main

data/lib/sportdb.rb

@@ -1,44 +1,97 @@
-# encoding: utf-8
-
-
-require 'sportdb/models'
-require 'sportdb/readers'
-
-require 'logutils/activerecord'   ## NOTE: check - add to/include in/move to sportdb/models
-
-## check if already included in datafile gem ??
-require 'fetcher'   # for fetching/downloading fixtures via HTTP/HTTPS etc.
-require 'datafile'   ## lets us use Datafile::Builder,Datafile etc.
-
-require 'gli'
-
-# our own code
-
-require 'sportdb/cli/version'    # let version always go first
-require 'sportdb/cli/opts'
-require 'sportdb/cli/main'
-
-
-
-module SportDb
-
-  def self.main( args=ARGV )
-    Tool.new.run( args )
-  end
-
-end  # module SportDb
-
-
-#####
-# auto-load/require some addons
-
-## puts 'before auto-load (require) sportdb addons'
-## puts '  before sportdb/update'
-## require 'sportdb/update'
-
-puts '  before sportdb/service'
-require 'sportdb/service'
-puts 'after auto-load (require) sportdb addons'
-
-
-SportDb.main   if __FILE__ == $0
+# encoding: utf-8
+
+require 'sportdb/readers'
+
+require 'logutils/activerecord'   ## NOTE: check - add to/include in/move to sportdb/models
+
+## check if already included in datafile gem ??
+require 'fetcher'   # for fetching/downloading fixtures via HTTP/HTTPS etc.
+require 'datafile'   ## lets us use Datafile::Builder,Datafile etc.
+
+require 'gli'
+
+# our own code
+
+require 'sportdb/cli/version'    # let version always go first
+require 'sportdb/cli/opts'
+require 'sportdb/cli/main'
+
+
+
+module SportDb
+
+  def self.main( args=ARGV )
+    Tool.new.run( args )
+  end
+
+end  # module SportDb
+
+
+
+##################
+# add web service support / machinery
+
+require 'webservice'
+
+####
+##  used for server/service command
+##   "preconfigured" base class for webservice
+class SportDbService < Webservice::Base
+  include SportDb::Models   # e.g. League, Season, Team, etc.
+
+  ## (auto-)add some (built-in) routes
+
+  get '/version(s)?' do
+    {
+      "sportdb":        SportDbCli::VERSION,  ## todo/fix: change to DbTool!!!
+      "sportdb/models": SportDb::VERSION,
+      ## todo/fix: add beerdb/note version - if present
+      ## todo/fix: add worlddb/models version
+      ## todo/fix: add some more libs - why? why not??
+      "activerecord":  [ActiveRecord::VERSION::MAJOR,ActiveRecord::VERSION::MINOR,ActiveRecord::VERSION::TINY].join('.'),
+      "webservice":    Webservice::VERSION,
+      "rack":          "#{Rack::RELEASE} (#{Rack::VERSION.join('.')})",     ## note: VERSION is the protocoll version as an array e.g.[1,2]
+      "ruby":          "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]",
+    }
+  end
+
+  get '/(stats|tables)' do
+    {
+      "teams":        SportDb::Model::Team.count,
+      "games":        SportDb::Model::Game.count,
+      "events":       SportDb::Model::Event.count,
+      "leagues":      SportDb::Model::League.count,
+      "seasons":      SportDb::Model::Season.count,
+      "countries":    WorldDb::Model::Country.count,
+      "system": {
+        "props":      ConfDb::Models::Prop.count,
+        "logs":       LogDb::Models::Log.count,
+      }
+    }
+  end
+
+  get '/props(.:format)?' do    # note: add format - lets you use props.csv and props.html
+    ConfDb::Models::Prop.all
+  end
+
+  get '/logs(.:format)?' do
+    LogDb::Models::Log.all
+  end
+
+
+  ## add favicon support
+  # get '/favicon.ico' do
+    ## use 302 to redirect
+    ##  note: use strg+F5 to refresh page (clear cache for favicon.ico)
+  #  redirect '/webservice-sportdb-32x32.png'
+  # end
+
+  # get '/webservice-beerdb-32x32.png' do
+  #  send_file "#{SportDbCli.root}/assets/webservice-sportdb-32x32.png"
+  # end
+
+end  # class SportDbService
+
+
+
+SportDb.main   if __FILE__ == $0

data/lib/sportdb/cli/main.rb

@@ -65,6 +65,17 @@ arg_name 'FILE'
 default_value opts.datafile
 flag [:f, :datafile]
 
+desc 'Leagues dir'
+arg_name 'PATH'
+default_value nil
+flag [:'leagues-dir', :leaguesdir]
+
+desc 'Clubs dir'
+arg_name 'PATH'
+default_value nil
+flag [:'clubs-dir', :clubsdir]
+
+
 
 desc '(Debug) Show debug messages'
 switch [:verbose], negatable: false    ## todo: use -w for short form? check ruby interpreter if in use too?
@@ -186,38 +197,40 @@ command [:new,:n] do |c|
 end  # command setup
 
 
-
 desc 'Start web service (HTTP JSON API)'
-command [:serve,:server] do |c|
+arg_name 'NAME'   # optional setup profile name
+command [:serve,:server,:s] do |c|
 
   c.action do |g,o,args|
 
-    connect_to_db( opts )
+    ## todo: document optional script arg (defaults to service)
+    script = args[0] || 'service'
+
+    ## todo/fix: add support for (default) Service (with no extension)
 
-    # note: server (HTTP service) not included in standard default require
-    ##   -- note - now included!!!
-    ## require 'sportdb/service'
-
-# make sure connections get closed after every request e.g.
-#
-#  after do
-#   ActiveRecord::Base.connection.close
-#  end
-#
-
-    puts 'before add middleware ConnectionManagement'
-    SportDb::Service::Server.use ActiveRecord::ConnectionAdapters::ConnectionManagement
-    puts 'after add middleware ConnectionManagement'
-    ## todo: check if we can check on/dump middleware stack
-
-    ## 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?
-      ActiveRecord::Base.connection.close
+    script_path = "#{script}.rb"     ## auto-add .rb extension
+
+    unless File.exist?( script_path ) ## if file doesn't exist try to fetch service script
+      script_path = "./#{script}.rb"   ## use / save script in local (current) working dir/folder
+      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/sportdb/sport.db.service/raw/master/#{script}.rb", script_path )
     end
 
-    SportDb::Service::Server.run!
+
+    code = File.open( script_path, 'r:utf-8' ) { |f| f.read }
+
+    connect_to_db( opts )
+
+    SportDb.tables   ## print table stats
+
+    SportDbService.class_eval( code )  ## note: MUST use class_eval (do NOT use instance_eval)  !!!
+
+    puts "dump routes:"
+    pp SportDbService.routes
+
+    puts "starting server..."
+    SportDbService.run!
 
     puts 'Done.'
   end
@@ -225,6 +238,7 @@ end # command serve
 
 
 
+
 desc 'Show logs'
 command :logs do |c|
   c.action do |g,o,args|
@@ -301,6 +315,18 @@ pre do |g,c,o,args|
     LogUtils::Logger.root.level = :debug
   end
 
+
+  if opts.clubs_dir?
+    puts "  setting clubs_dir to >#{opts.clubs_dir}<"
+    SportDb::Import.config.clubs_dir = opts.clubs_dir
+  end
+
+  if opts.leagues_dir?
+    puts "  setting leagues_dir to >#{opts.leagues_dir}<"
+    SportDb::Import.config.leagues_dir = opts.leagues_dir
+  end
+
+
   logger.debug "Executing #{c.name}"
   true
 end

data/lib/sportdb/cli/opts.rb

@@ -1,33 +1,43 @@
-# encoding: utf-8
-
-module SportDb
-
-class Opts
-
-  def merge_gli_options!( options = {} )
-    @db_path   = options[:dbpath]    if options[:dbpath].present?
-    @db_name   = options[:dbname]    if options[:dbname].present?
-    @datafile  = options[:datafile]  if options[:datafile].present?
-
-    @verbose = true     if options[:verbose] == true
-  end
-
-
-  def verbose=(boolean)   # add: alias for debug ??
-    @verbose = boolean
-  end
-
-  def verbose?
-    return false if @verbose.nil?   # default verbose/debug flag is false
-    @verbose == true
-  end
-
-
-  def db_path()   @db_path || '.';         end
-  def db_name()   @db_name || 'sport.db';  end
-
-  def datafile()  @datafile || './Datafile';  end
-  def datafile?() @datafile;  end    ## note: let's you check if datafile is set (or "untouched")
-end # class Opts
-
-end # module SportDb
+# encoding: utf-8
+
+module SportDb
+
+class Opts
+
+  def merge_gli_options!( options = {} )
+    @db_path   = options[:dbpath]    if options[:dbpath].present?
+    @db_name   = options[:dbname]    if options[:dbname].present?
+    @datafile  = options[:datafile]  if options[:datafile].present?
+
+    @verbose = true     if options[:verbose] == true
+
+    @leagues_dir = options[:'leagues-dir']   if options[:'leagues-dir'].present?
+    @clubs_dir   = options[:'clubs-dir']     if options[:'clubs-dir'].present?
+  end
+
+
+  def verbose=(boolean)   # add: alias for debug ??
+    @verbose = boolean
+  end
+
+  def verbose?
+    return false if @verbose.nil?   # default verbose/debug flag is false
+    @verbose == true
+  end
+
+
+  def db_path()   @db_path || '.';         end
+  def db_name()   @db_name || 'sport.db';  end
+
+  def datafile()  @datafile || './Datafile';  end
+  def datafile?() @datafile;  end    ## note: let's you check if datafile is set (or "untouched")
+
+
+  def clubs_dir()    @clubs_dir;  end
+  def clubs_dir?()   @clubs_dir.nil? == false;  end ## note: let's you check if clubs_dir set (by default it's NOT set)
+
+  def leagues_dir()  @leagues_dir;  end
+  def leagues_dir?() @leagues_dir.nil? == false; end
+end # class Opts
+
+end # module SportDb

data/lib/sportdb/cli/version.rb

@@ -1,25 +1,25 @@
-# encoding: utf-8
-
-# 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 = 1
-  PATCH = 1
-  VERSION = [MAJOR,MINOR,PATCH].join('.')
-
-  def self.version
-    VERSION
-  end
-
-  def self.banner
-    "sportdb/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
-  end
-
-end # module SportDbCli
+# encoding: utf-8
+
+# 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 = 3
+  PATCH = 2
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  def self.banner
+    "sportdb/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
+  end
+
+end # module SportDbCli

data/lib/sportdb/console.rb

@@ -1,109 +1,109 @@
-
-require 'logger'
-require 'sportdb/models'
-
-
-## shortcuts for models
-
-##
-##  todo/fix: just use include SportDb::Models  - why? why not? is it possible/working?
-
-Badge   = SportDb::Model::Badge
-Event   = SportDb::Model::Event
-Game    = SportDb::Model::Game
-Goal    = SportDb::Model::Goal
-Group   = SportDb::Model::Group
-League  = SportDb::Model::League
-Person  = SportDb::Model::Person
-Roster  = SportDb::Model::Roster
-Round   = SportDb::Model::Round
-Season  = SportDb::Model::Season
-Team    = SportDb::Model::Team
-
-
-### todo: check for racing.db extension if present??
-## only add if present
-Race    = SportDb::Model::Race
-Record  = SportDb::Model::Record
-Run     = SportDb::Model::Run
-Track   = SportDb::Model::Track
-
-
-
-Tag       = WorldDb::Model::Tag
-Tagging   = WorldDb::Model::Tagging
-Continent = WorldDb::Model::Continent
-Country   = WorldDb::Model::Country
-Region    = WorldDb::Model::Region
-City      = WorldDb::Model::City
-Prop      = WorldDb::Model::Prop
-
-
-## connect to db
-
-DB_CONFIG = {
-  adapter:  'sqlite3',
-  database: './sport.db'
-}
-
-pp DB_CONFIG
-ActiveRecord::Base.establish_connection( DB_CONFIG )
-
-## test drive
-
-puts "Welcome to sport.db, version #{SportDb::VERSION} (world.db, version #{WorldDb::VERSION})!"
-
-## print tables stats (e.g. no of records)
-puts 'sport.db'
-puts '--------'
-SportDb.tables
-
-puts 'world.db'
-puts '--------'
-WorldDb.tables
-
-puts 'Ready.'
-
-
-## add some predefined shortcuts
-
-##### some countries
-
-AT = Country.find_by_key( 'at' )
-DE = Country.find_by_key( 'de' )
-EN = Country.find_by_key( 'en' )
-
-US = Country.find_by_key( 'us' )
-CA = Country.find_by_key( 'ca' )
-MX = Country.find_by_key( 'mx' )
-
-#### some events
-
-EURO2008 = Event.find_by_key( 'euro.2008' )
-EURO2012 = Event.find_by_key( 'euro.2012' )
-EURO = EURO2012  # add alias
-
-BL = Event.find_by_key( 'de.2013/14' )
-PL = Event.find_by_key( 'en.2013/14' )
-
-### some club teams
-
-BARCA   = Team.find_by_key( 'barcelona' )
-MANU    = Team.find_by_key( 'manunited' )
-MUN = MANUNITED = MANU    # add alias
-BAYERN  = Team.find_by_key( 'bayern' )
-AUSTRIA = Team.find_by_key( 'austria' )
-
-### some national teams (three letter fifa codes)
-
-ESP = Team.find_by_key( 'esp' )
-GER = Team.find_by_key( 'ger' )
-AUT = Team.find_by_key( 'aut' )
-
-MEX = Team.find_by_key( 'mex' )
-ARG = Team.find_by_key( 'arg' )
-
-## turn on activerecord logging to console
-
-ActiveRecord::Base.logger = Logger.new( STDOUT )
-
+
+require 'logger'
+require 'sportdb/models'
+
+
+## shortcuts for models
+
+##
+##  todo/fix: just use include SportDb::Models  - why? why not? is it possible/working?
+
+Badge   = SportDb::Model::Badge
+Event   = SportDb::Model::Event
+Game    = SportDb::Model::Game
+Goal    = SportDb::Model::Goal
+Group   = SportDb::Model::Group
+League  = SportDb::Model::League
+Person  = SportDb::Model::Person
+Roster  = SportDb::Model::Roster
+Round   = SportDb::Model::Round
+Season  = SportDb::Model::Season
+Team    = SportDb::Model::Team
+
+
+### todo: check for racing.db extension if present??
+## only add if present
+Race    = SportDb::Model::Race
+Record  = SportDb::Model::Record
+Run     = SportDb::Model::Run
+Track   = SportDb::Model::Track
+
+
+
+Tag       = WorldDb::Model::Tag
+Tagging   = WorldDb::Model::Tagging
+Continent = WorldDb::Model::Continent
+Country   = WorldDb::Model::Country
+Region    = WorldDb::Model::Region
+City      = WorldDb::Model::City
+Prop      = WorldDb::Model::Prop
+
+
+## connect to db
+
+DB_CONFIG = {
+  adapter:  'sqlite3',
+  database: './sport.db'
+}
+
+pp DB_CONFIG
+ActiveRecord::Base.establish_connection( DB_CONFIG )
+
+## test drive
+
+puts "Welcome to sport.db, version #{SportDb::VERSION} (world.db, version #{WorldDb::VERSION})!"
+
+## print tables stats (e.g. no of records)
+puts 'sport.db'
+puts '--------'
+SportDb.tables
+
+puts 'world.db'
+puts '--------'
+WorldDb.tables
+
+puts 'Ready.'
+
+
+## add some predefined shortcuts
+
+##### some countries
+
+AT = Country.find_by_key( 'at' )
+DE = Country.find_by_key( 'de' )
+EN = Country.find_by_key( 'en' )
+
+US = Country.find_by_key( 'us' )
+CA = Country.find_by_key( 'ca' )
+MX = Country.find_by_key( 'mx' )
+
+#### some events
+
+EURO2008 = Event.find_by_key( 'euro.2008' )
+EURO2012 = Event.find_by_key( 'euro.2012' )
+EURO = EURO2012  # add alias
+
+BL = Event.find_by_key( 'de.2013/14' )
+PL = Event.find_by_key( 'en.2013/14' )
+
+### some club teams
+
+BARCA   = Team.find_by_key( 'barcelona' )
+MANU    = Team.find_by_key( 'manunited' )
+MUN = MANUNITED = MANU    # add alias
+BAYERN  = Team.find_by_key( 'bayern' )
+AUSTRIA = Team.find_by_key( 'austria' )
+
+### some national teams (three letter fifa codes)
+
+ESP = Team.find_by_key( 'esp' )
+GER = Team.find_by_key( 'ger' )
+AUT = Team.find_by_key( 'aut' )
+
+MEX = Team.find_by_key( 'mex' )
+ARG = Team.find_by_key( 'arg' )
+
+## turn on activerecord logging to console
+
+ActiveRecord::Base.logger = Logger.new( STDOUT )
+

metadata

@@ -1,101 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sportdb-models
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.18.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.18.2
 - !ruby/object:Gem::Dependency
   name: sportdb-readers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: footballdb-leagues
+  name: fetcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
-  name: footballdb-clubs
+  name: datafile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2019.11.22
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: fetcher
+  name: webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: datafile
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 2.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
-  name: sportdb-service
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.12.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.12.2
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: football-to-sqlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,30 +112,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
 description: sportdb - sport.db Command Line Tool
 email: opensport@googlegroups.com
 executables: