sportdb-writers 0.1.0 → 0.1.2

data/lib/sportdb/writers/github_config.rb

@@ -0,0 +1,97 @@
+
+module SportDb
+class GitHubConfig
+
+  ## map leagues to repo+path
+  ##  e.g.   fr.1   => europe/france
+  ##         eng..1 => england
+  ##
+  ##  for other than openfootball (default)
+  ## use @
+  ##   e.g.    myorg@austria
+  ##           austria@myorg ??
+  ##
+  ##           myorg@europe/france
+  ##            europe/france@myorg
+
+
+def self.read( path )
+    recs = read_csv( path )
+    new( recs )
+end
+
+def initialize( recs=nil )
+    @table = {}
+    add( recs )  if recs
+end
+
+
+def add( recs )
+  recs.each do |rec|
+    path = rec['path']  ## use pathspec - why? why not?
+                        ##  or repospec or such
+
+    ## auto-expand to openfootball as default org if no @ specified
+    owner, path = if path.index( '@')
+                      path.split( '@', 2 )
+                  else
+                      ['openfootball', path ]
+                  end
+    name, path = path.split( '/', 2 )
+
+
+    ## openfootball@europe/france
+    ##    =>
+    ##    owner: openfootball
+    ##    name:  europe
+    ##    path:  france
+    ##
+    ## openfootball@austria
+    ##    =>
+    ##    owner: openfootball
+    ##    name:  austria
+    ##    path:  nil
+    @table[ rec['key'] ] = {  'owner' => owner, ## (required)
+                              'name'  => name,  ## (required)
+                              'path'  => path   ## extra/inner/inside/local path (optional)
+                            }
+  end
+end
+
+
+##
+## todo/fix:
+##   make key lookup more flexible
+##    auto-add more variants!!!
+##       e.g. at.1  AT1, AT or such
+##
+
+## find (full) record by key
+def find( key )
+  key = key.to_s.downcase
+
+  ## first check for 1:1 match
+  rec = @table[key]
+  if rec.nil?
+     ## try match by (country / first) code
+     ##   split by .
+     key, _ = key.split( '.' )
+     rec = @table[key]
+  end
+
+  rec
+end
+alias_method :[], :find  ## keep alias - why? why not?
+
+
+def find_repo( key )
+   rec = _find( key )
+
+   rec ? "#{rec['owner']}/#{rec['name']}" : nil
+end
+
+end # class GitHubConfig
+end # module SportDb
+
+
+

data/lib/sportdb/writers/league_config.rb

@@ -0,0 +1,83 @@
+
+module SportDb
+class LeagueConfig
+
+def self.read( path )
+   recs = read_csv( path )
+   new( recs )
+end
+
+def initialize( recs=nil )
+   @table = {}
+   add( recs )  if recs
+end
+
+
+class LeagueItem
+    def initialize
+       @recs = []
+    end
+    def add( rec ) @recs << rec; end
+    alias_method :<<, :add
+
+    def find_by_season( season )
+        @recs.each do |rec|
+            start_season = rec['start_season']
+            end_season   = rec['end_season']
+            return rec  if (start_season.nil? || start_season <= season) &&
+                           (end_season.nil? || end_season >= season)
+        end
+        nil
+    end
+
+
+    def name_by_season( season )
+        rec = find_by_season( season )
+        rec ? rec['name'] : nil
+    end
+
+    def basename_by_season( season )
+        rec = find_by_season( season )
+        rec ? rec['basename'] : nil
+    end
+
+
+    def [](key)
+        ## short cut - if only one or zero rec
+        ##   return directly
+        if @recs.empty?
+            nil
+        elsif @recs.size == 1 &&
+              @recs[0]['start_season'].nil? &&
+              @recs[0]['end_season'].nil?
+            @recs[0][key.to_s]
+        else   ### return proc that requires season arg
+            case key.to_sym
+            when :name      then  method(:name_by_season).to_proc
+            when :basename  then  method(:basename_by_season).to_proc
+            else
+                nil  ## return nil - why? why not?
+                ## raise ArgumentError, "invalid key #{key}; use :name or :basename"
+            end
+        end
+    end
+end
+
+def add( recs )
+   recs.each do |rec|
+      @table[ rec['key'] ] ||= LeagueItem.new
+
+      ## note: auto-change seasons to season object or nil
+      @table[ rec['key'] ] << {  'name'         => rec['name'],
+                                 'basename'     => rec['basename'],
+                                 'start_season' => rec['start_season'].empty? ? nil : Season.parse( rec['start_season'] ),
+                                 'end_season'   => rec['end_season'].empty?   ? nil : Season.parse( rec['end_season'] ),
+                              }
+   end
+end
+
+
+def [](key) @table[ key.to_s.downcase ]; end
+
+end # class LeagueConfig
+end # module SportDb

data/lib/sportdb/writers/txt_writer.rb

@@ -46,7 +46,14 @@ def self.build( matches, rounds: true )
              buf << "#{round} #{match.round}"
          else ## use as is from match
            ## note: for now assume english names
-           buf << round_translations[match.round] || match.round
+            if match.round.nil?
+              ## warn
+              puts "!! ERROR - match with round nil?"
+              pp match
+              exit 1
+            end
+
+           buf << (round_translations[match.round] || match.round)
          end
         buf << "\n"
        end

data/lib/sportdb/writers/version.rb

@@ -1,11 +1,10 @@
 
 module SportDb
-  module Module
+module Module
   module Writers
-
     MAJOR = 0    ## todo: namespace inside version or something - why? why not??
     MINOR = 1
-    PATCH = 0
+    PATCH = 2
     VERSION = [MAJOR,MINOR,PATCH].join('.')
 
     def self.version
@@ -21,5 +20,5 @@ module SportDb
     end
 
   end # module Writers
-  end # module Module
-  end # module SportDb
+end # module Module
+end # module SportDb

data/lib/sportdb/writers/write.rb

@@ -53,7 +53,7 @@ def self.write( league:, season:,
                 source:,
                 extra: nil,
                 split: false,
-                normalize: false,   
+                normalize: false,
                 rounds: true )
   season = Season( season )  ## normalize season
 
