sportdb-formats 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec79f151992c1c7a16a8a500b60771a0babaf81a546c61ce54bdc0e644f6b6c
-  data.tar.gz: c8b1510c899407477b8799a21982ffa7c7fa72db708e83af3d9ac7d3007df366
+  metadata.gz: 41f3c7bf36eb0670146a99afc2b5d64bc08908519a5ec36814c2418af4e32a63
+  data.tar.gz: 3261bec4d966da877da33978a3feb6c2433ddc9cbe26ed7ecbd7b3080dd20a1e
 SHA512:
-  metadata.gz: f2e036967bdf35d73d1f93e1f1cb754058fb167a228785b9fbef4b21c8377b6bce9a9764bce2f9d79ed3629bb4202c6d344630bafdf187e53ec20e65c49ff32a
-  data.tar.gz: 95a64a731197e54d333ee931f31e9f6aae0691c09ad2494b80508b9db08e87b6be74520d8ce261667fa8df78aa8b5ce4ed9b13f343d598e6ee250811f284ff5f
+  metadata.gz: 81090e3dd2909aaf7655f61d51447a455bb71ff93f27f958934ba0c12a7ca2ca1eb6ee913756921762258111c953ce5fdec7ee62c71123fcae4f10c800b36375
+  data.tar.gz: 70fec4a289b64373025385516ab608acedc806f0cf9ced07c90db698a0a2e5a4c3bbb519f1c48356058705d10a43aa8ff634dc92f737090c855c6db8152aeba2

data/CHANGELOG.md

@@ -1,5 +1,4 @@
-### 2.1.2
-
+### 2.1.4
 ### 0.0.1 / 2019-10-28
 
 * Everything is new. First release.

data/Manifest.txt

@@ -2,7 +2,6 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-bin/fbchk
 lib/sportdb/formats.rb
 lib/sportdb/formats/datafile_package.rb
 lib/sportdb/formats/package.rb

data/lib/sportdb/formats/quick_match_linter.rb

@@ -58,14 +58,12 @@ class QuickMatchLinter
                 #    and seasons
                 #   for now merge stage into matches
 
-    secs = QuickLeagueOutlineReader.parse( @txt )
-    pp secs    if debug?
-
-    secs.each do |sec|   ## sec(tion)s
-      season = Season.parse( sec[:season] )   ## convert (str) to season obj!!!
-      league = sec[:league]
-      stage  = sec[:stage]
-      lines  = sec[:lines]
+    outline = QuickLeagueOutline.parse( @txt )
+    outline.each_sec do |sec|   ## sec(tion)s
+      season = Season.parse( sec.season )   ## convert (str) to season obj!!!
+      league = sec.league
+      stage  = sec.stage
+      lines  = sec.lines
 
       start =  if season.year?
                   Date.new( season.start_year, 1, 1 )
@@ -73,24 +71,43 @@ class QuickMatchLinter
                   Date.new( season.start_year, 7, 1 )
                 end
 
-###
-##      db check - check league
-##       fix/fix - add season to match_by   !!!!!!!
-##        note - changed to match (incl. code) from match_by(name:) only!!!
-      recs =  Import::League.match( league )
-      league_rec = nil
-      if recs.size == 1
-        league_rec = recs[0]
-        puts "     OK #{league} => #{league_rec.name}"
-      elsif recs.size == 0
-        msg = "NAME ERROR - no league match found for >#{league}<"
-        @errors << [msg]
-        puts "!! #{msg}"
-    else
-        msg = "NAME ERROR - ambigous; too many league matches (#{recs.size}) found for >#{league}<"
-        @errors << [msg]
-        puts "!! #{msg}"
-    end
+       league_rec = nil
+
+
+   ##   if all upcase or digits - assume/try code first
+   ##    todo/fix - change to find_by( code:  ) !!!!
+       period = Import::LeaguePeriod.find_by( code: league, season: season )
+       if period
+          ## find league by qname (assumed to be unique!!)
+          ##    todo/fix - use League.find_by!( name: ) !!!!
+          ##      make more specifi
+          league_rec = Import::League.find!( period.qname )
+          puts "        #{period.pretty_inspect}"
+          puts "     OK #{league}+#{season} => #{league_rec.pretty_inspect}"
+       else
+          ## try "generic" match by name (& more alt codes)
+          ###
+          ##      db check - check league
+          ##       fix/fix - add season to match_by   !!!!!!!
+          ##        note - changed to match (incl. code) from match_by(name:) only!!!
+        recs =  Import::League.match( league )
+        if recs.size == 1
+          league_rec = recs[0]
+          ## note - use pp (pretty_inspect) instead of league_rec.name
+          puts "     OK #{league} => #{league_rec.pretty_inspect}"
+        elsif recs.size == 0
+          msg = "NAME ERROR - no league match found for >#{league}<"
+          @errors << [msg]
+          puts "!! #{msg}"
+       else
+          msg = "NAME ERROR - ambigous; too many league matches (#{recs.size}) found for >#{league}<"
+          @errors << [msg]
+          puts "!! #{msg}"
+       end
+      end
+
+      ### note - skip section if no lines !!!!!
+      next if lines.empty?     ## or use lines.size == 0
 
 
       parser = MatchParser.new( lines,
@@ -147,7 +164,7 @@ class QuickMatchLinter
         team_rec = nil
         if recs.size == 1
           team_rec = recs[0]
-          puts "     OK #{team} => #{team_rec.name}, #{team_rec.country.name}"
+          puts "     OK #{team} => #{team_rec.pretty_inspect}"
         elsif recs.size == 0
           msg = "NAME ERROR - no team match found for >#{team}<"
           @errors << [msg]

data/lib/sportdb/formats/version.rb

@@ -4,7 +4,7 @@ module Formats
 
   MAJOR = 2    ## todo: namespace inside version or something - why? why not??
   MINOR = 1
-  PATCH = 2
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-search
@@ -78,18 +78,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 description: sportdb-formats - sport.db format and text utilities
 email: gerald.bauer@gmail.com
-executables:
-- fbchk
+executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -100,7 +99,6 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- bin/fbchk
 - lib/sportdb/formats.rb
 - lib/sportdb/formats/datafile_package.rb
 - lib/sportdb/formats/package.rb
@@ -128,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: sportdb-formats - sport.db format and text utilities

data/bin/fbchk

@@ -1,173 +0,0 @@
-#!/usr/bin/env ruby
-
-## tip: to test run:
-##   ruby -I ./lib bin/fbchk
-
-## our own code
-require 'sportdb/formats'
-
-
-
-require 'optparse'
-
-
-
-## local hack
-##   if exists up-to-date catalog db (use local version NOT built-in)
-catalog_path = '../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"
-