fbtok 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 434d60833636dd403ce4671279c847aa446295236685f264fa31b4791d9cdf82
-  data.tar.gz: 55729c6c2100163e05af42f53121958f7b9442ee15e07af2bfc28a7a94cdb75f
+  metadata.gz: 82c6131cf108aae7a0d7284bba488be307c1cb81c099dad53960d500a8710483
+  data.tar.gz: ae5c2366e89ac5ef1a25567a0c328aafc12ddc21f826e43c927027dfa48e5f47
 SHA512:
-  metadata.gz: e0694f22d437e9d614070acf083db4c4b522d99fe20c0c53370c6dd59d73107cc9ab7f94b26a049c4f3031f2acbfef2ff64ad0eb447dd6c2a54c34293becc717
-  data.tar.gz: fbe918cfe469447bcc1b77e9bb12a17e6430e6dc1bf5e287637cc0cb8379f606582c9adbfb1e3150609887db26fc7f75506f7faa64ae992f4e7a5487b7d0c16e
+  metadata.gz: e43061028eb9eae6a3f0cc50eccdf111f41270c89189fc50e5a9f4c56da976ed3b858d2201b234367009dbf036c17747a4e53952eaab3f500787fb1b695e023a
+  data.tar.gz: 18a70dbed909e896b47ddfe63ea98d1ed5ed3fe37a9dee15418e713790465ccc2a4f3033110a32916924dcf1fab9eb5132e411c37792c37abcf8b54ed301b3f9

data/CHANGELOG.md

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

data/Manifest.txt

@@ -2,8 +2,9 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+bin/fbt
 bin/fbtok
+bin/fbx
 lib/fbtok.rb
-lib/fbtok/fbtok.rb
 lib/fbtok/linter.rb
 lib/fbtok/opts.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.0.1'
+  self.version = '0.1.0'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -19,7 +19,10 @@ Hoe.spec 'fbtok' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-       ['sportdb-parser', '>= 0.3.9'],
+     #  ['sportdb-parser',  '>= 0.2.2'],
+     #  ['sportdb-structs', '>= 0.5.0'],
+     #  ['logutils',        '>= 0.6.1'],
+     ['sportdb-quick', '>= 0.3.0'],
   ]
 
   self.spec_extras = {

data/bin/fbt

@@ -0,0 +1,167 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbt
+##     -or-
+##   ruby -I ../parser/lib -I ./lib bin/fbt
+##     -or-
+##   ruby -I ../parser/lib -I ../sportdb-structs/lib -I ./lib bin/fbt
+
+
+## our own code
+require 'fbtok'
+
+
+##
+## read textfile
+##   and dump tokens
+##
+##   fbt  ../openfootball/.../euro.txt
+
+
+
+
+ args = ARGV
+ opts = { debug: false,
+          file:  nil,
+        }
+
+ 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
+
+
+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?
+                 [
+                   '../../../openfootball/euro/2021--europe/euro.txt',
+                   '../../../openfootball/euro/2024--germany/euro.txt',
+                 ]
+              else
+                ## check for directories
+                ##   and auto-expand
+                SportDb::Parser::Opts.expand_args( args )
+              end
+        specs << [paths, {}]
+    end
+
+
+if opts[:debug]
+   SportDb::QuickMatchReader.debug = true
+   SportDb::MatchParser.debug      = true
+else
+   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::QuickMatchReader.new( read_text( path ) )
+      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 << "# fbt 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
+
+  #  maybe write out in the future?
+  # basedir  = File.dirname( opts[:file] )
+  # basename = File.basename( opts[:file], File.extname( opts[:file] ))
+end
+
+
+puts "bye"
+

data/bin/fbtok

@@ -5,9 +5,141 @@
 
 require 'fbtok'
 
+args = ARGV
+ 
 
-Fbtok.main( ARGV )
+opts = {
+    debug: true,
+    metal: false,
+    file:  nil,
+}
 
+parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options] PATH"
+
+
+  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( "--metal",
+                 "turn off typed parse tree; show to the metal tokens"+
+                   " (default: #{opts[:metal]})" ) do |metal|
+    opts[:metal] = true
+  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
+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?
+             [
+               '../../../openfootball/euro/2021--europe/euro.txt',
+               '../../../openfootball/euro/2024--germany/euro.txt',
+             ]
+          else
+            ## check for directories
+            ##   and auto-expand
+            SportDb::Parser::Opts.expand_args( args )
+          end
+    specs << [paths, {}]
+end
+
+
+SportDb::Parser::Linter.debug = true    if opts[:debug]
+
+linter = SportDb::Parser::Linter.new
+
+
+specs.each_with_index do |(paths, rec),i|
+   errors = []
+
+   paths.each_with_index do |path,j|
+      puts "==> [#{j+1}/#{paths.size}] reading >#{path}<..."
+      linter.read( path, parse: !opts[:metal] )
+
+      errors += linter.errors    if linter.errors?
+   end
+
+   if errors.size > 0
+      puts
+      pp errors
+      puts
+      puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
+   else
+      puts
+      puts "OK   no parse errors found 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 << "# fbtok 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
+
+#  maybe write out in the future?
+# basedir  = File.dirname( opts[:file] )
+# basename = File.basename( opts[:file], File.extname( opts[:file] ))
+end
 
 puts "bye"
 

data/bin/fbx

