sportdb 1.8.6 → 1.8.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e0653d4fa44c978d188c969c7ed90ad85fb086c4
+  data.tar.gz: 5aed7d909b52fc30921b0b1e8de525454624ce6b
+SHA512:
+  metadata.gz: 12b2e6d68db5c2f17e60ee047e6d7402ed4b4f8baa32a65544a8de681c3d475668a8f62ff90731ff2d04df2b06a27ae5b188f21e037a66058481b25baac8af55
+  data.tar.gz: f0eed981f109218c6f23fc26a3148dddb3413d66a5ce3955bdc2cb88d6168f728b16efc2c8bde5b05b3a6e4981b75863202dd0276bf96ea229d0fe990e09342c

data/Manifest.txt

@@ -1,4 +1,4 @@
-History.md
+HISTORY.md
 Manifest.txt
 README.md
 Rakefile
@@ -6,9 +6,12 @@ bin/sportdb
 config/fixtures/de.yml
 config/fixtures/en.yml
 config/fixtures/es.yml
+config/fixtures/fr.yml
+config/fixtures/it.yml
 config/fixtures/pt.yml
+config/fixtures/ro.yml
 data/seasons.txt
-data/setups/all.yml
+data/setups/all.txt
 lib/sportdb.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
@@ -17,6 +20,7 @@ lib/sportdb/data/keys.rb
 lib/sportdb/data/models.rb
 lib/sportdb/deleter.rb
 lib/sportdb/lang.rb
+lib/sportdb/matcher.rb
 lib/sportdb/models/badge.rb
 lib/sportdb/models/event.rb
 lib/sportdb/models/event_ground.rb

data/Rakefile

@@ -13,25 +13,29 @@ Hoe.spec 'sportdb' do
   self.description = summary
 
   self.urls    = ['https://github.com/geraldb/sport.db.ruby']
-  
+
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'
-    
+
   # switch extension to .markdown for gihub formatting
   #  -- NB: auto-changed when included in manifest
-  # self.readme_file  = 'README.md'
-  # self.history_file = 'History.md'
-  
+  self.readme_file  = 'README.md'
+  self.history_file = 'HISTORY.md'
+
   self.extra_deps = [
-    ['worlddb', '>= 1.7'],  # NB: worlddb already includes
+    ['props' ],
+    ['logutils'],
+    ['textutils'],
+    ['worlddb', '>= 2.0.2'],  # NB: worlddb already includes
                                #         - logutils
                                #         - textutils
+    ['tagutils'],     # tags n tagging tables
     ['fetcher', '>= 0.3'],
 
     ## 3rd party
-    ['gli', '>= 2.5.6']
+    ['gli', '>= 2.5.6'],
 
-    ## ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
+    ['activerecord']  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
   ]
 

data/config/fixtures/de.yml

@@ -3,8 +3,11 @@
 
 
 group:      Gruppe
+
+## roll into one (matchday+round) ???
 matchday:   Spieltag
 round:      Runde
+
 stage:      Gruppenphase|Qualifikation|Play-off|Finalrunde|K.-o.-Phase
 
 

data/config/fixtures/en.yml

@@ -3,6 +3,9 @@
 
 
 group:      Group
+
+## roll into one (matchday+round) ???
+
 matchday:   Matchday
 round:      Round
 

data/config/fixtures/es.yml

@@ -3,9 +3,12 @@
 
 
 group:      Grupo
+
+## roll into one (matchday+round) ???
 matchday:   Jornada
 round:      Fecha
 
+
 stage:    Primera fase|Segunda fase|Fase de grupos|Fase final
 
 

data/config/fixtures/fr.yml

