footty 2026.5.25 → 2026.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b4ca658d25b404bf5b4f1594da50c42564ad7ffc43e3190429a7c4627b8c94
-  data.tar.gz: 25eac464226fea4b31da270bc195c443e34bc4fa68ce9de1bd0646b8ec63639e
+  metadata.gz: e610fb1316252ad640f6dc1797ff85af9252b00c7f3c90d4d182e683490f77b4
+  data.tar.gz: cacbd8b21aaa4f0e29225b158da9c0a35dc825ff6cfdbc4532662fa71997404c
 SHA512:
-  metadata.gz: a1762d1389a13f0380267a7b8a0621b6df1e176eb847a4cac454fcfdfb87ece7321a950e80ad2c1ffedbd38f2966def3c63cda9d159063e568b1854bac0349b9
-  data.tar.gz: e791218fe6679d8c03545114cb60a7ce588b8f8dce4f8d80764aaa1da1168f6ab7552af00098ad6165a59d97ecea5fc1292cbb979689835f029bb4d06a1bc5cb
+  metadata.gz: 8db64064a0d96b3c70a7a75fdb5246864c4e13ad950c39eb6a43795f6d6f9af45bf84f8a7590c46664c14547769c51b8116e030e64e1271df17be31e279f9a85
+  data.tar.gz: 94ab96e8e3dca3efa6a80fd30a72a469a41271b0819d9ff2a2ebafeb1b6491f10a043a4acc93c3f6f9a0bf99fb06309b9a03f127e26ba9b124b9ac2b07b44ef9

data/CHANGELOG.md

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

data/README.md

@@ -8,6 +8,12 @@
 
 
 
+## Step 0 - Installation Via Gems
+
+To install the command-line tool via gems (ruby's package manager) use:
+
+    $ gem install footty
+
 
 
 ## Usage - Who's playing today?
@@ -17,21 +23,20 @@ for upcoming or past matches. For example:
 
     $ footty         # Defaults to today's matches of top leagues
 
-
 prints on Sep 27, 2024:
 
     ==> English Premier League 2024/25
-    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
+    ▪ Matchday 6 ▪
+    Sat Sep 28 12:30   (in 1d)    Newcastle United FC    v    Manchester City FC
+               15:00   (in 1d)             Arsenal FC    v    Leicester City FC
+               15:00   (in 1d)           Brentford FC    v    West Ham United FC
+               15:00   (in 1d)             Chelsea FC    v    Brighton & Hove Albion
+               15:00   (in 1d)             Everton FC    v    Crystal Palace FC
+               15:00   (in 1d)   Nottingham Forest FC    v    Fulham FC
+               17:30   (in 1d) Wolverhampton Wanderers FC    v    Liverpool FC
+    Sun Sep 29 14:00   (in 2d)        Ipswich Town FC    v    Aston Villa FC
+               16:30   (in 2d)   Manchester United FC    v    Tottenham Hotspur FC
+    Mon Sep 30 20:00   (in 3d)        AFC Bournemouth    v    Southampton FC
 
 
 
@@ -45,7 +50,7 @@ Use `--yesterday` or `-y`  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.:
+Use `--upcoming`/`--up` or `-u` to print all upcoming matches e.g.:
 
     $ footty --upcoming    # -or-
     $ footty --up
@@ -91,19 +96,11 @@ See [footty/openfootball](https://github.com/sportdb/footty/blob/master/footty/l
 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.
-
-
+Use as you please with no restrictions whatsoever.
 
 
 ## Questions? Comments?

data/Rakefile

@@ -4,7 +4,7 @@ require './lib/footty/version.rb'
 Hoe.spec 'footty' do
   self.version = Footty::VERSION
 
-  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.summary = "footty - football.db command line tool(s) 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' }
@@ -17,8 +17,11 @@ Hoe.spec 'footty' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['sportdb-quick', '>= 0.7.0'],
     ['webget'],
+    ['sportdb-parser', '>= 0.8.0'],
+    ['sportdb-quick',  '>= 0.8.0'],
+    ['fbtok'],
+    ['fbtxt2json']
   ]
 
   self.licenses = ['Public Domain']

data/bin/footty

@@ -3,6 +3,13 @@
 ## tip: to test run:
 ##   ruby -I ./lib bin/footty
 
+
+## quick hack
+##   if available always use latest (local) source version
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/parser/lib' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/quick/lib' )
+
+
 require 'footty'
 
 Footty.main

data/bin/ftty

@@ -3,6 +3,12 @@
 ## tip: to test run:
 ##   ruby -I ./lib bin/ftty
 
+## quick hack
+##   if available always use latest (local) source version
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/parser/lib' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/quick/lib' )
+
+
 require 'footty'
 
 Footty.main

data/lib/footty/dataset/openfootball.rb

@@ -110,11 +110,19 @@ module Footty
       matches = []
       urls.each do |url|
                     txt = get!( url )    ## use "memoized" / cached result
-                    parser = SportDb::QuickMatchReader.new( txt )
-                    matches += parser.parse
+                    doc = Fbtxt::Document.new( txt )
+                    matches += doc.matches
                     ###  for multiple source file use latest name as "definitive"
-                    @league_name = parser.league_name
-                    ###  todo/fix - report errors
+                    @league_name = doc.title || '??'
+
+                    ###  todo/fix - imrove report errors formula
+                    if doc.errors?
+                      puts "!! HTTP ERROR - #{response.status.code} #{response.status.message}"
+                      exit 1
+                      puts "!! PARSE - #{doc.errors.size} parse error(s) in >#{url}<:"
+                      pp doc.errors
+                      exit 1
+                    end
                   end
 
       matches = matches.map {|match| match.as_json }  # convert to json

data/lib/footty/pp_matches.rb

@@ -9,9 +9,40 @@ module Footty
 
     today = Date.today
 
+    last_date  = nil
+    last_round = nil
+
     matches.each do |match|
+
+      ## note - merge group into round
+
+      round = String.new
+      round += "#{match['group']}, "   if match['group']     ## (optional) group
+      round += "#{match['round']}"
+
+      if last_round.nil? || last_round != round
+        print "▪ #{round} ▪\n"    ## knock out (k.o.) phase/stage
+        last_date = nil
+      else
+        ## print "     " + (" " *round.length)
+      end
+      last_round = round
+
+
+
+
+
       date = match['date']
-      print "#{date.strftime('%a %b %d')} "      ## e.g. Thu Jun 14
+
+      ## do NOT repeat same date
+      if last_date.nil? || last_date != date
+        print "#{date.strftime('%a %b %d')} "      ## e.g. Thu Jun 14
+      else
+        print "           "
+      end
+      last_date = date
+
+
       print "#{match['time']} "    if match['time']
 
       if date > today
@@ -55,7 +86,7 @@ module Footty
         score = "#{match['score'][0]}-#{match['score'][1]}"
         print "  #{score}  "
       else
-        print "    vs    "
+        print "   v   "
       end
 
       if match['team2'].is_a?( Hash )
@@ -65,20 +96,15 @@ module Footty
       end
 
 
-      print "▪"    ## note - add round marker!!
-
-
-      print " #{match['group']} /"   if match['group']     ## (optional) group
-
-
-      print " #{match['round']} "    ## knock out (k.o.) phase/stage
-
 
       print "%-5s " % "(\##{match['num']}) "   if match['num']
 
       print " @ #{match['ground']}"         if match['ground']
 
 
+      print " [#{match['status']}]"   if match['status']
+
+
       print "\n"
 
 

data/lib/footty/version.rb

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

data/lib/footty.rb

@@ -24,10 +24,3 @@ Webcache.root = './cache'
 
 #  pp Webcache.root
 Webget.config.sleep = 1  ## set delay in secs (to 1 sec - default is/maybe 3)
-
-
-
-
-
-
-Footty.main   if __FILE__ == $0

metadata

@@ -1,31 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: footty
 version: !ruby/object:Gem::Version
-  version: 2026.5.25
+  version: 2026.7.6
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-25 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: webget
+  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: sportdb-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: webget
+  name: fbtok
+  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: fbtxt2json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-description: footty - football.db command line tool for national & int'l football
+description: footty - football.db command line tool(s) 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:
@@ -121,6 +163,6 @@ requirements: []
 rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
-summary: footty - football.db command line tool for national & int'l football club
+summary: footty - football.db command line tool(s) for national & int'l football club
   leagues (& cups) from around the world (bonus - incl. world cup, euro and more)
 test_files: []