fbtok 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e2b9d1bb70a32d8ce47c920d411de8f45a99f7d8c9661d3f144f6087c4bb63
-  data.tar.gz: 2878f46e029072dc5170a0153afc3f791068f83535139bc3e93fbdabfacd85a7
+  metadata.gz: d2f0738b7fe70aa6b73cb62e99c6319fe782be09aca0f73f7891a037b98ba020
+  data.tar.gz: b801c24152bac941a766f1340409e3a32aeefb69a217bff94f7f86953749d2b1
 SHA512:
-  metadata.gz: 85f951fecd347f7af50ce5f43bb8fcc6afccb57a27180980e2401f51d91f7607f11aeaf0d713f8808404e99d49f38b4a8fa28d3982c5ee73f3772ea320e5ee80
-  data.tar.gz: d0ace4aab05240e76143ea5d83acafdf8eba3690ec22ecdbc108a15bf010a1386c8b71c9bc9e86d6a6728909141d1d0f36b3d97bab1292eb0c3bf57f4438930f
+  metadata.gz: 406113d724520254adf88aedbe49a6a11ea46aaeaebe85666f2a7a78ea1712936508db4b27bdda928436551d64f52503bc7c9cf98aef464af3cb200917ff324d
+  data.tar.gz: 9e5d237e6d3344b5c4ffb005d5d0c32d40003933ed99594d5e7a6480b6779254f92a15bfde8c4cc6b8b67feb39f4e40e8489d8cae009708eccccbf13b05fdc6b

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.3
+### 0.4.0
 ### 0.0.1 / 2025-01-02
 
 * Everything is new. First release.

data/Manifest.txt

@@ -2,11 +2,9 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-bin/fbchk
-bin/fbt
+bin/fbquick
 bin/fbtok
 bin/fbtree
 bin/fbx
 lib/fbtok.rb
-lib/fbtok/linter.rb
-lib/fbtok/opts.rb
+lib/fbtok/pathspec.rb

data/README.md

@@ -1,5 +1,5 @@
-# fbtok - football.txt lint tools incl. tokenizer, parser & more
- 
+# fbtok - football.txt lint tools incl. tokenizer (lexer), parser & more
+
 
 
 * home  :: [github.com/sportdb/footty](https://github.com/sportdb/footty)
@@ -20,20 +20,67 @@ $ gem install fbtok
 ## Usage
 
 
-### fbtok -  use tokenizer/parser
+### fbtok & fbtree -  use tokenizer (lexer) & parser
 
 - depends on sportdb-parser
 
-### fbt   -  use quick match reader &  fbx   -  dump match schedule  - uses quick league & match readers
+get help
+```
+$ fbtok -h
+$ fbtree -h
+```
+
+run on single / individual (data)files
+````
+$ fbtok england/2025-26/1-permierleague.txt
+$ fbtok worldcup/min/2022.txt
+
+$ fbtree england/2025-26/1-permierleague.txt
+$ fbtree worldcup/min/2022.txt
+
+```
+
+or on directories (auto-collecting all datafiles)
+
+$ fbtok england
+$ fbtok worldcup
+
+$ fbtree england
+$ fbtree worldcup
+```
+
 
-- depends on sportdb-quick
 
-### fbchk  -  use quick match linter; check league and team names via search & more
+### fbquick & fbx   -  use quick match reader & dump match schedule
+
+- depends on sportdb-quick (& sportdb-parser)
+
+get help
+```
+$ fbquick -h
+$ fbx -h
+```
+
+run on single / individual (data)files
+````
+$ fbquick england/2025-26/1-permierleague.txt
+$ fbquick worldcup/min/2022.txt
+
+$ fbx england/2025-26/1-permierleague.txt
+$ fbx worldcup/min/2022.txt
+
+```
+
+or on directories (auto-collecting all datafiles)
+
+$ fbquick england
+$ fbquick worldcup
+```
+
+note: `fbx` only works with single / individual (data)files
 
-- depends on sportdb-formats (incl. sportdb-search & sportdb-catalogs)
 
 
-...
 
 
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.3.3'
+  self.version = '0.4.0'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -19,10 +19,8 @@ Hoe.spec 'fbtok' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-     #  ['sportdb-structs', '>= 0.5.0'],
-     #  ['logutils',        '>= 0.6.1'],
-     ['sportdb-parser',  '>= 0.5.8'],
-     ['sportdb-formats', '>= 2.1.2'],
+     ['sportdb-parser', '>= 0.7.1'],
+     ['sportdb-quick',  '>= 0.7.0'],
   ]
 
   self.spec_extras = {

data/bin/{fbt → fbquick}

@@ -1,24 +1,20 @@
 #!/usr/bin/env ruby
 
 ## tip: to test run:
-##   ruby -I ./lib bin/fbt
+##   $ ruby -I ./lib bin/fbquick
 ##     -or-
-##   ruby -I ../parser/lib -I ./lib bin/fbt
+##   $ ruby -I ../parser/lib -I ./lib bin/fbquick
 ##     -or-
-##   ruby -I ../parser/lib -I ../sportdb-structs/lib -I ./lib bin/fbt
+##   $ ruby -I ../parser/lib -I ../quick/lib -I ./lib bin/fbquick
+
+##
+## todo/fix - add (shortcut) alias  fbquik,fbqk - why? why not?
 
 
 ## our own code
 require 'fbtok'
 
 
-##
-## read textfile
-##   and dump tokens
-##
-##   fbt  ../openfootball/.../euro.txt
-
-
 
 
  args = ARGV
@@ -57,7 +53,7 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-  
+
   SportDb::QuickMatchReader.debug = true
   SportDb::MatchParser.debug      = true
 else
@@ -70,30 +66,26 @@ end
 ## todo/check - use packs or projects or such
 ##                instead of specs - why? why not?
 specs =  if opts[:file]
-            SportDb::Parser::Opts.read_pathspecs( opts[:file] )
+            read_pathspecs( opts[:file] )
          else
-           paths =  if args.empty?
-                      ['/sports/openfootball/euro/2021--europe/euro.txt',
-                       '/sports/openfootball/euro/2024--germany/euro.txt'] 
-                    else
-                       ## check for directories
-                       ##   and auto-expand
-                       SportDb::Parser::Opts.expand_args( args )
-                    end
-             ## always return array of specs
-            [SportDb::Parser::Opts.build_pathspec( paths: paths)]  
+           args =     ['/sports/openfootball/euro/2021--europe/euro.txt',
+                       '/sports/openfootball/euro/2024--germany/euro.txt']  if args.empty?
+
+            build_pathspecs( args )
          end
 
+pp specs
 
 
-  specs.each_with_index do |spec,i|
-    paths = spec.paths
-    rec   = spec.rec
+
+  specs.each_with_index do |rec,i|
+    datafiles = rec['datafiles']
     errors = []
 
-    paths.each_with_index do |path,j|
-      puts "==> [#{j+1}/#{paths.size}] reading >#{path}<..."
-      quick = SportDb::QuickMatchReader.new( read_text( path ) )
+    datafiles.each_with_index do |path,j|
+      puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{datafiles.size}] reading >#{path}<..."
+      txt = read_text( path )
+      quick = SportDb::QuickMatchReader.new( txt )
       matches = quick.parse
 
       if quick.errors?
@@ -109,11 +101,11 @@ specs =  if opts[:file]
 
     if errors.size > 0
       puts
-      puts "!! #{errors.size} PARSE ERRORS in #{paths.size} datafile(s)"
+      puts "!! #{errors.size} PARSE ERRORS in #{datafiles.size} datafile(s)"
       pp errors
     else
       puts
-      puts "  OK - no parse errors in #{paths.size} datafile(s)"
+      puts "  OK - no parse errors in #{datafiles.size} datafile(s)"
     end
 
      ## add errors to rec via rec['errors'] to allow
@@ -126,9 +118,9 @@ specs =  if opts[:file]
 ###
 ## generate a report if --file option used
 if opts[:file]
-  buf = SportDb::Parser::BatchReport.new( 
-            specs, 
-            title: 'fbt summary report' ).build
+  buf = SportDb::PathspecReport.new(
+            specs,
+            title: 'fbquick summary report' ).build
 
   puts
   puts "SUMMARY:"
@@ -142,4 +134,3 @@ end
 
 
 puts "bye"
-

data/bin/fbtok

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 ## tip: to test run:
-##   ruby -I ./lib bin/fbtok
+##   $ ruby -I ./lib bin/fbtok
 
 require 'fbtok'
 
 args = ARGV
- 
+
 
 opts = {
     debug: true,
@@ -31,14 +31,6 @@ parser = OptionParser.new do |parser|
     opts[:warn] = true
   end
 
-=begin
-  parser.on( "--metal",
-                 "turn off typed parse tree; show to the metal tokens"+
-                   " (default: #{opts[:metal]})" ) do |metal|
-    opts[:metal] = true
-  end
-=end
-
 
   parser.on( "-f FILE", "--file FILE",
                 "read datafiles (pathspecs) via .csv file") do |file|
@@ -58,57 +50,56 @@ if opts[:debug]
   p args
 end
 
-SportDb::Parser::Linter.debug = opts[:debug]    
-SportDb::Parser::Opts.debug   = opts[:debug]
 
-SportDb::Parser::Linter.warn  = opts[:warn]    
+# SportDb::Parser::Linter.debug = opts[:debug]
+# SportDb::Parser::Linter.warn  = opts[:warn]
 
 
 
 ## todo/check - use packs or projects or such
 ##                instead of specs - why? why not?
 specs =  if opts[:file]
-            SportDb::Parser::Opts.read_pathspecs( opts[:file] )
+            read_pathspecs( opts[:file] )
          else
-           paths =  if args.empty?
-                      ['/sports/openfootball/euro/2021--europe/euro.txt',
-                       '/sports/openfootball/euro/2024--germany/euro.txt'] 
-                    else
-                       ## check for directories
-                       ##   and auto-expand
-                       SportDb::Parser::Opts.expand_args( args )
-                    end
-             ## always return array of specs
-            [SportDb::Parser::Opts.build_pathspec( paths: paths)]  
+           args = ['/sports/openfootball/euro/2021--europe/euro.txt',
+                   '/sports/openfootball/euro/2024--germany/euro.txt']  if args.empty?
+
+            build_pathspecs( args )
          end
 
 
-linter = SportDb::Parser::Linter.new
+pp specs
+
 
 
-specs.each_with_index do |spec,i|
-    paths = spec.paths
-    rec   = spec.rec
-   
+specs.each_with_index do |rec,i|
+    datafiles = rec['datafiles']
+
     errors = []
 
-   paths.each_with_index do |path,j|
-      puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{paths.size}] reading >#{path}<..."
-      tokens =  linter.read( path, parse: false )  ## only tokenize (do NOT parse)
+    datafiles.each_with_index do |path,j|
+      puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{datafiles.size}] reading >#{path}<..."
+
+      txt = read_text( path )
+      lexer = SportDb::Lexer.new( txt, debug: opts[:debug] )
+      tokens, more_errors = lexer.tokenize_with_errors
+
+      ####
+      ## todo - report error on empty file (no tokens!!!)
 
-      puts "   #{tokens.size} token(s)"    
+      puts "   #{tokens.size} token(s)"
 
-      errors += linter.errors    if linter.errors?
+      errors += more_errors    if more_errors.size > 0
    end
 
    if errors.size > 0
       puts
       pp errors
       puts
-      puts "!!   #{errors.size} tokenize error(s) in #{paths.size} datafiles(s)"
+      puts "!!   #{errors.size} tokenize error(s) in #{datafiles.size} datafiles(s)"
    else
       puts
-      puts "OK   no tokenize errors found in #{paths.size} datafile(s)"
+      puts "OK   no tokenize errors found in #{datafiles.size} datafile(s)"
    end
 
    ## add errors to rec via rec['errors'] to allow
@@ -120,9 +111,8 @@ end
 ###
 ## generate a report if --file option used
 if opts[:file]
-
-  buf = SportDb::Parser::BatchReport.new( 
-            specs, 
+  buf = SportDb::PathspecReport.new(
+            specs,
             title: 'fbtok summary report' ).build
 
   puts
@@ -135,4 +125,3 @@ if opts[:file]
 end
 
 puts "bye"
-

data/bin/fbtree

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 ## tip: to test run:
-##   ruby -I ./lib bin/fbtree
+##   $ ruby -I ./lib bin/fbtree
 
 require 'fbtok'
 
 args = ARGV
- 
+
 
 opts = {
     debug: true,
@@ -50,10 +50,9 @@ if opts[:debug]
   p args
 end
 
-SportDb::Parser::Linter.debug = opts[:debug]    
-SportDb::Parser::Opts.debug   = opts[:debug]
 
-SportDb::Parser::Linter.warn  = opts[:warn]    
+# SportDb::Parser::Linter.debug = opts[:debug]
+# SportDb::Parser::Linter.warn  = opts[:warn]
 
 
 
@@ -61,18 +60,12 @@ SportDb::Parser::Linter.warn  = opts[:warn]
 ## todo/check - use packs or projects or such
 ##                instead of specs - why? why not?
 specs =  if opts[:file]
-            SportDb::Parser::Opts.read_pathspecs( opts[:file] )
+            read_pathspecs( opts[:file] )
          else
-           paths =  if args.empty?
-                      ['/sports/openfootball/euro/2021--europe/euro.txt',
-                       '/sports/openfootball/euro/2024--germany/euro.txt'] 
-                    else
-                       ## check for directories
-                       ##   and auto-expand
-                       SportDb::Parser::Opts.expand_args( args )
-                    end
-             ## always return array of specs
-            [SportDb::Parser::Opts.build_pathspec( paths: paths)]  
+           args = ['/sports/openfootball/euro/2021--europe/euro.txt',
+                   '/sports/openfootball/euro/2024--germany/euro.txt']  if args.empty?
+
+            build_pathspecs( args )
          end
 
 
@@ -80,12 +73,12 @@ specs =  if opts[:file]
 def dump_tree_stats( tree )
   stats = Hash.new(0)  ## track counts only for now
   tree.each do |node|
-     stats[ node.class ] += 1 
+     stats[ node.class ] += 1
   end
 
   match_count  = stats[ RaccMatchParser::MatchLine ]
   goal_count   = stats[ RaccMatchParser::GoalLine ]
-  lineup_count = stats[ RaccMatchParser::LineupLine ] 
+  lineup_count = stats[ RaccMatchParser::LineupLine ]
 
   puts "   #{match_count} MatchLine(s)"     if match_count > 0
   puts "   #{goal_count} GoalLine(s)"       if goal_count > 0
@@ -95,31 +88,32 @@ end
 
 
 
-linter = SportDb::Parser::Linter.new
 
+specs.each_with_index do |rec,i|
+    datafiles = rec['datafiles']
 
-specs.each_with_index do |spec,i|
-    paths = spec.paths
-    rec   = spec.rec
-   
     errors = []
 
-   paths.each_with_index do |path,j|
-      puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{paths.size}] reading >#{path}<..."
-      tree = linter.read( path, parse: true )
+   datafiles.each_with_index do |path,j|
+      puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{datafiles.size}] reading >#{path}<..."
+
+      txt = read_text( path )
+      parser = RaccMatchParser.new( txt, debug: opts[:debug] )
+      tree = parser.parse
+
       dump_tree_stats( tree )
-    
-      errors += linter.errors    if linter.errors?
+
+      errors += parser.errors    if parser.errors?
    end
 
    if errors.size > 0
       puts
       pp errors
       puts
-      puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
+      puts "!!   #{errors.size} parse error(s) in #{datafiles.size} datafiles(s)"
    else
       puts
-      puts "OK   no parse errors found in #{paths.size} datafile(s)"
+      puts "OK   no parse errors found in #{datafiles.size} datafile(s)"
    end
 
    ## add errors to rec via rec['errors'] to allow
