fbtok 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a133154bf34937e2961a05a9f3768e92cd2e4d633e64f2a52977e7eb3a7d4ae3
-  data.tar.gz: 382ba42bb20a0038f9efeec721481d70efc41c6241a209da5ea9e2a1fb177ac1
+  metadata.gz: a1df323dd41b041e34646d3df3fb90ded24707020ff8cddc90af689f2f3d33d8
+  data.tar.gz: c023d5844a069b4c829390e80ea2b69503809d361357df27a0e87d4ee80e336a
 SHA512:
-  metadata.gz: 800048bae44e60c94fc87073a029075d3e8d88c620ecbc3b2b4217939b4a42b40d57f855e50b60f8fe52c37593a8fe30ce786ed98169bdf87b3f64e7d1987016
-  data.tar.gz: '0921aa61b66e4ca43c1a9643dbe951ad9fcb0bba493bc9d93c2c5ce9ef099629694323b003be701970364d2b05008826a52699d1a7759be301da48ae463db76a'
+  metadata.gz: 7d7759e09847da4650bc008c12a5a9c52702eb30567495a2e7667a324388203db4f2a7bba6a4ed0eea8a72a2ab211b01ca70b12e6a421026dfcf09fc024b64b2
+  data.tar.gz: fb1673e6b654fa8fa781844534de93c5ff913b0fd7c1c828c12319cf7b22de038b5e5f3a97a9b33a6a9d3a72fd8505c6c906e4a409aff23c140589f753f80123

data/CHANGELOG.md

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

data/Manifest.txt

@@ -12,4 +12,6 @@ lib/fbtok/fbquick.rb
 lib/fbtok/fbtok.rb
 lib/fbtok/fbtree.rb
 lib/fbtok/fbx.rb
+lib/fbtok/filepack.rb
 lib/fbtok/pathspec.rb
+lib/fbtok/pathspec_report.rb

data/README.md

@@ -25,23 +25,25 @@ $ gem install fbtok
 - depends on sportdb-parser
 
 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
 
@@ -50,19 +52,20 @@ $ fbtree worldcup
 ```
 
 
-
 ### 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
 
@@ -72,6 +75,7 @@ $ fbx worldcup/min/2022.txt
 
 or on directories (auto-collecting all datafiles)
 
+```
 $ fbquik england
 $ fbquik worldcup
 ```
@@ -81,8 +85,6 @@ note: `fbx` only works with single / individual (data)files
 
 
 
-
-
 ## Questions? Comments?
 
 Yes, you can. More than welcome.

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.4.1'
+  self.version = '0.5.0'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -19,7 +19,7 @@ Hoe.spec 'fbtok' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-     ['sportdb-parser', '>= 0.7.1'],
+     ['sportdb-parser', '>= 0.7.2'],
      ['sportdb-quick',  '>= 0.7.0'],
   ]
 

data/bin/fbquick

@@ -8,6 +8,13 @@
 ##   $ ruby -I ../parser/lib -I ../quick/lib -I ./lib bin/fbquick
 
 
+## 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' )
+
+
+
 ## our own code
 require 'fbtok'
 

data/bin/fbquik

@@ -3,6 +3,11 @@
 ## tip: to test run:
 ##   $ ruby -I ./lib bin/fbquik
 
+## 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' )
+
 
 ## our own code
 require 'fbtok'

data/bin/fbtok

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

data/bin/fbtree

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

data/bin/fbx

@@ -4,6 +4,13 @@
 ##   $ ruby -I ./lib  bin/fbx
 
 
+## 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' )
+
+
+
 ## our own code
 require 'fbtok'
 

data/lib/fbtok/fbquick.rb

@@ -54,10 +54,20 @@ end
 specs =  if opts[:file]
             read_pathspecs( opts[:file] )
          else
-           args =     ['/sports/openfootball/euro/2021--europe/euro.txt',
-                       '/sports/openfootball/euro/2024--germany/euro.txt']  if args.empty?
-
-            build_pathspecs( args )
+            ## check for filepack
+            ##
+            ## fix-fix-fix
+            ##  add tool specific filepack
+            ##       e.g. filepack.quik|quick.txt or such
+            ##   to match first??
+            ##   check a list of names!!
+            filepack =  if File.file?( './filepack.txt')
+                            read_filepack( './filepack.txt' )
+                        else
+                             nil
+                        end
+
+            build_pathspecs( args, filepack: filepack )
          end
 
 pp specs

data/lib/fbtok/fbtok.rb

@@ -58,10 +58,14 @@ end
 specs =  if opts[:file]
             read_pathspecs( opts[:file] )
          else
-           args = ['/sports/openfootball/euro/2021--europe/euro.txt',
-                   '/sports/openfootball/euro/2024--germany/euro.txt']  if args.empty?
-
-            build_pathspecs( args )
+            ## check for filepack
+            filepack =  if File.file?( './filepack.txt')
+                            read_filepack( './filepack.txt' )
+                        else
+                             nil
+                        end
+
+            build_pathspecs( args, filepack: filepack )
          end
 
 
@@ -82,11 +86,20 @@ specs.each_with_index do |rec,i|
       tokens, more_errors = lexer.tokenize_with_errors
 
       ####
-      ## todo - report error on empty file (no tokens!!!)
+      ## todo - report error on empty file (no tokens!!!) - why? why not?
 
       puts "   #{tokens.size} token(s)"
 
-      errors += more_errors    if more_errors.size > 0
+      if more_errors.size > 0
+         ## note - auto-add filename to errors
+         more_errors.each do |msg|
+          ###
+          ###   errors << [ path, *msg ] # note: use splat (*) to add extra values (starting with msg)
+              errors << [path, msg]
+         end
+      end
+
+
    end
 
    if errors.size > 0

data/lib/fbtok/fbtree.rb

@@ -58,10 +58,14 @@ end
 specs =  if opts[:file]
             read_pathspecs( opts[:file] )
          else
-           args = ['/sports/openfootball/euro/2021--europe/euro.txt',
-                   '/sports/openfootball/euro/2024--germany/euro.txt']  if args.empty?
-
-            build_pathspecs( args )
+            ## check for filepack
+            filepack =  if File.file?( './filepack.txt')
+                            read_filepack( './filepack.txt' )
+                        else
+                             nil
+                        end
+
+            build_pathspecs( args, filepack: filepack )
          end
 
 
@@ -81,7 +85,14 @@ specs.each_with_index do |rec,i|
 
       dump_tree_stats( tree )
 
-      errors += parser.errors    if parser.errors?
+      if parser.errors?
+         ## note - auto-add filename to errors
+         parser.errors.each do |msg|
+          ###
+          ###   errors << [ path, *msg ] # note: use splat (*) to add extra values (starting with msg)
+              errors << [path, msg]
+         end
+      end
    end
 
 

data/lib/fbtok/fbx.rb

@@ -54,8 +54,8 @@ end
 
 
 args =  [
-              '../../../openfootball/euro/2021--europe/euro.txt',
-              '../../../openfootball/euro/2024--germany/euro.txt',
+              '/sports/openfootball/euro/2021--europe/euro.txt',
+              '/sports/openfootball/euro/2024--germany/euro.txt',
         ]   if args.empty?
 
 pp args

data/lib/fbtok/filepack.rb

@@ -0,0 +1,63 @@
+###################
+##
+##  quick and dirty format for filepacks
+##      that is, named list of files
+##
+##   note -  space indent(ation) does NOT matter
+##
+
+
+
+##  PACK eng|en
+##  add NAME eng|en   - why? why not?
+##
+## change to FILEPACK_NAME - why? why not?
+FILEPACK_HEADER_RE = %r{\A
+                              (?: PACK ) [ ]+
+                              (?<header> .+?)   ## note - use non-greedy
+                          \z}x
+
+##   DIR  /sports/openfootball
+##   CD  /sports/openfootball     -- keep - why? why not?
+FILEPACK_DIR_RE = %r{\A
+                              (?: DIR|CD ) [ ]+
+                              (?<dir> .+? )      ## note - use non-greedy
+
+                      \z}x
+
+
+
+def parse_filepack( txt )
+    h={}
+    recs    = nil
+    basedir = nil
+
+    txt.each_line do |line|
+      line = line.strip
+
+      next  if line.start_with?('#') || line.empty?
+
+      break if line == '__END__'
+
+
+      if m=FILEPACK_HEADER_RE.match(line)
+        keys    = m[:header].strip.split(  /[ ]*\|[ ]*/ )
+        basedir = nil
+        recs = []
+        ## note - normalize keys for now (always downcase)
+        keys.each {|key| h[key.downcase] = recs }
+      elsif m=FILEPACK_DIR_RE.match(line)
+        basedir = m[:dir].strip
+      else
+        file =  basedir ? File.join( basedir, line ) : line
+        recs << file
+      end
+    end
+
+    h
+end
+
+
+def read_filepack( path )
+  parse_filepack( read_text( path ))
+end

data/lib/fbtok/pathspec.rb

@@ -1,13 +1,13 @@
 
 
 module SportDb
-
 class Pathspec
 
   def self.debug=(value) @@debug = value; end
   def self.debug?()      @@debug ||= false; end  ## note: default is FALSE
 
 
+
     SEASON_RE = %r{ (?:
                           (?<season>\d{4}-\d{2})
                         | (?<season>\d{4})
@@ -20,6 +20,9 @@ class Pathspec
     ##     BUT NOT as first character!!! (e.g. exclude .confg.txt !!!)
     ##               e.g. 2024-25/at.1.txt
     ##                        change to at_1 or uefa_cl or such - why? why not?
+    ##
+    ##   note - support case-insensitive flag  (e.g. 2025-26/namur/2_Prov_A.txt)
+
     MATCH_RE = %r{
                     ## "classic" variant i)  with season folder
                     ##     e.g.  /1930/cup.txt
@@ -30,6 +33,13 @@ class Pathspec
                           (?:  --[a-z0-9_-]+
                           )?
                          /
+
+                        ### note - allow optional directories
+                        (?:
+                            [a-z0-9][a-z0-9_-]*
+                              /
+                        )*
+
                        [a-z0-9][a-z0-9._-]* \.txt   ## e.g /1-premierleague.txt
                          $
                     )
@@ -46,35 +56,46 @@ class Pathspec
                             \.txt
                             $
                     )
-                }x
+                }xi
 
     ### add support for matchdatafile with season NOT in directory
     ##      but starting filename e.g. 2024_friendlies.txt or 2024-25_bundesliga.txt
 
 
-def self._norm_seasons( seasons )
-    seasons.map {|season| Season(season) }
-end
 
 
 ## todo/check - rename to glob or expand or such - why? why not?
+
+##
+##  todo - add a strict: true|false or   all: true|false or such option
+##                    that will use generic **/*.txt and only use ignore filter!!!
+
+
 def self._find( path, seasons: nil )
+    ##
+    ## note -  only if seasons filter is turn on
+    ##                     MATCH_RE gets used!!!
+    ##            otherwise generic **/*.txt
+    ##
+    ## note -   the ignore/exlude filter always gets used/applied for now
+
+
     ## check - rename dir
     ##          use root_dir or work_dir or cd or such - why? why not?
 
-
     ## note: normalize path - use File.expand_path ??
     ##    change all backslash to slash for now
     ## path = path.gsub( "\\", '/' )
-    path =  File.expand_path( path )
+    fullpath =  File.expand_path( path )
 
     ####
     ## note - make sure path exists; raise error if not
-    raise Errno::ENOENT, "No such directory - #{path})"  unless Dir.exist?( path )
+    raise Errno::ENOENT, "No such directory - #{path})"  unless Dir.exist?( fullpath )
 
 
     if seasons && seasons.size > 0
-       seasons = _norm_seasons( seasons )    ## norm seasons (string, integer => Season obj)
+       ## norm seasons (string, integer => Season obj)
+       seasons =  seasons.map {|season| Season(season) }
     end
 
 
@@ -83,33 +104,45 @@ def self._find( path, seasons: nil )
     ##     (normally excluded with just *)
     ##  was:  Dir.glob( "#{path}/**/{*,.*}.txt" )
 
-    candidates = Dir.glob( "#{path}/**/*.txt" )
+    candidates = Dir.glob( "#{fullpath}/**/*.txt" )
     ## pp candidates
 
 
     datafiles = []
     candidates.each do |candidate|
-       if m = MATCH_RE.match( candidate )
 
-          ## check for seasons filter
-          next   if seasons && seasons.size > 0 &&
-                    !seasons.include?( Season.parse( m[:season] ))
+         ## (i) check for (optional) seasons filter
+         if seasons && seasons.size > 0
+            if m=MATCH_RE.match( candidate )
+               next   unless seasons.include?( Season.parse( m[:season] ))
+            else
+              next    ## note - no season found in filename; skip too
+            end
+         end
 
-          ### exclude squad
-          ##   and .v2 or .v2603
+
+         ## (ii) check for (default/built-in) ignore/excludes
+          basename = File.basename( candidate, File.extname( candidate ))
+          dirname  = File.dirname( candidate )
+
+          ### exclude basenames with:
+          ##   - squad
+          ##   - .v2 or .v2603
           ##
           ##    - worldcup/more/1930_squads.txt   =>   squads
-          ##    - 2014--brazil/cup.v2.txt",
-          ##    - 2014--brazil/cup.v260318_164934.txt",
+          ##    - 2014--brazil/cup.v2.txt
+          ##    - 2014--brazil/cup.v260318_164934.txt
 
-          basename = File.basename( candidate, File.extname( candidate ))
+          next   if /squad/i.match?( basename )
+          next   if /\.v[0-9][0-9_]*/i.match?( basename )
 
-          next   if /squad/i.match( basename )
-          next   if /\.v[0-9][0-9_]*/i.match( basename )
+          #####
+          ### exclude dirs  with:
+          ##    - squad or wiki
+          next   if /squad|wiki/i.match?( dirname )
 
 
           datafiles << candidate
-       end
     end
 
     ## pp datafiles
@@ -119,13 +152,19 @@ end
 
 
 
-
+##
+## rename/change to read_csv - why? why not?
 def self.read( src )
-    recs = read_csv( src )
+    ## note: normalize scr - use File.expand_path ??
+    ##    change all backslash to slash for now
+    ## scr = scr.gsub( "\\", '/' )
+    fullsrc =  File.expand_path( scr )
+
+    recs = read_csv( fullsrc )
     pp recs     if debug?
 
     ##  note - make pathspecs relative to passed in file arg!!!
-    basedir = File.dirname( src )
+    basedir = File.dirname( fullsrc )
 
     recs.each do |rec|
         path = rec['path']
@@ -141,90 +180,69 @@ end
 
 
 
+def self.build( args, filepack: nil )
+  recs = []
 
-end  # class Pathspec
-
-
-
-##
-#  PathspecReport (aka/formerly BatchReport)
+  ## 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'] }
+    end
+  else
+
+    ## note - collect all "loose/standalone" files (NOT directories)
+    ##             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 )
+          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
+    end
 
-class PathspecReport
-  def initialize( specs, title: )
-     @specs = specs
-     @title = title
+    if more.size > 0
+      recs << { 'path'      => '<input>',
+                'datafiles' =>  more }
+    end
   end
 
-  def build
-     buf = String.new
-     buf << "# #{@title} - #{@specs.size} dataset(s)\n\n"
-
-     @specs.each_with_index do |rec,i|
-       datafiles  = rec['datafiles']
-       errors     = rec['errors']
-
-       if errors.size > 0
-         buf << "!! #{errors.size} ERROR(S)  "
-       else
-         buf << "   OK          "
-       end
-       buf << "%-20s" % rec['path']
-       buf << " - #{datafiles.size} datafile(s)"
-       buf << "\n"
-
-       if errors.size > 0
-         buf << errors.pretty_inspect
-         buf << "\n"
-       end
-     end
-
-     buf
-  end   # method build
-end  # class BatchReport
-
-BatchReport = PathspecReport
+  recs
+end
 
+end  # class Pathspec
 end  # module Sportdb
 
 
 
+
 ##
 ##  keep helpers as global functions - why? why not?
 
 
-
-def build_pathspecs( args )    ### note:   was expand_args
-   specs = []
-
-   ## note - collect all "loose/standalone" files (NOT directories)
-   ##             in single default pathspec node
-   more = []
-
-   args.each do |arg|
-    ## check if directory
-    if Dir.exist?( arg )
-          datafiles = SportDb::Pathspec._find( arg )
-          specs << { 'path'       => arg,
-                     'datafiles'  => datafiles }
-    elsif File.file?( arg )  ## assume it's a file
-        ## make sure path exists; raise error if not
-        ##   (auto-)expand path to normalize - why? why not?
-          more << arg
-    else
-        raise Errno::ENOENT, "No such file or directory - #{arg}"
-    end
-  end
-
-   if more.size > 0
-      specs << { 'path'      => '<input>',
-                 'datafiles' =>  more }
-   end
-
-  specs
+##  build pathspecs via arguments
+##   - (i) every dir is a pathspec entry/record
+##   - (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 )
 end
 
-
-
+####
+## read pathspecs via csv file (using path column)
 def read_pathspecs( src )
     SportDb::Pathspec.read( src )
 end

data/lib/fbtok/pathspec_report.rb

@@ -0,0 +1,42 @@
+module SportDb
+
+##
+#  PathspecReport (aka/formerly BatchReport)
+
+class PathspecReport
+  def initialize( specs, title: )
+     @specs = specs
+     @title = title
+  end
+
+  def build
+     buf = String.new
+     buf << "# #{@title} - #{@specs.size} dataset(s)\n\n"
+
+     @specs.each_with_index do |rec,i|
+       datafiles  = rec['datafiles']
+       errors     = rec['errors']
+
+       if errors.size > 0
+         buf << "!! #{errors.size} ERROR(S)  "
+       else
+         buf << "   OK          "
+       end
+       buf << "%-20s" % rec['path']
+       buf << " - #{datafiles.size} datafile(s)"
+       buf << "\n"
+
+       if errors.size > 0
+         buf << errors.pretty_inspect
+         buf << "\n"
+       end
+     end
+
+     buf
+  end   # method build
+end  # class BatchReport
+
+BatchReport = PathspecReport
+
+
+end  # module Sportdb

data/lib/fbtok.rb

@@ -3,8 +3,9 @@ require 'sportdb/quick'
 
 
 ## our own code
+require_relative 'fbtok/filepack'
 require_relative 'fbtok/pathspec'
-
+require_relative 'fbtok/pathspec_report'
 
 require_relative 'fbtok/fbtok'
 require_relative 'fbtok/fbtree'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-26 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,9 @@ files:
 - lib/fbtok/fbtok.rb
 - lib/fbtok/fbtree.rb
 - lib/fbtok/fbx.rb
+- lib/fbtok/filepack.rb
 - lib/fbtok/pathspec.rb
+- lib/fbtok/pathspec_report.rb
 homepage: https://github.com/sportdb/footty
 licenses:
 - Public Domain