@@ -71,7 +71,7 @@ def self.write( league:, season:,
        exit 1
   end
   source_info = { path: source }   ## wrap in "plain" source dir in source info
-  
+
   source_path = source_info[:path]
 
   ## format lets you specify directory layout
@@ -106,14 +106,14 @@ def self.write( league:, season:,
      if normalize.is_a?(Proc)
         matches = normalize.call( matches, league: league,
                                            season: season )
-     else 
+     else
        puts "!! ERROR - normalize; expected proc got #{normalize.inspect}"
        exit 1
-     end 
+     end
   end
- 
 
-  
+
+
   league_name  = league_info[ :name ]      # e.g. Brasileiro Série A
   basename     = league_info[ :basename]   #.e.g  1-seriea
 
@@ -122,7 +122,10 @@ def self.write( league:, season:,
 
   ## note - repo_path moved!!!
   ## repo_path    = league_info[ :path ]      # e.g. brazil or world/europe/portugal etc.
-  repo_path  = SportDb::GitHubSync::REPOS[ league ]
+  repo  = SportDb::GitHubSync::REPOS[ league ]
+  repo_path = "#{repo['owner']}/#{repo['name']}"
+  repo_path << "/#{repo['path']}"    if repo['path']  ## note: do NOT forget to add optional extra path!!!
+
 
 
   season_path = String.new     ## note: allow extra path for output!!!! e.g. archive/2000s etc.
@@ -175,7 +178,7 @@ def self.write( league:, season:,
                       )
 
     ## note: might be empty!!! if no matches skip (do NOT write)
-    write_text( "#{config.out_dir}/#{repo_path}/#{season_path}/#{stage_basename}.txt", 
+    write_text( "#{config.out_dir}/#{repo_path}/#{season_path}/#{stage_basename}.txt",
                   buf )   unless buf.empty?
   end
   else  ## no stages - assume "regular" plain vanilla season

data/lib/sportdb/writers.rb

@@ -1,14 +1,6 @@
-##  just use sportdb/catalogs  ?! - why? why not?
-#  require 'sportdb/importers'   # -- requires db support
-#  require 'sportdb/readers'     # -- requires db support
-#
-#   note - for now only requires sportdb/formats !!!
-#               normalize moved out as a proc!!!
-require 'sportdb/formats'
 
+require 'sportdb/quick'
 
-## todo/fix - make sure upstream cocos is included/required
-require 'cocos'
 
 
 module Writer
@@ -37,29 +29,67 @@ require_relative 'writers/goals'
 require_relative 'writers/write'
 
 
+## setup  leagues (info) table
+require_relative 'writers/league_config'
+
+module Writer
+  LEAGUES = SportDb::LeagueConfig.new
+
+  ['leagues_europe',
+   'leagues_america',
+   'leagues_world'
+  ].each do |name|
+    recs = read_csv( "#{SportDb::Module::Writers.root}/config/#{name}.csv" )
+    LEAGUES.add( recs )
+  end
+end  # module Writer
+
+
 
 ########################
 #  push & pull github scripts
 require 'gitti'    ## note - requires git machinery
 
+require_relative 'writers/github_config'
 require_relative 'writers/github'   ## github helpers/update machinery
 
 
+module SportDb
+class  GitHubSync
+  REPOS = GitHubConfig.new
+  recs = read_csv( "#{SportDb::Module::Writers.root}/config/openfootball.csv" )
+  REPOS.add( recs )
 
-## setup empty leagues (info) hash
-module Writer
-  LEAGUES = {}
+## todo/check: find a better name for helper?
+## note: datasets of format
+##
+## DATASETS = [
+##   ['it.1',    %w[2020/21 2019/20]],
+##  ['it.2',    %w[2019/20]],
+##  ['es.1',    %w[2019/20]],
+##  ['es.2',    %w[2019/20]],
+## ]
+
+def self.find_repos( datasets )
+  repos = []
+  datasets.each do |dataset|
+    league_key = dataset[0]
+    repo  = REPOS[ league_key ]
+    ## pp repo
+    if repo.nil?
+       puts "!! ERROR - no repo config/path found for league >#{league_key}<; sorry"
+       exit 1
+    end
+
+    repos <<  "#{repo['owner']}/#{repo['name']}"
+  end
+
+  pp repos
+  repos.uniq   ## note: remove duplicates (e.g. europe or world or such)
 end
+end  #  class  GitHubSync
+end  # module SportDb
 
-require_relative 'leagues/leagues_at'
-require_relative 'leagues/leagues_de'
-require_relative 'leagues/leagues_eng'
-require_relative 'leagues/leagues_es'
-require_relative 'leagues/leagues_europe'
-require_relative 'leagues/leagues_it'
-require_relative 'leagues/leagues_mx'
-require_relative 'leagues/leagues_south_america'
-require_relative 'leagues/leagues_world'
 
 
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-writers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-formats
+  name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cocos
-  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: !ruby/object:Gem::Requirement
@@ -89,7 +75,9 @@ dependencies:
 description: sportdb-writers - sport.db writers for match schedules and results, and
   more
 email: gerald.bauer@gmail.com
-executables: []
+executables:
+- fbgen
+- fbtxt
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -100,18 +88,17 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- lib/sportdb/leagues/leagues_at.rb
-- lib/sportdb/leagues/leagues_de.rb
-- lib/sportdb/leagues/leagues_eng.rb
-- lib/sportdb/leagues/leagues_es.rb
-- lib/sportdb/leagues/leagues_europe.rb
-- lib/sportdb/leagues/leagues_it.rb
-- lib/sportdb/leagues/leagues_mx.rb
-- lib/sportdb/leagues/leagues_south_america.rb
-- lib/sportdb/leagues/leagues_world.rb
+- bin/fbgen
+- bin/fbtxt
+- config/leagues_america.csv
+- config/leagues_europe.csv
+- config/leagues_world.csv
+- config/openfootball.csv
 - lib/sportdb/writers.rb
 - lib/sportdb/writers/github.rb
+- lib/sportdb/writers/github_config.rb
 - lib/sportdb/writers/goals.rb
+- lib/sportdb/writers/league_config.rb
 - lib/sportdb/writers/txt_writer.rb
 - lib/sportdb/writers/version.rb
 - lib/sportdb/writers/write.rb
@@ -129,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/sportdb/leagues/leagues_at.rb

@@ -1,35 +0,0 @@
-module Writer
-
-########################
-# Austria
-
-LEAGUES.merge!(
-  'at.1' => { name:     'Österr. Bundesliga',
-              basename: '1-bundesliga',
-              stages:   ->(season) {
-                            if season.start_year >= 2018
-                             [['Grunddurchgang'],
-                              ['Finaldurchgang - Meister',
-                               'Finaldurchgang - Qualifikation',
-                               'Europa League Play-off']]
-                            else
-                              nil
-                            end
-                          },
-            },
-  'at.2' => { name:     ->(season) { season.start_year >= 2018 ? 
-                                         'Österr. 2. Liga' : 
-                                         'Österr. Erste Liga' },
-              basename: ->(season) { season.start_year >= 2018 ? 
-                                         '2-liga2' : 
-                                         '2-liga1' },
-             },
-  'at.3.o' => { name:     'Österr. Regionalliga Ost',
-                basename: '3-regionalliga-ost',
-              },
-  'at.cup' => { name:     'ÖFB Cup',
-                basename: 'cup',
-              }
-)
-
-end   # module Writer

data/lib/sportdb/leagues/leagues_de.rb

@@ -1,21 +0,0 @@
-module Writer
-
-############################
-# Germany / Deutschland
-
-LEAGUES.merge!(
-  'de.1' => { name:     'Deutsche Bundesliga',
-              basename: '1-bundesliga',
-            },
-  'de.2' => { name:     'Deutsche 2. Bundesliga',
-              basename: '2-bundesliga2',
-            },
-  'de.3' => { name:     'Deutsche 3. Liga',
-              basename: '3-liga3',
-            },
-  'de.cup' => { name:     'DFB Pokal',
-                basename: 'cup',
-              }
-)
-
-end   # module Writer

data/lib/sportdb/leagues/leagues_eng.rb

@@ -1,58 +0,0 @@
-module Writer
-
-####################
-# England
-
-
-def self.eng1( season )
-  case season    ## todo/fix: - use cast e.g. Season(season) - make sure it's a season obj
-  when Season('1888/89')..Season('1891/92') ## single league (no divisions)
-    {name:     'English Football League',
-     basename: '1-footballleague'}
-  when Season('1892/93')..Season('1991/92')  ## start of division 1 & 2
-    {name:     'English Division One',
-     basename: '1-division1'}
-  else  ## starts in season 1992/93
-    {name:     'English Premier League',
-     basename: '1-premierleague'}
-  end
-end
-
-def self.eng2( season )
-  case season
-  when Season('1892/93')..Season('1991/92')
-    {name:     'English Division Two',  ## or use English Football League Second Division ???
-     basename: '2-division2'}
-  when Season('1992/93')..Season('2003/04')   ## start of premier league
-    {name:     'English Division One',
-     basename: '2-division1'}
-  else # starts in 2004/05
-    {name:     'English Championship',  ## rebranding divsion 1 => championship
-     basename: '2-championship'}
-  end
-end
-
-
-LEAGUES.merge!(
-  'eng.1' => { name:     ->(season) { eng1( season )[ :name ]     },
-               basename: ->(season) { eng1( season )[ :basename ] },
-             },
-  'eng.2' => { name:     ->(season) { eng2( season )[ :name ]     },
-               basename: ->(season) { eng2( season )[ :basename ] },
-             },
-  'eng.3' => { name:     'English League One',
-               basename: '3-league1',
-             },
-  'eng.4' => { name:     'English League Two',
-               basename: '4-league2',
-             },
-  'eng.5' => { name:     'English National League',
-               basename: '5-nationalleague',
-           },
-  'eng.cup' => { name:  'English FA Cup',
-                 basename: 'facup',
-               }
-)
-
-end   # module Writer
-

data/lib/sportdb/leagues/leagues_es.rb

@@ -1,15 +0,0 @@
-module Writer
-
-LEAGUES.merge!(
-  ###################
-  # Spain / Espana
-  'es.1' => { name:     'Primera División de España',
-              basename: '1-liga',
-            },
-  'es.2' => { name:     'Segunda División de España',
-              basename: '2-liga2',
-            },
-)
-
-end   # module Writer
-