fbtok 0.5.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd5c4d072690acf0846ea8a6c0d34af8857073debf4c8c2d5a5688d92133038
-  data.tar.gz: 0ea211c29fbc8dcb0305368da6ae654c35404e498b1816d8507695e9a9a0e9e2
+  metadata.gz: 79b90fe564aceafc6c304dda555d29602c54cd6a5dc0973d929948f342a34ad2
+  data.tar.gz: 32d96ae47f2d9341a28ab52397122dd7d45839689f05211b397c8233c8d879ff
 SHA512:
-  metadata.gz: 8c164cb1b0ab93492b055b20f9864ef2dfd0fbd3197bfe658c2a29b68df7cfd0fe06a5f8c4867b8e6e39826972190998385fd691178d2a502122f2b2f13d7cbf
-  data.tar.gz: e649301128cd231e73ddcd815b32359a658233fb334413f38c083bcf2c54f8b62836f9187abb8cfced19318588737128218fdcf0f46e92ff14728f20ce24df5c
+  metadata.gz: da06e09e80a97753369af5cf1abecc7af1576e5a02d7ad69866c060c724f94ed9f35c2d7022759c3ccc4f34275fba7fffde27cdd6a79976f73550ca359556a77
+  data.tar.gz: c951cbd72bb32e608e2bfb19ddf45498a9858305ec886062963d7b7517532a55c1d079650097ea1b2e7a96cba99b0f8ffc3177af6682fe09966feb76490a9f5e

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.5.3
+### 0.9.0
 ### 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.3'
+  self.version = '0.9.0'
 
   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,12 +40,11 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
-  SportDb::QuickMatchReader.debug = true
-  SportDb::MatchParser.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
 
 
@@ -67,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'])
@@ -88,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
@@ -122,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

@@ -6,9 +6,10 @@ def self.main( args=ARGV )
 
 opts = {
     debug: true,
+#    warn:  false,
+
     file:  nil,
     seasons: [],
-#    warn:  false,
 }
 
 
@@ -53,11 +54,9 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-end
-
 
-# SportDb::Parser::Linter.debug = opts[:debug]
-# SportDb::Parser::Linter.warn  = opts[:warn]
+  Fbtxt::Lexer.debug = true
+end
 
 
 
@@ -73,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'])
@@ -99,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, debug: opts[:debug] )
+      lexer = Fbtxt::Lexer.new( txt )
       tokens, more_errors = lexer.tokenize_with_errors
 
       ####
@@ -144,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

@@ -72,6 +72,9 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
+
+  Fbtxt::Lexer.debug = true
+  Fbtxt::Parser.debug = true
 end
 
 
@@ -144,7 +147,12 @@ specs =  if opts[:file]
                              nil
                         end
 
-            path = SportDb::Pathspec.path(
+            ##
+            ## maybe change to:
+            ##   Env.fbpath( default)
+            ##   or  fb_path          or such - why? why not?
+
+            path = Fbtxt::Pathspec.path(
                           ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
                            '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
                            '/sports/openfootball'])
@@ -161,9 +169,6 @@ specs =  if opts[:file]
 ##   opts[:debug] = false
 ## end
 
-# SportDb::Parser::Linter.debug = opts[:debug]
-# SportDb::Parser::Linter.warn  = opts[:warn]
-
 
 
 if opts[:seasons].size > 0
@@ -222,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
 
@@ -257,7 +262,7 @@ end
 
 
 def self.parse_with_errors( txt, opts={} )
-   parser = RaccMatchParser.new( txt, debug: opts[:debug] )
+   parser = RaccMatchParser.new( txt )
    tree = parser.parse
 
    dump_tree_stats( tree )

data/lib/fbtok/command-fbx.rb

@@ -46,10 +46,11 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
-  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
 
 
@@ -74,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{ (?:
@@ -280,7 +280,7 @@ def self.build( args, path: [],
 end
 
 end  # class Pathspecs
-end  # module Sportdb
+end  # module Fbtxt
 
 
 
@@ -295,17 +295,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 +317,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.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-22 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