fbtok 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1df323dd41b041e34646d3df3fb90ded24707020ff8cddc90af689f2f3d33d8
-  data.tar.gz: c023d5844a069b4c829390e80ea2b69503809d361357df27a0e87d4ee80e336a
+  metadata.gz: 6bb0384d86033771326222bc9284264b9bfc44c55210261e6b598fffb3ddf925
+  data.tar.gz: a7692e7b0f394373c364234ec7b7c57933d6bd1344b58d4139beb41381a59921
 SHA512:
-  metadata.gz: 7d7759e09847da4650bc008c12a5a9c52702eb30567495a2e7667a324388203db4f2a7bba6a4ed0eea8a72a2ab211b01ca70b12e6a421026dfcf09fc024b64b2
-  data.tar.gz: fb1673e6b654fa8fa781844534de93c5ff913b0fd7c1c828c12319cf7b22de038b5e5f3a97a9b33a6a9d3a72fd8505c6c906e4a409aff23c140589f753f80123
+  metadata.gz: 854430fe426e69eb27651930db928cb24bf7f4b489503a222f7ff67178fb087b465718e71cc4a9421a591ab87c784e35f2a26514c99de9151ddb9a1a13c4ec53
+  data.tar.gz: e602fe075cfbd20eeed1e744f4bdfa35314f2e42db69537cb8ff14ccc87b8fed50400d5f3aa53974e342a0b09c00b7110e0614e0d06ede5595c19e6e652de63d

data/CHANGELOG.md

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

data/lib/fbtok/fbquick.rb

@@ -67,7 +67,14 @@ specs =  if opts[:file]
                              nil
                         end
 
-            build_pathspecs( args, filepack: filepack )
+            path = SportDb::Pathspec.path(
+                          ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
+                           '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
+                           '/sports/openfootball'])
+
+
+            build_pathspecs( args, path: path,
+                                   filepack: filepack )
          end
 
 pp specs
@@ -101,6 +108,7 @@ pp specs
       pp errors
     else
       puts
+      pp datafiles
       puts "  OK - no parse errors in #{datafiles.size} datafile(s)"
     end
 

data/lib/fbtok/fbtok.rb

@@ -6,8 +6,8 @@ def self.main( args=ARGV )
 
 opts = {
     debug: true,
-    warn:  false,
     file:  nil,
+#    warn:  false,
 }
 
 
@@ -23,10 +23,10 @@ parser = OptionParser.new do |parser|
                "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( "-w", "--warn",
+#              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+#    opts[:warn] = true
+#  end
 
 
   parser.on( "-f FILE", "--file FILE",
@@ -65,7 +65,13 @@ specs =  if opts[:file]
                              nil
                         end
 
-            build_pathspecs( args, filepack: filepack )
+            path = SportDb::Pathspec.path(
+                          ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
+                           '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
+                           '/sports/openfootball'])
+
+            build_pathspecs( args, path: path,
+                                   filepack: filepack )
          end
 
 
@@ -109,6 +115,7 @@ specs.each_with_index do |rec,i|
       puts "!!   #{errors.size} tokenize error(s) in #{datafiles.size} datafiles(s)"
    else
       puts
+      pp datafiles
       puts "OK   no tokenize errors found in #{datafiles.size} datafile(s)"
    end
 

data/lib/fbtok/fbtree.rb

@@ -6,8 +6,8 @@ def self.main( args=ARGV )
 
 opts = {
     debug: true,
-    warn:  false,
     file:  nil,
+##    warn:  false,
 }
 
 parser = OptionParser.new do |parser|
@@ -22,10 +22,10 @@ parser = OptionParser.new do |parser|
                "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( "-w", "--warn",
