footty 2025.5.2 → 2026.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597423aa8445e6fd662c9a6541230726d1d97316e5f9a7ec7c8781dbf5f2f4e6
-  data.tar.gz: c5bf0acffaa91bd215253eef1b8271348e9596499ff202ef131fa8ef002abd5a
+  metadata.gz: 75b4ca658d25b404bf5b4f1594da50c42564ad7ffc43e3190429a7c4627b8c94
+  data.tar.gz: 25eac464226fea4b31da270bc195c443e34bc4fa68ce9de1bd0646b8ec63639e
 SHA512:
-  metadata.gz: fe813055addd774484ca21f19f4200c4cd567f242121df493192fbb5ea1b96a50a893d157c12d255b17743b1014eed13020914859bd23984aa969836e9302b20
-  data.tar.gz: 140a848370b4d24ce43c9cc815fb2b28e2745eb68060dcae43415c1a54c770f9aaeb675d0b809ffbaf753b7b1353b9e98a7d021b1fb73fdc5d08d5adfe15b936
+  metadata.gz: a1762d1389a13f0380267a7b8a0621b6df1e176eb847a4cac454fcfdfb87ece7321a950e80ad2c1ffedbd38f2966def3c63cda9d159063e568b1854bac0349b9
+  data.tar.gz: e791218fe6679d8c03545114cb60a7ce588b8f8dce4f8d80764aaa1da1168f6ab7552af00098ad6165a59d97ecea5fc1292cbb979689835f029bb4d06a1bc5cb

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 2025.5.2
+### 2026.5.25
 ### 1.0.0 / 2018-06-09
 
 * Everything is new (again). First release.

data/Manifest.txt

@@ -5,7 +5,9 @@ Rakefile
 bin/footty
 bin/ftty
 lib/footty.rb
-lib/footty/dataset.rb
-lib/footty/openfootball.rb
-lib/footty/print.rb
+lib/footty/dataset/dataset.rb
+lib/footty/dataset/openfootball.rb
+lib/footty/main.rb
+lib/footty/pp_matches.rb
+lib/footty/pp_week.rb
 lib/footty/version.rb

data/README.md

@@ -16,22 +16,22 @@ The footty (or ftty) command line tool lets you query the online football.db via
 for upcoming or past matches. For example:
 
     $ footty         # Defaults to today's matches of top leagues
-    
+
 
 prints on Sep 27, 2024:
 
     ==> English Premier League 2024/25
     Upcoming matches:
-    Sat Sep/28 12:30   (in 1d)    Newcastle United FC    vs    Manchester City FC     Matchday 6
-    Sat Sep/28 15:00   (in 1d)             Arsenal FC    vs    Leicester City FC      Matchday 6
-    Sat Sep/28 15:00   (in 1d)           Brentford FC    vs    West Ham United FC     Matchday 6
-    Sat Sep/28 15:00   (in 1d)             Chelsea FC    vs    Brighton & Hove Albion  Matchday 6
-    Sat Sep/28 15:00   (in 1d)             Everton FC    vs    Crystal Palace FC      Matchday 6
-    Sat Sep/28 15:00   (in 1d)   Nottingham Forest FC    vs    Fulham FC              Matchday 6
-    Sat Sep/28 17:30   (in 1d) Wolverhampton Wanderers FC    vs    Liverpool FC           Matchday 6
-    Sun Sep/29 14:00   (in 2d)        Ipswich Town FC    vs    Aston Villa FC         Matchday 6
-    Sun Sep/29 16:30   (in 2d)   Manchester United FC    vs    Tottenham Hotspur FC   Matchday 6
-    Mon Sep/30 20:00   (in 3d)        AFC Bournemouth    vs    Southampton FC         Matchday 6
+    Sat Sep 28 12:30   (in 1d)    Newcastle United FC    vs    Manchester City FC     ▪ Matchday 6
+    Sat Sep 28 15:00   (in 1d)             Arsenal FC    vs    Leicester City FC      ▪ Matchday 6
+    Sat Sep 28 15:00   (in 1d)           Brentford FC    vs    West Ham United FC     ▪ Matchday 6
+    Sat Sep 28 15:00   (in 1d)             Chelsea FC    vs    Brighton & Hove Albion ▪ Matchday 6
+    Sat Sep 28 15:00   (in 1d)             Everton FC    vs    Crystal Palace FC      ▪ Matchday 6
+    Sat Sep 28 15:00   (in 1d)   Nottingham Forest FC    vs    Fulham FC              ▪ Matchday 6
+    Sat Sep 28 17:30   (in 1d) Wolverhampton Wanderers FC    vs    Liverpool FC          ▪ Matchday 6
+    Sun Sep 29 14:00   (in 2d)        Ipswich Town FC    vs    Aston Villa FC         ▪ Matchday 6
+    Sun Sep 29 16:30   (in 2d)   Manchester United FC    vs    Tottenham Hotspur FC   ▪ Matchday 6
+    Mon Sep 30 20:00   (in 3d)        AFC Bournemouth    vs    Southampton FC         ▪ Matchday 6
 
 
 
