footty 0.4.1 → 2024.8.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879022e67b5a32b7c48593dbe546a6fc3ceeba3a14bc2e64ecc6e6cea6004b0a
-  data.tar.gz: b9075358a339760d56d5ac282a71859d1154002100e20b142d4f1dab44562676
+  metadata.gz: 2866ba25c1b7a6d08787aaff2bff8821bbc92dada92bcc85ad084b65ceace8b9
+  data.tar.gz: bad3de36a89de81e96565aa3c5c245d5cc53b56ea2faddfae38a0e8810f565e2
 SHA512:
-  metadata.gz: 12825097748d31665a168847c9aa0c017fbd21cc4353b7d9917ebaf0553ef1b0b7ab34995c7c8f5c8f0da2b7d740ce7c12ac3b7d113bdd85f58f07d480fa41d8
-  data.tar.gz: 8c7719e5dc9403397c4feaa10886acf04f5d2bc329f81f4a9069948ec4c17f379cab1c836f573099b9968b673b5b152b7e977e9885bf31c348e384e891a114a7
+  metadata.gz: fabcae4fbe59527bfb4dc35555d0ffa87271240a8ee385a6ea26842d3d268d58b4d6109ebee9159c362b1327447e5d36fae63b2e51f07931d32e5578103d7a70
+  data.tar.gz: df46117a0ab611d90315a17525308f71bd82aac6b00c2a07388e115d92381efdf2f8d339e98311278a80b8b68e3f83283b2eaef3d9ee7ab2c01f753a252d90c5

data/CHANGELOG.md

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

data/Manifest.txt

@@ -3,9 +3,7 @@ Manifest.txt
 README.md
 Rakefile
 bin/footty
+bin/ftty
 lib/footty.rb
-lib/footty/client.rb
+lib/footty/dataset.rb
 lib/footty/version.rb
-test/helper.rb
-test/test_client_euro.rb
-test/test_client_worldcup.rb

data/README.md