@@ -0,0 +1,149 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib -I ../parser/lib bin/fbx
+
+##
+## todo/fix - use for testing
+#                reads textfile and dumps results in json
+#
+#  check - keep fbx name or find a differnt name - why? why not?
+
+
+## our own code
+require 'fbtok'
+
+
+##
+## read textfile
+##   and dump match parse results
+##
+##   fbt  ../openfootball/.../euro.txt
+
+
+
+
+ args = ARGV
+ opts = { debug: false,
+          outline: false }
+
+ 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( "--verbose", "--debug",
+               "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
+    opts[:debug] = debug
+  end
+
+  parser.on( "--outline",
+                "turn on outline (only) output (default: #{opts[:outline]})" ) do |outline|
+    opts[:outline] = outline
+  end
+end
+parser.parse!( args )
+
+puts "OPTS:"
+p opts
+puts "ARGV:"
+p args
+
+
+
+
+
+paths =  if args.empty?
+            [
+              '../../../openfootball/euro/2021--europe/euro.txt',
+              '../../../openfootball/euro/2024--germany/euro.txt',
+            ]
+         else
+            ## check for directories
+            ##   and auto-expand
+
+            SportDb::Parser::Opts.expand_args( args )
+         end
+
+
+
+
+
+
+
+SportDb::MatchParser.debug = true    if opts[:debug]
+
+
+## errors = []
+
+
+paths.each_with_index do |path,i|
+    puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
+
+    txt = read_text( path )
+    secs = SportDb::LeagueOutlineReader.parse( txt )
+    ## pp secs
+
+    secs.each_with_index do |sec,j|   ## sec(tion)s
+      season = sec[:season]
+      league = sec[:league]
+      stage  = sec[:stage]
+      lines  = sec[:lines]
+
+      puts "   section #{j+1}/#{secs.size} -   #{league.name} #{season}, #{stage}  -  #{lines.size} line(s)"
+
+      next if opts[:outline]
+
+=begin
+    ### check if event info availabe - use start_date;
+      ##    otherwise we have to guess (use a "synthetic" start_date)
+      event_info = catalog.events.find_by( season: season,
+                                           league: league )
+
+      start = if event_info && event_info.start_date
+                  puts "event info found:"
+                  puts "  using start date from event: "
+                  pp event_info
+                  pp event_info.start_date
+                  event_info.start_date
+              else
+=end
+     start  =   if season.year?
+                  Date.new( season.start_year, 1, 1 )
+                else
+                  Date.new( season.start_year, 7, 1 )
+                end
+
+      parser = SportDb::MatchParser.new( lines,
+                                         start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
+
+      auto_conf_teams,  matches, rounds, groups = parser.parse
+
+      puts ">>> #{auto_conf_teams.size} teams:"
+      pp auto_conf_teams
+      puts ">>> #{matches.size} matches:"
+      ## pp matches
+      puts ">>> #{rounds.size} rounds:"
+      pp rounds
+      puts ">>> #{groups.size} groups:"
+      pp groups
+    end  # each secs
+end  # each paths
+
+=begin
+if errors.size > 0
+    puts
+    pp errors
+    puts
+    puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
+else
+    puts
+    puts "OK   no parse errors found in #{paths.size} datafile(s)"
+end
+=end
+
+puts "bye"
+

data/lib/fbtok.rb

@@ -1,9 +1,13 @@
 
-require 'sportdb/parser'
+require 'sportdb/quick'
+
+
+## more stdlibs
+require 'optparse'   ## check - already auto-required in cocos? keep? why? why not?
 
 
 ## our own code
 require_relative 'fbtok/opts'
-require_relative 'fbtok/fbtok'
+require_relative 'fbtok/linter'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 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-parser
+  name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,9 @@ dependencies:
 description: fbtok - football.txt lint tools incl. tokenizer, parser & more
 email: gerald.bauer@gmail.com
 executables:
+- fbt
 - fbtok
+- fbx
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -72,9 +74,10 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbt
 - bin/fbtok
+- bin/fbx
 - lib/fbtok.rb
-- lib/fbtok/fbtok.rb
 - lib/fbtok/linter.rb
 - lib/fbtok/opts.rb
 homepage: https://github.com/sportdb/footty

data/lib/fbtok/fbtok.rb

@@ -1,141 +0,0 @@
-
-module Fbtok
-def self.main( args=ARGV )
-
-    opts = {
-        debug: true,
-        metal: false,
-        file:  nil,
-    }
-
-    parser = OptionParser.new do |parser|
-      parser.banner = "Usage: #{$PROGRAM_NAME} [options] PATH"
-
-
-      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( "--metal",
-                     "turn off typed parse tree; show to the metal tokens"+
-                       " (default: #{opts[:metal]})" ) do |metal|
-        opts[:metal] = true
-      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
-    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?
-                 [
-                   '../../../openfootball/euro/2021--europe/euro.txt',
-                   '../../../openfootball/euro/2024--germany/euro.txt',
-                 ]
-              else
-                ## check for directories
-                ##   and auto-expand
-                SportDb::Parser::Opts.expand_args( args )
-              end
-        specs << [paths, {}]
-    end
-
-
-    SportDb::Parser::Linter.debug = true    if opts[:debug]
-
-    linter = SportDb::Parser::Linter.new
-
-
-    specs.each_with_index do |(paths, rec),i|
-       errors = []
-
-       paths.each_with_index do |path,j|
-          puts "==> [#{j+1}/#{paths.size}] reading >#{path}<..."
-          linter.read( path, parse: !opts[:metal] )
-
-          errors += linter.errors    if linter.errors?
-       end
-
-       if errors.size > 0
-          puts
-          pp errors
-          puts
-          puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
-       else
-          puts
-          puts "OK   no parse errors found 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 << "# fbtok 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
-
-  #  maybe write out in the future?
-  # basedir  = File.dirname( opts[:file] )
-  # basename = File.basename( opts[:file], File.extname( opts[:file] ))
-end
-
-
-
-end  # method self.main
-end  #  module Fbtok