@@ -0,0 +1,53 @@
+###########################
+# known keywords for fixtures
+
+
+group:      Groupe
+
+## roll into one (matchday+round) ???
+
+matchday:   Journée
+round:      Journée
+
+stage:    Phase de groupes|Phase à élimination directe|Phase finale
+# e.g.
+#  Group stage
+#  Play off stage|Play-off stage
+#  Knockout stage|Knockout stages
+#  First stage
+#  Second stage
+#  Qualifying rounds
+
+
+
+
+### Knockout rounds
+
+round32:        Seizièmes de finale
+round16:        Huitièmes de finale
+quarterfinals:  Quarts de finale
+semifinals:     Demi-finales
+thirdplace:     Match pour la troisième place
+final:          Finale
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  Match aller
+leg2:  Match retour
+
+
+#######################
+# months of year
+
+january:   janvier
+february:  février
+march:     mars
+april:     avril
+may:       mai
+june:      juin
+july:      juillet
+august:    août
+september: septembre
+october:   octobre
+november:  novembre
+december:  décembre

data/config/fixtures/it.yml

@@ -0,0 +1,55 @@
+###########################
+# known keywords for fixtures
+
+
+group:     Gruppo
+
+
+## roll into one (matchday+round) ???
+
+matchday:   Giornata
+round:      Giornata
+
+stage:    Fase a gironi|Fase a eliminazione diretta
+# e.g.
+#  Group stage
+#  Play off stage|Play-off stage
+#  Knockout stage|Knockout stages
+#  First stage
+#  Second stage
+#  Qualifying rounds
+
+
+
+
+### Knockout rounds
+
+round32:        Sedicesimi di finale
+round16:        Ottavi di finale
+quarterfinals:  Quarti di finale
+semifinals:     Semifinali
+thirdplace:     Finale 3º posto
+final:          Finale
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  Andata
+leg2:  Ritorno
+
+
+#######################
+# months of year
+
+january:   gennaio
+february:  febbraio
+march:     marzo
+april:     aprile
+may:       maggio
+june:      giugno
+july:      luglio
+august:    agosto
+september: settembre
+october:   ottobre
+november:  novembre
+december:  dicembre
+

data/config/fixtures/pt.yml

@@ -2,43 +2,46 @@
 # known keywords for fixtures
 
 
-group:      Grupo  # Grupo
-matchday:   # Jornada
-round:      # Fecha
+group:      Grupo
 
-stage:  Primeira Fase|Segunda Fase  # Primera fase|Segunda fase|Fase de grupos|Fase final
+## roll into one (matchday+round) ???
+
+matchday:   Rodada
+round:      Rodada
+
+stage:  Fase de grupos|Fase final|Primeira Fase|Segunda Fase
 
 
 ### 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
+round32:        16-avos de final
+round16:        Oitavos de final|Oitavas-de-final
+quarterfinals:  Quartos de final|Quartas-de-final
+semifinals:     Semifinais
+thirdplace:     Terceiro lugar
+final:          Final
+
 
 ### Pair matches/games if marked with leg1 n leg2
 
-leg1:  Ida    # Ida
-leg2:  Volta  # Vuelta
+leg1:  1º jogo    # Ida  -- exists ??
+leg2:  2º jogo    # Volta  -- exists ??
 
 
 
 #######################
 # 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
-
+january:   janeiro
+february:  fevereiro
+march:     março
+april:     abril
+may:       maio
+june:      junho
+july:      julho
+august:    agosto
+september: setembro
+october:   outubro
+november:  novembro
+december:  dezembro
 

data/config/fixtures/ro.yml

@@ -0,0 +1,55 @@
+###########################
+# known keywords for fixtures
+
+
+group:       Grupa
+
+## roll into one (matchday+round) ???
+
+matchday:   Etapa
+round:      Runda
+
+
+stage:    Faza grupelor|Faza eliminatorie
+# e.g.
+#  Group stage
+#  Play off stage|Play-off stage
+#  Knockout stage|Knockout stages
+#  First stage
+#  Second stage
+#  Qualifying rounds
+
+
+
+
+### Knockout rounds
+
+round32:        1/16 de finală
+round16:        Optimi de finală
+quarterfinals:  Sferturi de finală
+semifinals:     Semifinale
+thirdplace:     Meciul pentru locul 3
+final:          Finala
+
+### Pair matches/games if marked with leg1 n leg2
+
+leg1:  Tur     ##  Prima manșă - use too ??
+leg2:  Retur   ##  Manșa secundă  - use too ??
+
+
+#######################
+# months of year
+
+january:   ianuarie
+february:  februarie
+march:     martie
+april:     aprilie
+may:       mai
+june:      iunie
+july:      iulie
+august:    august
+september: septembrie
+october:   octombrie
+november:  noiembrie
+december:  decembrie
+

data/data/seasons.txt

@@ -2,15 +2,40 @@
 # use period for season? why? why not? 
 #   - semantic hairsplitting?  make it an alias? why? why not? who cares?
 
+
+###
+# use 2012-13 or 2012_13  or 2012.13 or 2012+13  why? why not ???
+
+2020/21
+2019/20
+2018/19
+2017/18
+2016/17
+2015/16
 2014/15
 2013/14
-2012/13   # use 2012-13 or 2012_13  or 2012.13 or 2012+13 ???
+2012/13
 2011/12
 2010/11
 2009/10
 2008/09
 2007/08
-2015            # years only
+2006/07
+2005/06
+2004/05
+2003/04
+2002/03
+2001/02
+2000/01
+
+# -- years only -- 
+
+2020
+2019
+2018
+2017
+2016
+2015
 2014
 2013
 2012
@@ -18,11 +43,24 @@
 2010
 2009
 2008
+2007
+2006
+2005
+2004
+2003
+2002
+2001
+2000
+
+
+# e.g. Liga MX has two (complete) seasons in *one* year e.g. Clausura 2013 n Apertura 2013
+### for 2013.1  use 2013_I 2013-I 2013.I n 2013-II 2013.II or 2013.A n 2013.B - why? why not??
+
+2015.1
+2015.2
 2014.1
 2014.2
-2013.1   # e.g. Liga MX has two (complete) seasons in *one* year e.g. Clausura 2013 n Apertura 2013
+2013.1
 2013.2
 2012.1
 2012.2
-
-### for 2013.1  use 2013_I 2013-I 2013.I n 2013-II 2013.II or 2013.A n 2013.B 

data/data/setups/all.txt

@@ -0,0 +1,5 @@
+######################
+# builtin seed data
+
+seasons
+

data/lib/sportdb.rb

@@ -71,6 +71,7 @@ require 'sportdb/utils_record'
 require 'sportdb/utils_round'
 require 'sportdb/utils_scores'
 require 'sportdb/utils_teams'
+require 'sportdb/matcher'
 require 'sportdb/reader'
 require 'sportdb/lang'
 
@@ -128,7 +129,7 @@ module SportDb
 
   def self.create
     CreateDb.new.up
-    WorldDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
+    ConfDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
   end
 
   def self.read_setup( setup, include_path )

data/lib/sportdb/cli/main.rb

@@ -95,6 +95,8 @@ command [:create] do |c|
     connect_to_db( opts )
     
     LogDb.create
+    ConfDb.create
+    TagDb.create
     WorldDb.create
     SportDb.create
     
@@ -126,6 +128,8 @@ command [:setup,:s] do |c|
     setup = args[0] || 'all'
     
     LogDb.create
+    ConfDb.create
+    TagDb.create
     WorldDb.create
     SportDb.create
 

data/lib/sportdb/lang.rb

@@ -18,12 +18,17 @@ class Lang
     builtin_words = {
       'en' => 'fixtures/en',
       'de' => 'fixtures/de',
-      'es' => 'fixtures/es'
+      'es' => 'fixtures/es',
+      'fr' => 'fixtures/fr',
+      'it' => 'fixtures/it',
+      'pt' => 'fixtures/pt',
+      'ro' => 'fixtures/ro'
     }
 
     load_words( builtin_words, SportDb.config_path )
   end
 
+
   def load_words( h, include_path )
     @lang = 'en'   # make default lang english/en
     @words = {}  # resets fixtures

data/lib/sportdb/matcher.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+module SportDb
+
+module Matcher
+
+  include WorldDb::Matcher
+
+  def match_leagues_for_country( name, &blk )
+    match_xxx_for_country( name, 'leagues', &blk )
+  end
+
+  def match_teams_for_country( name, &blk )
+    match_xxx_for_country( name, 'teams', &blk )
+  end
+
+  def match_tracks_for_country( name, &blk )
+    match_xxx_for_country( name, 'tracks', &blk )
+  end
+
+  def match_skiers_for_country( name, &blk )
+    match_xxx_for_country( name, 'skiers', &blk )
+  end
+
+  def match_stadiums_for_country( name, &blk )
+    match_xxx_for_country( name, 'stadiums', &blk )
+  end
+
+end # module Matcher
+
+end # module SportDb

data/lib/sportdb/models/badge.rb

@@ -1,4 +1,5 @@
-module SportDb::Model
+module SportDb
+  module Model
 
 class Badge < ActiveRecord::Base
 
@@ -9,5 +10,5 @@ class Badge < ActiveRecord::Base
 end  # class Badge
   
 
-end # module SportDb::Model
-
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/event.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-module SportDb::Model
+module SportDb
+  module Model
 
 class Event < ActiveRecord::Base
 
@@ -58,4 +59,5 @@ class Event < ActiveRecord::Base
 
 end # class Event
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/event_ground.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class EventGround < ActiveRecord::Base
@@ -9,4 +11,5 @@ class EventGround < ActiveRecord::Base
 end # class EventGround
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/event_team.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class EventTeam < ActiveRecord::Base
@@ -9,4 +11,6 @@ class EventTeam < ActiveRecord::Base
 end # class EventTeam
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/forward.rb

@@ -2,7 +2,8 @@
 ### forward references
 ##   require first to resolve circular references
 
-module SportDb::Model
+module SportDb
+  module Model
 
   ## todo: why? why not use include WorldDb::Models here???
 
@@ -10,7 +11,8 @@ module SportDb::Model
   Country   = WorldDb::Model::Country
   Region    = WorldDb::Model::Region
   City      = WorldDb::Model::City
-  Prop      = WorldDb::Model::Prop
+
+  Prop      = ConfDb::Model::Prop
 
   ## nb: for now only team and league use worlddb tables
   #   e.g. with belongs_to assoc (country,region)
@@ -19,10 +21,12 @@ module SportDb::Model
   class League < ActiveRecord::Base ; end
   class Ground < ActiveRecord::Base ; end
 
+  end
 end
 
 
-module WorldDb::Model
+module WorldDb
+  module Model
 
   # add alias? why? why not? # is there a better way?
   #  - just include SportDb::Models  - why? why not?
@@ -31,4 +35,6 @@ module WorldDb::Model
   League = SportDb::Model::League
   Ground = SportDb::Model::Ground
 
+  end
 end
+

data/lib/sportdb/models/game.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Game < ActiveRecord::Base
@@ -361,4 +363,5 @@ class Game < ActiveRecord::Base
 end # class Game
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/goal.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Goal < ActiveRecord::Base
@@ -9,4 +11,5 @@ class Goal < ActiveRecord::Base
 end  # class Goal
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/ground.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 class Ground < ActiveRecord::Base
 
@@ -93,4 +95,6 @@ class Ground < ActiveRecord::Base
 
 end # class Ground
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/group.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Group < ActiveRecord::Base
@@ -19,5 +21,5 @@ class Group < ActiveRecord::Base
 end # class Group
   
   
-end # module SportDb::Model
-
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/group_team.rb

@@ -1,4 +1,5 @@
-module SportDb::Model
+module SportDb
+  module Model
 
 
 class GroupTeam < ActiveRecord::Base
@@ -9,5 +10,5 @@ class GroupTeam < ActiveRecord::Base
 end # class GroupTeam
 
 
-end # module SportDb::Model
-
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/league.rb

@@ -1,4 +1,5 @@
-module SportDb::Model
+module SportDb
+  module Model
 
 
 class League < ActiveRecord::Base
@@ -78,4 +79,5 @@ class League < ActiveRecord::Base
 end  # class League
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/person.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Person < ActiveRecord::Base
@@ -62,5 +64,6 @@ class Person < ActiveRecord::Base
 end  # class Person
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
 

data/lib/sportdb/models/race.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Race < ActiveRecord::Base
@@ -13,4 +15,6 @@ class Race < ActiveRecord::Base
 end  # class Race
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/record.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Record < ActiveRecord::Base
@@ -10,4 +12,6 @@ class Record < ActiveRecord::Base
 end  # class Record
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/roster.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 ### use LineUp, Squad for name? - alias??
 
@@ -11,4 +13,6 @@ class Roster < ActiveRecord::Base
 end  # class Roster
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/round.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Round < ActiveRecord::Base
@@ -8,6 +10,8 @@ class Round < ActiveRecord::Base
   
 end # class Round
   
-  
-end # module SportDb::Model
+
+  end # module Model
+end # module SportDb
+
 

data/lib/sportdb/models/run.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Run < ActiveRecord::Base
@@ -8,4 +10,6 @@ class Run < ActiveRecord::Base
 end  # class Run
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/season.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 
 class Season < ActiveRecord::Base
@@ -8,4 +10,5 @@ class Season < ActiveRecord::Base
 end  # class Season
 
 
-end # module SportDb::Model
+  end  # module Model
+end # module SportDb

data/lib/sportdb/models/team.rb

@@ -1,4 +1,6 @@
-module SportDb::Model
+
+module SportDb
+  module Model
 
 ##################
 #  FIX: add ?
@@ -154,4 +156,5 @@ class Team < ActiveRecord::Base
 end  # class Team
   
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/track.rb

@@ -1,4 +1,5 @@
-module SportDb::Model
+module SportDb
+  module Model
 
 class Track < ActiveRecord::Base
 
@@ -55,4 +56,6 @@ class Track < ActiveRecord::Base
 end  # class Track
 
 
-end # module SportDb::Model
+  end # module Model
+end # module SportDb
+

data/lib/sportdb/models/world/city.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 
-module WorldDb::Model
+module WorldDb
+  module Model
 
   class City
     has_many :teams,   class_name: 'SportDb::Model::Team',   foreign_key: 'city_id'
@@ -15,5 +16,6 @@ module WorldDb::Model
     has_many :games,   :through => :grounds
   end
 
-end # module WorldDb::Model
+  end # module Model
+end # module WorldDb
 

data/lib/sportdb/models/world/continent.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-module WorldDb::Model
+module WorldDb
+  module Model
 
   class Continent
     has_many :teams,          :through => :countries
@@ -14,4 +15,6 @@ module WorldDb::Model
     has_many :grounds, :through => :countries
   end # class Continent
 
-end # module WorldDb::Model
+  end # module Model
+end # module WorldDb
+

data/lib/sportdb/models/world/country.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-module WorldDb::Model
+module WorldDb
+  module Model
 
   class Country
     has_many :teams,          class_name: 'SportDb::Model::Team',   foreign_key: 'country_id'
@@ -13,5 +14,5 @@ module WorldDb::Model
     has_many :grounds, class_name: 'SportDb::Model::Ground', foreign_key: 'country_id'
   end # class Country
 
-end # module WorldDb::Model
-
+  end # module Model
+end # module WorldDb

data/lib/sportdb/models/world/region.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 
-module WorldDb::Model
+module WorldDb
+  module Model
 
   class Region
     has_many :teams,          class_name: 'SportDb::Model::Team',   :through => :cities
@@ -13,5 +14,6 @@ module WorldDb::Model
     has_many :grounds, class_name: 'SportDb::Model::Ground', :through => :cities
   end # class Region
 
-end # module WorldDb::Model
+  end # module Model
+end # module WorldDb
 

data/lib/sportdb/reader.rb

@@ -2,33 +2,6 @@
 
 module SportDb
 
-module Matcher
-
-  include WorldDb::Matcher
-
-  def match_leagues_for_country( name, &blk )
-    match_xxx_for_country( name, 'leagues', &blk )
-  end
-
-  def match_teams_for_country( name, &blk )
-    match_xxx_for_country( name, 'teams', &blk )
-  end
-
-  def match_tracks_for_country( name, &blk )
-    match_xxx_for_country( name, 'tracks', &blk )
-  end
-
-  def match_skiers_for_country( name, &blk )
-    match_xxx_for_country( name, 'skiers', &blk )
-  end
-
-  def match_stadiums_for_country( name, &blk )
-    match_xxx_for_country( name, 'stadiums', &blk )
-  end
-
-end # module Matcher
-
-
 class Reader
 
   include LogUtils::Logging
@@ -47,7 +20,15 @@ class Reader
   end
 
   def load_setup( name )
-    path = "#{include_path}/#{name}.yml"
+    path = "#{include_path}/#{name}.txt"
+    
+    ## depcrecated - for now check if "new" format exsits
+    ##  - if not fall back to old format
+    unless File.exists?( path )
+      puts "  deprecated manifest/setup format [SportDb.Reader]; use new plain text format"
+      ## try old yml format
+      path = "#{include_path}/#{name}.yml"
+    end
 
     logger.info "parsing data '#{name}' (#{path})..."
 

data/lib/sportdb/updater.rb

@@ -44,8 +44,8 @@ module SportDb
         [ 'it',      'it-italy' ],
         [ 'be',      'europe', 'be-belgium' ], # NB: europe/be-belgium
         [ 'ro',      'europe', 'ro-romania' ],
-        [ 'cl',      'europe'      ],
-        [ 'el',      'europe'      ],
+        [ 'cl',      'europe-champions-league' ],
+        [ 'el',      'europe-champions-league' ],
         [ 'br',      'br-brazil' ],
         [ 'mx',      'mx-mexico' ],  # todo: add mx.* for clausura etc ??
         [ 'euro',    'euro-cup',   ],

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.6'
+  VERSION = '1.8.7'
 end
 
 

data/test/helper.rb

@@ -19,6 +19,8 @@ require 'active_record'
 require 'worlddb'
 require 'logutils'
 require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
+require 'props/db'   ## fix: use textutils/db in the future too ??
+
 
 ## our own code
 
@@ -54,8 +56,12 @@ def setup_in_memory_db
   ## build schema
 
   LogDb.create
+  ConfDb.create
+  TagDb.create
   WorldDb.create
   SportDb.create
+
+  SportDb.read_builtin
 end
 
 ####

metadata

@@ -1,82 +1,166 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.6
-  prerelease: 
+  version: 1.8.7
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: props
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: textutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &20428068 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *20428068
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: tagutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &20427156 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *20427156
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &20426016 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *20426016
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20424108 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20424108
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20455920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *20455920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -84,9 +168,12 @@ files:
 - config/fixtures/de.yml
 - config/fixtures/en.yml
 - config/fixtures/es.yml
+- config/fixtures/fr.yml
+- config/fixtures/it.yml
 - config/fixtures/pt.yml
+- config/fixtures/ro.yml
 - data/seasons.txt
-- data/setups/all.yml
+- data/setups/all.txt
 - lib/sportdb.rb
 - lib/sportdb/cli/main.rb
 - lib/sportdb/cli/opts.rb
@@ -95,6 +182,7 @@ files:
 - lib/sportdb/data/models.rb
 - lib/sportdb/deleter.rb
 - lib/sportdb/lang.rb
+- lib/sportdb/matcher.rb
 - lib/sportdb/models/badge.rb
 - lib/sportdb/models/event.rb
 - lib/sportdb/models/event_ground.rb
@@ -176,6 +264,7 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -193,22 +282,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sportdb
-rubygems_version: 1.8.16
+rubyforge_project: 
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: sportdb - sport.db command line tool
 test_files:
 - test/test_changes.rb

data/data/setups/all.yml

@@ -1,5 +0,0 @@
-############################
-#  builtin seed data
-
-data:
-- seasons