sportdb 0.9.2 → 0.9.3

data/Manifest.txt

@@ -1,58 +1,58 @@
-History.markdown
+History.md
 Manifest.txt
-README.markdown
+README.md
 Rakefile
 bin/sportdb
-db/america/2011.rb
-db/america/2011.txt
-db/america/2011.yml
-db/america/teams.txt
-db/at/2011_12/bl.rb
-db/at/2011_12/bl.txt
-db/at/2011_12/cup.rb
-db/at/2012_13/bl.rb
-db/at/2012_13/bl.txt
-db/at/2012_13/cup.rb
-db/at/2012_13/cup.txt
-db/at/badges.rb
-db/at/teams.txt
-db/cl/2011_12/cl.rb
-db/cl/2011_12/el.rb
-db/cl/2012_13/cl.rb
-db/cl/badges.rb
-db/cl/teams.txt
-db/copa/sud_2012_13.rb
-db/copa/sud_2012_13.txt
-db/copa/teams.txt
-db/de/2012_13/bl.rb
-db/de/2012_13/bl.txt
-db/de/teams.txt
-db/en/2012_13/pl.rb
-db/en/2012_13/pl.txt
-db/en/teams.txt
-db/es/teams.txt
-db/euro/2008.rb
-db/euro/2008.txt
-db/euro/2012.rb
-db/euro/2012.txt
-db/euro/teams.txt
-db/leagues.rb
-db/mx/apertura_2012.rb
-db/mx/apertura_2012.txt
-db/mx/teams.txt
-db/nfl/teams.rb
-db/nhl/teams.txt
-db/ro/l1_2012_13.rb
-db/ro/teams.txt
-db/seasons.rb
-db/world/2010.rb
-db/world/2010.txt
-db/world/quali_2012_13_america.rb
-db/world/quali_2012_13_america.txt
-db/world/quali_2012_13_europe.rb
-db/world/quali_2012_13_europe_c.txt
-db/world/quali_2012_13_europe_i.txt
-db/world/teams.txt
+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
 lib/sportdb.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/cli/runner.rb

data/Rakefile

@@ -1,6 +1,15 @@
 require 'hoe'
 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
   
   self.version = SportDB::VERSION
@@ -8,21 +17,28 @@ Hoe.spec 'sportdb' do
   self.summary = 'sportdb - sport.db command line tool'
   self.description = summary
 
