sportdb 0.9.7 → 1.0.0

data/Manifest.txt

@@ -3,62 +3,19 @@ Manifest.txt
 README.md
 Rakefile
 bin/sportdb
-data/america/2011.rb
-data/america/2011.txt
-data/america/2011.yml
-data/america/teams.txt
-data/at/2011_12/bl.rb
-data/at/2011_12/bl.txt
-data/at/2011_12/cup.rb
-data/at/2012_13/bl.rb
-data/at/2012_13/bl.txt
-data/at/2012_13/cup.rb
-data/at/2012_13/cup.txt
-data/at/badges.rb
-data/at/teams.txt
-data/cl/2011_12/cl.rb
-data/cl/2011_12/el.rb
-data/cl/2012_13/cl.rb
-data/cl/badges.rb
-data/cl/teams.txt
-data/copa/sud_2012_13.rb
-data/copa/sud_2012_13.txt
-data/copa/teams.txt
-data/de/2012_13/bl.rb
-data/de/2012_13/bl.txt
-data/de/teams.txt
-data/en/2012_13/pl.rb
-data/en/2012_13/pl.txt
-data/en/teams.txt
-data/es/teams.txt
-data/euro/2008.rb
-data/euro/2008.txt
-data/euro/2012.rb
-data/euro/2012.txt
-data/euro/teams.txt
-data/leagues.rb
-data/mx/apertura_2012.rb
-data/mx/apertura_2012.txt
-data/mx/teams.txt
-data/nfl/teams.txt
-data/nhl/teams.txt
-data/ro/l1_2012_13.rb
-data/ro/teams.txt
-data/seasons.rb
-data/world/2010.rb
-data/world/2010.txt
-data/world/quali_2012_13_america.rb
-data/world/quali_2012_13_america.txt
-data/world/quali_2012_13_europe.rb
-data/world/quali_2012_13_europe_c.txt
-data/world/quali_2012_13_europe_i.txt
-data/world/teams.txt
+config/fixtures.de.yml
+config/fixtures.en.yml
+config/fixtures.es.yml
+config/fixtures.pt.yml
 lib/sportdb.rb
+lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
-lib/sportdb/cli/runner.rb
 lib/sportdb/console.rb
-lib/sportdb/keys.rb
-lib/sportdb/loader.rb
+lib/sportdb/data/fixtures.rb
+lib/sportdb/data/keys.rb
+lib/sportdb/data/models.rb
+lib/sportdb/deleter.rb
+lib/sportdb/lang.rb
 lib/sportdb/models/badge.rb
 lib/sportdb/models/city.rb
 lib/sportdb/models/country.rb
@@ -76,7 +33,7 @@ lib/sportdb/models/season.rb
 lib/sportdb/models/team.rb
 lib/sportdb/reader.rb
 lib/sportdb/schema.rb
-lib/sportdb/templater.rb
+lib/sportdb/stats.rb
 lib/sportdb/utils.rb
 lib/sportdb/version.rb
-templates/fixtures.rb.erb
+tasks/test.rb

data/Rakefile

@@ -4,11 +4,6 @@ require './lib/sportdb/version.rb'
 ## NB: plugin (hoe-manifest) not required; just used for future testing/development
 Hoe::plugin :manifest   # more options for manifests (in the future; not yet)
 
-###########
-#### NB: if you try this script at home
-#    you need to create a (symbolic) link to the sport.db fixtures
-#     e.g. use ln -s ../sport.db  data  or similar
-
 
 Hoe.spec 'sportdb' do
   
@@ -28,17 +23,23 @@ Hoe.spec 'sportdb' do
   # self.history_file = 'History.md'
   
   self.extra_deps = [
+    ['worlddb', '~> 1.0.1'],  # NB: worlddb already includes
+                               #         - commander
+                               #         - logutils
+                               #         - textutils
+    
+    ## 3rd party
+    ['commander', '~> 4.1.3']   # remove? -- already included as dep in worlddb
+
     ## ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
-    ['worlddb', '~> 0.6.8']
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
   ]
 
   self.licenses = ['Public Domain']
 
-#
-#  self.spec_extras = {
-#    :required_ruby_version => '>= 1.9.2'
-#  }
+  self.spec_extras = {
+   :required_ruby_version => '>= 1.9.2'
+  }
 
   self.post_install_message =<<EOS
 ******************************************************************************

data/bin/sportdb

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

data/config/fixtures.de.yml

@@ -0,0 +1,42 @@
+###########################
+# known keywords for fixtures
+
+
+group:      Gruppe
+matchday:   Spieltag
+round:      Runde
+stage:      Gruppenphase|Qualifikation|Play-off|Finalrunde|K.-o.-Phase
+
+
+### Knock out rounds
+
+round32:        Sechzehntelfinale|1/16 Finale
+round16:        Achtelfinale|1/8 Finale
+quarterfinals:  Viertelfinale|1/4 Finale
+semifinals:     Halbfinale|Semifinale|1/2 Finale
+thirdplace:     Spiel um Platz 3
+final:          Finale|Endspiel
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  Hin|Hinspiel|Hinspiele
+leg2:  Rück|Rückspiel|Rückspiele
+
+
+#######################
+# months of year
+
+january:   Jänner|Januar
+february:  Feber|Februar
+march:     März
+april:     April
+may:       Mai
+june:      Juni
+july:      Juli
+august:    August
+september: September
+october:   Oktober
+november:  November
+december:  Dezember
+
+

data/config/fixtures.en.yml

@@ -0,0 +1,52 @@
+###########################
+# known keywords for fixtures
+
+
+group:      Group
+matchday:   Matchday
+round:      Round
+
+stage:    Stage|Phase|Rounds
+# e.g.
+#  Group stage
+#  Play off stage|Play-off stage
+#  Knockout stage|Knockout stages
+#  First stage
+#  Second stage
+#  Qualifying rounds
+
+
+
+
+### Knockout rounds
+
+round32:        Round of 32|Last 32
+round16:        Round of 16|Last 16
+quarterfinals:  Quarterfinals|Quarter-finals|Quarters|Quarterfinal  # todo: check if singular Quaterfinal is possible??
+semifinals:     Semifinals|Semi-finals|Semis
+thirdplace:     Third-place play-off|Third place play-off|Third place|3rd place match
+final:          Final|Finals
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  1st leg|1st Leg|First leg     # todo: check for automatica ignore case - why? why not?
+leg2:  2nd leg|2nd Leg|Second leg
+
+
+#######################
+# months of year
+
+january:   January
+february:  February
+march:     March
+april:     April
+may:       May
+june:      June
+july:      July
+august:    August
+september: September
+october:   October
+november:  November
+december:  December
+
+

data/config/fixtures.es.yml

@@ -0,0 +1,44 @@
+###########################
+# known keywords for fixtures
+
+
+group:      Grupo
+matchday:   Jornada
+round:      Fecha
+
+stage:    Primera fase|Segunda fase|Fase de grupos|Fase final
+
+
+### Knock out rounds
+
+round32:        Dieciseisavos de final|16vos de final
+round16:        Octavos|Octavos de final|8vos de final
+quarterfinals:  Cuartos|Cuartos de final|4tos de final
+semifinals:     Semifinales|Semifinal
+thirdplace:     Tercer lugar
+final:          Final
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  Ida
+leg2:  Vuelta
+
+
+
+#######################
+# months of year
+
+january:   enero
+february:  febrero
+march:     marzo
+april:     abril
+may:       mayo
+june:      junio
+july:      julio
+august:    agosto
+september: septiembre
+october:   octubre
+november:  noviembre
+december:  diciembre
+
+

data/config/fixtures.pt.yml

@@ -0,0 +1,44 @@
+###########################
+# known keywords for fixtures
+
+
+group:      Grupo  # Grupo
+matchday:   # Jornada
+round:      # Fecha
+
+stage:  Primeira Fase|Segunda Fase  # Primera fase|Segunda fase|Fase de grupos|Fase final
+
+
+### Knock out rounds
+
+round32:        # Dieciseisavos de final|16vos de final
+round16:        Oitavas-de-final   # Octavos|Octavos de final|8vos de final
+quarterfinals:  Quartas-de-final   # Cuartos|Cuartos de final|4tos de final
+semifinals:     Semifinais         # Semifinales|Semifinal
+thirdplace:     # Tercer lugar
+final:          Final  # Final
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  Ida    # Ida
+leg2:  Volta  # Vuelta
+
+
+
+#######################
+# months of year
+
+january:   janeiro   # enero
+february:  fevereiro # febrero
+march:     março     # marzo
+april:     abril     # abril
+may:       maio      # mayo
+june:      junho     # junio
+july:      julho     # julio
+august:    # agosto
+september: # septiembre
+october:   # octubre
+november:  # noviembre
+december:  # diciembre
+
+

data/lib/sportdb/cli/main.rb

@@ -0,0 +1,189 @@
+# encoding: utf-8
+
+require 'commander/import'
+
+# our own code / additional for cli only
+
+require 'sportdb/cli/opts'
+
+
+program :name,  'sportdb'
+program :version, SportDB::VERSION
+program :description, "sport.db command line tool, version #{SportDB::VERSION}"
+
+
+# default_command :help
+default_command :load
+
+program :help_formatter, Commander::HelpFormatter::TerminalCompact
+
+## program :help, 'Examples', 'yada yada -try multi line later'
+
+=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
+
+
+## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
+myopts = SportDB::Opts.new
+
+### global option (required)
+## todo: add check that path is valid?? possible?
+
+global_option '-i', '--include PATH', String, "Data path (default is #{myopts.data_path})"
+global_option '-d', '--dbpath PATH', String, "Database path (default is #{myopts.db_path})"
+global_option '-n', '--dbname NAME', String, "Database name (datault is #{myopts.db_name})"
+
+
+def connect_to_db( options )
+  puts SportDB.banner
+
+  puts "working directory: #{Dir.pwd}"
+
+  db_config = {
+    :adapter  => 'sqlite3',
+    :database => "#{options.db_path}/#{options.db_name}"
+  }
+
+  puts "Connecting to db using settings: "
+  pp db_config
+
+  ActiveRecord::Base.establish_connection( db_config )
+end
+
+
+command :create do |c|
+  c.syntax = 'sportdb create [options]'
+  c.description = 'Create DB schema'
+  c.action do |args, options|
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+    
+    LogDB.create
+    WorldDB.create
+    SportDB.create
+    puts 'Done.'
+  end # action
+end # command create
+
+command :setup do |c|
+  c.syntax = 'sportdb setup [options]'
+  c.description = "Create DB schema 'n' load all data"
+
+  c.option '--world', 'Populate world tables'
+  ## todo: use --world-include - how? find better name?
+  c.option '--worldinclude PATH', String, 'World data path'
+
+  c.option '--sport', 'Populate sport tables'
+  c.option '--delete', 'Delete all records'
+
+  c.action do |args, options|
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+    
+    if options.world.present? || options.sport.present?
+      
+      ## todo: check order for reference integrity
+      #  not really possible to delete world data if sport data is present
+      #   delete sport first
+      
+      if options.delete.present?
+        SportDB.delete! if options.sport.present?
+        WorldDB.delete! if options.world.present?
+      end
+      
+      if options.world.present?
+        WorldDB.read_all( myopts.world_data_path )
+      end
+      if options.sport.present?
+        SportDB.read_all( myopts.data_path )
+      end
+
+    else  # assume "plain" regular setup
+      LogDB.create
+      WorldDB.create
+      SportDB.create
+    
+      WorldDB.read_all( myopts.world_data_path )
+      SportDB.read_all( myopts.data_path )
+    end
+    puts 'Done.'
+  end # action
+end  # command setup
+
+command :load do |c|
+  ## todo: how to specify many fixutes <>... ??? in syntax
+  c.syntax = 'sportdb load [options] FIXTURE...'
+  c.description = 'Load fixtures'
+
+  c.option '-e', '--event KEY', String, 'Event to load'
+  c.option '--delete', 'Delete all records'
+
+  c.action do |args, options|
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+    
+    SportDB.delete! if options.delete.present?
+
+    logger = LogUtils::Logger.new
+
+    reader = SportDB::Reader.new( logger )
+ 
+    args.each do |arg|
+      name = arg     # File.basename( arg, '.*' )
+
+      if myopts.event.present?
+        ## fix: rename to load_event_fixtures_w... or similar
+        reader.load_fixtures_with_include_path( myopts.event, name, myopts.data_path )
+      else
+        ## fix> add a convenience method for loading single fixture
+        ary = []
+        ary << name
+        reader.load_with_include_path( ary, myopts.data_path )
+      end
+    end # each arg
+
+    puts 'Done.'
+  end
+end # command load
+
+
+command :stats do |c|
+  c.syntax = 'sportdb stats [options]'
+  c.description = 'Show stats'
+  c.action do |args, options|
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts ) 
+    
+    SportDB.stats
+    
+    puts 'Done.'
+  end
+end
+
+
+command :test do |c|
+  c.syntax = 'sportdb test [options]'
+  c.description = 'Debug/test command suite'
+  c.action do |args, options|
+    puts "hello from test command"
+    puts "args (#{args.class.name}):"
+    pp args
+    puts "options:"
+    pp options
+    puts "options.__hash__:"
+    pp options.__hash__
+    puts 'Done.'
+  end
+end

data/lib/sportdb/cli/opts.rb

@@ -2,91 +2,33 @@ module SportDB
 
 class Opts
 
-  def create=(boolean)
-    @create = boolean
-  end
-
-  def create?
-    return false if @create.nil?   # default create flag is false
-    @create == true
-  end
-  
-  def setup=(boolean)
-    @setup = boolean
-  end
+  def merge_commander_options!( options = {} )
+    @db_path   = options[:dbpath]  if options[:dbpath].present?
+    @db_name   = options[:dbname]  if options[:dbname].present?
 
-  def setup?
-    return false if @setup.nil?   # default setup flag is false
-    @setup == true
-  end
+    @data_path = options[:include] if options[:include].present?
+    @event     = options[:event]   if options[:event].present?
 
-  def sport=(boolean)
-    @sport = boolean
+    @world_data_path = options[:worldinclude] if options[:worldinclude].present? 
   end
 
-  def sport?
-    return false if @sport.nil?   # default sport flag is false
-    @sport == true
-  end
-  
-  
-  def world=(boolean)
-    @world = boolean
-  end
 
-  def world?
-    return false if @world.nil?   # default populate world tables flag is false
-    @world == true
+  def db_path
+    @db_path || '.'
   end
 
-
-  def generate=(boolean)
-    @generate = boolean
+  def db_name
+    @db_name || 'sport.db'
   end
 
-  def generate?
-    return false if @generate.nil?   # default generate flag is false
-    @generate == true
-  end
-  
   def event=(value)
     @event = value
   end
-  
+
   def event
     @event   # NB: option has no default; return nil  ## || '.'
-  end  
-  
-
-  def delete=(boolean)
-    @delete = boolean
   end
 
-  def delete?
-    return false if @delete.nil?   # default create flag is false
-    @delete == true
-  end
-
-
-  # use loader? (that is, built-in seed data)
-  def load=(boolean)
-    @load = boolean
-  end
-
-  def load?
-    return false if @load.nil?   # default create flag is false
-    @load == true
-  end
-
-
-  def output_path=(value)
-    @output_path = value
-  end
-  
-  def output_path
-    @output_path || '.'
-  end
-  
 
   def data_path=(value)
     @data_path = value
@@ -97,6 +39,10 @@ class Opts
   end
 
 
+  def world_data_path
+    @world_data_path   # NB: option has no default; return nil
+  end
+
 end # class Opts
 
 end # module SportDB