+#              "turn warnings into errors (default: #{opts[:warn]})" ) do |warn|
+#    opts[:warn] = true
+#  end
 
 
   parser.on( "-f FILE", "--file FILE",
@@ -38,7 +38,6 @@ parser = OptionParser.new do |parser|
 end
 parser.parse!( args )
 
-
 if opts[:debug]
   puts "OPTS:"
   p opts
@@ -47,8 +46,6 @@ if opts[:debug]
 end
 
 
-# SportDb::Parser::Linter.debug = opts[:debug]
-# SportDb::Parser::Linter.warn  = opts[:warn]
 
 
 
@@ -65,10 +62,30 @@ specs =  if opts[:file]
                              nil
                         end
 
-            build_pathspecs( args, filepack: filepack )
+            path = SportDb::Pathspec.path(
+                          ['/sports/sportdb/sport.db.v2/parser/fbtxt-specs',
+                           '/sports/sportdb/sport.db.v2/parser/fbtxt-samples',
+                           '/sports/openfootball'])
+
+            build_pathspecs( args, path: path,
+                                   filepack: filepack )
          end
 
 
+pp specs
+
+## if more than single datafile
+##     auto-switch into quite mode for now
+## if specs.size > 0  && specs[0]['datafiles'].size > 1
+##   opts[:debug] = false
+## end
+
+# SportDb::Parser::Linter.debug = opts[:debug]
+# SportDb::Parser::Linter.warn  = opts[:warn]
+
+
+
+
 
 
 specs.each_with_index do |rec,i|
@@ -103,6 +120,7 @@ specs.each_with_index do |rec,i|
       puts "!!   #{errors.size} parse error(s) in #{datafiles.size} datafiles(s)"
    else
       puts
+      pp datafiles
       puts "OK   no parse errors found in #{datafiles.size} datafile(s)"
    end
 

data/lib/fbtok/pathspec.rb

@@ -3,11 +3,6 @@
 module SportDb
 class Pathspec
 
-  def self.debug=(value) @@debug = value; end
-  def self.debug?()      @@debug ||= false; end  ## note: default is FALSE
-
-
-
     SEASON_RE = %r{ (?:
                           (?<season>\d{4}-\d{2})
                         | (?<season>\d{4})
@@ -71,7 +66,7 @@ class Pathspec
 ##                    that will use generic **/*.txt and only use ignore filter!!!
 
 
-def self._find( path, seasons: nil )
+def self.find( path, seasons: nil )
     ##
     ## note -  only if seasons filter is turn on
     ##                     MATCH_RE gets used!!!
@@ -85,11 +80,11 @@ def self._find( path, seasons: nil )
 
     ## note: normalize path - use File.expand_path ??
     ##    change all backslash to slash for now
-    ## path = path.gsub( "\\", '/' )
     fullpath =  File.expand_path( path )
 
     ####
     ## note - make sure path exists; raise error if not
+    ##   ENOENT => Error No Entity
     raise Errno::ENOENT, "No such directory - #{path})"  unless Dir.exist?( fullpath )
 
 
@@ -150,15 +145,33 @@ def self._find( path, seasons: nil )
 end
 
 
+def self.path( default=[])
+ ## check for  FBPATH
+ ##         or FBTXT_PATH
+      path = ENV['FBPATH'] || ENV['FBTXT_PATH']
+      if path
+          path.split( /[:;]/)
+      else
+         default
+      end
+end
+end # class Pathspec
+
+
+
+
+
+class Pathspecs    ## change to a module - why? why not?
+
+
+def self.debug=(value) @@debug = value; end
+def self.debug?()      @@debug ||= false; end     ## note: default is FALSE
 
 
-##
-## rename/change to read_csv - why? why not?
 def self.read( src )
-    ## note: normalize scr - use File.expand_path ??
-    ##    change all backslash to slash for now
-    ## scr = scr.gsub( "\\", '/' )
-    fullsrc =  File.expand_path( scr )
+    ## note: normalize src - use File.expand_path ??
+    ##    change all backslash to slash for now (\ to /)
+    fullsrc =  File.expand_path( src )
 
     recs = read_csv( fullsrc )
     pp recs     if debug?
@@ -167,11 +180,13 @@ def self.read( src )
     basedir = File.dirname( fullsrc )
 
     recs.each do |rec|
+        ##
+        ## todo/check - check for season/seasons column - why? why not?
         path = rec['path']
         fullpath = File.expand_path( path, basedir )
-        datafiles =   _find( fullpath )
+        datafiles =   Pathspec.find( fullpath )
 
-        ## add (new) datafiles column (from expanded pathspec)
+        ## auto-add (new) datafiles column (from expanded pathspec)
         rec['datafiles'] = datafiles
     end
 
@@ -180,7 +195,8 @@ end
 
 
 
-def self.build( args, filepack: nil )
+def self.build( args, path: [],
+                      filepack: nil )
   recs = []
 
   ## check fo no args case  (and filepack present with default)
@@ -195,22 +211,34 @@ def self.build( args, filepack: nil )
     ##             in single default pathspec node
     more = []
 
-
     args.each do |arg|
-      if filepack && filepack.has_key?( arg.downcase )
+       ## note - ALWAYS give priority to existing directory matches (over filepack)
+       ##             e.g. euro or such -  why? why not?
+       ##
+       ##  todo/check  if euro/ works too?
+       ## check if directory
+       if Dir.exist?( arg )
+          recs << { 'path'       => arg,
+                    'datafiles'  => Pathspec.find( arg ) }
+       elsif filepack && filepack.has_key?( arg.downcase )
            recs << { 'path'      => "<#{arg.downcase}>",
                      'datafiles' => filepack[arg.downcase] }
-      ## check if directory
-      elsif Dir.exist?( arg )
-          recs << { 'path'       => arg,
-                    'datafiles'  => _find( arg ) }
-      elsif File.file?( arg )  ## assume it's a file
-        ## make sure path exists; raise error if not
-        ##   (auto-)expand path to normalize - yes why? why not?
-          more << File.expand_path( arg )
-      else
-        raise Errno::ENOENT, "No such file or directory - #{arg}"
-      end
+       else   ## assume it's a file
+           file = find_file( arg, path: path )
+            ## check if file (exists) in any path lookup
+            if file
+              ## todo/fix:
+              ##   add File.expand_path upstream in find_file !!!
+              ##           and remove later here
+              ##       also fix upstream Errorno::ENOENT to Errno::ENOENT !!!
+              ##
+              ## make sure path exists; raise error if not
+               ## (auto-)expand path to normalize - yes why? why not?
+              more << File.expand_path(file)
+            else
+              raise Errno::ENOENT, "No such file or directory - #{arg}"
+            end
+       end
     end
 
     if more.size > 0
@@ -222,7 +250,7 @@ def self.build( args, filepack: nil )
   recs
 end
 
-end  # class Pathspec
+end  # class Pathspecs
 end  # module Sportdb
 
 
@@ -237,12 +265,12 @@ end  # module Sportdb
 ##   - (ii) all files get bundled together into <input> pathspec entry/record
 ##
 ##   note: was formerly known as expand_args
-def build_pathspecs( args, filepack: nil )
-   SportDb::Pathspec.build( args, filepack: filepack )
+def build_pathspecs( args, path: [], filepack: nil )
+   SportDb::Pathspecs.build( args, path: path, filepack: filepack )
 end
 
 ####
 ## read pathspecs via csv file (using path column)
 def read_pathspecs( src )
-    SportDb::Pathspec.read( src )
+    SportDb::Pathspecs.read( src )
 end

metadata

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