-  self.urls    = ['http://geraldb.github.com/sport.db']
+  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
-  self.readme_file  = 'README.markdown'
-  self.history_file = 'History.markdown'
+  #  -- NB: auto-changed when included in manifest
+  # self.readme_file  = 'README.md'
+  # self.history_file = 'History.md'
   
   self.extra_deps = [
     ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
-    ['worlddb', '~> 0.5.0']
+    ['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.post_install_message =<<EOS
 ******************************************************************************
 

data/{db → data}/at/2012_13/bl.txt

@@ -126,35 +126,35 @@
 
 16. Runde  -  Sa 17. Nov 2012
 
-17.11. 16:00  RB Salzburg      -     FC Wacker
-17.11. 16:00  FK Austria Wien      -     Wiener Neustadt
-17.11. 16:00  SV Mattersburg      -     SK Rapid Wien
-17.11. 16:00  SK Sturm Graz      -     SV Ried
-17.11. 16:00  Wolfsberger AC      -     Admira Wacker
+17.11. 16:00  RB Salzburg      2:0     FC Wacker
+17.11. 16:00  FK Austria Wien      3:0     Wiener Neustadt
+17.11. 16:00  SV Mattersburg      0:3     SK Rapid Wien
+17.11. 16:00  SK Sturm Graz      3:1     SV Ried
+17.11. 16:00  Wolfsberger AC      1:1     Admira Wacker
 
 17. Runde  -  Sa 24. Nov 2012
 
-24.11. 16:00  FC Wacker      -     SK Sturm Graz
-24.11. 16:00  Admira Wacker      -     SK Rapid Wien
-24.11. 16:00  FK Austria Wien      -     SV Mattersburg
-24.11. 16:00  SV Ried      -     RB Salzburg
-24.11. 16:00  Wiener Neustadt      -     Wolfsberger AC
+24.11. 16:00  FC Wacker      0:3     SK Sturm Graz
+24.11. 16:00  Admira Wacker      0:2     SK Rapid Wien
+24.11. 16:00  FK Austria Wien      3:1     SV Mattersburg
+24.11. 16:00  SV Ried      3:1     RB Salzburg
+24.11. 16:00  Wiener Neustadt      2:1     Wolfsberger AC
 
 18. Runde  -  Sa 1. Dez 2012
 
-01.12. 16:00  SK Sturm Graz      -     Wiener Neustadt
-01.12. 16:00  SK Rapid Wien      -     SV Ried
-01.12. 16:00  RB Salzburg      -     FK Austria Wien
-01.12. 16:00  SV Mattersburg      -     Admira Wacker
-01.12. 16:00  Wolfsberger AC      -     FC Wacker
+01.12. 16:00  SK Sturm Graz      3:1     Wiener Neustadt
+01.12. 16:00  SK Rapid Wien      4:3     SV Ried
+01.12. 16:00  RB Salzburg      0:0     FK Austria Wien
+01.12. 16:00  SV Mattersburg      3:0     Admira Wacker
+01.12. 16:00  Wolfsberger AC      2:2     FC Wacker
 
 19. Runde  -  Sa 8. Dez 2012
 
-08.12. 16:00  SV Mattersburg      -     Wiener Neustadt
-08.12. 16:00  Admira Wacker      -     SV Ried
-08.12. 16:00  SK Rapid Wien      -     FC Wacker
-08.12. 16:00  SK Sturm Graz      -     RB Salzburg
-08.12. 16:00  Wolfsberger AC      -     FK Austria Wien
+08.12. 16:00  SV Mattersburg      1:0     Wiener Neustadt
+08.12. 16:00  Admira Wacker      0:3     SV Ried
+08.12. 16:00  SK Rapid Wien      2:1     FC Wacker
+08.12. 16:00  SK Sturm Graz      1:1     RB Salzburg
+08.12. 16:00  Wolfsberger AC      3:6     FK Austria Wien
 
 20. Runde  -  Sa 15. Dez 2012
 
@@ -165,3 +165,34 @@
 15.12. 16:00  SV Ried      -     Wolfsberger AC
 
 
+21. Runde  - Sa 16. Feb 2013
+
+2013-02-16 12:00  SV Ried  -  FC Wacker Innsbruck
+2013-02-16 12:00  Rapid Wien  -  Austria Wien
+2013-02-16 12:00  SV Mattersburg  -  Sturm Graz
+2013-02-16 12:00  Wolfsberger AC  -  RB Salzburg
+2013-02-16 12:00  FC Admira Wacker  -  SC Wiener Neustadt
+
+22. Runde - Sa 23. Feb 2013
+
+2013-02-23 12:00  SC Wiener Neustadt  -  SV Ried
+2013-02-23 12:00  Sturm Graz  -  Wolfsberger AC
+2013-02-23 12:00  RB Salzburg  -  Rapid Wien
+2013-02-23 12:00  Austria Wien  -  FC Admira Wacker
+2013-02-23 12:00  FC Wacker Innsbruck  -  SV Mattersburg
+
+23. Runde - Di 26. Feb 2013
+
+2013-02-26 12:00  SV Ried  -  Austria Wien
+2013-02-26 12:00  Rapid Wien  -  Sturm Graz
+2013-02-26 12:00  FC Wacker Innsbruck  -  SC Wiener Neustadt
+2013-02-26 12:00  Wolfsberger AC  -  SV Mattersburg
+2013-02-26 12:00  FC Admira Wacker  -  RB Salzburg
+
+24. Runde - Sa 02. Mar 2013
+
+2013-03-02 12:00  Sturm Graz  -  FC Admira Wacker
+2013-03-02 12:00  RB Salzburg  -  SC Wiener Neustadt
+2013-03-02 12:00  Austria Wien  -  FC Wacker Innsbruck
+2013-03-02 12:00  SV Mattersburg  -  SV Ried
+2013-03-02 12:00  Wolfsberger AC  -  Rapid Wien

data/{db → data}/cl/2012_13/cl.rb

@@ -191,13 +191,13 @@ cl1    = Round.create!( event: cl, pos: 13, title: 'Finale',                   s
 
 games_cla = [
   [[ 1, zagreb, [0,2], porto,  Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 2, porto,  [], zagreb, Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 2, porto,  [3,0], zagreb, Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 2, paris,  [4,1], kiew,   Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 1, kiew,   [], paris,  Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 1, kiew,   [0,2], paris,  Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 1, kiew,   [2,0], zagreb, Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 2, zagreb, [], kiew,   Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 2, zagreb, [1,1], kiew,   Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 2, porto,  [1,0], paris,  Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 1, paris,  [], porto,  Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 1, paris,  [2,1], porto,  Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 1, porto,  [3,2], kiew,   Time.cet('2012-10-24 20:45'), clr3 ],
    [ 1, kiew,   [0,0], porto,  Time.cet('2012-11-06 20:45'), clr4 ]],
   [[ 2, zagreb, [0,2], paris,  Time.cet('2012-10-24 20:45'), clr3 ],
@@ -206,13 +206,13 @@ games_cla = [
 
 games_clb = [
   [[ 3, montpellier, [1,2], arsenal,     Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 4, arsenal,     [], montpellier, Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 4, arsenal,     [2,0], montpellier, Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 4, olympiacos,  [1,2], schalke,     Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 3, schalke,     [], olympiacos,  Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 3, schalke,     [1,0], olympiacos,  Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 3, arsenal,     [3,1], olympiacos,  Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 3, olympiacos,  [], arsenal,     Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 3, olympiacos,  [2,1], arsenal,     Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 4, schalke,     [2,2], montpellier, Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 4, montpellier, [], schalke,     Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 4, montpellier, [1,1], schalke,     Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 3, arsenal,     [0,2], schalke,     Time.cet('2012-10-24 20:45'), clr3 ],
    [ 3, schalke,     [2,2], arsenal,     Time.cet('2012-11-06 20:45'), clr4 ]],
   [[ 4, montpellier, [1,2], olympiacos,  Time.cet('2012-10-24 20:45'), clr3 ],
@@ -221,13 +221,13 @@ games_clb = [
 
 games_clc = [
   [[ 5, malaga,     [3,0], zenit,      Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 5, zenit,      [], malaga,     Time.cet('2012-11-21 18:00'), clr5 ]],
+   [ 5, zenit,      [2,2], malaga,     Time.cet('2012-11-21 18:00'), clr5 ]],
   [[ 6, milan,      [0,0], anderlecht, Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 6, anderlecht, [], milan,      Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 6, anderlecht, [1,3], milan,      Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 5, zenit,      [2,3], milan,      Time.cet('2012-10-03 18:00'), clr2 ],
-   [ 5, milan,      [], zenit,      Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 5, milan,      [0,1], zenit,      Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 6, anderlecht, [0,3], malaga,     Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 6, malaga,     [], anderlecht, Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 6, malaga,     [2,2], anderlecht, Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 5, zenit,      [1,0], anderlecht, Time.cet('2012-10-24 18:00'), clr3 ],
    [ 5, anderlecht, [1,0], zenit,      Time.cet('2012-11-06 20:45'), clr4 ]],
   [[ 6, malaga,     [1,0], milan,      Time.cet('2012-10-24 20:45'), clr3 ],
@@ -236,13 +236,13 @@ games_clc = [
 
 games_cld = [
   [[ 7, madrid,   [3,2], mancity,  Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 7, mancity,  [], madrid,   Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 7, mancity,  [1,1], madrid,   Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 8, dortmund, [1,0], ajax,     Time.cet('2012-09-18 20:45'), clr1 ],
-   [ 8, ajax,     [], dortmund, Time.cet('2012-11-21 20:45'), clr5 ]],
+   [ 8, ajax,     [1,4], dortmund, Time.cet('2012-11-21 20:45'), clr5 ]],
   [[ 7, ajax,     [1,4], madrid,   Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 8, madrid,   [], ajax,     Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 8, madrid,   [4,1], ajax,     Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 8, mancity,  [1,1], dortmund, Time.cet('2012-10-03 20:45'), clr2 ],
-   [ 7, dortmund, [], mancity,  Time.cet('2012-12-04 20:45'), clr6 ]],
+   [ 7, dortmund, [1,0], mancity,  Time.cet('2012-12-04 20:45'), clr6 ]],
   [[ 7, dortmund, [2,1], madrid,   Time.cet('2012-10-24 20:45'), clr3 ],
    [ 8, madrid,   [2,2], dortmund, Time.cet('2012-11-06 20:45'), clr4 ]],
   [[ 8, ajax,     [3,1], mancity,  Time.cet('2012-10-24 20:45'), clr3 ],
@@ -252,13 +252,13 @@ games_cld = [
 
 games_cle = [
   [[ 9,  chelsea,      [2,2], juventus,     Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 9,  juventus,     [], chelsea,      Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 9,  juventus,     [3,0], chelsea,      Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 10, donezk,       [2,0], nordsjalland, Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 10, nordsjalland, [], donezk,       Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 10, nordsjalland, [2,5], donezk,       Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 9,  nordsjalland, [0,4], chelsea,      Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 9,  chelsea,      [], nordsjalland, Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 9,  chelsea,      [6,1], nordsjalland, Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 10, juventus,     [1,1], donezk,       Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 10, donezk,       [], juventus,     Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 10, donezk,       [0,1], juventus,     Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 9,  donezk,       [2,1], chelsea,      Time.cet('2012-10-23 20:45'), clr3 ],
    [ 9,  chelsea,      [3,2], donezk,       Time.cet('2012-11-07 20:45'), clr4 ]],
   [[ 10, nordsjalland, [1,1], juventus,     Time.cet('2012-10-23 20:45'), clr3 ],
@@ -267,13 +267,13 @@ games_cle = [
 
 games_clf = [
   [[ 11, bayern,   [2,1], valencia, Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 11, valencia, [], bayern,   Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 11, valencia, [1,1], bayern,   Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 12, lille,    [1,3], borissow, Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 12, borissow, [], lille,    Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 12, borissow, [0,2], lille,    Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 11, borissow, [3,1], bayern,   Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 12, bayern,   [], borissow, Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 12, bayern,   [4,1], borissow, Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 12, valencia, [2,0], lille,    Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 11, lille,    [], valencia, Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 11, lille,    [0,1], valencia, Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 11, lille,    [0,1], bayern,   Time.cet('2012-10-23 20:45'), clr3 ],
    [ 11, bayern,   [6,1], lille,    Time.cet('2012-11-07 20:45'), clr4 ]],
   [[ 12, borissow, [0,3], valencia, Time.cet('2012-10-23 20:45'), clr3 ],
@@ -282,13 +282,13 @@ games_clf = [
 
 games_clg = [
   [[ 13, celtic,    [0,0], benfica,   Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 14, benfica,   [], celtic,    Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 14, benfica,   [2,1], celtic,    Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 14, barcelona, [3,2], spartak,   Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 13, spartak,   [], barcelona, Time.cet('2012-11-20 18:00'), clr5 ]],
+   [ 13, spartak,   [0,3], barcelona, Time.cet('2012-11-20 18:00'), clr5 ]],
   [[ 13, spartak,   [2,3], celtic,    Time.cet('2012-10-02 18:00'), clr2 ],
-   [ 14, celtic,    [], spartak,   Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 14, celtic,    [2,1], spartak,   Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 14, benfica,   [0,2], barcelona, Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 13, barcelona, [], benfica,   Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 13, barcelona, [0,0], benfica,   Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 13, spartak,   [2,1], benfica,   Time.cet('2012-10-23 18:00'), clr3 ],
    [ 14, benfica,   [2,0], spartak,   Time.cet('2012-11-07 20:45'), clr4 ]],
   [[ 14, barcelona, [2,1], celtic,    Time.cet('2012-10-23 20:45'), clr3 ],
@@ -297,13 +297,13 @@ games_clg = [
 
 games_clh = [
   [[ 15, manunited,   [1,0], galatasaray, Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 15, galatasaray, [], manunited,   Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 15, galatasaray, [1,0], manunited,   Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 16, braga,       [0,2], cluj,        Time.cet('2012-09-19 20:45'), clr1 ],
-   [ 16, cluj,        [], braga,       Time.cet('2012-11-20 20:45'), clr5 ]],
+   [ 16, cluj,        [3,1], braga,       Time.cet('2012-11-20 20:45'), clr5 ]],
   [[ 15, cluj,        [1,2], manunited,   Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 16, manunited,   [], cluj,        Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 16, manunited,   [0,1], cluj,        Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 16, galatasaray, [0,2], braga,       Time.cet('2012-10-02 20:45'), clr2 ],
-   [ 15, braga,       [], galatasaray, Time.cet('2012-12-05 20:45'), clr6 ]],
+   [ 15, braga,       [1,2], galatasaray, Time.cet('2012-12-05 20:45'), clr6 ]],
   [[ 15, manunited,   [3,2], braga,       Time.cet('2012-10-23 20:45'), clr3 ],
    [ 15, braga,       [1,3], manunited,   Time.cet('2012-11-07 20:45'), clr4 ]],
   [[ 16, galatasaray, [1,1], cluj,        Time.cet('2012-10-23 20:45'), clr3 ],

data/data/nfl/teams.txt

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+######################################
+## NFL Teams 2012
+
+
+nyjets,       New York Jets|Jets,                    AFC East,  NYJ, city:newyork
+newengland,   New England Patriots|New England|Patriots, AFC East,  NE_, city:boston
+bufbills,      Buffalo Bills|Buffalo|Bills,            AFC East,  BUF, city:buffalo
+miami,        Miami Dolphins|Miami|Dolphins,             AFC East,  MIA, city:miami
+
+baltimore,    Baltimore Ravens|Ravens,    AFC North,  BAL,  city:baltimore
+cincinnati,   Cincinnati Bengals|Bengals,  AFC North,  CIN,  city:cincinnati
+steelers,     Pittsburgh Steelers|Steelers, AFC North,  PIT,  city:pittsburgh
+cleveland,    Cleveland Browns|Browns,    AFC North,  CLE,  city:cleveland
+
+houston,      Houston Texans|Texans,       AFC South,  HOU,  city:houston
+indianapolis, Indianapolis Colts|Colts,   AFC South,  IND,  city:indianapolis
+tennessee,    Tennessee Titans|Titans,     AFC South,  TEN,  city:nashville
+jacksonville, Jacksonville Jaguars|Jaguars, AFC South,  JAC,  city:jacksonville
+
+sandiego,     San Diego Chargers|San Diego|Chargers,       AFC West, SD_,  city:sandiego
+denver,       Denver Broncos|Denver|Broncos,              AFC West, DEN,  city:denver
+oakland,      Oakland Raiders|Oakland|Raiders,           AFC West, OAK,   city:oakland
+kansascity,   Kansas City Chiefs|Kansas City|Chiefs, AFC West,  KC_, city:kansascity
+
+nygiants,     New York Giants|Giants,      NFC East, NYG, city:newyork
+phieagles, Philadelphia Eagles|Eagles,  NFC East, PHI, city:philadelphia
+dalcowboys,       Dallas Cowboys|Cowboys,       NFC East, DAL, city:dallas
+washington,   Washington Redskins|Redskins,  NFC East, WAS, city:washington
+
+chibears,      Chicago Bears|Bears,     NFC North,  CHI, city:chicago
+greenbay,     Green Bay Packers|Packers, NFC North,  GB_, city:greenbay
+minnesota,    Minnesota Vikings|Vikings, NFC North,  MIN, city:minneapolis
+detlions,      Detroit Lions|Lions,     NFC North,  DET, city:detroit
+
+
+atlanta,      Atlanta Falcons|Falcons,       NFC South, ATL, city:atlanta
+tbbuccaneers,     Tampa Bay Buccaneers|Buccaneers,  NFC South, TB_, city:tampa
+neworleans,   New Orleans Saints|Saints,    NFC South, NO_, city:neworleans
+carpnathers,     Carolina Panthers|Panthers,     NFC South, CAR, city:charlotte
+
+sf49ers, San Francisco 49ers|49ers,  NFC West,  SF_,  city:sanfrancisco
+seattle,      Seattle Seahawks|Seahawks,     NFC West,  SEA,  city:seattle
+arizona,      Arizona Cardinals|Cardinals,    NFC West,  ARI,  city:phoenix
+stlrams,      St. Louis Rams|Rams,       NFC West,  STL,  city:stlouis

data/data/nhl/teams.txt

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+######################################
+## NHL  Teams 2012
+
+njdevils,     New Jersey Devils,   East/Atlantic, NJD, us, city:newark
+nyislanders,  New York Islanders,  East/Atlantic, NYI, us, city:newyork
+nyrangers,    New York Rangers,    East/Atlantic, NYR, us, city:newyork
+phiflyers,    Philadelphia Flyers, East/Atlantic, PHI, us, city:philadelphia
+pitpenguins,  Pittsburgh Penguins, East/Atlantic, PIT, us, city:pittsburgh
+
+bosbruis,   Boston Bruis,        East/Northeast, BOS, us, city:boston
+bufabres,  Buffalo Sabres,      East/Northeast, BUF, us, city:buffalo
+montreal, Montreal Canadiens,  East/Northeast, MTL, ca, city:montreal
+ottawa,   Ottawa Senators,     East/Northeast, OTT, ca, city:ottawa
+toronto,  Toronto Maple Leafs, East/Northeast, TOR, ca, city:toronto
+
+carhurricanes, Carolina Hurricanes,   East/Southeast, CAR, us, city:raleigh
+florida,   Florida Panthers,     East/Southeast, FLA, us, city:miami
+tblightning,  Tampa Bay Lightning,  East/Southeast, TBL, us, city:tampa
+wshcapitals, Washington Capitals, East/Southeast, WSH, us, city:washington
+winnipeg,   Winnipeg Jets,       East/Southeast, WPG, ca, city:winnipeg
+
+chiblackhawks,   Chicago Blackhawks,    West/Central, CHI, us, city:chicago
+columbus,  Columbus Blue Jackets, West/Central, CLB, us, city:columbus
+detredwings,   Detroit Red Wings,     West/Central, DET, us, city:detroit
+nshpredators,  Nashville Predators,  West/Central, NSH, us, city:nashville
+stlblues,    St. Louis Blues,      West/Central, STL, us, city:stlouis
+
+calgary,     Calgary Flames,     West/Northwest, CGY, ca, city:calgary
+colavalanche,    Colorado Avalanche, West/Northwest, COL, us, city:denver
+edmonton,    Edmonton Oilers,    West/Northwest, EDM, ca, city:edmonton
+minwild,   Minnesota Wild,     West/Northwest, MIN, us, city:stpaul
+vancouver,    Vancouver Canucks, West/Northwest, VAN, ca, city:vancouver
+
+anaheim,        Anaheim Ducks,     West/Pacific, ANA,  us,  city:anaheim
+dalstars,       Dallas Stars,      West/Pacific, DAL,  us, city:dallas
+loskings,       Los Angeles Kings, West/Pacific, LOS,  us, city:losangeles
+phxcoyotes,      Phoenix Coyotes,   West/Pacific, PHX,  us, city:phoenix
+sjsharks,      San Jose Sharks,   West/Pacific, SHS,  us, city:sanjose

data/lib/sportdb/reader.rb

@@ -2,6 +2,51 @@
 
 module SportDB
 
+
+##
+## fix/todo: move to/merge into LineReader itself
+
+class StringLineReader
+
+  def initialize( logger=nil, data )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+    
+    @data = data
+  end
+
+  attr_reader :logger
+
+
+  def each_line
+    @data.each_line do |line|
+  
+      if line =~ /^\s*#/
+        # skip komments and do NOT copy to result (keep comments secret!)
+        logger.debug 'skipping comment line'
+        next
+      end
+        
+      if line =~ /^\s*$/ 
+        # kommentar oder leerzeile überspringen 
+        logger.debug 'skipping blank line'
+        next
+      end
+
+      # remove leading and trailing whitespace
+      line = line.strip
+ 
+      yield( line )
+    end # each lines
+  end # method each_line
+
+end
+
+
 class Reader
 
 ## make models available in sportdb module by default with namespace
@@ -35,6 +80,17 @@ class Reader
   end
 
 
+  def load_fixtures_from_string( event_key, text )  # load from string (e.g. passed in via web form)
+
+    ## todo/fix: move code into LineReader e.g. use LineReader.fromString() - why? why not?
+    reader = StringLineReader.new( logger, text )
+    
+    load_fixtures_worker( event_key, reader )
+
+    ## fix add prop 
+    ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )  
+  end
+
   def load_fixtures_with_include_path( event_key, name, include_path )  # load from file system
     path = "#{include_path}/#{name}.txt"
 

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-21 00:00:00 Z
+date: 2012-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 23
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
+        - 6
+        - 8
+        version: 0.6.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id004
 description: sportdb - sport.db command line tool
@@ -86,88 +86,62 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
-- db/america/2011.txt
-- db/america/teams.txt
-- db/at/2011_12/bl.txt
-- db/at/2012_13/bl.txt
-- db/at/2012_13/cup.txt
-- db/at/teams.txt
-- db/cl/teams.txt
-- db/copa/sud_2012_13.txt
-- db/copa/teams.txt
-- db/de/2012_13/bl.txt
-- db/de/teams.txt
-- db/en/2012_13/pl.txt
-- db/en/teams.txt
-- db/es/teams.txt
-- db/euro/2008.txt
-- db/euro/2012.txt
-- db/euro/teams.txt
-- db/mx/apertura_2012.txt
-- db/mx/teams.txt
-- db/nhl/teams.txt
-- db/ro/teams.txt
-- db/world/2010.txt
-- db/world/quali_2012_13_america.txt
-- db/world/quali_2012_13_europe_c.txt
-- db/world/quali_2012_13_europe_i.txt
-- db/world/teams.txt
 files: 
-- History.markdown
+- History.md
 - Manifest.txt
-- README.markdown
+- README.md
 - Rakefile
 - bin/sportdb
-- db/america/2011.rb
-- db/america/2011.txt
-- db/america/2011.yml
-- db/america/teams.txt
-- db/at/2011_12/bl.rb
-- db/at/2011_12/bl.txt
-- db/at/2011_12/cup.rb
-- db/at/2012_13/bl.rb
-- db/at/2012_13/bl.txt
-- db/at/2012_13/cup.rb
-- db/at/2012_13/cup.txt
-- db/at/badges.rb
-- db/at/teams.txt
-- db/cl/2011_12/cl.rb
-- db/cl/2011_12/el.rb
-- db/cl/2012_13/cl.rb
-- db/cl/badges.rb
-- db/cl/teams.txt
-- db/copa/sud_2012_13.rb
-- db/copa/sud_2012_13.txt
-- db/copa/teams.txt
-- db/de/2012_13/bl.rb
-- db/de/2012_13/bl.txt
-- db/de/teams.txt
-- db/en/2012_13/pl.rb
-- db/en/2012_13/pl.txt
-- db/en/teams.txt
-- db/es/teams.txt
-- db/euro/2008.rb
-- db/euro/2008.txt
-- db/euro/2012.rb
-- db/euro/2012.txt
-- db/euro/teams.txt
-- db/leagues.rb
-- db/mx/apertura_2012.rb
-- db/mx/apertura_2012.txt
-- db/mx/teams.txt
-- db/nfl/teams.rb
-- db/nhl/teams.txt
-- db/ro/l1_2012_13.rb
-- db/ro/teams.txt
-- db/seasons.rb
-- db/world/2010.rb
-- db/world/2010.txt
-- db/world/quali_2012_13_america.rb
-- db/world/quali_2012_13_america.txt
-- db/world/quali_2012_13_europe.rb
-- db/world/quali_2012_13_europe_c.txt
-- db/world/quali_2012_13_europe_i.txt
-- db/world/teams.txt
+- 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
 - lib/sportdb.rb
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/cli/runner.rb
@@ -195,9 +169,9 @@ files:
 - lib/sportdb/utils.rb
 - lib/sportdb/version.rb
 - templates/fixtures.rb.erb
-homepage: http://geraldb.github.com/sport.db
-licenses: []
-
+homepage: https://github.com/geraldb/sport.db.ruby
+licenses: 
+- Public Domain
 post_install_message: |
   ******************************************************************************
   
@@ -208,7 +182,7 @@ post_install_message: |
 
 rdoc_options: 
 - --main
-- README.markdown
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -216,10 +190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 55
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 9
+      - 2
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/db/nfl/teams.rb

@@ -1,58 +0,0 @@
-# encoding: utf-8
-
-######################################
-## NFL Teams 2012
-
-
-## todo: add "official" three letter tags
-
-teams = [
- ['nyjets',     'New York Jets',                    'AFC East'],
- ['newengland', 'New England Patriots|New England', 'AFC East'],
- ['buffalo',    'Buffalo Bills|Buffalo',            'AFC East'],
- ['miami',      'Miami Dolphins|Miami',             'AFC East'],
-
- ['', 'Baltimore Ravens',    'AFC North'],
- ['', 'Cincinnati Bengals',  'AFC North'],
- ['', 'Pittsburgh Steelers', 'AFC North'],
- ['', 'Cleveland Browns',    'AFC North'],
-
- ['', 'Houston Texans',       'AFC South'],
- ['', 'Indianapolis Colts',   'AFC South'],
- ['', 'Tennessee Titans',     'AFC South'],
- ['', 'Jacksonville Jaguars', 'AFC South'],
-
- ['sandiego', 'San Diego Chargers|San Diego',     'AFC West'],
- ['denver', 'Denver Broncos|Denver',              'AFC West'],
- ['oakland', 'Oakland Raiders|Oakland',           'AFC West'],
- ['kansascity', 'Kansas City Chiefs|Kansas City', 'AFC West'],
-
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
-
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
-
-
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
-
-
- ['', '', ''],
- ['', '', ''],
- ['', '', ''],
- ['', '', '']]
-
-
-us = Country.find_by_key!( 'us' )
-
-Team.create_from_ary!( teams, club: true, country: us )
-
-## The End
-#################

data/db/nhl/teams.txt

@@ -1,40 +0,0 @@
-# encoding: utf-8
-
-######################################
-## NHL  Teams 2012
-
-newjersey,    New Jersey Devils,   East/Atlantic, us
-nyislanders,  New York Islanders,  East/Atlantic, us, city:newyork
-nyrangers,    New York Rangers,    East/Atlantic, us, city:newyork
-philadelphia, Philadelphia Flyers, East/Atlantic, us, city:philadelphia
-pittsburgh,   Pittsburgh Penguins, East/Atlantic, us, city:pittsburgh
-
-boston,   Boston Bruis,        East/Northeast, us, city:boston
-buffalo,  Buffalo Sabres,      East/Northeast, us, city:buffalo
-montreal, Montreal Canadiens,  East/Northeast, ca, city:montreal
-ottawa,   Ottawa Senators,     East/Northeast, ca, city:ottawa
-toronto,  Toronto Maple Leafs, East/Northeast, ca, city:toronto
-
-carolina, Carolina Hurricanes,   East/Southeast, us
-florida,   Florida Panthers,     East/Southeast, us
-tampabay,  Tampa Bay Lightning,  East/Southeast, us
-washington, Washington Capitals, East/Southeast, us, city:washington
-winnipeg,   Winnipeg Jets,       East/Southeast, ca, city:winnipeg
-
-chicago,   Chicago Blackhawks,    West/Central, us, city:chicago
-columbus,  Columbus Blue Jackets, West/Central, us, city:columbus
-detroit,   Detroit Red Wings,     West/Central, us, city:detroit
-nashville,  Nashville Predators,  West/Central, us, city:nashville
-stlouis,    St. Louis Blues,      West/Central, us, city:stlouis
-
-calgary,     Calgary Flames,     West/Northwest, ca, city:calgary
-colorado,    Colorado Avalanche, West/Northwest, us
-edmonton,    Edmonton Oilers,    West/Northwest, ca, city:edmonton
-minnesota,   Minnesota Wild,     West/Northwest, us
-vancouver,    Vancouver Canucks, West/Northwest, ca, city:vancouver
-
-anaheim,      Anaheim Ducks,     West/Pacific, us, city:anaheim
-dallas,       Dallas Stars,      West/Pacific, us, city:dallas
-losangeles,   Los Angeles Kings, West/Pacific, us, city:losangeles
-phoenix,      Phoenix Coyotes,   West/Pacific, us, city:phoenix
-sanjose,      San Jose Sharks,   West/Pacific, us, city:sanjose