footty 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9e350f6c69753563babe7b6313e990333d20f8a
-  data.tar.gz: 9abbd3a090529c2d6dceb8f5cb4a30c09032885a
+SHA256:
+  metadata.gz: 879022e67b5a32b7c48593dbe546a6fc3ceeba3a14bc2e64ecc6e6cea6004b0a
+  data.tar.gz: b9075358a339760d56d5ac282a71859d1154002100e20b142d4f1dab44562676
 SHA512:
-  metadata.gz: 9fb986e01c99f9ce33b1ebb04e321af30c85570967c42a046029c3c70726a57e38a56a8f217792959cebe9d59313962407af8ca54a07c4a2af07f422812751ad
-  data.tar.gz: dae5fdad18c6f894f01e991d5bc0db5f9345fbde968edf3d42b4f3407c79a31e2678af30269d2b24d67b419e1d8f1602d6a856bad70828aa0c08b87f93d31979
+  metadata.gz: 12825097748d31665a168847c9aa0c017fbd21cc4353b7d9917ebaf0553ef1b0b7ab34995c7c8f5c8f0da2b7d740ce7c12ac3b7d113bdd85f58f07d480fa41d8
+  data.tar.gz: 8c7719e5dc9403397c4feaa10886acf04f5d2bc329f81f4a9069948ec4c17f379cab1c836f573099b9968b673b5b152b7e977e9885bf31c348e384e891a114a7

data/{HISTORY.md → CHANGELOG.md}

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

data/Manifest.txt

@@ -1,4 +1,4 @@
-HISTORY.md
+CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
@@ -7,4 +7,5 @@ lib/footty.rb
 lib/footty/client.rb
 lib/footty/version.rb
 test/helper.rb
-test/test_client.rb
+test/test_client_euro.rb
+test/test_client_worldcup.rb

data/README.md

@@ -1,80 +1,86 @@
-# footty - football.db command line client for world cup (russia 2018) 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 world cup 2018 matches
-
-prints on Jun/14 2018:
-
-    #1 Thu Jun/14       Russia (RUS)  5-0  Saudi Arabia (KSA) Group A  @ Luzhniki Stadium, Moscow
-                     [Gazinsky 12' Cheryshev 43' Dzyuba 71' Cheryshev 90+1' Golovin 90+4']
-
-prints on Jun/15 2018:
-
-    #2 Fri Jun/15        Egypt (EGY) vs      Uruguay (URU) Group A  @ Ekaterinburg Arena, Ekaterinburg
-    #3 Fri Jun/15     Portugal (POR) vs        Spain (ESP) Group B  @ Fisht Stadium, Sochi
-    #4 Fri Jun/15      Morocco (MAR) vs         Iran (IRN) Group B  @ Saint Petersburg Stadium, Saint Petersburg
-
-prints on Jun/16:
-
-    #5 Sat Jun/16       France (FRA) vs    Australia (AUS) Group C  @ Kazan Arena, Kazan
-    #6 Sat Jun/16         Peru (PER) vs      Denmark (DEN) Group C  @ Mordovia Arena, Saransk
-    #7 Sat Jun/16    Argentina (ARG) vs      Iceland (ISL) Group D  @ Spartak Stadium, Moscow
-    #8 Sat Jun/16      Croatia (CRO) vs      Nigeria (NGA) Group D  @ Kaliningrad Stadium, Kaliningrad
-
-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.
-
-
-## 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 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!

data/Rakefile

@@ -1,30 +1,30 @@
-require 'hoe'
-require './lib/footty/version.rb'
-
-Hoe.spec 'footty' do
-
-  self.version = Footty::VERSION
-
-  self.summary = 'footty - football.db command line client for world cup (russia 2018) and more - who is playing today?'
-  self.description = summary
-
-  self.urls = ['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 = 'HISTORY.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 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

data/bin/footty

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-
-require 'footty'
-
-Footty.main
+#!/usr/bin/env ruby
+
+require 'footty'
+
+Footty.main

data/lib/footty.rb

@@ -1,152 +1,160 @@
-# encoding: utf-8
-
-
-## 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
-    @@client ||= Client.new    ## 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.get_yesterdays_matches
-      if matches.empty?
-         puts "** No matches played yesterday.\n"
-      end
-    elsif ['tomorrow', 't', '+1', '1'].include? what
-      matches = client.get_tomorrows_matches
-      if matches.empty?
-         puts "** No matches scheduled tomorrow.\n"
-      end
-    elsif ['past', 'p', 'prev'].include? what
-      matches = client.get_past_matches
-      if matches.empty?
-         puts "** No matches played yet.\n"
-      end
-    elsif ['upcoming', 'up', 'u', 'next', 'n'].include? what
-      matches = client.get_upcoming_matches
-      if matches.empty?
-         puts "** No more matches scheduled.\n"
-      end
-    else
-       matches = client.get_todays_matches
-
-       ## no matches today
-       if matches.empty?
-          puts "** No matches scheduled today.\n"
-
-          if Date.today > Date.new( 2018, 7, 11 )   ## world cup is over, look back
-            puts "Past matches:"
-            matches = client.get_past_matches
-          else  ## world cup is upcoming /in-progress,look forward
-            puts "Upcoming matches:"
-            matches = client.get_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 "%20s" % "#{match['team1']['name']} (#{match['team1']['code']})"
-
-      if match['score1'] && match['score2']
-        print " #{match['score1']}-#{match['score2']} "
-      else
-        print " vs "
-      end
-
-      print "%20s" % "#{match['team2']['name']} (#{match['team2']['code']})"
-
-      if match['group']
-        print " #{match['group']} "    ## group phase/stage
-      else
-        print " #{match['round']} "    ## knock out (k.o.) phase/stage
-      end
-
-      print " @ #{match['stadium']['name']}, #{match['city']}"
-      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
+## 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

data/lib/footty/client.rb

@@ -1,103 +1,106 @@
-# encoding: utf-8
-
-module Footty
-
-  class Client
-
-    include LogUtils::Logging
-
-    API_BASE = 'https://raw.githubusercontent.com/openfootball/world-cup.json/master/2018'
-
-    def initialize( opts={} )
-      @opts   = opts
-      @worker = Fetcher::Worker.new
-    end
-
-
-
-    ### note:
-    ##   cache ALL methods - only do one web request for worldcup match schedule & results
-    def get_worldcup
-      @worldcup ||= get( 'worldcup.json' )    ## use "memoized" / cached result
-    end
-
-
-
-
-
-    ## for testing lets you use /round/1 etc.
-    def get_round( num )
-      h = get_worldcup
-      matches = h[ 'rounds' ][ num-1 ]    ## note: rounds hash starts with zero (not 1)
-      matches
-    end
-
-
-    def get_todays_matches( date: Date.today )      get_matches_for( date ); end
-    def get_tomorrows_matches( date: Date.today )   get_matches_for( date+1 );  end
-    def get_yesterdays_matches( date: Date.today )  get_matches_for( date-1 );  end
-
-    def get_matches_for( date )
-      hash  = get_worldcup
-      matches = select_matches( hash[ 'rounds' ] ) { |match| date == Date.parse( match['date'] ) }
-      matches
-    end
-
-
-    def get_upcoming_matches( date: Date.today )
-      ## note: includes todays matches for now
-      hash  = get_worldcup
-      matches = select_matches( hash[ 'rounds' ] ) { |match| date <= Date.parse( match['date'] ) }
-      matches
-    end
-
-    def get_past_matches( date: Date.today )
-      hash  = get_worldcup
-      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( path )
-      ## uri = URI.parse( "#{API_BASE}/#{path}" )
-      # fix: use is_a? URI in fetcher
-      uri_string = "#{API_BASE}/#{path}"
-
-      response = @worker.get_response( uri_string )
-
-      if response.code == '200'
-        ##
-        ## todo/check:
-        ##  do we need to force utf-8 encoding?
-        ##   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
+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/lib/footty/version.rb

@@ -1,14 +1,14 @@
-# encoding: utf-8
-
-
-module Footty
-   VERSION = '0.4.0'
-
-   def self.banner
-     "footty/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-   end
-
-   def self.root
-     "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
-   end
-end
+
+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
+
+

data/test/test_client_euro.rb

@@ -0,0 +1,103 @@
+###
+#  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.rb → test_client_worldcup.rb}

@@ -1,36 +1,37 @@
-# encoding: utf-8
-
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_client_worldcup.rb
 
 require 'helper'
 
 
 
-class TestClient < MiniTest::Test
+class TestClientWorldCup < MiniTest::Test
 
   def setup
-    @client = Footty.client
+    @client = Footty::Client.new( league: 'worldcup', year: 2018 )
   end
 
 
   def test_getters
     today = Date.new( 2018, 6, 16 )
 
-    todays     = @client.get_todays_matches( date: today )
+    todays     = @client.todays_matches( date: today )
     pp todays
     assert_equal 4,     todays.size
 
-    yesterdays = @client.get_yesterdays_matches( date: today )
+    yesterdays = @client.yesterdays_matches( date: today )
     pp yesterdays
     assert_equal 3,     yesterdays.size
 
-    tomorrows  = @client.get_tomorrows_matches( date: today )
+    tomorrows  = @client.tomorrows_matches( date: today )
     pp tomorrows
     assert_equal 3,     tomorrows.size
 
-    past     = @client.get_past_matches( date: today )
+    past     = @client.past_matches( date: today )
     pp past
 
-    upcoming = @client.get_upcoming_matches( date: today )
+    upcoming = @client.upcoming_matches( date: today )
     pp upcoming
   end
 
@@ -38,7 +39,7 @@ class TestClient < MiniTest::Test
 
   def test_todays_matches_2018_6_14
      today = Date.new( 2018, 6, 14 )
-     ary = @client.get_todays_matches( date: today )
+     ary = @client.todays_matches( date: today )
      ## pp ary
 =begin
 [{"num"=>1,
@@ -62,13 +63,13 @@ class TestClient < MiniTest::Test
      assert_equal 'RUS',        ary[0]['team1']['code']
      assert_equal 'KSA',        ary[0]['team2']['code']
      assert_equal 'Matchday 1', ary[0]['round']
-     assert_nil                 ary[0]['score1']
-     assert_nil                 ary[0]['score2']
+     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.get_todays_matches( date: today )
+     ary = @client.todays_matches( date: today )
      ## note: returns empty array if no matches scheduled/playing today
      pp ary
 
@@ -77,7 +78,7 @@ class TestClient < MiniTest::Test
   end
 
   def test_world_2018_round_1
-    h = @client.get_round( 1 )
+    h = @client.round( 1 )
 
     ## pp h
 =begin
@@ -100,13 +101,13 @@ class TestClient < MiniTest::Test
 
     assert_equal 'RUS', h['matches'][0]['team1']['code']
     assert_equal 'KSA', h['matches'][0]['team2']['code']
-    assert_nil          h['matches'][0]['score1']
-    assert_nil          h['matches'][0]['score2']
+    assert_equal 5,     h['matches'][0]['score1']
+    assert_equal 0,     h['matches'][0]['score2']
   end
 
 
   def test_world_2018_round_2
-    h = @client.get_round( 2 )
+    h = @client.round( 2 )
 
     ## pp h
 =begin
@@ -155,9 +156,9 @@ class TestClient < MiniTest::Test
 
     assert_equal 'EGY', h['matches'][0]['team1']['code']
     assert_equal 'URU', h['matches'][0]['team2']['code']
-    assert_nil          h['matches'][0]['score1']
-    assert_nil          h['matches'][0]['score2']
+    assert_equal  0,    h['matches'][0]['score1']
+    assert_equal  1,    h['matches'][0]['score2']
   end
 
 
-end # class TestClient
+end # class TestClientWorldCup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
@@ -42,42 +42,48 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
-description: footty - football.db command line client for world cup (russia 2018)
-  and more - who is playing today?
+        version: '3.22'
+description: footty - football.db command line client for european "euro" championship
+  2020 (in 2021) and more - who is playing today?
 email: opensport@googlegroups.com
 executables:
 - footty
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -86,12 +92,13 @@ files:
 - lib/footty/client.rb
 - lib/footty/version.rb
 - test/helper.rb
-- test/test_client.rb
+- test/test_client_euro.rb
+- test/test_client_worldcup.rb
 homepage: https://github.com/sportdb/footty
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -108,10 +115,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: footty - football.db command line client for world cup (russia 2018) and
-  more - who is playing today?
+summary: footty - football.db command line client for european "euro" championship
+  2020 (in 2021) and more - who is playing today?
 test_files: []