fbtok 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eef844f7c201c7ead0ccc9ed46324f32b17e33b837aa43d37cd0b6bbab6fc4b
-  data.tar.gz: 985a3e86686c326fa816db8fcef1385ccc8c5372ac740f46992a9a019685f451
+  metadata.gz: dfc4498d40f6906734e5fbff0f1931782e0a49e302490468715891ed5018d4e6
+  data.tar.gz: 298261705a027c7b08560418f0ace0d7a6f7d1c088500f3acc5b80ab20666ad9
 SHA512:
-  metadata.gz: e0ac5582359acf8fe7c5fb3391c9970e4dcd93f7e2742d92b8b558b2f4c840a9589ed6c157d115f6a98170a5865aa50457078eea2266cfde526b5a8b97630c33
-  data.tar.gz: 6af6b00555bc59d5745eba085ce599782b08f6bb5e33982fcd07b260ce9ca1f3df062bc6ee05514f737ec24ebd9ad9b422c94839e76e07871fa75b206e476552
+  metadata.gz: a433fe38169042980bfaaa030cf2f59c50dd146251b79dece1524b8f80dbfc51435c0de2d41046a88782a6c470e74a34a7e9db893603b4b3facb8395cf2f0068
+  data.tar.gz: eaa790f1b4d474cabf4198b7d9e2e1c0411531cd017cd822c9baf6d73e8d5b6562f64d3881784c621f348acc27edc481193137321648ca351449a874d18e94c4

data/CHANGELOG.md

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

data/Rakefile

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

data/lib/fbtok/command-fbquick.rb

@@ -40,8 +40,10 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
+  SportDb::Lexer.debug = true
+  RaccMatchParser.debug = true
+  SportDb::MatchParser.debug = true
   SportDb::QuickMatchReader.debug = true
-  SportDb::MatchParser.debug      = true
 else
   SportDb::QuickMatchReader.debug = false
   SportDb::MatchParser.debug      = false

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]
+  SportDb::Lexer.debug = true
+end
 
 
 
@@ -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 = SportDb::Lexer.new( txt )
       tokens, more_errors = lexer.tokenize_with_errors
 
       ####

data/lib/fbtok/command-fbtree.rb

@@ -4,11 +4,18 @@ module Fbtree
 def self.main( args=ARGV )
 
 
+
 opts = {
     debug: true,
+##    warn:  false,
+
+    json:  false,
+    yaml:  false,
+
     file:  nil,
+    tty:   false,
+
     seasons: [],
-##    warn:  false,
 }
 
 parser = OptionParser.new do |parser|
@@ -29,6 +36,13 @@ parser = OptionParser.new do |parser|
 #  end
 
 
+  parser.on( "-f FILE", "--file FILE",
+                "read datafiles (pathspecs) via .csv file") do |file|
+    opts[:file] = file
+    ## note: for batch (massive) processing auto-set debug (verbose output) to false (as default)
+    opts[:debug] = false
+  end
+
   parser.on( "--seasons SEASONS",
                "filter by seasons (default: #{opts[:seasons]})") do |seasons|
     opts[:seasons] = seasons
@@ -36,13 +50,20 @@ parser = OptionParser.new do |parser|
                         .map { |season| Season.parse(season.strip) }
   end
 
-  parser.on( "-f FILE", "--file FILE",
-                "read datafiles (pathspecs) via .csv file") do |file|
-    opts[:file] = file
-    ## note: for batch (massive) processing auto-set debug (verbose output) to false (as default)
-    opts[:debug] = false
+
+  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 )
 
@@ -51,10 +72,66 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
+
+  SportDb::Lexer.debug = true
+  RaccMatchParser.debug = true
 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
+
 
 
 
@@ -70,6 +147,11 @@ specs =  if opts[:file]
                              nil
                         end
 
+            ##
+            ## maybe change to:
+            ##   Env.fbpath( default)
+            ##   or  fb_path          or such - why? why not?
+
             path = SportDb::Pathspec.path(
                           ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
                            '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
@@ -87,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
@@ -108,20 +187,17 @@ specs.each_with_index do |rec,i|
       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, "#{parser.errors.size} parse error(s), #{tree.size} tree node(s)"]
+         log << [:ERROR, path, "#{more_errors.size} parse error(s), #{tree.size} tree node(s)"]
       else
          log << [:OK, path, "#{tree.size} tree node(s)"]
       end
@@ -184,4 +260,31 @@ def self.dump_tree_stats( tree )
 end
 
 
+
+def self.parse_with_errors( txt, opts={} )
+   parser = RaccMatchParser.new( txt )
+   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/command-fbx.rb

@@ -46,6 +46,8 @@ if opts[:debug]
   puts "ARGV:"
   p args
 
+  SportDb::Lexer.debug = true
+  RaccMatchParser.debug = true
   SportDb::MatchParser.debug = true
 else
   SportDb::MatchParser.debug = false

data/lib/fbtok/pathspec.rb

@@ -1,33 +1,5 @@
 
 
-##
-## 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
-
-
-
 
 
 module SportDb
@@ -161,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-11 00:00:00.000000000 Z
+date: 2026-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser