fbup 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33923b42a018912296afcb27db14743f78423e51544fbe92824e2e82517e3d76
-  data.tar.gz: 6bad9339c925d0422c7bd0f32993ea5974027d30ace711a8a6c81cf9cdf9fbd6
+  metadata.gz: 68ab9d496c98e7322a20c75e1b7b351bff26cb684aa15f0e7150879183e0d6a2
+  data.tar.gz: '08e0a215cd0007e324f01da26a78c615ba44ce889a3da48bc62def771c1b0c90'
 SHA512:
-  metadata.gz: 81044d7cb605d472b002aab5c9ba181b51f80f9333d62c59ca09318c1f49884eb55f6744217d83e7acda2ea9a4bdfca0100afa9a483bd8f7047b5d992b5ad6fd
-  data.tar.gz: 2a9cf3a2fdbe49b3a27c5aafa8e8ba2471461e6c4f7ca3b7e4dde39fec782a59155cb37096e591459fa8b3640ee6d21451f8dc758fd1cd198baed9f5fceffd4b
+  metadata.gz: d9e1f3e2171f973847bab5f8b703da05fe94726b0be5b48510b9f04cd878baada565ef1345d163a1daa56f25195149592f67046c700ad6c96294118a52423a2a
+  data.tar.gz: 75d415e44856d90707a22ec178dc0c550a976ee450bb8eac64ffd938929a4927576659aad59a9d3facda7ccc3ecf8a0e05bffb7b789473b046ce2179df73a0d8

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.2
+### 0.2.0
 ### 0.0.1 / 2024-12-29
 
 * Everything is new. First release.

data/Rakefile