@@ -132,8 +126,8 @@ end
 ## generate a report if --file option used
 if opts[:file]
 
-  buf = SportDb::Parser::BatchReport.new( 
-            specs, 
+  buf = SportDb::PathspecReport.new(
+            specs,
             title: 'fbtree summary report' ).build
 
   puts

data/bin/fbx

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ## tip: to test run:
-##   ruby -I ./lib -I ../parser/lib bin/fbx
+##   $ ruby -I ./lib -I ../parser/lib bin/fbx
 
 ##
 ## todo/fix - use for testing
@@ -40,10 +40,10 @@ require 'fbtok'
     opts[:debug] = debug
   end
 
-  parser.on( "--outline",
-                "turn on outline (only) output (default: #{opts[:outline]})" ) do |outline|
-    opts[:outline] = outline
-  end
+#  parser.on( "--outline",
+#                "turn on outline (only) output (default: #{opts[:outline]})" ) do |outline|
+#    opts[:outline] = outline
+#  end
 end
 parser.parse!( args )
 
@@ -53,27 +53,23 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-  
-  SportDb::MatchParser.debug = true    
+
+  SportDb::MatchParser.debug = true
 else
-  SportDb::MatchParser.debug = false    
+  SportDb::MatchParser.debug = false
   LogUtils::Logger.root.level = :info
 end
 
 
-paths =  if args.empty?
-            [
+args =  [
               '../../../openfootball/euro/2021--europe/euro.txt',
               '../../../openfootball/euro/2024--germany/euro.txt',
-            ]
-         else
-            ## check for directories
-            ##   and auto-expand
+        ]   if args.empty?
 
-            SportDb::Parser::Opts.expand_args( args )
-         end
+pp args
 
 
+paths = args
 
 
 ## errors = []
@@ -83,58 +79,20 @@ paths.each_with_index do |path,i|
     puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
 
     txt = read_text( path )
-    outline = SportDb::QuickLeagueOutline.parse( txt )
-
-    ##  todo/fix - add each_sec_with_index upstream
-    ##    add outline.secs.size - why? why not?
-    j = 0
-    secs_count = '?'
-    outline.each_sec do |sec|   ## sec(tion)s
-      season = Season.parse( sec.season )   ## convert (str) to season obj!!!
-      league = sec.league
-      stage  = sec.stage
-      lines  = sec.lines
-
-      puts "   section #{j+1}/#{secs_count} -   #{league} #{season}, #{stage}  -  #{lines.size} line(s)"
-
-      next if opts[:outline]
 
-=begin
-    ### check if event info availabe - use start_date;
-      ##    otherwise we have to guess (use a "synthetic" start_date)
-      event_info = catalog.events.find_by( season: season,
-                                           league: league )
-
-      start = if event_info && event_info.start_date
-                  puts "event info found:"
-                  puts "  using start date from event: "
-                  pp event_info
-                  pp event_info.start_date
-                  event_info.start_date
-              else
-=end
-     start  =   if season.year?
-                  Date.new( season.start_year, 1, 1 )
-                else
-                  Date.new( season.start_year, 7, 1 )
-                end
-
-      parser = SportDb::MatchParser.new( lines,
-                                         start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
+    parser = SportDb::MatchParser.new( txt, start: nil )
 
-      auto_conf_teams,  matches, rounds, groups = parser.parse
+    auto_conf_teams, matches, rounds, groups = parser.parse
 
       puts ">>> #{auto_conf_teams.size} teams:"
       pp auto_conf_teams
       puts ">>> #{matches.size} matches:"
-      ## pp matches
+      pp matches[0,2]   ## print first two matches
+      puts "..."
       puts ">>> #{rounds.size} rounds:"
       pp rounds
       puts ">>> #{groups.size} groups:"
       pp groups
-
-      j += 1
-    end  # each secs
 end  # each paths
 
 =begin
@@ -150,4 +108,3 @@ end
 =end
 
 puts "bye"
-