@@ -1,86 +1,74 @@
-# footty - football.db command line client for european ("euro") championship 2020 (in 2021) and more
-
-* home  :: [github.com/sportdb/footty](https://github.com/sportdb/footty)
-* bugs  :: [github.com/sportdb/footty/issues](https://github.com/sportdb/footty/issues)
-* gem   :: [rubygems.org/gems/footty](https://rubygems.org/gems/footty)
-* rdoc  :: [rubydoc.info/gems/footty](http://rubydoc.info/gems/footty)
-* forum :: [opensport](http://groups.google.com/group/opensport)
-
-
-
-
-
-## Usage - Who's playing today?
-
-The footty command line tool lets you query the online football.db HTTP JSON API services
-for upcoming or past matches. For example:
-
-    $ footty              # Defaults to today's euro 2020 (in 2021) matches
-
-prints on Jun/14 2021:
-
-   #20 Mon Jun/14         Scotland (SCO)   vs   Czech Republic (CZE)   Group D / Matchday 1
-   #25 Mon Jun/14           Poland (POL)   vs   Slovakia (SVK)         Group E / Matchday 1
-   #26 Mon Jun/14            Spain (ESP)   vs   Sweden (SWE)           Group E / Matchday 1
-
-and the next day with `footty yesterday`:
-
-   #20 Mon Jun/14         Scotland (SCO) 0-2 (0-1) Czech Republic (CZE)   Group D / Matchday 1
-   #25 Mon Jun/14           Poland (POL) 1-2 (0-1) Slovakia (SVK)         Group E / Matchday 1
-   #26 Mon Jun/14            Spain (ESP) 0-0       Sweden (SWE)           Group E / Matchday 1
-
-prints on Jun/15 2021:
-
-   #31 Tue Jun/15          Hungary (HUN)    vs    Portugal (POR)         Group F / Matchday 1
-   #32 Tue Jun/15           France (FRA)    vs    Germany (GER)          Group F / Matchday 1
-
-and so on.
-Use `tomorrow` or `t` or `+1` to print tomorrow's matches e.g.:
-
-    $ footty tomorrow    # -or-
-    $ footty t
-
-Use `yesterday` or `y` or `-1` to print yesterday's matches e.g.:
-
-    $ footty yesterday    # -or-
-    $ footty y
-
-Use `upcoming` or `up` or `u` to print all upcoming matches e.g.:
-
-    $ footty upcoming    # -or-
-    $ footty up
-
-Use `past` or `p` to print all past matches e.g.:
-
-    $ footty past    # -or-
-    $ footty p
-
-
-That's it. Enjoy the beautiful game.
-
-
-
-
-## Trivia
-
-Why tty? tty stands for teletype (tty) writer and is the old traditional (short) name for the unix command line.
-
-
-## Install
-
-Just install the gem:
-
-    $ gem install footty
-
-
-## License
-
-The `footty` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.
-
-
-## Questions? Comments?
-
-Send them along to the
-[Open Sports & Friends Forum/Mailing List](http://groups.google.com/group/opensport).
-Thanks!
+# footty - football.db command line client for european ("euro") championship 2024 and more
+
+* home  :: [github.com/sportdb/footty](https://github.com/sportdb/footty)
+* bugs  :: [github.com/sportdb/footty/issues](https://github.com/sportdb/footty/issues)
+* gem   :: [rubygems.org/gems/footty](https://rubygems.org/gems/footty)
+* rdoc  :: [rubydoc.info/gems/footty](http://rubydoc.info/gems/footty)
+
+
+
+
+
+## Usage - Who's playing today?
+
+The footty command line tool lets you query the online football.db HTTP JSON API services
+for upcoming or past matches. For example:
+
+    $ footty              # Defaults to today's euro 2024 matches
+
+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-
+    $ footty t
+
+Use `yesterday` or `y` or `-1` to print yesterday's matches e.g.:
+
+    $ footty yesterday    # -or-
+    $ footty y
+
+Use `upcoming` or `up` or `u` to print all upcoming matches e.g.:
+
+    $ footty upcoming    # -or-
+    $ footty up
+
+Use `past` or `p` to print all past matches e.g.:
+
+    $ footty past    # -or-
+    $ footty p
+
+
+That's it. Enjoy the beautiful game.
+
+
+
+
+## Trivia
+
+Why tty? tty stands for teletype (tty) writer and is the old traditional (short) name for the unix command line.
+
+
+## Install
+
+Just install the gem:
+
+    $ gem install footty
+
+
+## License
+
+The `footty` scripts are dedicated to the public domain.
+Use it as you please with no restrictions whatsoever.
+
+
+
+
+
+## Questions? Comments?
+
+Yes, you can. More than welcome.
+See [Help & Support »](https://github.com/openfootball/help)
+

data/Rakefile

@@ -1,30 +1,29 @@
-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 2020 (in 2021) and more - who is playing today?'
-  self.description = summary
-
-  self.urls = { home: 'https://github.com/sportdb/footty' }
-
-  self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
-
-  # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.md'
-  self.history_file = 'CHANGELOG.md'
-
-  self.extra_deps = [
-    ['logutils' ],
-    ['fetcher']
-  ]
-
-  self.licenses = ['Public Domain']
-
-  self.spec_extras = {
-   required_ruby_version: '>= 2.3'
-  }
-end
+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.description = summary
+
+  self.urls = { home: 'https://github.com/sportdb/footty' }
+
+  self.author = 'Gerald Bauer'
+  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']
+  ]
+
+  self.licenses = ['Public Domain']
+
+  self.spec_extras = {
+   required_ruby_version: '>= 3.1.0'
+  }
+end

data/bin/footty

@@ -1,5 +1,8 @@
-#!/usr/bin/env ruby
-
-require 'footty'
-
-Footty.main
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/footty
+
+require 'footty'
+
+Footty.main

data/bin/ftty

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/ftty
+
+require 'footty'
+
+Footty.main

data/lib/footty/dataset.rb

@@ -0,0 +1,142 @@
+module Footty
+
+
+
+  class Dataset
+
+    def initialize( league:, year: )
+      @league = league
+      @year   = year
+      @season = Season( "#{year}/#{year+1}" )
+    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',
+    }
+
+    ### 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 ))
+                  end
+                end
+    end
+
+    def end_date
+       @end_date ||= begin
+                        end_date = nil
+                        each do |match|
+                           date = Date.strptime(match['date'], '%Y-%m-%d' )
+                           end_date = date  if end_date.nil? ||
+                                               date > end_date
+                        end
+                        end_date
+                     end
+    end
+
+    def start_date
+       @start_date ||= begin
+                        start_date = nil
+                        each do |match|
+                           date = Date.strptime(match['date'], '%Y-%m-%d' )
+                           start_date = date  if start_date.nil? ||
+                                               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 { |match| date == Date.parse( match['date'] ) }
+      matches
+    end
+
+
+    def upcoming_matches( date: Date.today,
+                          limit: nil )
+      ## note: includes todays matches for now
+      matches = select_matches { |match| date <= Date.parse( match['date'] ) }
+
+      if limit
+        matches[0, limit]  ## cut-off
+      else
+        matches
+      end
+    end
+
+    def past_matches( date: Date.today )
+      matches = select_matches { |match| date > Date.parse( match['date'] ) }
+      ## note reveserve matches (chronological order/last first)
+      matches.reverse
+    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 )
+      end
+
+      ## todo/fix:
+      ##  sort matches here; might not be chronologicial (by default)
+      matches
+    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
+end # module Footty

data/lib/footty/version.rb

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

data/lib/footty.rb

@@ -1,160 +1,187 @@
-## stdlibs
-
-require 'net/http'
-require 'uri'
-require 'json'
-require 'pp'
-
-
-## 3rd party gems/libs
-## require 'props'
-
-require 'logutils'
-require 'fetcher'
-
-
-# our own code
-require 'footty/version' # let it always go first
-require 'footty/client'
-
-
-module Footty
-
-  def self.client
-    ## note: hard code tournament / league for now
-    @client ||= Client.new( league: 'euro', year: 2020 )    ## use "singelton" / shared client
-  end
-
-
-
-  def self.main
-    puts banner # say hello
-
-    what = ARGV[0] || 'today'
-    what = what.downcase
-
-    ## in the future make today "configurable" as param - why? why not?
-    today = Date.today
-
-    if ['yesterday', 'y', '-1'].include?( what )
-      matches = client.yesterdays_matches
-      if matches.empty?
-         puts "** No matches played yesterday.\n"
-      end
-    elsif ['tomorrow', 't', '+1', '1'].include?( what )
-      matches = client.tomorrows_matches
-      if matches.empty?
-         puts "** No matches scheduled tomorrow.\n"
-      end
-    elsif ['past', 'p', 'prev'].include?( what )
-      matches = client.past_matches
-      if matches.empty?
-         puts "** No matches played yet.\n"
-      end
-    elsif ['upcoming', 'up', 'u', 'next', 'n'].include?( what )
-      matches = client.upcoming_matches
-      if matches.empty?
-         puts "** No more matches scheduled.\n"
-      end
-    else
-       matches = client.todays_matches
-
-       ## no matches today
-       if matches.empty?
-          puts "** No matches scheduled today.\n"
-
-          ## note: was world cup 2018 - end date -- Date.new( 2018, 7, 11 )
-          if Date.today > Date.new( 2021, 7, 11 )   ## tournament is over, look back
-            puts "Past matches:"
-            matches = client.past_matches
-          else  ## world cup is upcoming /in-progress,look forward
-            puts "Upcoming matches:"
-            matches = client.upcoming_matches
-          end
-       end
-    end
-
-
-
-    print_matches( matches )
-  end
-
-
-
-  def self.print_matches( matches )
-    ## print games
-
-    today = Date.today
-
-    matches.each do |match|
-      print "   %5s" % "\##{match['num']} "
-
-      date = Date.parse( match['date'] )
-      print "#{date.strftime('%a %b/%d')} "      ## e.g. Thu Jun/14
-      if date > today
-         diff = (date - today).to_i
-         print "%10s" % "(in #{diff}d) "
-      end
-
-      print "%22s" % "#{match['team1']['name']} (#{match['team1']['code']})"
-
-      ## todo/fix: add support for knockout scores
-      ##                 with score1et/score1p  (extra time and penalty)
-      if match['score1'] && match['score2']
-        print " #{match['score1']}-#{match['score2']} "
-        print "(#{match['score1i']}-#{match['score2i']}) "
-      else
-        print "    vs    "
-      end
-
-      print "%-22s" % "#{match['team2']['name']} (#{match['team2']['code']})"
-
-      if match['group']
-        print " #{match['group']} /"    ## group phase/stage
-      end
-
-      print " #{match['round']} "    ## knock out (k.o.) phase/stage
-
-      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
-
-
-
-Footty.main  if __FILE__ == $0
+require 'sportdb/quick'   ## note - pulls in cocos et al
+
+
+# our own code
+require_relative 'footty/version' # let it always go first
+require_relative 'footty/dataset'
+
+
+module Footty
+
+  def self.main
+    puts banner # say hello
+
+     league = 'en'
+     year   = 2024
+
+     ## filter ARGV for league or year
+     args = ARGV.select do |arg|
+                             if arg =~ /^\d{4}$/
+                                 year = arg.to_i(10)
+                                 false  ## eat-up
+                             elsif ['world',
+                                    'euro',
+                                    'de',
+                                    'en',
+                                    'at'].include?( arg )
+                                 league = arg
+                                 false
+                             else
+                                 true
+                             end
+                         end
+
+
+    what = args[0] || 'today'
+    what = what.downcase
+
+
+    # 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
+
+    if ['yesterday', 'y', '-1'].include?( what )
+      matches = dataset.yesterdays_matches
+      if matches.empty?
+         puts "** No matches played yesterday.\n"
+      end
+    elsif ['tomorrow', 't', '+1', '1'].include?( what )
+      matches = dataset.tomorrows_matches
+      if matches.empty?
+         puts "** No matches scheduled tomorrow.\n"
+      end
+    elsif ['past', 'p', 'prev'].include?( what )
+      matches = dataset.past_matches
+      if matches.empty?
+         puts "** No matches played yet.\n"
+      end
+    elsif ['upcoming', 'up', 'u', 'next', 'n'].include?( what )
+      matches = dataset.upcoming_matches
+      if matches.empty?
+         puts "** No more matches scheduled.\n"
+      end
+    else
+       matches = dataset.todays_matches
+
+       ## no matches today
+       if matches.empty?
+          puts "** No matches scheduled today.\n"
+
+          ## 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
+
+    print_matches( matches )
+  end
+
+
+  def self.print_matches( matches )
+    ## print games
+
+    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['group']
+        print " #{match['group']} /"    ## group phase/stage
+      end
+
+      print " #{match['round']} "    ## knock out (k.o.) phase/stage
+
+      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
+
+
+
+Footty.main  if __FILE__ == $0

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 2024.8.28
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fetcher
+  name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -64,19 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '4.1'
 description: footty - football.db command line client for european "euro" championship
-  2020 (in 2021) and more - who is playing today?
-email: opensport@googlegroups.com
+  2024 and more - who is playing today?
+email: gerald.bauer@gmail.com
 executables:
 - footty
+- ftty
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -88,12 +75,10 @@ files:
 - README.md
 - Rakefile
 - bin/footty
+- bin/ftty
 - lib/footty.rb
-- lib/footty/client.rb
+- lib/footty/dataset.rb
 - lib/footty/version.rb
-- test/helper.rb
-- test/test_client_euro.rb
-- test/test_client_worldcup.rb
 homepage: https://github.com/sportdb/footty
 licenses:
 - Public Domain
@@ -108,16 +93,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: footty - football.db command line client for european "euro" championship
-  2020 (in 2021) and more - who is playing today?
+  2024 and more - who is playing today?
 test_files: []

data/lib/footty/client.rb

@@ -1,106 +0,0 @@
-module Footty
-
-
-  class Client
-
-    include LogUtils::Logging
-
-
-    def initialize( league:, year: )
-      @worker = Fetcher::Worker.new
-
-      @league = league
-      @year   = year
-    end
-
-
-    APIS = {
-      worldcup: 'https://github.com/openfootball/worldcup.json/raw/master/$year$/worldcup.json',
-      euro:     'https://github.com/openfootball/euro.json/raw/master/$year$/euro.json'
-    }
-
-    ### note:
-    ##   cache ALL methods - only do one web request for match schedule & results
-    def get_matches
-      @data ||= begin
-                  str = APIS[ @league.downcase.to_sym ]
-                  str = str.gsub( '$year$', @year.to_s )
-
-                  get( str )    ## use "memoized" / cached result
-                end
-    end
-
-
-
-
-    ## for testing lets you use /round/1 etc.
-    def round( num )
-      h = get_matches
-      matches = h[ 'rounds' ][ num-1 ]    ## note: rounds hash starts with zero (not 1)
-      matches
-    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 )
-      hash  = get_matches
-      matches = select_matches( hash[ 'rounds' ] ) { |match| date == Date.parse( match['date'] ) }
-      matches
-    end
-
-
-    def upcoming_matches( date: Date.today )
-      ## note: includes todays matches for now
-      hash  = get_matches
-      matches = select_matches( hash[ 'rounds' ] ) { |match| date <= Date.parse( match['date'] ) }
-      matches
-    end
-
-    def past_matches( date: Date.today )
-      hash  = get_matches
-      matches = select_matches( hash[ 'rounds' ] ) { |match| date > Date.parse( match['date'] ) }
-      ## note reveserve matches (chronological order/last first)
-      matches.reverse
-    end
-
-private
-
-    def select_matches( rounds )
-      matches = []
-      rounds.each do |round|
-        round['matches'].each do |match|
-          if yield( match )
-            ## hack: add (outer) round to match
-            match['round'] = round['name']
-            matches << match
-          else
-            ## puts " skipping game   play_date #{play_date}"
-          end
-        end
-      end
-      matches
-    end
-
-
-    def get( str )
-      response = @worker.get_response( str )
-
-      if response.code == '200'
-        ##
-        ## fix/fix/todo/check:
-        ##  do we need to force utf-8 encoding? yes!!!!
-        ##   check for teams w/ non-ascii names
-        hash = JSON.parse( response.body )
-        ## pp hash
-        hash
-      else
-        logger.error "fetch HTTP - #{response.code} #{response.message}"
-        nil
-      end
-    end
-
-  end # class Client
-end # module Footty

data/test/helper.rb

@@ -1,10 +0,0 @@
-## $:.unshift(File.dirname(__FILE__))
-
-## minitest setup
-
-require 'minitest/autorun'
-
-
-## our own code
-
-require 'footty'

data/test/test_client_euro.rb

@@ -1,103 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_client_euro.rb
-
-require 'helper'
-
-
-
-class TestClientEuro < MiniTest::Test
-
-  def setup
-    @client = Footty::Client.new( league: 'euro', year: 2020 )
-  end
-
-
-  def test_getters
-    today = Date.new( 2021, 6, 15 )
-
-    todays     = @client.todays_matches( date: today )
-    pp todays
-    assert_equal 2,     todays.size
-
-    yesterdays = @client.yesterdays_matches( date: today )
-    pp yesterdays
-    assert_equal 3,     yesterdays.size
-
-    tomorrows  = @client.tomorrows_matches( date: today )
-    pp tomorrows
-    assert_equal 3,     tomorrows.size
-
-    past     = @client.past_matches( date: today )
-    pp past
-
-    upcoming = @client.upcoming_matches( date: today )
-    pp upcoming
-  end
-
-
-  def test_todays_matches_2021_6_15
-     today = Date.new( 2021, 6, 15 )
-     ary = @client.todays_matches( date: today )
-     pp ary
-=begin
-[{"num"=>31,
-  "date"=>"2021-06-15",
-  "team1"=>{"name"=>"Hungary", "code"=>"HUN"},
-  "team2"=>{"name"=>"Portugal", "code"=>"POR"},
-  "score1"=>nil,
-  "score2"=>nil,
-  "score1i"=>nil,
-  "score2i"=>nil,
-  "group"=>"Group F",
-  "round"=>"Matchday 1"},
-  ...
-=end
-
-     assert_equal Array, ary.class     ## for now just check return type (e.g. assume Array for parsed JSON data)
-     assert_equal 2,     ary.size
-     assert_equal 'HUN',        ary[0]['team1']['code']
-     assert_equal 'POR',        ary[0]['team2']['code']
-     assert_equal 'Matchday 1', ary[0]['round']
-     # assert_equal 5,            ary[0]['score1']
-     # assert_equal 0,            ary[0]['score2']
-  end
-
-
-  def test_todays_matches_2021_6_10
-     today = Date.new( 2021, 6, 10 )
-     ary = @client.todays_matches( date: today )
-     ## note: returns empty array if no matches scheduled/playing today
-     pp ary
-
-     assert_equal Array, ary.class     ## for now just check return type (e.g. assume Array for parsed JSON data)
-     assert              ary.empty?
-  end
-
-
-  def test_euro_round_1
-    h = @client.round( 1 )
-
-    pp h
-=begin
-{"name"=>"Matchday 1",
- "matches"=>
-  [{"num"=>1,
-    "date"=>"2021-06-11",
-    "team1"=>{"name"=>"Turkey", "code"=>"TUR"},
-    "team2"=>{"name"=>"Italy", "code"=>"ITA"},
-    "score1"=>0,
-    "score2"=>3,
-    "score1i"=>0,
-    "score2i"=>0,
-    "group"=>"Group A"},
-=end
-
-    assert_equal 'TUR', h['matches'][0]['team1']['code']
-    assert_equal 'ITA', h['matches'][0]['team2']['code']
-    assert_equal 0,     h['matches'][0]['score1']
-    assert_equal 3,     h['matches'][0]['score2']
-  end
-
-
-end # class TestClientEuro

data/test/test_client_worldcup.rb

@@ -1,164 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_client_worldcup.rb
-
-require 'helper'
-
-
-
-class TestClientWorldCup < MiniTest::Test
-
-  def setup
-    @client = Footty::Client.new( league: 'worldcup', year: 2018 )
-  end
-
-
-  def test_getters
-    today = Date.new( 2018, 6, 16 )
-
-    todays     = @client.todays_matches( date: today )
-    pp todays
-    assert_equal 4,     todays.size
-
-    yesterdays = @client.yesterdays_matches( date: today )
-    pp yesterdays
-    assert_equal 3,     yesterdays.size
-
-    tomorrows  = @client.tomorrows_matches( date: today )
-    pp tomorrows
-    assert_equal 3,     tomorrows.size
-
-    past     = @client.past_matches( date: today )
-    pp past
-
-    upcoming = @client.upcoming_matches( date: today )
-    pp upcoming
-  end
-
-
-
-  def test_todays_matches_2018_6_14
-     today = Date.new( 2018, 6, 14 )
-     ary = @client.todays_matches( date: today )
-     ## pp ary
-=begin
-[{"num"=>1,
-  "date"=>"2018-06-14",
-  "time"=>"18:00",
-  "team1"=>{"name"=>"Russia", "code"=>"RUS"},
-  "team2"=>{"name"=>"Saudi Arabia", "code"=>"KSA"},
-  "score1"=>nil,
-  "score2"=>nil,
-  "score1i"=>nil,
-  "score2i"=>nil,
-  "group"=>"Group A",
-  "stadium"=>{"key"=>"luzhniki", "name"=>"Luzhniki Stadium"},
-  "city"=>"Moscow",
-  "timezone"=>"UTC+3",
-  "round"=>"Matchday 1"}]
-=end
-
-     assert_equal Array, ary.class     ## for now just check return type (e.g. assume Array for parsed JSON data)
-     assert_equal 1,     ary.size
-     assert_equal 'RUS',        ary[0]['team1']['code']
-     assert_equal 'KSA',        ary[0]['team2']['code']
-     assert_equal 'Matchday 1', ary[0]['round']
-     assert_equal 5,            ary[0]['score1']
-     assert_equal 0,            ary[0]['score2']
-  end
-
-  def test_todays_matches_2018_6_10
-     today = Date.new( 2018, 6, 10 )
-     ary = @client.todays_matches( date: today )
-     ## note: returns empty array if no matches scheduled/playing today
-     pp ary
-
-     assert_equal Array, ary.class     ## for now just check return type (e.g. assume Array for parsed JSON data)
-     assert              ary.empty?
-  end
-
-  def test_world_2018_round_1
-    h = @client.round( 1 )
-
-    ## pp h
-=begin
-{"name"=>"Matchday 1",
- "matches"=>
-  [{"num"=>1,
-    "date"=>"2018-06-14",
-    "time"=>"18:00",
-    "team1"=>{"name"=>"Russia", "code"=>"RUS"},
-    "team2"=>{"name"=>"Saudi Arabia", "code"=>"KSA"},
-    "score1"=>nil,
-    "score2"=>nil,
-    "score1i"=>nil,
-    "score2i"=>nil,
-    "group"=>"Group A",
-    "stadium"=>{"key"=>"luzhniki", "name"=>"Luzhniki Stadium"},
-    "city"=>"Moscow",
-    "timezone"=>"UTC+3"}]}
-=end
-
-    assert_equal 'RUS', h['matches'][0]['team1']['code']
-    assert_equal 'KSA', h['matches'][0]['team2']['code']
-    assert_equal 5,     h['matches'][0]['score1']
-    assert_equal 0,     h['matches'][0]['score2']
-  end
-
-
-  def test_world_2018_round_2
-    h = @client.round( 2 )
-
-    ## pp h
-=begin
-{"name"=>"Matchday 2",
- "matches"=>
-  [{"num"=>2,
-    "date"=>"2018-06-15",
-    "time"=>"17:00",
-    "team1"=>{"name"=>"Egypt", "code"=>"EGY"},
-    "team2"=>{"name"=>"Uruguay", "code"=>"URU"},
-    "score1"=>nil,
-    "score2"=>nil,
-    "score1i"=>nil,
-    "score2i"=>nil,
-    "group"=>"Group A",
-    "stadium"=>{"key"=>"ekaterinburg", "name"=>"Ekaterinburg Arena"},
-    "city"=>"Ekaterinburg",
-    "timezone"=>"UTC+5"},
-   {"num"=>3,
-    "date"=>"2018-06-15",
-    "time"=>"21:00",
-    "team1"=>{"name"=>"Portugal", "code"=>"POR"},
-    "team2"=>{"name"=>"Spain", "code"=>"ESP"},
-    "score1"=>nil,
-    "score2"=>nil,
-    "score1i"=>nil,
-    "score2i"=>nil,
-    "group"=>"Group B",
-    "stadium"=>{"key"=>"fisht", "name"=>"Fisht Stadium"},
-    "city"=>"Sochi",
-    "timezone"=>"UTC+3"},
-   {"num"=>4,
-    "date"=>"2018-06-15",
-    "time"=>"18:00",
-    "team1"=>{"name"=>"Morocco", "code"=>"MAR"},
-    "team2"=>{"name"=>"Iran", "code"=>"IRN"},
-    "score1"=>nil,
-    "score2"=>nil,
-    "score1i"=>nil,
-    "score2i"=>nil,
-    "group"=>"Group B",
-    "stadium"=>{"key"=>"saintpetersburg", "name"=>"Saint Petersburg Stadium"},
-    "city"=>"Saint Petersburg",
-    "timezone"=>"UTC+3"}]}
-=end
-
-    assert_equal 'EGY', h['matches'][0]['team1']['code']
-    assert_equal 'URU', h['matches'][0]['team2']['code']
-    assert_equal  0,    h['matches'][0]['score1']
-    assert_equal  1,    h['matches'][0]['score2']
-  end
-
-
-end # class TestClientWorldCup