fbtok 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d30fb729e926e1745a62c927272839f8be9b6578b92a6d4aa6415872c49164
-  data.tar.gz: 9eb174553656a9394993c554969600262807f8210dd1b4d01a5b392431bf14f0
+  metadata.gz: a133154bf34937e2961a05a9f3768e92cd2e4d633e64f2a52977e7eb3a7d4ae3
+  data.tar.gz: 382ba42bb20a0038f9efeec721481d70efc41c6241a209da5ea9e2a1fb177ac1
 SHA512:
-  metadata.gz: 9fadde8d521bf4dc46f20650789b1b9de1e8ffe68289bd499ea5d0807e8911bfe7a424a082dfcc599c8e7e97dce63b30ed9962d93cba4cf6b4d5ee3e4f8703bf
-  data.tar.gz: 197a3385174d42bab7045a8d3e64844f85d131da66d51973cfca71cd2176e88baa2831b40a9d1cfe31b8f13352971576f5427b02575c8b2a12d7f38d81fc3ce9
+  metadata.gz: 800048bae44e60c94fc87073a029075d3e8d88c620ecbc3b2b4217939b4a42b40d57f855e50b60f8fe52c37593a8fe30ce786ed98169bdf87b3f64e7d1987016
+  data.tar.gz: '0921aa61b66e4ca43c1a9643dbe951ad9fcb0bba493bc9d93c2c5ce9ef099629694323b003be701970364d2b05008826a52699d1a7759be301da48ae463db76a'

data/CHANGELOG.md

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

data/Manifest.txt

@@ -2,11 +2,14 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-bin/fbchk
-bin/fbt
+bin/fbquick
+bin/fbquik
 bin/fbtok
 bin/fbtree
 bin/fbx
 lib/fbtok.rb
-lib/fbtok/linter.rb
-lib/fbtok/opts.rb
+lib/fbtok/fbquick.rb
+lib/fbtok/fbtok.rb
+lib/fbtok/fbtree.rb
+lib/fbtok/fbx.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,66 @@ $ 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/fbquik & fbx   -  use quick match reader & dump match schedule
+
+- depends on sportdb-quick (& sportdb-parser)
+
+get help
+```
+$ fbquik -h
+$ fbx -h
+```
+
+run on single / individual (data)files
+````
+$ fbquik england/2025-26/1-permierleague.txt
+$ fbquik worldcup/min/2022.txt
+
+$ fbx england/2025-26/1-permierleague.txt
+$ fbx worldcup/min/2022.txt
+```
+
+or on directories (auto-collecting all datafiles)
+
+$ fbquik england
+$ fbquik 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.4'
+  self.version = '0.4.1'
 
   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/fbquick

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   $ ruby -I ./lib bin/fbquick
+##     -or-
+##   $ ruby -I ../parser/lib -I ./lib bin/fbquick
+##     -or-
+##   $ ruby -I ../parser/lib -I ../quick/lib -I ./lib bin/fbquick
+
+
+## our own code
+require 'fbtok'
+
+
+Fbquick.main

data/bin/fbquik

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   $ ruby -I ./lib bin/fbquik
+
+
+## our own code
+require 'fbtok'
+
+
+Fbquick.main

data/bin/fbtok

@@ -1,138 +1,9 @@
 #!/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,
-    warn:  false,
-    file:  nil,
-}
-
-parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$PROGRAM_NAME} [options] PATH"
-
-
-  parser.on( "-q", "--quiet",
-             "less debug output/messages (default: #{!opts[:debug]})" ) do |debug|
-    opts[:debug] = false
-  end
-  parser.on( "--verbose", "--debug",
-               "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
-    opts[:debug] = true
-  end
-  parser.on( "-w", "--warn",
-              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
-    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|
-    opts[:file] = file
-    ## note: for batch (massive) processing auto-set debug (verbose output) to false (as default)
-    opts[:debug] = false
-  end
-end
-parser.parse!( args )
-
-
-
-if opts[:debug]
-  puts "OPTS:"
-  p opts
-  puts "ARGV:"
-  p args
-end
-
-SportDb::Parser::Linter.debug = opts[:debug]    
-SportDb::Parser::Opts.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] )
-         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)]  
-         end
-
-
-linter = SportDb::Parser::Linter.new
-
-
-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}<..."
-      tokens =  linter.read( path, parse: false )  ## only tokenize (do NOT parse)
-
-      puts "   #{tokens.size} token(s)"    
-
-      errors += linter.errors    if linter.errors?
-   end
-
-   if errors.size > 0
-      puts
-      pp errors
-      puts
-      puts "!!   #{errors.size} tokenize error(s) in #{paths.size} datafiles(s)"
-   else
-      puts
-      puts "OK   no tokenize errors found in #{paths.size} datafile(s)"
-   end
-
-   ## add errors to rec via rec['errors'] to allow
-   ##   for further processing/reporting
-   rec['errors'] = errors
-end
-
-
-###
-## generate a report if --file option used
-if opts[:file]
-
-  buf = SportDb::Parser::BatchReport.new( 
-            specs, 
-            title: 'fbtok summary report' ).build
-
-  puts
-  puts "SUMMARY:"
-  puts buf
-
-  #  maybe write out in the future?
-  # basedir  = File.dirname( opts[:file] )
-  # basename = File.basename( opts[:file], File.extname( opts[:file] ))
-end
-
-puts "bye"
 
+Fbtok.main

data/bin/fbtree

@@ -1,148 +1,8 @@
 #!/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,
-    warn:  false,
-    file:  nil,
-}
-
-parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$PROGRAM_NAME} [options] PATH"
-
-
-  parser.on( "-q", "--quiet",
-             "less debug output/messages (default: #{!opts[:debug]})" ) do |debug|
-    opts[:debug] = false
-  end
-  parser.on( "--verbose", "--debug",
-               "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
-    opts[:debug] = true
-  end
-  parser.on( "-w", "--warn",
-              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
-    opts[:warn] = true
-  end
-
-
-  parser.on( "-f FILE", "--file FILE",
-                "read datafiles (pathspecs) via .csv file") do |file|
-    opts[:file] = file
-    ## note: for batch (massive) processing auto-set debug (verbose output) to false (as default)
-    opts[:debug] = false
-  end
-
-end
-parser.parse!( args )
-
-
-if opts[:debug]
-  puts "OPTS:"
-  p opts
-  puts "ARGV:"
-  p args
-end
-
-SportDb::Parser::Linter.debug = opts[:debug]    
-SportDb::Parser::Opts.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] )
-         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)]  
-         end
-
-
-
-def dump_tree_stats( tree )
-  stats = Hash.new(0)  ## track counts only for now
-  tree.each do |node|
-     stats[ node.class ] += 1 
-  end
-
-  match_count  = stats[ RaccMatchParser::MatchLine ]
-  goal_count   = stats[ RaccMatchParser::GoalLine ]
-  lineup_count = stats[ RaccMatchParser::LineupLine ] 
-
-  puts "   #{match_count} MatchLine(s)"     if match_count > 0
-  puts "   #{goal_count} GoalLine(s)"       if goal_count > 0
-  puts "   #{lineup_count} LineupLine(s)"   if lineup_count > 0
-end
-
-
-
-
-linter = SportDb::Parser::Linter.new
-
-
-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 )
-      dump_tree_stats( tree )
-    
-      errors += linter.errors    if linter.errors?
-   end
-
-   if errors.size > 0
-      puts
-      pp errors
-      puts
-      puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
-   else
-      puts
-      puts "OK   no parse errors found in #{paths.size} datafile(s)"
-   end
-
-   ## add errors to rec via rec['errors'] to allow
-   ##   for further processing/reporting
-   rec['errors'] = errors
-end
-
-
-###
-## generate a report if --file option used
-if opts[:file]
-
-  buf = SportDb::Parser::BatchReport.new( 
-            specs, 
-            title: 'fbtree summary report' ).build
-
-  puts
-  puts "SUMMARY:"
-  puts buf
-
-  #  maybe write out in the future?
-  # basedir  = File.dirname( opts[:file] )
-  # basename = File.basename( opts[:file], File.extname( opts[:file] ))
-end
-
-puts "bye"
+Fbtree.main

data/bin/fbx

@@ -1,153 +1,11 @@
 #!/usr/bin/env ruby
 
 ## tip: to test run:
-##   ruby -I ./lib -I ../parser/lib bin/fbx
-
-##
-## todo/fix - use for testing
-#                reads textfile and dumps results in json
-#
-#  check - keep fbx name or find a differnt name - why? why not?
+##   $ ruby -I ./lib  bin/fbx
 
 
 ## our own code
 require 'fbtok'
 
 
-##
-## read textfile
-##   and dump match parse results
-##
-##   fbt  ../openfootball/.../euro.txt
-
-
-
-
- args = ARGV
- opts = { debug: false,
-          outline: false }
-
- parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
-
-##
-## check if git has a offline option?? (use same)
-##             check for other tools - why? why not?
-
-
-  parser.on( "--verbose", "--debug",
-               "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
-    opts[:debug] = debug
-  end
-
-  parser.on( "--outline",
-                "turn on outline (only) output (default: #{opts[:outline]})" ) do |outline|
-    opts[:outline] = outline
-  end
-end
-parser.parse!( args )
-
-
-if opts[:debug]
-  puts "OPTS:"
-  p opts
-  puts "ARGV:"
-  p args
-  
-  SportDb::MatchParser.debug = true    
-else
-  SportDb::MatchParser.debug = false    
-  LogUtils::Logger.root.level = :info
-end
-
-
-paths =  if args.empty?
-            [
-              '../../../openfootball/euro/2021--europe/euro.txt',
-              '../../../openfootball/euro/2024--germany/euro.txt',
-            ]
-         else
-            ## check for directories
-            ##   and auto-expand
-
-            SportDb::Parser::Opts.expand_args( args )
-         end
-
-
-
-
-## errors = []
-
-
-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)
-
-      auto_conf_teams,  matches, rounds, groups = parser.parse
-
-      puts ">>> #{auto_conf_teams.size} teams:"
-      pp auto_conf_teams
-      puts ">>> #{matches.size} matches:"
-      ## pp matches
-      puts ">>> #{rounds.size} rounds:"
-      pp rounds
-      puts ">>> #{groups.size} groups:"
-      pp groups
-
-      j += 1
-    end  # each secs
-end  # each paths
-
-=begin
-if errors.size > 0
-    puts
-    pp errors
-    puts
-    puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
-else
-    puts
-    puts "OK   no parse errors found in #{paths.size} datafile(s)"
-end
-=end
-
-puts "bye"
-
+Fbx.main