footty 2024.8.28 → 2024.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2866ba25c1b7a6d08787aaff2bff8821bbc92dada92bcc85ad084b65ceace8b9
-  data.tar.gz: bad3de36a89de81e96565aa3c5c245d5cc53b56ea2faddfae38a0e8810f565e2
+  metadata.gz: 2254b1fa1cf0832e403b6bc0e6509d1ffee06e0f552fec2b805b124c0a867c0d
+  data.tar.gz: 8c8182dabe0e72801b580e46bed8471baacd01080fedac360b2532b63673d9cb
 SHA512:
-  metadata.gz: fabcae4fbe59527bfb4dc35555d0ffa87271240a8ee385a6ea26842d3d268d58b4d6109ebee9159c362b1327447e5d36fae63b2e51f07931d32e5578103d7a70
-  data.tar.gz: df46117a0ab611d90315a17525308f71bd82aac6b00c2a07388e115d92381efdf2f8d339e98311278a80b8b68e3f83283b2eaef3d9ee7ab2c01f753a252d90c5
+  metadata.gz: 3e7421b9f2bf8ec572a55075970301343604a4dbaaabfeceec10827df9a712184fa9372a72c34e0f79811a4ae47b8a773115916e0e195d46def89a9e509b509d
+  data.tar.gz: 4ef82377e9caead4e3ec0048b8eac6120fe77c8de4018e69e74faec2842f33909626234a5bc2ccef137661f999c7825f9ef834c64cab292bcf4e9c357467d645

data/CHANGELOG.md

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

data/README.md

@@ -1,4 +1,5 @@
-# footty - football.db command line client for european ("euro") championship 2024 and more
+# footty - football.db command line tool for national & int'l football club leagues (& cups) from around the world (bonus - incl. world cup, euro and more)
+
 
 * home  :: [github.com/sportdb/footty](https://github.com/sportdb/footty)
 * bugs  :: [github.com/sportdb/footty/issues](https://github.com/sportdb/footty/issues)
@@ -11,15 +12,27 @@
 
 ## Usage - Who's playing today?
 
-The footty command line tool lets you query the online football.db HTTP JSON API services
+The footty command line tool lets you query the online football.db via HTTP
 for upcoming or past matches. For example:
 
-    $ footty              # Defaults to today's euro 2024 matches
+    $ footty         # Defaults to today's English Premier League 2024/25 matches
+
+prints on Sep 27, 2024:
+
+    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
+
 
-prints on Jun/14 2024:
 
-    #1 Fri Jun/14            Germany (GER)    vs    Scotland (SCO)         Group A / Matchday 1
-   
 Use `tomorrow` or `t` or `+1` to print tomorrow's matches e.g.:
 
     $ footty tomorrow    # -or-
@@ -41,9 +54,34 @@ Use `past` or `p` to print all past matches e.g.:
     $ footty p
 
 
+
 That's it. Enjoy the beautiful game.
 
 
+## Bonus - More Leagues & Cups  - Bundesliga, Serie A, Ligue 1, La Liga & More
+
+Pass in the league code to display the Germand Bundesliga, Spanish La Liga, etc:
+
+    $ footty de        #  who's playing in the bundesliga today?
+    $ footty es        #  who's playing in la liga today?
+    ...
+
+League codes include:
+
+- `de`  =>  Bundesliga
+- `es`  =>  La Liga
+- `it`  =>  Serie A
+- `fr`  =>  Ligue 1
+- ...
+
+More
+
+- `world`  =>  World Cup
+- `euro`   =>  "Euro" - European Championship
+
+See [footty/dataset](https://github.com/sportdb/footty/blob/master/lib/footty/dataset.rb) for the complete built-in list of data sources (and league keys).
+
+
 
 
 ## Trivia
@@ -66,7 +104,6 @@ Use it as you please with no restrictions whatsoever.
 
 
 
-
 ## Questions? Comments?
 
 Yes, you can. More than welcome.

data/Rakefile

@@ -2,23 +2,23 @@ require 'hoe'
 require './lib/footty/version.rb'
 
 Hoe.spec 'footty' do
-
   self.version = Footty::VERSION
 
-  self.summary = 'footty - football.db command line client for european "euro" championship 2024 and more - who is playing today?'
+  self.summary = "footty - football.db command line tool for national & int'l football club leagues (& cups) from around the world (bonus - incl. world cup, euro and more)"
   self.description = summary
 
   self.urls = { home: 'https://github.com/sportdb/footty' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'gerald.bauer@gmail.com'
+  self.email  = 'gerald.bauer@gmail.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['sportdb-quick']
+    ['sportdb-quick', '>= 0.2.0'],
+    ['webget'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/footty/dataset.rb

@@ -1,49 +1,106 @@
 module Footty
 
 
-
   class Dataset
+    SOURCES = {
+      'world' => { '2022' => [ 'worldcup/2022--qatar/cup.txt',
+                               'worldcup/2022--qatar/cup_finals.txt'],
+                   '2018' => [ 'worldcup/2018--russia/cup.txt',
+                               'worldcup/2018--russia/cup_finals.txt']
+                 },
+      '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',
+      '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',
+      'atcup' =>  'austria/$season$/cup.txt',
+
+      'fr'=>    'europe/france/$season$/1-ligue1.txt',
+      'nl'=>    'europe/netherlands/$season$/1-eredivisie.txt',
+      'be'=>    'europe/belgium/$season$/1-firstdivisiona.txt',
+
+      'champs'=> 'champions-league/$season$/cl.txt',
+
+      'br'    => 'south-america/brazil/$year$/1-seriea.txt',
+      'ar'    => 'south-america/argentina/$year$/1-primeradivision.txt',
+      'co'    => 'south-america/colombia/$year$/1-primeraa.txt',
+      ## use a different code for copa libertadores? why? why not?
+      'copa'  => 'south-america/copa-libertadores/$year$/libertadores.txt',
+
+      'mx'    => 'mexico/$season$/1-ligamx.txt',
+
+      'eg'    => 'africa/egypt/$season$/1-premiership.txt',
+      'ma'    => 'africa/morocco/$season$/1-botolapro1.txt',
+    }
+
 
-    def initialize( league:, year: )
+    ## return built-in league keys
+    def self.leagues()  SOURCES.keys; end
+
+
+    def initialize( league:,  year: nil )
       @league = league
-      @year   = year
-      @season = Season( "#{year}/#{year+1}" )
+
+      spec = SOURCES[ @league.downcase ]
+      urls = if spec.is_a?( Hash )  ## assume lookup by year
+                if year.nil?  ## lookup default first entry
+                     year = spec.keys[0].to_i
+                     spec.values[0]
+                else
+                     spec[ year.to_s ]
+                end
+              else  ## assume vanilla urls (no lookup by year)
+                   ## default to 2024 for now
+                   year = 2024  if year.nil?
+                   spec
+              end
+      raise ArgumentError, "no dataset (source) for league #{league} found"    if urls.nil?
+
+      ## wrap single sources (strings) in array
+      urls = urls.is_a?( Array ) ? urls : [urls]
+      ## expand shortened url and fill-in template vars
+      @urls = urls.map { |url| openfootball_url( url, year: year ) }
     end
 
 
-    APIS = {
-      world:    'https://raw.githubusercontent.com/openfootball/worldcup.json/master/$year$/worldcup.json',
-      euro:     'https://raw.githubusercontent.com/openfootball/euro.json/master/$year$/euro.json',
-      de:       'https://raw.githubusercontent.com/openfootball/deutschland/master/$season$/1-bundesliga.txt',
-      en:       'https://raw.githubusercontent.com/openfootball/england/master/$season$/1-premierleague.txt',
-      at:       'https://raw.githubusercontent.com/openfootball/austria/master/$season$/1-bundesliga-i.txt',
-    }
+    def openfootball_url( path, year: )
+       repo, local_path = path.split( '/',  2)
+       url = "https://raw.githubusercontent.com/openfootball/#{repo}/master/#{local_path}"
+       ## check for template vars too
+       season = Season( "#{year}/#{year+1}" )
+       url = url.gsub( '$year$', year.to_s )
+       url = url.gsub( '$season$', season.to_path )
+       url
+    end
+
 
     ### note:
     ##   cache ALL methods - only do one web request for match schedule & results
     def matches
       @data ||= begin
-                  url = APIS[ @league.downcase.to_sym ]
-                  url = url.gsub( '$year$', @year.to_s )
-                  url = url.gsub( '$season$', @season.to_path )
-
-                  res = get!( url )    ## use "memoized" / cached result
-                  if url.end_with?( '.json' )
-                      JSON.parse( res.text )
-                  else  ## assume football.txt format
-                      matches = SportDb::QuickMatchReader.parse( res.text )
-                      data = matches.map {|match| match.as_json }  # convert to json
-                      ## quick hack to get keys as strings not symbols!!
-                      ##  fix upstream
-                      JSON.parse( JSON.generate( data ))
+                  matches = []
+                  @urls.each do |url|
+                    txt = get!( url )    ## use "memoized" / cached result
+                    matches += SportDb::QuickMatchReader.parse( txt )
                   end
+                  data = matches.map {|match| match.as_json }  # convert to json
+                  ## quick hack to get keys as strings not symbols!!
+                  ##  fix upstream
+                  JSON.parse( JSON.generate( data ))
                 end
     end
 
+
     def end_date
        @end_date ||= begin
                         end_date = nil
-                        each do |match|
+                        matches.each do |match|
                            date = Date.strptime(match['date'], '%Y-%m-%d' )
                            end_date = date  if end_date.nil? ||
                                                date > end_date
@@ -55,7 +112,7 @@ module Footty
     def start_date
        @start_date ||= begin
                         start_date = nil
-                        each do |match|
+                        matches.each do |match|
                            date = Date.strptime(match['date'], '%Y-%m-%d' )
                            start_date = date  if start_date.nil? ||
                                                date < start_date
@@ -89,54 +146,44 @@ module Footty
     def past_matches( date: Date.today )
       matches = select_matches { |match| date > Date.parse( match['date'] ) }
       ## note reveserve matches (chronological order/last first)
-      matches.reverse
+      ## matches.reverse
+      matches
     end
 
 
 private
-    def each
-      data = matches
-      if data.is_a?( Hash) && data.has_key?('rounds')
-        data['rounds'].each do |round|
-          round['matches'].each do |match|
-            ## hack: add (outer) round to match
-            match['round'] = round['name']
-            yield( match )
-          end
-        end
-      else  ## assume flat matches in Array
-        data.each do |match|
-          yield( match )
-        end
-      end
-    end
-
-
-    def select_matches
-      matches = []
-      each do |match|
-         matches << match   if yield( match )
+    def select_matches( &blk)
+      selected = []
+      matches.each do |match|
+         selected << match   if blk.call( match )
       end
 
       ## todo/fix:
       ##  sort matches here; might not be chronologicial (by default)
-      matches
+      selected
     end  # method select_matches
 
 
-    def get!( url )
-      response = Webclient.get( url )
 
-      if response.status.ok?
-         response
-      else
-        puts "!! HTTP ERROR - #{response.status.code} #{response.status.message}"
-        ## dump headers
-        response.headers.each do |key,value|
-           puts "   #{key}:  #{value}"
-        end
-        exit 1
-      end
-    end  # method get!
-  end # class Client
+    def get!( url )
+        ##  use cached urls for 12h by default
+        ##  if expired in cache (or not present) than get/fetch
+       if Webcache.expired_in_12h?( url )
+         response = Webget.text( url )
+
+         if response.status.ok?
+           response.text   # note - return text (utf-8)
+         else
+           ## dump headers
+           response.headers.each do |key,value|
+             puts "   #{key}:  #{value}"
+           end
+           puts "!! HTTP ERROR - #{response.status.code} #{response.status.message}"
+           exit 1
+         end
+       else
+         Webcache.read( url )
+       end
+    end  # method get_txt!
+  end # class Dataset
 end # module Footty

data/lib/footty/version.rb

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

data/lib/footty.rb

@@ -1,29 +1,34 @@
 require 'sportdb/quick'   ## note - pulls in cocos et al
-
+require 'webget'    ## add webcache support
 
 # our own code
 require_relative 'footty/version' # let it always go first
 require_relative 'footty/dataset'
 
 
-module Footty
 
-  def self.main
+## 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.main( args=ARGV )
     puts banner # say hello
 
      league = 'en'
-     year   = 2024
+     year   = nil
+
+     leagues = Dataset.leagues  ## e.g. ['world','euro',
+                                ##       'de','en','at']
 
-     ## filter ARGV for league or year
-     args = ARGV.select do |arg|
+     ## filter args for league or year
+     args = args.select do |arg|
                              if arg =~ /^\d{4}$/
                                  year = arg.to_i(10)
                                  false  ## eat-up
-                             elsif ['world',
-                                    'euro',
-                                    'de',
-                                    'en',
-                                    'at'].include?( arg )
+                             elsif leagues.include?( arg )
                                  league = arg
                                  false
                              else

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 2024.8.28
+  version: 2024.9.27
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-quick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: webget
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,8 +72,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-description: footty - football.db command line client for european "euro" championship
-  2024 and more - who is playing today?
+description: footty - football.db command line tool for national & int'l football
+  club leagues (& cups) from around the world (bonus - incl. world cup, euro and more)
 email: gerald.bauer@gmail.com
 executables:
 - footty
@@ -103,6 +117,6 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: footty - football.db command line client for european "euro" championship
-  2024 and more - who is playing today?
+summary: footty - football.db command line tool for national & int'l football club
+  leagues (& cups) from around the world (bonus - incl. world cup, euro and more)
 test_files: []