footty 2025.4.9 → 2025.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3101d3bc2cbc21aae12dcc1a108f7972211d55c86415a06c48e0a8db945ac3f
-  data.tar.gz: afaa93ffb303fd4205acdaa1aee1c80ec810a7bf723dabb99960025edb03076b
+  metadata.gz: 597423aa8445e6fd662c9a6541230726d1d97316e5f9a7ec7c8781dbf5f2f4e6
+  data.tar.gz: c5bf0acffaa91bd215253eef1b8271348e9596499ff202ef131fa8ef002abd5a
 SHA512:
-  metadata.gz: 8d23098b1142d238c5f18bec351b6aff504682cb21e724df04dace6a9e40294267463037313c0fafae9a51e46ae80f88e976b681fb6d79fd51832282610957b7
-  data.tar.gz: 3906e217d2f73536b52295c6502eed1b96af0d4cd436a331c075ecc1780ab8c005ebbad260ef3856a70009cd5a4befd037f700e4a3f1d050b7bc3842b70a5b90
+  metadata.gz: fe813055addd774484ca21f19f4200c4cd567f242121df493192fbb5ea1b96a50a893d157c12d255b17743b1014eed13020914859bd23984aa969836e9302b20
+  data.tar.gz: 140a848370b4d24ce43c9cc815fb2b28e2745eb68060dcae43415c1a54c770f9aaeb675d0b809ffbaf753b7b1353b9e98a7d021b1fb73fdc5d08d5adfe15b936

data/CHANGELOG.md

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

data/Manifest.txt

@@ -5,7 +5,6 @@ Rakefile
 bin/footty
 bin/ftty
 lib/footty.rb
-lib/footty/datalib.rb
 lib/footty/dataset.rb
 lib/footty/openfootball.rb
 lib/footty/print.rb

data/README.md

@@ -81,7 +81,7 @@ More
 - `world`  =>  World Cup
 - `euro`   =>  "Euro" - European Championship
 
-See [footty/openfootball](https://github.com/sportdb/footty/blob/master/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/openfootball.rb) for the complete built-in list of data sources (and league codes).
 
 
 

data/lib/footty/dataset.rb

@@ -42,10 +42,40 @@ module Footty
     def yesterdays_matches( date: Date.today )  matches_for( date-1 );  end
 
     def matches_for( date )
-      matches = select_matches { |match| date == Date.parse( match['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 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 
+    end
+
+
 
     def upcoming_matches( date: Date.today,
                           limit: nil )

data/lib/footty/openfootball.rb

@@ -11,11 +11,23 @@ module Footty
       'euro' =>  { '2024' => 'euro/2024--germany/euro.txt',
                    '2021' => 'euro/2021--europe/euro.txt'
                  },
-      'de'  =>    'deutschland/$season$/1-bundesliga.txt',
-      'de2' =>   'deutschland/$season$/2-bundesliga2.txt',
-   
-      'en'=>    'england/$season$/1-premierleague.txt',
-      'es'=>    'espana/$season$/1-liga.txt',
+      'de'    =>    'deutschland/$season$/1-bundesliga.txt',
+      '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',
+      ##  add alternate codes!!!
+      ##   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',
@@ -27,18 +39,31 @@ module Footty
       'nl'=>    'europe/netherlands/$season$_nl1.txt',
       'be'=>    'europe/belgium/$season$_be1.txt',
 
-      'champs'=> 'champions-league/$season$/cl.txt',
+      'champs'     => 'champions-league/$season$/cl.txt',
+      'uefacl'    => 'champions-league/$season$/cl.txt',
+      'uefael'    => 'champions-league/$season$/el.txt',
+      'uefaconf'  => 'champions-league/$season$/conf.txt',
+
 
       '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',
 
       'mx'    => 'world/north-america/mexico/$season$_mx1.txt',
+      'mls'   => 'world/north-america/major-league-soccer/$year$_mls.txt',
+
+      'concacafcl' => 'world/north-america/champions-league/$year$_concacafcl.txt',
 
       'eg'    => 'world/africa/egypt/$season$_eg1.txt',
       'ma'    => 'world/africa/morocco/$season$_ma1.txt',
+
+      'au'    =>  'world/pacific/australia/$season$_au1.txt',
+      'jp'    =>  'world/asia/japan/$year$_jp1.txt',
+      'cn'    =>  'world/asia/china/$year$_cn1.txt',
+
     }
 
 
@@ -51,6 +76,8 @@ module Footty
     def self.latest_season( league: )
       spec = SOURCES[ league.downcase ]
 
+      raise ArgumentError, "no dataset (source) for league #{league} found"    if spec.nil?
+
       ##  todo/fix - report error if no spec found
       season =  if spec.is_a?( Hash )  ## assume lookup by year
                     spec.keys[0]   

data/lib/footty/version.rb

@@ -1,6 +1,6 @@
 
 module Footty
-   VERSION = '2025.4.9'
+   VERSION = '2025.5.2'
 
    def self.banner
      "footty/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"

data/lib/footty.rb

@@ -10,7 +10,6 @@ require 'optparse'
 require_relative 'footty/version' # let version always go first
 require_relative 'footty/dataset'
 require_relative 'footty/openfootball'
-## require_relative 'footty/datalib'
 
 require_relative 'footty/print'
 
@@ -23,6 +22,27 @@ 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
 
@@ -31,13 +51,15 @@ module Footty
               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:      nil,
+              week:      false,
               #  window:    nil,   ## 2 day plus/minus  +2/-2
            }
 
@@ -50,6 +72,11 @@ module Footty
         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
@@ -63,6 +90,11 @@ module Footty
       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 )
 
@@ -72,9 +104,40 @@ module Footty
     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',   '2022'],
            ['euro',   '2024'],
+           ['mls',    '2025'],
+           ['concacafcl', '2025'],
            ['mx',     '2024/25'],
            ['copa',   '2025'],       ## copa libertadores
            ['en',     '2024/25'],
@@ -82,8 +145,12 @@ module Footty
            ['it',     '2024/25'],
            ['fr',     '2024/25'],
            ['de',     '2024/25'],
+           ['decup',  '2024/25'],
            ['at',     '2024/25'],
-           ['champs', '2024/25'],
+           ['atcup',   '2024/25'],
+           ['uefacl',   '2024/25'],
+           ['uefael',   '2024/25'],
+           ['uefaconf', '2024/25'],
           ]
  
           
@@ -108,6 +175,28 @@ module Footty
     
   
 
+    ###################
+    ##  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 )
@@ -124,20 +213,36 @@ module Footty
                'past'
              elsif opts[:upcoming]
                'upcoming'
+             elsif opts[:week]
+               'week'
              else
                'today'
              end
 
-    ## start with two empty lines - assume (massive) debug output before ;-)
-    puts
-    puts
+
+    ## 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 == 'yesterday'
+      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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 2025.4.9
+  version: 2025.5.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-quick
@@ -91,7 +91,6 @@ files:
 - bin/footty
 - bin/ftty
 - lib/footty.rb
-- lib/footty/datalib.rb
 - lib/footty/dataset.rb
 - lib/footty/openfootball.rb
 - lib/footty/print.rb

data/lib/footty/datalib.rb

@@ -1,20 +0,0 @@
-module Footty
-
-class Datalib  ## Library (Selection) of datasets
-               ##  nameing - use datasel(ection) or datacol(lection)
-               ##               or databox or dataman(ger) or 
-               ##               or datacache or 
-               ##               or datacomposite/view
-               ##               or dtataportal  or ???
-
-
-def initialize( datasets=[] )
-   @datasets = datasets
-end
-
-
-
-
-
-end  # class Datalib
-end  # module Footty