sportdb 2.1.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462f64e48cea18e67436574ea602fb33b00c233f
-  data.tar.gz: 547a07bb677135cbc245e317ddc2c30d619e5346
+  metadata.gz: 0abc35fb1d3dbb732804349eeec3c26a6dc63d99
+  data.tar.gz: 6e7338d3c6d9b8765e42dcbbac64b418d1761d6c
 SHA512:
-  metadata.gz: 2640177ec4c7f3c9ff4743f365755adddaf915cb4b05772b2885e5c878c3a2fc70e375ba328226581c664efa0ee26cfcd4c4df05ada239a2608166337da8c440
-  data.tar.gz: 4874fa7df01d41799af5ac192ba362f3136712e5ff594b2c0601fbf68d5bb4348f49e79c7842972d7d3f90d667b071f9eb554f32b433d148e5ef8b57b3582a20
+  metadata.gz: 458d9011e99e6abbe78ae1d9448f9175c2057a4cf7869ce66f50aeb8572157ff64721f21d318ddcee64d6917bf5dfeac4ec045b50d4e5ec95fb0abe74aebcefb
+  data.tar.gz: edfbbb41911d7ad3687381a8d5471ce3c7f289cdf03ed95ea7098519253b3c3ee0b493c920874165a601df272d60f9ae3ff57dc89dce8bf5cbb5474ed64b3c56

data/Manifest.txt

@@ -8,3 +8,5 @@ lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/cli/version.rb
 lib/sportdb/console.rb
+test/helper.rb
+test/test_commands.rb

data/Rakefile

@@ -20,21 +20,18 @@ Hoe.spec 'sportdb' do
   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' ],
+    ['sportdb-readers', '>= 1.1.2'],
 
-    ['fetcher',  '>= 0.4.5'],    ## check if included already in datafil ??
-    ['datafile', '>= 0.3.1'],
+    ['fetcher',    '>= 0.4.5'],    ## check if included already in datafil ??
+    ['datafile',   '>= 0.3.1'],
+    ['webservice', '>= 0.7.0'],
 
-    ### sportdb addons
+    ### incl. sportdb addons - why? why not?
     ## ['sportdb-keys'],
     ## ['sportdb-update'],
-    ['sportdb-service'],
 
     ## 3rd party
-    ['gli', '>= 2.12.2'],
+    ['gli', '>= 2.19.0'],
 
     ## ['activerecord'],  # Note: will include activesupport,etc.
     ['sqlite3']

data/lib/sportdb.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-
-require 'sportdb/models'
 require 'sportdb/readers'
 
 require 'logutils/activerecord'   ## NOTE: check - add to/include in/move to sportdb/models
@@ -19,24 +17,81 @@ require 'sportdb/cli/opts'
 require 'sportdb/cli/main'
 
 
+
 module SportDb
 
-  def self.main
-    Tool.new.run(ARGV)
+  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'
+##################
+# 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

@@ -60,6 +60,23 @@ arg_name 'NAME'
 default_value opts.db_name
 flag [:n, :dbname]
 
+desc 'Datafile'
+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?
 
@@ -87,8 +104,8 @@ command [:build,:b] do |c|
   c.action do |g,o,args|
 
     ## 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' )
+    if File.file?( opts.datafile )   ## note use file? (exist? will also check for directory/folder!!)
+      datafile = Datafile::Datafile.load_file( opts.datafile )
       datafile.download  # datafile step 1 - download all datasets/zips
 
       connect_to_db( opts )
@@ -97,7 +114,7 @@ command [:build,:b] do |c|
 
       datafile.read  # datafile step 2 - read all datasets
     else
-      puts "no ./Datafile found; try local build in >#{Dir.pwd}<"
+      puts "no datafile >#{opts.datafile}< found; trying local build in >#{Dir.pwd}<"
 
       connect_to_db( opts )
 
@@ -117,13 +134,13 @@ command [:read,:r] do |c|
   c.action do |g,o,args|
 
     ## 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!!)
+    if File.file?( opts.datafile )   ## note use file? (exist? will also check for directory/folder!!)
       connect_to_db( opts )
 
-      datafile = Datafile::Datafile.load_file( './Datafile' )
+      datafile = Datafile::Datafile.load_file( opts.datafile )
       datafile.read
     else
-      puts "no ./Datafile found; try local read in >#{Dir.pwd}<"
+      puts "no datafile >#{opts.datafile}< found; trying local read in >#{Dir.pwd}<"
 
       connect_to_db( opts )
 
@@ -143,7 +160,7 @@ command [:download,:dl] do |c|
 
     # note: no database connection needed (check - needed for logs?? - not setup by default???)
 
-    datafile = Datafile::Datafile.load_file( './Datafile' )
+    datafile = Datafile::Datafile.load_file( opts.datafile )
     datafile.download
 
     puts 'Done.'
@@ -163,6 +180,8 @@ command [:new,:n] do |c|
     worker = Fetcher::Worker.new
     worker.copy( "https://github.com/openfootball/datafile/raw/master/#{setup}.rb", './Datafile' )
 
+    ## todo/check: use custom datafile (opts.datafile) if present? why? why not?
+
     ## step 2: same as command build (todo - reuse code)
     datafile = Datafile::Datafile.load_file( './Datafile' )
     datafile.download  # datafile step 1 - download all datasets/zips
@@ -178,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)
+
+    script_path = "#{script}.rb"     ## auto-add .rb 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
+    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
@@ -217,6 +238,7 @@ end # command serve
 
 
 
+
 desc 'Show logs'
 command :logs do |c|
   c.action do |g,o,args|
@@ -293,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

@@ -5,10 +5,14 @@ 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?
+    @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
 
 
@@ -22,13 +26,18 @@ class Opts
   end
 
 
-  def db_path
-    @db_path || '.'
-  end
+  def db_path()   @db_path || '.';         end
+  def db_name()   @db_name || 'sport.db';  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

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

data/test/helper.rb

@@ -0,0 +1,9 @@
+## $:.unshift(File.dirname(__FILE__))
+
+## minitest setup
+
+require 'minitest/autorun'
+
+
+## our own code
+require 'sportdb'

data/test/test_commands.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_commands.rb
+
+
+require 'helper'
+
+class TestCommands < MiniTest::Test
+
+  def test_help
+     args = ['help']
+     SportDb.main( args )
+  end
+
+end # class TestCommands

metadata

@@ -1,71 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2020-08-01 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
-- !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
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: fetcher
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: sportdb-service
+  name: webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +142,8 @@ files:
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/version.rb
 - lib/sportdb/console.rb
+- test/helper.rb
+- test/test_commands.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain