footty 2025.4.28 → 2025.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620119829b1dbd891a01c374c8996a264e347f329e0211387e18fdc12add6fe6
-  data.tar.gz: cc1f485cc3bbfc12ab5f3846823df6c63f7295912045996a08c2ccb4e50eb7a5
+  metadata.gz: 597423aa8445e6fd662c9a6541230726d1d97316e5f9a7ec7c8781dbf5f2f4e6
+  data.tar.gz: c5bf0acffaa91bd215253eef1b8271348e9596499ff202ef131fa8ef002abd5a
 SHA512:
-  metadata.gz: a0394d72327b87ad90e207e48883bf90acace8e1183d85f9175b9a6484ab8c62e3e12759f77a3eac1e59cc526e0eeacdd70183418a29a920e47c10732f28e51e
-  data.tar.gz: a0e274e21d9ca9620cbdda59ebdec84e92f5b8a99a4e747a177b076de6b830c94b66064c5b89c7ae6ae989b47803558aa7720fd51a321c089705987ad5196f52
+  metadata.gz: fe813055addd774484ca21f19f4200c4cd567f242121df493192fbb5ea1b96a50a893d157c12d255b17743b1014eed13020914859bd23984aa969836e9302b20
+  data.tar.gz: 140a848370b4d24ce43c9cc815fb2b28e2745eb68060dcae43415c1a54c770f9aaeb675d0b809ffbaf753b7b1353b9e98a7d021b1fb73fdc5d08d5adfe15b936

data/CHANGELOG.md

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

data/lib/footty/dataset.rb

@@ -42,7 +42,20 @@ 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
 

data/lib/footty/openfootball.rb

@@ -39,7 +39,11 @@ 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',
@@ -51,6 +55,8 @@ module Footty
       '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',
 

data/lib/footty/version.rb

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

data/lib/footty.rb

@@ -22,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
 
@@ -38,7 +59,7 @@ module Footty
               upcoming:  nil,
               past:      nil,
 
-              #  week:      nil,
+              week:      false,
               #  window:    nil,   ## 2 day plus/minus  +2/-2
            }
 
@@ -69,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 )
 
@@ -110,6 +136,8 @@ module Footty
     
     top = [['world',   '2022'],
            ['euro',   '2024'],
+           ['mls',    '2025'],
+           ['concacafcl', '2025'],
            ['mx',     '2024/25'],
            ['copa',   '2025'],       ## copa libertadores
            ['en',     '2024/25'],
@@ -117,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'],
           ]
  
           
@@ -181,21 +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.28
+  version: 2025.5.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-quick