fbtok 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c719bbab25c068f69c9bd0bc44036ad355c8ca486ea3dfbec6d2276b4d436fbb
-  data.tar.gz: 7053879da0e31078524b8b74453d5e7f2d3b97b0d503629467210088d91955c5
+  metadata.gz: 90e2b9d1bb70a32d8ce47c920d411de8f45a99f7d8c9661d3f144f6087c4bb63
+  data.tar.gz: 2878f46e029072dc5170a0153afc3f791068f83535139bc3e93fbdabfacd85a7
 SHA512:
-  metadata.gz: 38bd241c9466046377aef3c951de74b25f9a7ae1d38e1827997ba673bea7cb60105344c7f78bd997b8e0e16dc90c89946fe08db39bb3433751e1a55167e55bbf
-  data.tar.gz: d59f2b6fed95ebb4e7539baf4e841db5ea008b29357438de13bf3094a3062aae7e47d5825d6f7a8299a1684b3295b9c5821806eee890b67fd68dcbb392034a1e
+  metadata.gz: 85f951fecd347f7af50ce5f43bb8fcc6afccb57a27180980e2401f51d91f7607f11aeaf0d713f8808404e99d49f38b4a8fa28d3982c5ee73f3772ea320e5ee80
+  data.tar.gz: d0ace4aab05240e76143ea5d83acafdf8eba3690ec22ecdbc108a15bf010a1386c8b71c9bc9e86d6a6728909141d1d0f36b3d97bab1292eb0c3bf57f4438930f

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.1
+### 0.3.3
 ### 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.3.1'
+  self.version = '0.3.3'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary

data/bin/fbtok

@@ -10,6 +10,7 @@ args = ARGV
 
 opts = {
     debug: true,
+    warn:  false,
     file:  nil,
 }
 
@@ -18,13 +19,17 @@ parser = OptionParser.new do |parser|
 
 
   parser.on( "-q", "--quiet",
-             "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+             "less debug output/messages (default: #{!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( "-w", "--warn",
+              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+    opts[:warn] = true
+  end
 
 =begin
   parser.on( "--metal",
@@ -51,11 +56,13 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-
-  SportDb::Parser::Linter.debug = true    
-  SportDb::Parser::Opts.debug   = true
 end
 
+SportDb::Parser::Linter.debug = opts[:debug]    
+SportDb::Parser::Opts.debug   = opts[:debug]
+
+SportDb::Parser::Linter.warn  = opts[:warn]    
+
 
 
 ## todo/check - use packs or projects or such

data/bin/fbtree

@@ -10,6 +10,7 @@ args = ARGV
 
 opts = {
     debug: true,
+    warn:  false,
     file:  nil,
 }
 
@@ -18,13 +19,18 @@ parser = OptionParser.new do |parser|
 
 
   parser.on( "-q", "--quiet",
-             "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+             "less debug output/messages (default: #{!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( "-w", "--warn",
+              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+    opts[:warn] = true
+  end
+
 
   parser.on( "-f FILE", "--file FILE",
                 "read datafiles (pathspecs) via .csv file") do |file|
@@ -42,11 +48,12 @@ if opts[:debug]
   p opts
   puts "ARGV:"
   p args
-
-  SportDb::Parser::Linter.debug = true    
-  SportDb::Parser::Opts.debug   = true
 end
 
+SportDb::Parser::Linter.debug = opts[:debug]    
+SportDb::Parser::Opts.debug   = opts[:debug]
+
+SportDb::Parser::Linter.warn  = opts[:warn]    
 
 
 

data/lib/fbtok/linter.rb

@@ -10,6 +10,10 @@ def self.debug=(value) @@debug = value; end
 def self.debug?()      @@debug ||= false; end  ## note: default is FALSE
 def debug?()  self.class.debug?; end
 
+##  turn warn(ings) into errors (default is false)
+def self.warn=(value) @@warn = value; end
+def self.warn?()      @@warn ||= false; end  ## note: default is FALSE
+def warn?()   self.class.warn?; end
 
 
 attr_reader :errors
@@ -101,7 +105,8 @@ def read( path, parse: true )
 
    ##
    ## auto-add error if no tokens/tree nodes
-   if @tree.empty?   ## @tree.size == 0
+   ##   note - do NOT report empty file error by default 
+   if @tree.empty? && warn?  ## @tree.size == 0
       @errors << [path, "empty; no #{parse ? 'parse tree nodes' : 'tokens'}"]
    end
 

data/lib/fbtok/opts.rb

@@ -13,7 +13,7 @@ class Opts
 
     SEASON_RE = %r{ (?:
                        \d{4}-\d{2}
-                     | \d{4}(--[a-z0-9_-]+)?
+                     | \d{4} (?: --[a-z0-9_-]+ )?   ## todo/fix - allow "extension" to 2024-25 too - why?
                     )
                   }x
     SEASON = SEASON_RE.source    ## "inline" helper for embedding in other regexes - keep? why? why not?
@@ -25,12 +25,26 @@ class Opts
     ##     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 (/)
+    MATCH_RE = %r{ (?:   ## "classic"  variant i)  with season folder
+                      (?: ^|/ )      # beginning (^) or beginning of path (/)
                        #{SEASON}
-                     /[a-z0-9][a-z0-9_.-]*\.txt$  ## txt e.g /1-premierleague.txt
+                         /
+                       [a-z0-9][a-z0-9_.-]*\.txt$  ## txt e.g /1-premierleague.txt
+                    )
+                     |
+                    (?:  ## "compact" variant ii) with season in filename
+                       (?: ^|/ )      # beginning (^) or beginning of path (/)
+                        (?: \d{4}-\d{2} 
+                                | 
+                              \d{4}
+                         )
+                         _  ## allow more than one underscore - why? why not?
+                        [a-z0-9][a-z0-9_.-]*\.txt$           
+                    )
                 }x
 
-
+    ### add support for matchdatafile with season NOT in directory
+    ##      but starting filename e.g. 2024_friendlies.txt or 2024-25_bundesliga.txt
 
 
 def self._find( path )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-25 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser