fbtok 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1df323dd41b041e34646d3df3fb90ded24707020ff8cddc90af689f2f3d33d8
-  data.tar.gz: c023d5844a069b4c829390e80ea2b69503809d361357df27a0e87d4ee80e336a
+  metadata.gz: 9eef844f7c201c7ead0ccc9ed46324f32b17e33b837aa43d37cd0b6bbab6fc4b
+  data.tar.gz: 985a3e86686c326fa816db8fcef1385ccc8c5372ac740f46992a9a019685f451
 SHA512:
-  metadata.gz: 7d7759e09847da4650bc008c12a5a9c52702eb30567495a2e7667a324388203db4f2a7bba6a4ed0eea8a72a2ab211b01ca70b12e6a421026dfcf09fc024b64b2
-  data.tar.gz: fb1673e6b654fa8fa781844534de93c5ff913b0fd7c1c828c12319cf7b22de038b5e5f3a97a9b33a6a9d3a72fd8505c6c906e4a409aff23c140589f753f80123
+  metadata.gz: e0ac5582359acf8fe7c5fb3391c9970e4dcd93f7e2742d92b8b558b2f4c840a9589ed6c157d115f6a98170a5865aa50457078eea2266cfde526b5a8b97630c33
+  data.tar.gz: 6af6b00555bc59d5745eba085ce599782b08f6bb5e33982fcd07b260ce9ca1f3df062bc6ee05514f737ec24ebd9ad9b422c94839e76e07871fa75b206e476552

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.5.0
+### 0.5.2
 ### 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.0'
+  self.version = '0.5.2'
 
   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/{fbquick.rb → command-fbquick.rb}

@@ -67,7 +67,14 @@ specs =  if opts[:file]
                              nil
                         end
 
-            build_pathspecs( args, filepack: filepack )
+            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
 
 pp specs
@@ -101,6 +108,7 @@ pp specs
       pp errors
     else
       puts
+      pp datafiles
       puts "  OK - no parse errors in #{datafiles.size} datafile(s)"
     end
 

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

@@ -6,8 +6,9 @@ def self.main( args=ARGV )
 
 opts = {
     debug: true,
-    warn:  false,
     file:  nil,
+    seasons: [],
+#    warn:  false,
 }
 
 
@@ -23,11 +24,18 @@ parser = OptionParser.new do |parser|
                "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( "-w", "--warn",
+#              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+#    opts[:warn] = 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|
@@ -65,18 +73,27 @@ specs =  if opts[:file]
                              nil
                         end
 
-            build_pathspecs( args, filepack: filepack )
+            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
 
 
-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}<..."
@@ -97,18 +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 log
       puts "OK   no tokenize errors found in #{datafiles.size} datafile(s)"
    end
 

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

@@ -6,8 +6,9 @@ def self.main( args=ARGV )
 
 opts = {
     debug: true,
-    warn:  false,
     file:  nil,
+    seasons: [],
+##    warn:  false,
 }
 
 parser = OptionParser.new do |parser|
@@ -22,11 +23,18 @@ parser = OptionParser.new do |parser|
                "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( "-w", "--warn",
+#              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+#    opts[:warn] = 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|
@@ -38,7 +46,6 @@ parser = OptionParser.new do |parser|
 end
 parser.parse!( args )
 
-
 if opts[:debug]
   puts "OPTS:"
   p opts
@@ -47,8 +54,6 @@ if opts[:debug]
 end
 
 
-# SportDb::Parser::Linter.debug = opts[:debug]
-# SportDb::Parser::Linter.warn  = opts[:warn]
 
 
 
@@ -65,16 +70,39 @@ specs =  if opts[:file]
                              nil
                         end
 
-            build_pathspecs( args, filepack: filepack )
+            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 more than single datafile
+##     auto-switch into quite mode for now
+## if specs.size > 0  && specs[0]['datafiles'].size > 1
+##   opts[:debug] = false
+## end
+
+# SportDb::Parser::Linter.debug = opts[:debug]
+# SportDb::Parser::Linter.warn  = opts[:warn]
+
+
+
+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}<..."
@@ -92,6 +120,10 @@ 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, "#{parser.errors.size} parse error(s), #{tree.size} tree node(s)"]
+      else
+         log << [:OK, path, "#{tree.size} tree node(s)"]
       end
    end
 
@@ -100,9 +132,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 log
       puts "OK   no parse errors found in #{datafiles.size} datafile(s)"
    end
 

data/lib/fbtok/pathspec.rb

@@ -1,12 +1,37 @@
 
 
-module SportDb
-class Pathspec
+##
+## note - add find_dir( name, path: )  helper
+##    move upstream into cocos - why? why not?
+def find_dir( name, path: [] )
+    return File.expand_path( name )     if Dir.exist?( name )
+
+##  note - if name starts with / or \ assume it's absolute!!
+##    do NOT search!!!
+##     note - search still works for
+##               ./austria  or ../austria or such
+##
+##  todo/check/fix-fix-fix
+##     is there a File.absolute? or such method for reuse??
+##
+##  todo/fix-fix-fix add absolute check upstream to find_file too!!!
+    return nil    if name.start_with?( %r{[/\\]} )
+
+    path.each do |basedir|
+        ## todo/check -  always make sure basedir is an absolute/expanded path - why? why not?
+        dirpath = File.expand_path( name, basedir )
+        return dirpath   if Dir.exist?( dirpath )
+    end
+
+    nil   ## return nil if not found
+end
+
+
 
-  def self.debug=(value) @@debug = value; end
-  def self.debug?()      @@debug ||= false; end  ## note: default is FALSE
 
 
+module SportDb
+class Pathspec
 
     SEASON_RE = %r{ (?:
                           (?<season>\d{4}-\d{2})
@@ -71,7 +96,7 @@ class Pathspec
 ##                    that will use generic **/*.txt and only use ignore filter!!!
 
 
-def self._find( path, seasons: nil )
+def self.find( path, seasons: nil )
     ##
     ## note -  only if seasons filter is turn on
     ##                     MATCH_RE gets used!!!
@@ -85,11 +110,11 @@ def self._find( path, seasons: nil )
 
     ## note: normalize path - use File.expand_path ??
     ##    change all backslash to slash for now
-    ## path = path.gsub( "\\", '/' )
     fullpath =  File.expand_path( path )
 
     ####
     ## note - make sure path exists; raise error if not
+    ##   ENOENT => Error No Entity
     raise Errno::ENOENT, "No such directory - #{path})"  unless Dir.exist?( fullpath )
 
 
@@ -150,15 +175,33 @@ def self._find( path, seasons: nil )
 end
 
 
+def self.path( default=[])
+ ## check for  FBPATH
+ ##         or FBTXT_PATH
+      path = ENV['FBPATH'] || ENV['FBTXT_PATH']
+      if path
+          path.split( /[:;]/)
+      else
+         default
+      end
+end
+end # class Pathspec
+
+
+
+
+
+class Pathspecs    ## change to a module - why? why not?
+
+
+def self.debug=(value) @@debug = value; end
+def self.debug?()      @@debug ||= false; end     ## note: default is FALSE
 
 
-##
-## rename/change to read_csv - why? why not?
 def self.read( src )
-    ## note: normalize scr - use File.expand_path ??
-    ##    change all backslash to slash for now
-    ## scr = scr.gsub( "\\", '/' )
-    fullsrc =  File.expand_path( scr )
+    ## note: normalize src - use File.expand_path ??
+    ##    change all backslash to slash for now (\ to /)
+    fullsrc =  File.expand_path( src )
 
     recs = read_csv( fullsrc )
     pp recs     if debug?
@@ -167,11 +210,13 @@ def self.read( src )
     basedir = File.dirname( fullsrc )
 
     recs.each do |rec|
+        ##
+        ## todo/check - check for season/seasons column - why? why not?
         path = rec['path']
         fullpath = File.expand_path( path, basedir )
-        datafiles =   _find( fullpath )
+        datafiles =   Pathspec.find( fullpath )
 
-        ## add (new) datafiles column (from expanded pathspec)
+        ## auto-add (new) datafiles column (from expanded pathspec)
         rec['datafiles'] = datafiles
     end
 
@@ -179,15 +224,30 @@ 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, filepack: nil )
+def self.build( args, path: [],
+                      filepack: nil )
   recs = []
 
   ## check fo no args case  (and filepack present with default)
   if args.empty?
     if filepack && filepack.has_key?('default')
                recs << { 'path'      => '<default>',
-                         'datafiles' => filepack['default'] }
+                         'datafiles' => _expand_pathspecs(filepack['default']) }
     end
   else
 
@@ -195,22 +255,38 @@ def self.build( args, filepack: nil )
     ##             in single default pathspec node
     more = []
 
-
     args.each do |arg|
-      if filepack && filepack.has_key?( arg.downcase )
-           recs << { 'path'      => "<#{arg.downcase}>",
-                     'datafiles' => filepack[arg.downcase] }
-      ## check if directory
-      elsif Dir.exist?( arg )
+       ## note - ALWAYS give priority to existing directory matches (over filepack)
+       ##             e.g. euro or such -  why? why not?
+       ##
+       ##  todo/check  if euro/ works too?
+       ## check if directory
+       ##     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'  => _find( arg ) }
-      elsif File.file?( arg )  ## assume it's a file
-        ## make sure path exists; raise error if not
-        ##   (auto-)expand path to normalize - yes why? why not?
-          more << File.expand_path( arg )
-      else
-        raise Errno::ENOENT, "No such file or directory - #{arg}"
-      end
+                    'datafiles'  => Pathspec.find( dir ) }
+       elsif filepack && filepack.has_key?( arg.downcase )
+           recs << { 'path'      => "<#{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
+            if file
+              ## todo/fix:
+              ##   add File.expand_path upstream in find_file !!!
+              ##           and remove later here
+              ##       also fix upstream Errorno::ENOENT to Errno::ENOENT !!!
+              ##
+              ## make sure path exists; raise error if not
+               ## (auto-)expand path to normalize - yes why? why not?
+              more << File.expand_path(file)
+            else
+              raise Errno::ENOENT, "No such file or directory - #{arg}"
+            end
+       end
     end
 
     if more.size > 0
@@ -222,7 +298,7 @@ def self.build( args, filepack: nil )
   recs
 end
 
-end  # class Pathspec
+end  # class Pathspecs
 end  # module Sportdb
 
 
@@ -237,12 +313,36 @@ end  # module Sportdb
 ##   - (ii) all files get bundled together into <input> pathspec entry/record
 ##
 ##   note: was formerly known as expand_args
-def build_pathspecs( args, filepack: nil )
-   SportDb::Pathspec.build( args, filepack: filepack )
+def build_pathspecs( args, path: [], filepack: nil )
+   SportDb::Pathspecs.build( args, path: path, filepack: filepack )
 end
 
 ####
 ## read pathspecs via csv file (using path column)
 def read_pathspecs( src )
-    SportDb::Pathspec.read( 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.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-09 00:00:00.000000000 Z
+date: 2026-06-11 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