@@ -81,7 +81,7 @@ More
 - `world`  =>  World Cup
 - `euro`   =>  "Euro" - European Championship
 
-See [footty/openfootball](https://github.com/sportdb/footty/blob/master/footty/lib/footty/openfootball.rb) for the complete built-in list of data sources (and league codes).
+See [footty/openfootball](https://github.com/sportdb/footty/blob/master/footty/lib/footty/dataset/openfootball.rb) for the complete built-in list of data sources (and league codes).
 
 
 
@@ -110,4 +110,3 @@ Use it as you please with no restrictions whatsoever.
 
 Yes, you can. More than welcome.
 See [Help & Support »](https://github.com/openfootball/help)
-

data/Rakefile

@@ -17,7 +17,7 @@ Hoe.spec 'footty' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['sportdb-quick', '>= 0.2.0'],
+    ['sportdb-quick', '>= 0.7.0'],
     ['webget'],
   ]
 

data/lib/footty/{dataset.rb → dataset/dataset.rb}

@@ -1,25 +1,26 @@
 module Footty
 
 
-  class Dataset
+##
+#    note - assume "upstream" date is always date object or nil (NOT string)!!!
 
+  class Dataset
 
     def matches
        raise ArgumentError, "method matches must be implemented by concrete class!!"
     end
 
     def league_name
-      raise ArgumentError, "method league_name must be implemented by concrete class!!"
+       raise ArgumentError, "method league_name must be implemented by concrete class!!"
     end
 
 
+
     def end_date
        @end_date ||= begin
                         end_date = nil
                         matches.each do |match|
-                           date = Date.strptime(match['date'], '%Y-%m-%d' )
-                           end_date = date  if end_date.nil? ||
-                                               date > end_date
+                           end_date = match['date']   if end_date.nil? || match['date'] > end_date
                         end
                         end_date
                      end
@@ -29,58 +30,29 @@ module Footty
        @start_date ||= begin
                         start_date = nil
                         matches.each do |match|
-                           date = Date.strptime(match['date'], '%Y-%m-%d' )
-                           start_date = date  if start_date.nil? ||
-                                               date < start_date
+                           start_date = date = match['date']  if start_date.nil? || date = match['date'] < start_date
                         end
                         start_date
                        end
     end
 
-    def todays_matches( date: Date.today )      matches_for( date ); end
-    def tomorrows_matches( date: Date.today )   matches_for( date+1 );  end
-    def yesterdays_matches( date: Date.today )  matches_for( date-1 );  end
 
-    def matches_for( date )
-      matches = select_matches do |match| 
-                                  date == Date.parse( match['date'] ) 
-                               end
-      matches
-    end
-
-    
-    def weeks_matches( week_start, week_end )  matches_within( week_start, week_end);  end
-
-    def matches_within( start_date, end_date )
-      matches = select_matches do |match| 
-                                 date = Date.parse( match['date'] )
-                                 date >= start_date && date <= end_date  
-                               end
-      matches
-    end
+    def todays_matches(     date: Date.today )  _select_matches { |match| date   == match['date'] };  end
+    def tomorrows_matches(  date: Date.today )  _select_matches { |match| date+1 == match['date'] };  end
+    def yesterdays_matches( date: Date.today )  _select_matches { |match| date-1 == match['date'] };  end
 
 
-    def query( q )
-        ## query/check for team name match for now
-        rx =  /#{Regexp.escape(q)}/i   ## use case-insensitive regex match
-        
-        matches = select_matches do |match|
-                          if rx.match( match['team1'] ) ||
-                             rx.match( match['team2'] )  
-                             true
-                          else
-                             false
-                          end
-                  end
-        matches 
+    def weeks_matches( start_week, end_week )
+      _select_matches do |match|
+                                 match['date'] >= start_week && match['date'] <= end_week
+                       end
     end
 
 
-
     def upcoming_matches( date: Date.today,
                           limit: nil )
       ## note: includes todays matches for now
-      matches = select_matches { |match| date <= Date.parse( match['date'] ) }
+      matches = _select_matches { |match| date <= match['date'] }
 
       if limit
         matches[0, limit]  ## cut-off
@@ -89,16 +61,34 @@ module Footty
       end
     end
 
+
     def past_matches( date: Date.today )
-      matches = select_matches { |match| date > Date.parse( match['date'] ) }
+      matches = _select_matches { |match| date > match['date'] }
       ## note reveserve matches (chronological order/last first)
       ## matches.reverse
       matches
     end
 
 
-private
-    def select_matches( &blk)
+
+    def query( q )
+        ## query/check for team name match for now
+        rx =  /#{Regexp.escape(q)}/i   ## use case-insensitive regex match
+
+        _select_matches do |match|
+                          if rx.match( match['team1'] ) ||
+                             rx.match( match['team2'] )
+                             true
+                          else
+                             false
+                          end
+                        end
+    end
+
+
+
+
+    def _select_matches( &blk )
       selected = []
       matches.each do |match|
          selected << match   if blk.call( match )

data/lib/footty/{openfootball.rb → dataset/openfootball.rb}

@@ -3,7 +3,9 @@ module Footty
 
   class OpenfootballDataset  <  Dataset
     SOURCES = {
-      'world' => { '2022' => [ 'worldcup/2022--qatar/cup.txt',
+      'world' => { '2026' => [ 'worldcup/2026--usa/cup.txt',
+                               'worldcup/2026--usa/cup_finals.txt'],
+                   '2022' => [ 'worldcup/2022--qatar/cup.txt',
                                'worldcup/2022--qatar/cup_finals.txt'],
                    '2018' => [ 'worldcup/2018--russia/cup.txt',
                                'worldcup/2018--russia/cup_finals.txt']
@@ -15,7 +17,7 @@ module Footty
       'de2'   =>   'deutschland/$season$/2-bundesliga2.txt',
       'de3'   =>   'deutschland/$season$/3-liga3.txt',
       'decup' =>   'deutschland/$season$/cup.txt',
-      
+
 
       'en'   =>    'england/$season$/1-premierleague.txt',
       'en2'  =>    'england/$season$/2-championship.txt',
@@ -23,13 +25,13 @@ module Footty
       ##   use  eflcup, facup - why? why not?
       'eneflcup'  =>  'england/$season$/eflcup.txt',
       'enfacup'   =>  'england/$season$/facup.txt',
-    
+
 
       'es'    =>  'espana/$season$/1-liga.txt',
       'escup' =>  'espana/$season$/cup.txt',
 
       'it'=>    'italy/$season$/1-seriea.txt',
-   
+
       'at'=>    'austria/$season$/1-bundesliga.txt',
       'at2'  =>   'austria/$season$/2-liga2.txt',
       'at3o' =>   'austria/$season$/3-regionalliga-ost.txt',
@@ -48,7 +50,7 @@ module Footty
       'br'    => 'south-america/brazil/$year$_br1.txt',
       'ar'    => 'south-america/argentina/$year$_ar1.txt',
       'co'    => 'south-america/colombia/$year$_co1.txt',
-      
+
       ## use a different code for copa libertadores? why? why not?
       'copa'  => 'south-america/copa-libertadores/$year$_copal.txt',
 
@@ -80,10 +82,10 @@ module Footty
 
       ##  todo/fix - report error if no spec found
       season =  if spec.is_a?( Hash )  ## assume lookup by year
-                    spec.keys[0]   
+                    spec.keys[0]
                 else  ## assume vanilla urls (no lookup by year)
-                    ## default to 2025 or 2024/25 for now
-                    spec.index( '$year$') ? '2025' : '2024/25'
+                    ## default to 2026 or 2025/26 for now
+                    spec.index( '$year$') ? '2026' : '2025/26'
                 end
       season
     end
@@ -116,13 +118,27 @@ module Footty
                   end
 
       matches = matches.map {|match| match.as_json }  # convert to json
-             
-      ## note - sort by date/time 
+
+      ## note - sort by date/time
       ##  (assume stable sort; no reshuffle of matches if already sorted by date/time)
 
+
+      ###
+      ## note - convert date to date obj or nil !!!
+      matches = matches.map do |match|
+                                 if match['date'] && match['date'].empty? == false
+                                    match['date'] = Date.strptime( match['date'], '%Y-%m-%d' )
+                                 else
+                                    match['date'] = nil
+                                 end
+
+                                 match
+                            end
+
+
       matches = matches.sort do |l,r|
                      result =  l['date'] <=> r['date']
-                     result =  l['time'] <=> r['time']    if result == 0 && 
+                     result =  l['time'] <=> r['time']    if result == 0 &&
                                                            (l['time'] && r['time'])
                      result
                   end
@@ -131,12 +147,13 @@ module Footty
     end
 
 
+
     def openfootball_url( path, season: )
        repo, local_path = path.split( '/',  2)
        url = "https://raw.githubusercontent.com/openfootball/#{repo}/master/#{local_path}"
        ## check for template vars too
        season = Season( season )
-       url = url.gsub( '$year$', season.start_year.to_s )
+       url = url.gsub( '$year$',   season.start_year.to_s )
        url = url.gsub( '$season$', season.to_path )
        url
     end
@@ -144,7 +161,7 @@ module Footty
 
     def matches()     @matches; end
     def league_name() @league_name; end
-  
+
 
 
     def get!( url )

data/lib/footty/main.rb

@@ -0,0 +1,248 @@
+
+
+module Footty
+
+
+  def self.main( args=ARGV )
+    puts banner # say hello
+
+
+    opts = {  debug:   false,
+              verbose: false,    ## add more details
+              ## add cache/cache_dir - why? why not?
+
+              query:   nil,
+
+              ## display format/mode  - week/window/upcoming/past (default is today)
+              yesterday: nil,
+              tomorrow:  nil,
+              upcoming:  nil,
+              past:      nil,
+
+              week:      false,
+              #  window:    nil,   ## 2 day plus/minus  +2/-2
+           }
+
+
+    parser = OptionParser.new do |parser|
+      parser.banner = "Usage: #{$PROGRAM_NAME} [options] LEAGUES"
+
+      parser.on( "--verbose",
+                 "turn on verbose output (default: #{opts[:verbose]})" ) do |verbose|
+        opts[:verbose] = true
+      end
+
+      parser.on( "-q NAME", "--query",
+                   "query mode; display matches where team name matches query" ) do |query|
+        opts[:query] = query
+      end
+
+
+      parser.on( "-y", "--yesterday" ) do |yesterday|
+        opts[:yesterday] = true
+      end
+      parser.on( "-t", "--tomorrow" ) do |tomorrow|
+        opts[:tomorrow] = true
+      end
+      parser.on( "-p", "--past" ) do |past|
+        opts[:past] = true
+      end
+      parser.on( "-u", "--up", "--upcoming" ) do |upcoming|
+        opts[:upcoming] = true
+      end
+
+      parser.on( "-w", "--week",
+                  "show matches of the (sport) week from tue to mon (default: #{opts[:week]})" ) do |week|
+        opts[:week] = true
+      end
+    end
+    parser.parse!( args )
+
+
+    puts "OPTS:"
+    p opts
+    puts "ARGV:"
+    p args
+
+
+    ###
+    ##   use simple norm(alize) args (that is,) league codes for now
+    ##      - downcase, strip dot (.) etc.)
+    ##   e.g.  en.facup   => enfacup
+    ##         at.cup     => atcup     etc.
+    args = args.map { |arg| arg.downcase.gsub( /[._-]/, '' ) }
+
+
+
+    ######################
+    ## note - first check for buil-in "magic" commands
+    ##   e.g. leagues / codes    -  dump built-in league codes
+
+    if args.include?( 'leagues' )
+       puts "==> openfootball dataset sources:"
+       pp OpenfootballDataset::SOURCES
+
+       ## pretty print keys/codes only
+       puts
+       puts OpenfootballDataset::SOURCES.keys.join( ' ' )
+       puts "   #{OpenfootballDataset::SOURCES.keys.size} league code(s)"
+
+       exit 1
+    end
+
+
+
+    top = [['world',   '2026'],   ## world cup (w/ national teams)
+         #  ['euro',   '2024'],
+         #  ['mls',    '2025'],
+         #  ['concacafcl', '2025'],
+         #  ['mx',     '2024/25'],
+           ['en',     '2025/26'],
+           ['es',     '2025/26'],
+           ['it',     '2025/26'],
+           ['fr',     '2025/26'],
+           ['de',     '2025/26'],
+         #  ['decup',  '2025/26'],
+         #  ['at',     '2025/26'],
+         #  ['atcup',   '2025/26'],
+           ['uefacl',   '2025/26'],
+         #  ['uefael',   '2025/26'],
+         #  ['uefaconf', '2025/26'],
+           ['br',     '2026'],
+           ['copa',   '2026'],       ## copa libertadores  (not copa america,etc.)
+          ]
+
+
+    leagues =  if args.size == 0
+                   top
+               else
+                   ### auto-fill (latest) season/year
+                   args.map do |arg|
+                              [arg, OpenfootballDataset.latest_season( league: arg )]
+                            end
+               end
+
+
+    ## fetch leagues
+    datasets =  leagues.map do |league, season|
+                                dataset = OpenfootballDataset.new( league: league, season: season )
+                                ## parse matches
+                                matches = dataset.matches
+                                puts "  #{league} #{season} - #{matches.size} match(es)"
+                                dataset
+                            end
+
+
+
+    ###################
+    ##  check for query option to filter matches by query (team)
+    if opts[:query]
+      q = opts[:query]
+      puts
+      puts
+      datasets.each do |dataset|
+        matches = dataset.query( q )
+
+        if matches.size == 0
+           ## siltently skip for now
+        else  ## assume matches found
+          print "==> #{dataset.league_name}"
+          print "   #{dataset.start_date} - #{dataset.end_date}"
+          print "   -- #{dataset.matches.size} match(es)"
+          print "\n"
+          print_matches( matches )
+        end
+      end
+      exit 1
+    end
+
+
+    # Dataset.new( league: 'euro', year: 2024 )
+    # dataset = Dataset.new( league: league, year: year )
+
+    ## in the future make today "configurable" as param - why? why not?
+    today = Date.today
+
+
+     what =  if opts[:yesterday]
+               'yesterday'
+             elsif opts[:tomorrow]
+               'tomorrow'
+             elsif opts[:past]
+               'past'
+             elsif opts[:upcoming]
+               'upcoming'
+             elsif opts[:week]
+               'week'
+             else
+               'today'
+             end
+
+
+    ## if week get week number and start and end date (tuesday to mondey)
+    if what == 'week'
+      week_start, week_end = Footty.week_tue_to_mon( today)
+      puts
+      puts  "=== " + Footty.fmt_week( week_start, week_end ) + " ==="
+    else
+      ## start with two empty lines - assume (massive) debug output before ;-)
+      puts
+      puts
+    end
+
+    datasets.each do |dataset|
+      print "==> #{dataset.league_name}"
+      print "   #{dataset.start_date} - #{dataset.end_date}"
+      print "   -- #{dataset.matches.size} match(es)"
+      print "\n"
+
+      if what == 'week'
+        matches = dataset.weeks_matches( week_start, week_end )
+        if matches.empty?
+          puts (' '*4) + "** No matches scheduled or played in week #{week_start.cweek}.\n"
+        end
+     elsif what == 'yesterday'
+        matches = dataset.yesterdays_matches
+        if matches.empty?
+           puts (' '*4) + "** No matches played yesterday.\n"
+        end
+      elsif what == 'tomorrow'
+        matches = dataset.tomorrows_matches
+        if matches.empty?
+           puts (' '*4) + "** No matches scheduled tomorrow.\n"
+        end
+      elsif what == 'past'
+        matches = dataset.past_matches
+        if matches.empty?
+           puts (' '*4) + "** No matches played yet.\n"
+        end
+      elsif what == 'upcoming'
+        matches = dataset.upcoming_matches
+        if matches.empty?
+           puts (' '*4) + "** No more matches scheduled.\n"
+        end
+      else   ## assume today
+         matches = dataset.todays_matches
+
+         ## no matches today
+         if matches.empty?
+            puts (' '*4) + "** No matches scheduled today.\n"
+
+            if opts[:verbose]
+              ## note: was world cup 2018 - end date -- Date.new( 2018, 7, 11 )
+              ## note: was euro 2020 (in 2021) - end date -- Date.new( 2021, 7, 11 )
+              if Date.today > dataset.end_date    ## tournament is over, look back
+                puts "Past matches:"
+                matches = dataset.past_matches
+              else  ## world cup is upcoming /in-progress,look forward
+                puts "Upcoming matches:"
+                matches = dataset.upcoming_matches( limit: 18 )
+              end
+            end
+         end
+       end
+       print_matches( matches )
+      end
+
+  end # method self.main
+end # module Footty

data/lib/footty/pp_matches.rb

@@ -0,0 +1,135 @@
+
+module Footty
+
+
+##
+#    note - assume "upstream" date is always date object or nil (NOT string)!!!
+
+ def self.print_matches( matches )
+
+    today = Date.today
+
+    matches.each do |match|
+      date = match['date']
+      print "#{date.strftime('%a %b %d')} "      ## e.g. Thu Jun 14
+      print "#{match['time']} "    if match['time']
+
+      if date > today
+         diff = (date - today).to_i
+         print "%10s" % "(in #{diff}d) "
+      end
+
+
+      if match['team1'].is_a?( Hash )
+        print "%22s" % "#{match['team1']['name']} (#{match['team1']['code']})"
+      else
+        print "%22s" % "#{match['team1']}"
+      end
+
+
+
+      if match['score'].is_a?( Hash )
+
+          if match['score']['et']
+             et = "#{match['score']['et'][0]}-#{match['score']['et'][1]} aet"
+             print "  #{et}"
+          end
+
+          if match['score']['ft']
+             ft = "#{match['score']['ft'][0]}-#{match['score']['ft'][1]}"
+             if match['score']['et']
+                print " (#{ft})"
+             else
+                print "  #{ft}"
+             end
+          end
+
+          if match['score']['p']
+            pen = "#{match['score']['p'][0]}-#{match['score']['p'][1]} pen"
+            print ", #{pen}"
+          end
+          print "  "
+
+      elsif match['score'] &&
+            match['score'][0] && match['score'][1]
+        score = "#{match['score'][0]}-#{match['score'][1]}"
+        print "  #{score}  "
+      else
+        print "    vs    "
+      end
+
+      if match['team2'].is_a?( Hash )
+        print "%-22s" % "#{match['team2']['name']} (#{match['team2']['code']})"
+      else
+        print "%-22s" % "#{match['team2']}"
+      end
+
+
+      print "▪"    ## note - add round marker!!
+
+
+      print " #{match['group']} /"   if match['group']     ## (optional) group
+
+
+      print " #{match['round']} "    ## knock out (k.o.) phase/stage
+
+
+      print "%-5s " % "(\##{match['num']}) "   if match['num']
+
+      print " @ #{match['ground']}"         if match['ground']
+
+
+      print "\n"
+
+
+      if match['goals1'] && match['goals2']
+        print "                     ("
+
+        print _pp_goals(match['goals1'])   if match['goals1'].size > 0
+
+        print "; "   if match['goals1'].size > 0 &&
+                        match['goals2'].size > 0
+
+        print _pp_goals(match['goals2'])   if match['goals2'].size > 0
+
+        print ")\n"
+      end
+    end
+  end
+
+
+
+def self._pp_goals( recs )
+   players = {}
+
+   ## "fold" multiple goals of player
+   recs.each do |rec|
+
+      name = rec['name']
+
+      if  rec['minute'].nil? || rec['minute'].empty?
+        puts "!! WARN - (goals) minute empty:"
+        pp rec
+        ## use '??'
+        rec['minute'] = '??'
+        ## raise ArgumentError, "minute empty"
+      end
+
+      goal = String.new
+      goal << "#{rec['minute']}'"
+      goal << '(og)'   if rec['owngoal'] == true
+      goal << '(p)'    if rec['penalty'] == true
+
+      player_rec = players[ name ] ||= { name: name, goals: [] }
+      player_rec[:goals] << goal
+   end
+
+
+   buf =  players.map do |_,player|
+                    "#{player[:name]} #{player[:goals].join(',')}"
+                end.join( ' ' )
+   buf
+end
+
+
+end # module Footty

data/lib/footty/pp_week.rb

@@ -0,0 +1,24 @@
+
+module Footty
+
+
+  def self.week_tue_to_mon( today=Date.today )
+    ## Calculate the start of the (sport) week (tuesday)
+    ##  note - wday starts counting sunday (0), monday (1), etc.
+    week_tue = today - (today.wday - 2) % 7
+    week_mon = week_tue + 6
+
+    [week_tue,week_mon]
+  end
+
+
+  def self.fmt_week( week_start, week_end )
+    buf = String.new
+    buf << "Week %02d" % week_start.cweek
+    buf << " - #{week_start.strftime( "%a %b %-d")}"
+    buf << " to #{week_end.strftime( "%a %b %-d %Y")}"
+    buf
+  end
+
+
+end # module Footty

data/lib/footty/version.rb

@@ -1,6 +1,6 @@
 
 module Footty
-   VERSION = '2025.5.2'
+   VERSION = '2026.5.25'
 
    def self.banner
      "footty/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
@@ -10,5 +10,3 @@ module Footty
      File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
    end
 end
-
-

data/lib/footty.rb

@@ -1,294 +1,33 @@
 require 'sportdb/quick'   ## note - pulls in cocos et al
-require 'webget'    ## add webcache support
-
-require 'optparse'
+require 'webget'          ## add webcache support
 
 
 
 
 # our own code
 require_relative 'footty/version' # let version always go first
-require_relative 'footty/dataset'
-require_relative 'footty/openfootball'
-
-require_relative 'footty/print'
-
-
-
-## set cache to local .cache dir for now - why? why not?
-Webcache.root = './cache'
-#  pp Webcache.root
-Webget.config.sleep = 1  ## set delay in secs (to 1 sec - default is/maybe 3)
-
-
-module Footty
-
-
-  def self.week_tue_to_mon( today=Date.today )
-    ## Calculate the start of the (sport) week (tuesday)
-    ##  note - wday starts counting sunday (0), monday (1), etc.
-    week_tue = today - (today.wday - 2) % 7
-    week_mon = week_tue + 6
-
-    [week_tue,week_mon]
-  end
-
-  def self.fmt_week( week_start, week_end )
-    buf = String.new
-    buf << "Week %02d" % week_start.cweek
-    buf << " - #{week_start.strftime( "%a %b/%-d")}"
-    buf << " to #{week_end.strftime( "%a %b/%-d %Y")}"
-    buf 
-  end
-
-
-
-  def self.main( args=ARGV )
-    puts banner # say hello
-
-
-    opts = {  debug:   false,
-              verbose: false,    ## add more details
-              ## add cache/cache_dir - why? why not?
-
-              query:   nil,
-
-              ## display format/mode  - week/window/upcoming/past (default is today)
-              yesterday: nil,
-              tomorrow:  nil,
-              upcoming:  nil,
-              past:      nil,
-
-              week:      false,
-              #  window:    nil,   ## 2 day plus/minus  +2/-2
-           }
-
-           
-    parser = OptionParser.new do |parser|
-      parser.banner = "Usage: #{$PROGRAM_NAME} [options] LEAGUES"
-
-      parser.on( "--verbose", 
-                 "turn on verbose output (default: #{opts[:verbose]})" ) do |verbose|
-        opts[:verbose] = true
-      end   
-
-      parser.on( "-q NAME", "--query",
-                   "query mode; display matches where team name matches query" ) do |query|
-        opts[:query] = query
-      end
 
+require_relative 'footty/dataset/dataset'
+require_relative 'footty/dataset/openfootball'
 
-      parser.on( "-y", "--yesterday" ) do |yesterday|
-        opts[:yesterday] = true
-      end
-      parser.on( "-t", "--tomorrow" ) do |tomorrow|
-        opts[:tomorrow] = true
-      end
-      parser.on( "-p", "--past" ) do |past|
-        opts[:past] = true
-      end
-      parser.on( "-u", "--up", "--upcoming" ) do |upcoming|
-        opts[:upcoming] = true
-      end
+require_relative 'footty/pp_matches'
+require_relative 'footty/pp_week'
 
-      parser.on( "-w", "--week",
-                  "show matches of the (sport) week from tue to mon (default: #{opts[:week]})" ) do |week|
-        opts[:week] = true
-      end
-    end
-    parser.parse!( args )
+require_relative 'footty/main'
 
 
-    puts "OPTS:"
-    p opts
-    puts "ARGV:"
-    p args
 
 
-    ###
-    ##   use simple norm(alize) args (that is,) league codes for now
-    ##      - downcase, strip dot (.) etc.)
-    ##   e.g.  en.facup   => enfacup
-    ##         at.cup     => atcup     etc.
-    args = args.map { |arg| arg.downcase.gsub( /[._-]/, '' ) }
 
+## set cache to local .cache dir for now - why? why not?
+Webcache.root = './cache'
 
+#  pp Webcache.root
+Webget.config.sleep = 1  ## set delay in secs (to 1 sec - default is/maybe 3)
 
-    ######################
-    ## note - first check for buil-in "magic" commands
-    ##   e.g. leagues / codes    -  dump built-in league codes
-
-    if args.include?( 'leagues' ) 
-       puts "==> openfootball dataset sources:"
-       pp OpenfootballDataset::SOURCES
-       
-       ## pretty print keys/codes only
-       puts  
-       puts OpenfootballDataset::SOURCES.keys.join( ' ' )
-       puts "   #{OpenfootballDataset::SOURCES.keys.size} league code(s)"
-
-       exit 1
-    end
-
-
-
-
-    
-    top = [['world',   '2022'],
-           ['euro',   '2024'],
-           ['mls',    '2025'],
-           ['concacafcl', '2025'],
-           ['mx',     '2024/25'],
-           ['copa',   '2025'],       ## copa libertadores
-           ['en',     '2024/25'],
-           ['es',     '2024/25'],
-           ['it',     '2024/25'],
-           ['fr',     '2024/25'],
-           ['de',     '2024/25'],
-           ['decup',  '2024/25'],
-           ['at',     '2024/25'],
-           ['atcup',   '2024/25'],
-           ['uefacl',   '2024/25'],
-           ['uefael',   '2024/25'],
-           ['uefaconf', '2024/25'],
-          ]
- 
-          
-    leagues =  if args.size == 0
-                   top
-               else
-                   ### auto-fill (latest) season/year 
-                   args.map do |arg| 
-                              [arg, OpenfootballDataset.latest_season( league: arg )]  
-                            end
-               end
-
-
-    ## fetch leagues
-    datasets =  leagues.map do |league, season|
-                                dataset = OpenfootballDataset.new( league: league, season: season )
-                                ## parse matches
-                                matches = dataset.matches
-                                puts "  #{league} #{season} - #{matches.size} match(es)"                                 
-                                dataset
-                            end                     
-    
-  
-
-    ###################
-    ##  check for query option to filter matches by query (team)
-    if opts[:query]
-      q = opts[:query]
-      puts
-      puts
-      datasets.each do |dataset|
-        matches = dataset.query( q )
-
-        if matches.size == 0
-           ## siltently skip for now
-        else  ## assume matches found
-          print "==> #{dataset.league_name}"
-          print "   #{dataset.start_date} - #{dataset.end_date}"
-          print "   -- #{dataset.matches.size} match(es)"
-          print "\n"
-          print_matches( matches )
-        end
-      end
-      exit 1
-    end
-
-
-    # Dataset.new( league: 'euro', year: 2024 )
-    # dataset = Dataset.new( league: league, year: year )
-
-    ## in the future make today "configurable" as param - why? why not?
-    today = Date.today
-
-
-     what =  if opts[:yesterday]
-               'yesterday'
-             elsif opts[:tomorrow]
-               'tomorrow'
-             elsif opts[:past]
-               'past'
-             elsif opts[:upcoming]
-               'upcoming'
-             elsif opts[:week]
-               'week'
-             else
-               'today'
-             end
-
-
-    ## if week get week number and start and end date (tuesday to mondey)
-    if what == 'week'
-      week_start, week_end = Footty.week_tue_to_mon( today)
-      puts
-      puts  "=== " + Footty.fmt_week( week_start, week_end ) + " ==="
-    else
-      ## start with two empty lines - assume (massive) debug output before ;-)
-      puts
-      puts
-    end
-
-    datasets.each do |dataset|
-      print "==> #{dataset.league_name}"
-      print "   #{dataset.start_date} - #{dataset.end_date}"
-      print "   -- #{dataset.matches.size} match(es)"
-      print "\n"
-
-      if what == 'week'
-        matches = dataset.weeks_matches( week_start, week_end )    
-        if matches.empty?
-          puts (' '*4) + "** No matches scheduled or played in week #{week_start.cweek}.\n"
-        end
-     elsif what == 'yesterday'
-        matches = dataset.yesterdays_matches
-        if matches.empty?
-           puts (' '*4) + "** No matches played yesterday.\n"
-        end
-      elsif what == 'tomorrow'
-        matches = dataset.tomorrows_matches
-        if matches.empty?
-           puts (' '*4) + "** No matches scheduled tomorrow.\n"
-        end
-      elsif what == 'past'
-        matches = dataset.past_matches
-        if matches.empty?
-           puts (' '*4) + "** No matches played yet.\n"
-        end
-      elsif what == 'upcoming'
-        matches = dataset.upcoming_matches
-        if matches.empty?
-           puts (' '*4) + "** No more matches scheduled.\n"
-        end
-      else   ## assume today
-         matches = dataset.todays_matches
-
-         ## no matches today
-         if matches.empty?
-            puts (' '*4) + "** No matches scheduled today.\n"
-
-            if opts[:verbose]
-              ## note: was world cup 2018 - end date -- Date.new( 2018, 7, 11 )
-              ## note: was euro 2020 (in 2021) - end date -- Date.new( 2021, 7, 11 )
-              if Date.today > dataset.end_date    ## tournament is over, look back
-                puts "Past matches:"
-                matches = dataset.past_matches
-              else  ## world cup is upcoming /in-progress,look forward
-                puts "Upcoming matches:"
-                matches = dataset.upcoming_matches( limit: 18 )
-              end
-            end
-         end
-       end
-       print_matches( matches )
-      end
 
-  end # method self.main
-end # module Footty
 
 
 
 
-Footty.main  if __FILE__ == $0
+Footty.main   if __FILE__ == $0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 2025.5.2
+  version: 2026.5.25
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2026-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-quick
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: webget
   requirement: !ruby/object:Gem::Requirement
@@ -91,9 +91,11 @@ files:
 - bin/footty
 - bin/ftty
 - lib/footty.rb
-- lib/footty/dataset.rb
-- lib/footty/openfootball.rb
-- lib/footty/print.rb
+- lib/footty/dataset/dataset.rb
+- lib/footty/dataset/openfootball.rb
+- lib/footty/main.rb
+- lib/footty/pp_matches.rb
+- lib/footty/pp_week.rb
 - lib/footty/version.rb
 homepage: https://github.com/sportdb/footty
 licenses:

data/lib/footty/print.rb

@@ -1,102 +0,0 @@
-
-module Footty
-
- def self.print_matches( matches )
-  
-    today = Date.today
-
-    matches.each do |match|
-      print "   %5s" % "\##{match['num']} "   if match['num']
-
-      date = Date.strptime( match['date'], '%Y-%m-%d' )
-      print "#{date.strftime('%a %b/%d')} "      ## e.g. Thu Jun/14
-      print "#{match['time']} "  if match['time']
-
-      if date > today
-         diff = (date - today).to_i
-         print "%10s" % "(in #{diff}d) "
-      end
-
-
-      if match['team1'].is_a?( Hash )
-        print "%22s" % "#{match['team1']['name']} (#{match['team1']['code']})"
-      else
-        print "%22s" % "#{match['team1']}"
-      end
-
-
-      if match['score'].is_a?( Hash ) &&
-         match['score']['ft']
-          if match['score']['ft']
-             print " #{match['score']['ft'][0]}-#{match['score']['ft'][1]} "
-          end
-          if match['score']['et']
-            print "aet #{match['score']['et'][0]}-#{match['score']['et'][1]} "
-          end
-          if match['score']['p']
-            print "pen #{match['score']['p'][0]}-#{match['score']['p'][1]} "
-          end
-      elsif match['score1'] && match['score2']
-        ## todo/fix: add support for knockout scores
-        ##                 with score1et/score1p  (extra time and penalty)
-        print " #{match['score1']}-#{match['score2']} "
-        print "(#{match['score1i']}-#{match['score2i']}) "
-      else
-        print "    vs    "
-      end
-
-      if match['team2'].is_a?( Hash )
-        print "%-22s" % "#{match['team2']['name']} (#{match['team2']['code']})"
-      else
-        print "%-22s" % "#{match['team2']}"
-      end
-
-      if match['stage']
-        print " #{match['stage']} /"    ## stage
-      end
-
-      if match['group']
-        print " #{match['group']} /"    ## group phase
-      end
-
-      print " #{match['round']} "    ## knock out (k.o.) phase/stage
-
-      ## todo/fix - check for ground name in use???
-      if match['stadium']
-        print " @ #{match['stadium']['name']}, #{match['city']}"
-      end
-
-      print "\n"
-
-
-      if match['goals1'] && match['goals2']
-        print "                     ["
-        match['goals1'].each_with_index do |goal,i|
-          print " "    if i > 0
-          print "#{goal['name']}"
-          print " #{goal['minute']}"
-          print "+#{goal['offset']}"   if goal['offset']
-          print "'"
-          print " (o.g.)"    if goal['owngoal']
-          print " (pen.)"    if goal['penalty']
-        end
-        match['goals2'].each_with_index do |goal,i|
-          if i == 0
-            print "; "
-          else
-           print " "
-          end
-          print "#{goal['name']}"
-          print " #{goal['minute']}"
-          print "+#{goal['offset']}"  if goal['offset']
-          print "'"
-          print " (o.g.)"  if goal['owngoal']
-          print " (pen.)"  if goal['penalty']
-        end
-        print "]\n"
-      end
-    end
-  end
-
-
-end # module Footty