fbtok 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bb0384d86033771326222bc9284264b9bfc44c55210261e6b598fffb3ddf925
-  data.tar.gz: a7692e7b0f394373c364234ec7b7c57933d6bd1344b58d4139beb41381a59921
+  metadata.gz: 9cd5c4d072690acf0846ea8a6c0d34af8857073debf4c8c2d5a5688d92133038
+  data.tar.gz: 0ea211c29fbc8dcb0305368da6ae654c35404e498b1816d8507695e9a9a0e9e2
 SHA512:
-  metadata.gz: 854430fe426e69eb27651930db928cb24bf7f4b489503a222f7ff67178fb087b465718e71cc4a9421a591ab87c784e35f2a26514c99de9151ddb9a1a13c4ec53
-  data.tar.gz: e602fe075cfbd20eeed1e744f4bdfa35314f2e42db69537cb8ff14ccc87b8fed50400d5f3aa53974e342a0b09c00b7110e0614e0d06ede5595c19e6e652de63d
+  metadata.gz: 8c164cb1b0ab93492b055b20f9864ef2dfd0fbd3197bfe658c2a29b68df7cfd0fe06a5f8c4867b8e6e39826972190998385fd691178d2a502122f2b2f13d7cbf
+  data.tar.gz: e649301128cd231e73ddcd815b32359a658233fb334413f38c083bcf2c54f8b62836f9187abb8cfced19318588737128218fdcf0f46e92ff14728f20ce24df5c

data/CHANGELOG.md

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

data/Manifest.txt

@@ -2,16 +2,18 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+bin/fbfind
 bin/fbquick
 bin/fbquik
 bin/fbtok
 bin/fbtree
 bin/fbx
 lib/fbtok.rb
-lib/fbtok/fbquick.rb
-lib/fbtok/fbtok.rb
-lib/fbtok/fbtree.rb
-lib/fbtok/fbx.rb
+lib/fbtok/command-fbfind.rb
+lib/fbtok/command-fbquick.rb
+lib/fbtok/command-fbtok.rb
+lib/fbtok/command-fbtree.rb
+lib/fbtok/command-fbx.rb
 lib/fbtok/filepack.rb
 lib/fbtok/pathspec.rb
 lib/fbtok/pathspec_report.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.5.1'
+  self.version = '0.5.3'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary

data/bin/fbfind

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   $ ruby -I ./lib bin/fbfind
+
+
+require 'fbtok'
+
+
+Fbfind.main

data/lib/fbtok/command-fbfind.rb

@@ -0,0 +1,105 @@
+
+
+module Fbfind
+
+def self.main( args=ARGV )
+
+opts = {
+    debug: false,
+    file:  nil,
+    seasons: [],
+}
+
+
+parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options] DATAFILE or DIR"
+
+
+  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( "--seasons SEASONS",
+               "filter by seasons (default: #{opts[:seasons]})") do |seasons|
+    opts[:seasons] = seasons
+                        .split( /[,:]/ )
+                        .map { |season| Season.parse(season.strip) }
+  end
+
+
+  parser.on( "-f FILE", "--file FILE",
+                "read datafiles (pathspecs) via .csv file") do |file|
+    opts[:file] = file
+  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::Linter.warn  = opts[:warn]
+
+
+
+## todo/check - use packs or projects or such
+##                instead of specs - why? why not?
+specs =  if opts[:file]
+            read_pathspecs( opts[:file] )
+         else
+            ## check for filepack
+            filepack =  if File.file?( './filepack.txt')
+                            read_filepack( './filepack.txt' )
+                        else
+                             nil
+                        end
+
+            path = SportDb::Pathspec.path(
+                          ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
+                           '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
+                           '/sports/openfootball'])
+
+            build_pathspecs( args, path: path,
+                                   filepack: filepack )
+         end
+
+
+if opts[:debug]
+  puts
+  puts "pathspecs:"
+  pp specs
+end
+
+
+if opts[:seasons].size > 0
+   specs = filter_pathspecs( specs, seasons: opts[:seasons] )
+end
+
+puts
+specs.each_with_index do |rec,i|
+    path = rec['path']
+    datafiles = rec['datafiles']
+
+    print "==> [#{i+1}/#{specs.size}] #{path}"
+    print "  (incl. seasons #{opts[:seasons]})"     if opts[:seasons].size > 0
+    print "...\n"
+    pp datafiles
+    puts "   #{datafiles.size} datafile(s)"
+end
+
+puts "bye"
+end
+
+end  ## module Fbfind

data/lib/fbtok/{fbtok.rb → command-fbtok.rb}

@@ -7,6 +7,7 @@ def self.main( args=ARGV )
 opts = {
     debug: true,
     file:  nil,
+    seasons: [],
 #    warn:  false,
 }
 
@@ -29,6 +30,13 @@ parser = OptionParser.new do |parser|
 #  end
 
 
+  parser.on( "--seasons SEASONS",
+               "filter by seasons (default: #{opts[:seasons]})") do |seasons|
+    opts[:seasons] = seasons
+                        .split( /[,:]/ )
+                        .map { |season| Season.parse(season.strip) }
+  end
+
   parser.on( "-f FILE", "--file FILE",
                 "read datafiles (pathspecs) via .csv file") do |file|
     opts[:file] = file
@@ -75,14 +83,17 @@ specs =  if opts[:file]
          end
 
 
-pp specs
 
+if opts[:seasons].size > 0
+   specs = filter_pathspecs( specs, seasons: opts[:seasons] )
+end
 
 
 specs.each_with_index do |rec,i|
     datafiles = rec['datafiles']
 
     errors = []
+    log    = []   ## quick one-line summary per datafile
 
     datafiles.each_with_index do |path,j|
       puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{datafiles.size}] reading >#{path}<..."
@@ -103,19 +114,24 @@ specs.each_with_index do |rec,i|
           ###   errors << [ path, *msg ] # note: use splat (*) to add extra values (starting with msg)
               errors << [path, msg]
          end
+
+         log << [:ERROR, path, "#{more_errors.size} tokenize error(s), #{tokens.size} token(s)"]
+      else
+         log << [:OK, path, "#{tokens.size} token(s)"]
       end
+   end
 
 
-   end
 
    if errors.size > 0
       puts
       pp errors
       puts
+      pp log
       puts "!!   #{errors.size} tokenize error(s) in #{datafiles.size} datafiles(s)"
    else
       puts
-      pp datafiles
+      pp log
       puts "OK   no tokenize errors found in #{datafiles.size} datafile(s)"
    end
 

data/lib/fbtok/{fbtree.rb → command-fbtree.rb}

@@ -4,10 +4,18 @@ module Fbtree
 def self.main( args=ARGV )
 
 
+
 opts = {
     debug: true,
-    file:  nil,
 ##    warn:  false,
+
+    json:  false,
+    yaml:  false,
+
+    file:  nil,
+    tty:   false,
+
+    seasons: [],
 }
 
 parser = OptionParser.new do |parser|
@@ -35,6 +43,27 @@ parser = OptionParser.new do |parser|
     opts[:debug] = false
   end
 
+  parser.on( "--seasons SEASONS",
+               "filter by seasons (default: #{opts[:seasons]})") do |seasons|
+    opts[:seasons] = seasons
+                        .split( /[,:]/ )
+                        .map { |season| Season.parse(season.strip) }
+  end
+
+
+  parser.on( "-j", "--json",
+                "turn on output in json (default: #{opts[:json]})" ) do |json|
+    opts[:json] = true
+  end
+  parser.on( "-y", "--yaml",
+                "turn on output in yaml (default: #{opts[:yaml]})" ) do |yaml|
+    opts[:yaml] = true
+  end
+
+  parser.on( "-t", "--terminal", "--tty",
+             "force terminal/tty input (default: #{opts[:tty]})" ) do |tty|
+    opts[:tty] = tty
+  end
 end
 parser.parse!( args )
 
@@ -47,6 +76,59 @@ end
 
 
 
+## special case for typed input via terminal/tty
+if opts[:tty]
+
+   puts "type your football.TXT lines here (exit with ctrl-z and return):"
+   lines = STDIN.readlines   ## note - readlines incl. trailing newline!
+
+   txt = lines.join  ## note - join with no space (already incl. trailing newline!)
+
+   puts "--- parsing #{lines.size} line(s) ---"
+   puts txt
+   puts "--- results ---"
+
+   tree, errors = parse_with_errors( txt, opts )
+
+   if errors.size > 0
+      puts
+      pp errors
+      puts
+      puts "!!   #{errors.size} parse error(s)"
+      exit 1
+   else
+      puts
+      puts "OK   no parse errors found"
+      exit 0
+   end
+end
+
+
+
+## check for piped input  e.g.  $ curl | fbtree
+if !STDIN.tty?   ## input NOT via tty (teletype terminal)
+
+   txt = STDIN.read
+
+   puts "--- parsing ---"
+   puts txt
+   puts "--- results ---"
+
+   tree, errors = parse_with_errors( txt, opts )
+
+   if errors.size > 0
+      puts
+      pp errors
+      puts
+      puts "!!   #{errors.size} parse error(s)"
+      exit 1
+   else
+      puts
+      puts "OK   no parse errors found"
+      exit 0
+   end
+end
+
 
 
 
@@ -72,7 +154,6 @@ specs =  if opts[:file]
          end
 
 
-pp specs
 
 ## if more than single datafile
 ##     auto-switch into quite mode for now
@@ -85,6 +166,9 @@ pp specs
 
 
 
+if opts[:seasons].size > 0
+   specs = filter_pathspecs( specs, seasons: opts[:seasons] )
+end
 
 
 
@@ -92,23 +176,25 @@ specs.each_with_index do |rec,i|
     datafiles = rec['datafiles']
 
     errors = []
+    log    = []   ## quick one-line summary per datafile
 
    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
+      tree, more_errors = parse_with_errors( txt, opts )
 
-      dump_tree_stats( tree )
-
-      if parser.errors?
+      if more_errors.size > 0
          ## note - auto-add filename to errors
-         parser.errors.each do |msg|
+         more_errors.each do |msg|
           ###
           ###   errors << [ path, *msg ] # note: use splat (*) to add extra values (starting with msg)
               errors << [path, msg]
          end
+
+         log << [:ERROR, path, "#{more_errors.size} parse error(s), #{tree.size} tree node(s)"]
+      else
+         log << [:OK, path, "#{tree.size} tree node(s)"]
       end
    end
 
@@ -117,10 +203,12 @@ specs.each_with_index do |rec,i|
       puts
       pp errors
       puts
+      puts
+      pp log
       puts "!!   #{errors.size} parse error(s) in #{datafiles.size} datafiles(s)"
    else
       puts
-      pp datafiles
+      pp log
       puts "OK   no parse errors found in #{datafiles.size} datafile(s)"
    end
 
@@ -167,4 +255,31 @@ def self.dump_tree_stats( tree )
 end
 
 
+
+def self.parse_with_errors( txt, opts={} )
+   parser = RaccMatchParser.new( txt, debug: opts[:debug] )
+   tree = parser.parse
+
+   dump_tree_stats( tree )
+
+   if opts[:yaml]
+         puts "--- yaml ---"
+         puts  YAML.dump( tree )
+   end
+
+   if opts[:json]
+         puts "--- json ---"
+         ## puts  JSON.pretty_generate( tree )
+         ##
+         ##   note - use hacky but more beautiful pretty_print
+         txtjson =  tree.as_json.pretty_inspect
+         txtjson =  txtjson.gsub( '=>', ': ' )
+         puts txtjson
+   end
+
+
+   [tree, parser.errors]
+end
+
+
 end # module Fbtree

data/lib/fbtok/pathspec.rb

@@ -1,5 +1,7 @@
 
 
+
+
 module SportDb
 class Pathspec
 
@@ -131,6 +133,15 @@ def self.find( path, seasons: nil )
           next   if /squad/i.match?( basename )
           next   if /\.v[0-9][0-9_]*/i.match?( basename )
 
+          ### exclude
+          ##     logs.txt  or logs.xxx.txt etc
+          ##     log.txt  or log.xxx.txt etc
+          ##     -or-
+          ##     errors.txt  or errors.xxx.txt etc
+          next   if /^logs?($|\.)/i.match?( basename )
+          next   if /^errors?($|\.)/i.match?( basename )
+
+
           #####
           ### exclude dirs  with:
           ##    - squad or wiki
@@ -194,6 +205,20 @@ def self.read( src )
 end
 
 
+## quick (internal) helper to
+##    expand names (directories)  ending with /*
+##                 with Pathspec.find
+def self._expand_pathspecs( names )
+   datafiles = []
+   names.each do |name|
+      if name.end_with?('/*')
+         datafiles += Pathspec.find( name[0..-3] )
+      else
+         datafiles << name
+      end
+   end
+   datafiles
+end
 
 def self.build( args, path: [],
                       filepack: nil )
@@ -203,7 +228,7 @@ def self.build( args, path: [],
   if args.empty?
     if filepack && filepack.has_key?('default')
                recs << { 'path'      => '<default>',
-                         'datafiles' => filepack['default'] }
+                         'datafiles' => _expand_pathspecs(filepack['default']) }
     end
   else
 
@@ -217,12 +242,16 @@ def self.build( args, path: [],
        ##
        ##  todo/check  if euro/ works too?
        ## check if directory
-       if Dir.exist?( arg )
+       ##     note - make find_dir/path lookup an env variable
+       ##               e.g. FBTXT_ROOTDIR, FBTXT_SOURCE, FBSOURCE,
+       ##                    FBTXT_REPOS/PACKS/etc. or such!!!
+       ##     add dir_path/dirs or such to build - why? why not?
+       if dir=find_dir( arg, path: ['/sports/openfootball']  )
           recs << { 'path'       => arg,
-                    'datafiles'  => Pathspec.find( arg ) }
+                    'datafiles'  => Pathspec.find( dir ) }
        elsif filepack && filepack.has_key?( arg.downcase )
            recs << { 'path'      => "<#{arg.downcase}>",
-                     'datafiles' => filepack[arg.downcase] }
+                     'datafiles' => _expand_pathspecs(filepack[arg.downcase]) }
        else   ## assume it's a file
            file = find_file( arg, path: path )
             ## check if file (exists) in any path lookup
@@ -274,3 +303,27 @@ end
 def read_pathspecs( src )
     SportDb::Pathspecs.read( src )
 end
+
+
+
+def filter_pathspecs( specs, seasons: )
+    ## norm seasons
+    seasons =  seasons.map {|season| Season(season) }
+
+    ##  todo/fix: auto-add/update  rec['seasons'] column - why? why not?
+
+    ## note - filter datafiles inplace!!!
+    specs.each do |rec|
+       rec['datafiles'] =
+       rec['datafiles'].select do |candidate|
+             m=SportDb::Pathspec::MATCH_RE.match( candidate )
+             if m && seasons.include?( Season.parse( m[:season] ))
+                true
+             else
+                false
+             end
+        end
+    end
+
+    specs
+end

data/lib/fbtok.rb

@@ -7,7 +7,8 @@ require_relative 'fbtok/filepack'
 require_relative 'fbtok/pathspec'
 require_relative 'fbtok/pathspec_report'
 
-require_relative 'fbtok/fbtok'
-require_relative 'fbtok/fbtree'
-require_relative 'fbtok/fbquick'
-require_relative 'fbtok/fbx'
+require_relative 'fbtok/command-fbfind'
+require_relative 'fbtok/command-fbtok'
+require_relative 'fbtok/command-fbtree'
+require_relative 'fbtok/command-fbquick'
+require_relative 'fbtok/command-fbx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-10 00:00:00.000000000 Z
+date: 2026-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -75,6 +75,7 @@ dependencies:
 description: fbtok - football.txt lint tools incl. tokenizer, parser & more
 email: gerald.bauer@gmail.com
 executables:
+- fbfind
 - fbquick
 - fbquik
 - fbtok
@@ -90,16 +91,18 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbfind
 - bin/fbquick
 - bin/fbquik
 - bin/fbtok
 - bin/fbtree
 - bin/fbx
 - lib/fbtok.rb
-- lib/fbtok/fbquick.rb
-- lib/fbtok/fbtok.rb
-- lib/fbtok/fbtree.rb
-- lib/fbtok/fbx.rb
+- lib/fbtok/command-fbfind.rb
+- lib/fbtok/command-fbquick.rb
+- lib/fbtok/command-fbtok.rb
+- lib/fbtok/command-fbtree.rb
+- lib/fbtok/command-fbx.rb
 - lib/fbtok/filepack.rb
 - lib/fbtok/pathspec.rb
 - lib/fbtok/pathspec_report.rb