@@ -22,7 +22,7 @@ Hoe.spec 'fbup' do
   self.extra_deps = [
        ['gitti',              '>= 0.6.1'],
        ['sportdb-writers',    '>= 0.4.1'],
-       ['football-timezones', '>= 0.3.0'],
+       ['leagues',            '>= 0.1.1'],
   ]
 
   self.spec_extras = {

data/bin/fbup

@@ -7,7 +7,7 @@
 
 
 ## note - quick hack - auto-add local football timezones
-$LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
 $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
 require 'fbup'
 

data/config/openfootball.csv

@@ -14,7 +14,7 @@ key,  path,  flags
 
 at,   austria,           classic
 
-de,   deutschland,       classic
+de,     deutschland,     classic
 eng,  england,           classic
 es,   espana,            classic 
 it,   italy,             classic
@@ -114,7 +114,7 @@ copa.s,  south-america/copa-libertadores,
 
 
 ###
-# world repo
+# /world repo
 
 eg,         world/africa/egypt,
 ma,         world/africa/morocco,
@@ -137,8 +137,6 @@ mls,  world/north-america/major-league-soccer,
 
 
 mx,                world/north-america/mexico,
-##  todo/check - why mx config is not enough?
-## mx.2.expansion,    world/north-america/mexico
 
 
 ## fix/change concacaf.cl to concacaf.champs !!!
@@ -150,4 +148,11 @@ concacaf.champs, world/north-america/champions-league,
 au,   world/pacific/australia,
 
 
-world,   worldcup,      ## add custom  flag - why? why not?
+## use world.clubs or club ??
+world.clubs,  club-worldcup,   classic     ## use classic setup for now - why? why not?
+world.club,   club-worldcup,   classic   
+
+
+
+world,   worldcup,      ## add custom  flag - why? why not?
+

data/lib/fbup/github.rb

@@ -1,5 +1,5 @@
 
-module Fbup
+module Fbup   ### rename module to Up - why? why not?
 
 ###
 ## todo/fix:

data/lib/fbup/main.rb

@@ -115,17 +115,27 @@ puts "ARGV:"
 p args
 
 
+
+source_path = opts[:source_path]
+
+### get latest season with autofiller
+##     todo use new LeaguesetAutofiller class - why? why not?
+##    or move code of autofiller here - why? why not?
+##
+autofiller = ->(league_query) {           
+  Leagueset.autofiller( league_query, source_path: source_path )
+} 
+
 datasets =   if opts[:file]
-                  read_leagueset( opts[:file] )
+                  read_leagueset( opts[:file], autofill: autofiller )
              else
-                  parse_leagueset_args( args )
+                  parse_leagueset_args( args, autofill: autofiller )
              end
 
 puts "datasets:"
 pp datasets
 
 
-source_path = opts[:source_path]
 
 root_dir =  if opts[:test]
                opts[:test_dir]
@@ -147,18 +157,34 @@ pp sync
 
 sync.git_fast_forward_if_clean    if opts[:ffwd]
 
+
 ### step 0 - validate and fill-in seasons etc.
 datasets.validate!( source_path: source_path )
 
 
-datasets.each do |league_key, seasons|
-    puts "==> gen #{league_key} - #{seasons.size} seasons(s)..."
+##
+## note - use league_query (or league_qkey or _querykey) or such
+##                for user supplied key to compute/find the canoncial league code
+
+datasets.each do |league_query, seasons|
+    puts "==> gen #{league_query} - #{seasons.size} seasons(s)..."
 
-    league_info = find_league_info( league_key )
-    pp league_info
 
     seasons.each do |season|
-      filename = "#{season.to_path}/#{league_key}.csv"
+      ## note - league info requires season 
+      ##          PLUS use (canoncial) league code from info!!!
+      league_info = LeagueCodes.find_by( code: league_query, season: season )
+      pp league_info
+
+      league_code  = league_info[ 'code' ]
+      league_name  = league_info[ 'name' ]       # e.g. Brasileiro Série A
+
+      ### todo/fix - move basename out of league_info
+      ###               make it github/openfootball "legacy" code
+      basename     = league_info[ 'basename' ]   #.e.g  1-seriea
+  
+    
+      filename = "#{season.to_path}/#{league_code}.csv"
       path = find_file( filename, path: source_path )
 
       ### get matches
@@ -168,7 +194,7 @@ datasets.each do |league_key, seasons|
 
 
       ## get repo config for flags and more
-      repo  = GitHubSync::REPOS[ league_key ]
+      repo  = GitHubSync::REPOS[ league_code ]
       flags = repo['flags'] || {}
       classic_flag = flags['classic'] || false
 
@@ -184,18 +210,13 @@ datasets.each do |league_key, seasons|
       puts txt   if opts[:debug]
 
 
-      league_name  = league_info[ :name ]      # e.g. Brasileiro Série A
-      basename     = league_info[ :basename]   #.e.g  1-seriea
-
-      league_name =  league_name.call( season )   if league_name.is_a?( Proc )  ## is proc/func - name depends on season
-      basename    =  basename.call( season )      if basename.is_a?( Proc )  ## is proc/func - name depends on season
-
+   
 
       if classic_flag || opts[:classic]
          ## do nothing 
       else 
          ## add quick fix for new league name overwrites
-         league_name = LEAGUE_NAMES_V2[league_key] || league_name
+         league_name = LEAGUE_NAMES_V2[league_code] || league_name
       end
 
 
@@ -218,7 +239,7 @@ datasets.each do |league_key, seasons|
                      ## change base name to league key
                      ##   todo - fix - make gsub smarter
                      ##    change at.cup to at_cup - why? why not?
-                     basename = league_key.gsub( '.', '' )
+                     basename = league_code.gsub( '.', '' )
                      "/#{season.to_path}_#{basename}.txt"
                   end
 

data/lib/fbup/version.rb

@@ -3,8 +3,8 @@ module SportDb
 module Module
   module Fbup
     MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-    MINOR = 1
-    PATCH = 2
+    MINOR = 2
+    PATCH = 0
     VERSION = [MAJOR,MINOR,PATCH].join('.')
 
     def self.version

data/lib/fbup.rb

@@ -1,6 +1,6 @@
 
 require 'sportdb/writers'
-require 'football/timezones'   ## pulls-in find_league_info, etc.
+require 'leagues'   ## pulls-in find_league_info, etc.
 
 
 require 'optparse'    ## command-line processing; check if included updstream?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitti
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: football-timezones
+  name: leagues
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement