fbtok 0.5.4 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc4498d40f6906734e5fbff0f1931782e0a49e302490468715891ed5018d4e6
-  data.tar.gz: 298261705a027c7b08560418f0ace0d7a6f7d1c088500f3acc5b80ab20666ad9
+  metadata.gz: c19bd3b153f7429d9397fb767ba9d420ee74ebef9065cc294cd8f6ef9efa9141
+  data.tar.gz: 51187932ab782b85c941741864fbc40287252fe1d7e01e0411bc1b13131644f9
 SHA512:
-  metadata.gz: a433fe38169042980bfaaa030cf2f59c50dd146251b79dece1524b8f80dbfc51435c0de2d41046a88782a6c470e74a34a7e9db893603b4b3facb8395cf2f0068
-  data.tar.gz: eaa790f1b4d474cabf4198b7d9e2e1c0411531cd017cd822c9baf6d73e8d5b6562f64d3881784c621f348acc27edc481193137321648ca351449a874d18e94c4
+  metadata.gz: 926145f258c1b0bc260dcb726478c34a9ea19872449dd1d7c046dde7035fafc4f23dd9cfdc37307bacf628e87e54b70437f444ef2bcf1f6f41e96dfab2b2852b
+  data.tar.gz: 00bd95604cb4f1add3214b158ec8237f948aac7ccee2a087c05e358bab5834911088daea3b9b269275ff733f04675b6e4e15bfb5fd0ef20bac27d9375a6c0cbf

data/CHANGELOG.md

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

data/README.md

@@ -22,7 +22,7 @@ $ gem install fbtok
 
 ### fbtok & fbtree -  use tokenizer (lexer) & parser
 
-- depends on sportdb-parser
+- depends on fbtxt-parser
 
 get help
 
@@ -54,7 +54,7 @@ $ fbtree worldcup
 
 ### fbquick/fbquik & fbx   -  use quick match reader & dump match schedule
 
-- depends on sportdb-quick (& sportdb-parser)
+- depends on fbtxt-document (& fbtxt-parser)
 
 get help
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.5.4'
+  self.version = '0.9.1'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -19,8 +19,8 @@ Hoe.spec 'fbtok' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-     ['sportdb-parser', '>= 0.7.2'],
-     ['sportdb-quick',  '>= 0.7.0'],
+     ['fbtxt-parser',    '>= 0.9.0'],
+     ['fbtxt-document',  '>= 0.9.0'],
   ]
 
   self.spec_extras = {

data/bin/fbquick

@@ -5,13 +5,13 @@
 ##     -or-
 ##   $ ruby -I ../parser/lib -I ./lib bin/fbquick
 ##     -or-
-##   $ ruby -I ../parser/lib -I ../quick/lib -I ./lib bin/fbquick
+##   $ ruby -I ../parser/lib -I ../document/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' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/document/lib' )
 
 
 

data/bin/fbquik

@@ -6,7 +6,7 @@
 ## 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' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/document/lib' )
 
 
 ## our own code

data/bin/fbx

@@ -7,7 +7,7 @@
 ## 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' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db.v2/document/lib' )
 
 
 

data/lib/fbtok/command-fbfind.rb

@@ -49,10 +49,6 @@ if opts[:debug]
 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?
@@ -66,7 +62,7 @@ specs =  if opts[:file]
                              nil
                         end
 
-            path = SportDb::Pathspec.path(
+            path = Fbtxt::Pathspec.path(
                           ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
                            '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
                            '/sports/openfootball'])

data/lib/fbtok/command-fbquick.rb

@@ -40,14 +40,11 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
-  SportDb::Lexer.debug = true
-  RaccMatchParser.debug = true
-  SportDb::MatchParser.debug = true
-  SportDb::QuickMatchReader.debug = true
+  Fbtxt::Lexer.debug = true
+  Fbtxt::Parser.debug = true
+  Fbtxt::Document.debug = true
 else
-  SportDb::QuickMatchReader.debug = false
-  SportDb::MatchParser.debug      = false
-  LogUtils::Logger.root.level = :info
+  ## note - assume no debug is default
 end
 
 
@@ -69,7 +66,7 @@ specs =  if opts[:file]
                              nil
                         end
 
-            path = SportDb::Pathspec.path(
+            path = Fbtxt::Pathspec.path(
                           ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
                            '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
                            '/sports/openfootball'])
@@ -90,14 +87,14 @@ pp specs
     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
+      doc = Fbtxt::Document.new( txt )
+      matches = doc.matches
 
-      if quick.errors?
-        puts "!! #{quick.errors.size} error(s):"
-        pp quick.errors
+      if doc.errors?
+        puts "!! #{doc.errors.size} error(s):"
+        pp doc.errors
 
-        quick.errors.each do |err|
+        doc.errors.each do |err|
           errors << [ path, *err ]   # note: use splat (*) to add extra values (starting with msg)
         end
       end
@@ -124,7 +121,7 @@ pp specs
 ###
 ## generate a report if --file option used
 if opts[:file]
-  buf = SportDb::PathspecReport.new(
+  buf = Fbtxt::PathspecReport.new(
             specs,
             title: 'fbquick summary report' ).build
 

data/lib/fbtok/command-fbtok.rb

@@ -55,7 +55,7 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
-  SportDb::Lexer.debug = true
+  Fbtxt::Lexer.debug = true
 end
 
 
@@ -72,7 +72,7 @@ specs =  if opts[:file]
                              nil
                         end
 
-            path = SportDb::Pathspec.path(
+            path = Fbtxt::Pathspec.path(
                           ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
                            '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
                            '/sports/openfootball'])
@@ -98,7 +98,7 @@ specs.each_with_index do |rec,i|
       puts "==> [#{i+1}/#{specs.size}, #{j+1}/#{datafiles.size}] reading >#{path}<..."
 
       txt = read_text( path )
-      lexer = SportDb::Lexer.new( txt )
+      lexer = Fbtxt::Lexer.new( txt )
       tokens, more_errors = lexer.tokenize_with_errors
 
       ####
@@ -143,7 +143,7 @@ end
 ###
 ## generate a report if --file option used
 if opts[:file]
-  buf = SportDb::PathspecReport.new(
+  buf = Fbtxt::PathspecReport.new(
             specs,
             title: 'fbtok summary report' ).build
 

data/lib/fbtok/command-fbtree.rb

@@ -73,8 +73,8 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
-  SportDb::Lexer.debug = true
-  RaccMatchParser.debug = true
+  Fbtxt::Lexer.debug = true
+  Fbtxt::Parser.debug = true
 end
 
 
@@ -152,7 +152,7 @@ specs =  if opts[:file]
             ##   Env.fbpath( default)
             ##   or  fb_path          or such - why? why not?
 
-            path = SportDb::Pathspec.path(
+            path = Fbtxt::Pathspec.path(
                           ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
                            '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
                            '/sports/openfootball'])
@@ -227,7 +227,7 @@ end
 ## generate a report if --file option used
 if opts[:file]
 
-  buf = SportDb::PathspecReport.new(
+  buf = Fbtxt::PathspecReport.new(
             specs,
             title: 'fbtree summary report' ).build
 

data/lib/fbtok/command-fbx.rb

@@ -46,12 +46,11 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
-  SportDb::Lexer.debug = true
-  RaccMatchParser.debug = true
-  SportDb::MatchParser.debug = true
+  Fbtxt::Lexer.debug = true
+  Fbtxt::Parser.debug = true
+  Fbtxt::Document.debug = true
 else
-  SportDb::MatchParser.debug = false
-  LogUtils::Logger.root.level = :info
+  ## note - assume no debug is default
 end
 
 
@@ -76,19 +75,18 @@ paths.each_with_index do |path,i|
 
     ##
     ## note - use start: nil => requires that first date incl. a year!!!
-    parser = SportDb::MatchParser.new( txt, start: nil )
+    doc = Fbtxt::Document.new( txt, start: nil )
 
-    auto_conf_teams, matches, rounds, groups = parser.parse
 
-      puts ">>> #{auto_conf_teams.size} teams:"
-      pp auto_conf_teams
-      puts ">>> #{matches.size} matches:"
-      pp matches[0,2]   ## print first two matches
+      puts ">>> #{doc.teams.size} teams:"
+      pp doc.teams
+      puts ">>> #{doc.matches.size} matches:"
+      pp doc.matches[0,2]   ## print first two matches
       puts "..."
-      puts ">>> #{rounds.size} rounds:"
-      pp rounds
-      puts ">>> #{groups.size} groups:"
-      pp groups
+      puts ">>> #{doc.rounds.size} rounds:"
+      pp doc.rounds
+      puts ">>> #{doc.groups.size} groups:"
+      pp doc.groups
 end  # each paths
 
 =begin

data/lib/fbtok/pathspec.rb

@@ -2,7 +2,7 @@
 
 
 
-module SportDb
+module Fbtxt
 class Pathspec
 
     SEASON_RE = %r{ (?:
@@ -133,6 +133,10 @@ def self.find( path, seasons: nil )
           next   if /squad/i.match?( basename )
           next   if /\.v[0-9][0-9_]*/i.match?( basename )
 
+          ## exclude
+          ##    .meta.txt   used in (wget) cache for meta data
+          next   if /\.meta$/i.match?( basename )
+
           ### exclude
           ##     logs.txt  or logs.xxx.txt etc
           ##     log.txt  or log.xxx.txt etc
@@ -280,7 +284,7 @@ def self.build( args, path: [],
 end
 
 end  # class Pathspecs
-end  # module Sportdb
+end  # module Fbtxt
 
 
 
@@ -295,17 +299,18 @@ end  # module Sportdb
 ##
 ##   note: was formerly known as expand_args
 def build_pathspecs( args, path: [], filepack: nil )
-   SportDb::Pathspecs.build( args, path: path, filepack: filepack )
+   Fbtxt::Pathspecs.build( args, path: path, filepack: filepack )
 end
 
 ####
 ## read pathspecs via csv file (using path column)
 def read_pathspecs( src )
-    SportDb::Pathspecs.read( src )
+    Fbtxt::Pathspecs.read( src )
 end
 
 
 
+
 def filter_pathspecs( specs, seasons: )
     ## norm seasons
     seasons =  seasons.map {|season| Season(season) }
@@ -316,7 +321,7 @@ def filter_pathspecs( specs, seasons: )
     specs.each do |rec|
        rec['datafiles'] =
        rec['datafiles'].select do |candidate|
-             m=SportDb::Pathspec::MATCH_RE.match( candidate )
+             m=Fbtxt::Pathspec::MATCH_RE.match( candidate )
              if m && seasons.include?( Season.parse( m[:season] ))
                 true
              else

data/lib/fbtok/pathspec_report.rb

@@ -1,4 +1,4 @@
-module SportDb
+module Fbtxt
 
 ##
 #  PathspecReport (aka/formerly BatchReport)
@@ -39,4 +39,4 @@ end  # class BatchReport
 BatchReport = PathspecReport
 
 
-end  # module Sportdb
+end  # module Fbtxt

data/lib/fbtok.rb

@@ -1,5 +1,5 @@
 
-require 'sportdb/quick'
+require 'fbtxt/document'
 
 
 ## our own code

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.9.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-24 00:00:00.000000000 Z
+date: 2026-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-parser
+  name: fbtxt-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: sportdb-quick
+  name: fbtxt-document
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement