fbtok 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c6131cf108aae7a0d7284bba488be307c1cb81c099dad53960d500a8710483
-  data.tar.gz: ae5c2366e89ac5ef1a25567a0c328aafc12ddc21f826e43c927027dfa48e5f47
+  metadata.gz: efa16f747083c94f0a8fbb8df7ac3d1718ad2c204fca2008b711da35a7adf5ac
+  data.tar.gz: da8dfd82204875f23fc9efa236a1af79701e83047c5c3bf1fc34b4032371db51
 SHA512:
-  metadata.gz: e43061028eb9eae6a3f0cc50eccdf111f41270c89189fc50e5a9f4c56da976ed3b858d2201b234367009dbf036c17747a4e53952eaab3f500787fb1b695e023a
-  data.tar.gz: 18a70dbed909e896b47ddfe63ea98d1ed5ed3fe37a9dee15418e713790465ccc2a4f3033110a32916924dcf1fab9eb5132e411c37792c37abcf8b54ed301b3f9
+  metadata.gz: 29635412c9fb671cc254fa735dbf994289a961d02b92ca2480e80f4021d7f0d5b154f3b6d00c10cf50b1bce6f950ab624cbb1865d1273595a9401ad9c66a9ad4
+  data.tar.gz: b81ed7ecffc27725bef9dbb0f9b448eac302b649e89b7ac7da68c556fff4b14a4243dfe736145210b4cabc3a4b1b30d6633ab7a4d9fcd9f4e8082fc88522b275

data/CHANGELOG.md

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

data/Manifest.txt

@@ -2,6 +2,7 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+bin/fbchk
 bin/fbt
 bin/fbtok
 bin/fbx

data/README.md

@@ -19,6 +19,20 @@ $ gem install fbtok
 
 ## Usage
 
+
+### fbtok -  use tokenizer/parser
+
+- depends on sportdb-parser
+
+### fbt   -  use quick match reader &  fbx   -  dump match schedule  - uses quick league & match readers
+
+- depends on sportdb-quick
+
+### fbchk  -  use quick match linter; check league and team names via search & more
+
+- depends on sportdb-formats (incl. sportdb-search & sportdb-catalogs)
+
+
 ...
 
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.1.0'
+  self.version = '0.1.2'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -22,7 +22,7 @@ Hoe.spec 'fbtok' do
      #  ['sportdb-parser',  '>= 0.2.2'],
      #  ['sportdb-structs', '>= 0.5.0'],
      #  ['logutils',        '>= 0.6.1'],
-     ['sportdb-quick', '>= 0.3.0'],
+     ['sportdb-formats', '>= 2.1.2'],
   ]
 
   self.spec_extras = {

data/bin/fbchk

@@ -0,0 +1,177 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbchk
+
+
+## local hack for debugging
+##   use local versions if present
+$LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-structs/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-catalogs/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-search/lib' ))
+
+
+## our own code
+require 'fbtok'
+
+
+
+## local hack
+##   if exists up-to-date catalog db (use local version NOT built-in)
+catalog_path = '/sports/sportdb/sport.db/catalog/catalog.db'
+if File.exist?( catalog_path )
+  SportDb::Import.config.catalog_path = catalog_path
+end
+
+
+ args = ARGV
+ opts = { debug: false,
+          file:  nil,
+          teams: true,   ## check/lint teams (name errros etc.)
+        }
+
+ parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
+
+##
+## check if git has a offline option?? (use same)
+##             check for other tools - why? why not?
+#    parser.on( "-q", "--quiet",
+#                 "less debug output/messages - default is (#{!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( "-f FILE", "--file FILE",
+                    "read datafiles (pathspecs) via .csv file") do |file|
+      opts[:file] = file
+    end
+
+    parser.on( "--[no-]teams",
+                  "turn on/off team name checks (default: #{opts[:teams]})") do |teams|
+      opts[:teams] = teams
+    end
+end
+parser.parse!( args )
+
+
+puts "OPTS:"
+p opts
+puts "ARGV:"
+p args
+
+
+    ## todo/check - use packs or projects or such
+    ##                instead of specs - why? why not?
+    specs = []
+    if opts[:file]
+          recs = read_csv( opts[:file] )
+          pp recs
+          ##  note - make pathspecs relative to passed in file arg!!!
+          basedir = File.dirname( opts[:file] )
+          recs.each do |rec|
+             paths = SportDb::Parser::Opts.find( rec['path'], dir: basedir )
+             specs << [paths, rec]
+          end
+    else
+       paths = if args.empty?
+                 []
+              else
+                ## check for directories
+                ##   and auto-expand
+                SportDb::Parser::Opts.expand_args( args )
+              end
+        specs << [paths, {}]
+    end
+
+
+if opts[:debug]
+   SportDb::QuickMatchLinter.debug = true
+   SportDb::QuickMatchReader.debug = true
+   SportDb::MatchParser.debug      = true
+else
+   SportDb::QuickMatchLinter.debug = false
+   SportDb::QuickMatchReader.debug = false
+   SportDb::MatchParser.debug      = false
+   LogUtils::Logger.root.level = :info
+end
+
+
+  specs.each_with_index do |(paths, rec),i|
+    errors = []
+    paths.each_with_index do |path,j|
+      puts "==> [#{j+1}/#{paths.size}] reading >#{path}<..."
+      quick = SportDb::QuickMatchLinter.new( read_text( path ),
+                                              check_teams: opts[:teams] )
+      matches = quick.parse
+
+
+      if quick.errors?
+        puts "!! #{quick.errors.size} error(s):"
+        pp quick.errors
+
+        quick.errors.each do |err|
+          errors << [ path, *err ]   # note: use splat (*) to add extra values (starting with msg)
+        end
+      end
+      puts "  #{matches.size} match(es)"
+    end
+
+    if errors.size > 0
+      puts
+      puts "!! #{errors.size} PARSE ERRORS in #{paths.size} datafile(s)"
+      pp errors
+    else
+      puts
+      puts "  OK - no parse errors in #{paths.size} datafile(s)"
+    end
+
+     ## add errors to rec via rec['errors'] to allow
+     ##   for further processing/reporting
+     rec['errors'] = errors
+  end
+
+
+
+###
+## generate a report if --file option used
+if opts[:file]
+
+  buf = String.new
+
+  buf << "# fbchk summary report - #{specs.size} dataset(s)\n\n"
+
+  specs.each_with_index do |(paths, rec),i|
+     errors = rec['errors']
+
+     if errors.size > 0
+       buf << "!! #{errors.size} ERROR(S)  "
+     else
+       buf << "   OK          "
+     end
+     buf << "%-20s" % rec['path']
+     buf << " - #{paths.size} datafile(s)"
+     buf << "\n"
+
+     if errors.size > 0
+         buf << errors.pretty_inspect
+         buf << "\n"
+     end
+ end
+
+  puts
+  puts "SUMMARY:"
+  puts buf
+
+  basedir  = File.dirname( opts[:file] )
+  basename = File.basename( opts[:file], File.extname( opts[:file] ))
+  outpath  = "#{basedir}/fbcheck.#{basename}.txt"
+  write_text( outpath, buf )
+end
+
+
+puts "bye"
+

data/bin/fbx

@@ -84,16 +84,16 @@ paths.each_with_index do |path,i|
     puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
 
     txt = read_text( path )
-    secs = SportDb::LeagueOutlineReader.parse( txt )
+    secs = SportDb::QuickLeagueOutlineReader.parse( txt )
     ## pp secs
 
     secs.each_with_index do |sec,j|   ## sec(tion)s
-      season = sec[:season]
+      season = Season.parse( sec[:season] )   ## convert (str) to season obj!!!
       league = sec[:league]
       stage  = sec[:stage]
       lines  = sec[:lines]
 
-      puts "   section #{j+1}/#{secs.size} -   #{league.name} #{season}, #{stage}  -  #{lines.size} line(s)"
+      puts "   section #{j+1}/#{secs.size} -   #{league} #{season}, #{stage}  -  #{lines.size} line(s)"
 
       next if opts[:outline]
 

data/lib/fbtok/opts.rb

@@ -18,11 +18,12 @@ class Opts
     ## note: if pattern includes directory add here
     ##     (otherwise move to more "generic" datafile) - why? why not?
     ##   update - note include/allow dot (.) too
+    ##     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?
     MATCH_RE = %r{ (?: ^|/ )      # beginning (^) or beginning of path (/)
                        #{SEASON}
-                     /[a-z0-9_.-]+\.txt$  ## txt e.g /1-premierleague.txt
+                     /[a-z0-9][a-z0-9_.-]*\.txt$  ## txt e.g /1-premierleague.txt
                 }x
 
 

data/lib/fbtok.rb

@@ -1,5 +1,5 @@
 
-require 'sportdb/quick'
+require 'sportdb/formats'
 
 
 ## more stdlibs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Gerald Bauer
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-quick
+  name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,7 @@ dependencies:
 description: fbtok - football.txt lint tools incl. tokenizer, parser & more
 email: gerald.bauer@gmail.com
 executables:
+- fbchk
 - fbt
 - fbtok
 - fbx
@@ -74,6 +75,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbchk
 - bin/fbt
 - bin/fbtok
 - bin/fbx