sportdb-parser 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1466b82654b4a4f0f823a96709488dedb595d08731a55abc128691e0ffe2a80b
-  data.tar.gz: 14995e94dc079ab61e77d056d15c9a5830dc573129661ca453b2892d087c2061
+  metadata.gz: e5af84e3a141fc577287c8c788eb27a79bf1fc78ed0c08e80df6004383788b66
+  data.tar.gz: 0e23fca8e4566021eb220d20925f97694fcc5b8b7c165c6ce469b5f08feb9cc1
 SHA512:
-  metadata.gz: 75c2b4f455e8bb1b5e471c39f8fa3b5069bd0bb2a808ad8b246c0f2b060c5416f9f56a3619ad7db7ac5f21a6177c762aa28ae8e9c939b03a2569cf27d34f9b81
-  data.tar.gz: 9c4f9095a61410499ae7628b1eb3295d8f456e62feae45a4c254d9157904326abf6571f3c4a04c078551b6364cd09252509f709bfeef46a569dbe202f4058460
+  metadata.gz: b6434b5d4df17e72a83f9b63ceef117ddfe50157073cbe4657e6e47e8aa820e8aaf986030642fc86160fd9c551cc55c9e9a35187cf09de3e0c346a00d1f58f17
+  data.tar.gz: dc9b9fd5c782409c019aa2de0d4aea5bdeb90a7a4e01c83ed58b08d4315f1a87ae84268f269d20a10463567633471e1b05052c24bfa47bc49e988bb927e2f927

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 0.1.0
+
 ### 0.0.1 / 2024-07-12
 
 * Everything is new. First release.

data/Manifest.txt

@@ -6,9 +6,11 @@ bin/fbt
 lib/sportdb/parser.rb
 lib/sportdb/parser/lang.rb
 lib/sportdb/parser/linter.rb
+lib/sportdb/parser/opts.rb
 lib/sportdb/parser/outline_reader.rb
 lib/sportdb/parser/parser.rb
 lib/sportdb/parser/token-date.rb
 lib/sportdb/parser/token-score.rb
 lib/sportdb/parser/token-text.rb
 lib/sportdb/parser/token.rb
+lib/sportdb/parser/version.rb

data/Rakefile

@@ -1,9 +1,10 @@
 require 'hoe'
+require './lib/sportdb/parser/version.rb'
 
 
 Hoe.spec 'sportdb-parser' do
 
-  self.version = '0.0.1'
+  self.version = SportDb::Module::Parser::VERSION
 
   self.summary = "sportdb-parser - football.txt match parser (& tokenizer)"
   self.description = summary
@@ -19,7 +20,10 @@ Hoe.spec 'sportdb-parser' do
 
   self.licenses = ['Public Domain']
 
-  self.extra_deps = []
+  self.extra_deps = [
+       ['cocos'],
+       ['season-formats'],
+  ]
 
   self.spec_extras = {
     required_ruby_version: '>= 2.2.2'

data/bin/fbt

@@ -3,9 +3,11 @@
 ## tip: to test run:
 ##   ruby -I ./lib bin/fbt
 
+## our own code
 require 'sportdb/parser'
 
 
+
 require 'optparse'
 
 ##
@@ -15,40 +17,6 @@ require 'optparse'
 ##   fbt  ../openfootball/.../euro.txt
 
 
-  SEASON_RE = %r{ (?:
-                       \d{4}-\d{2}
-                     | \d{4}(--[a-z0-9_-]+)?
-                    )
-                  }x
-    SEASON = SEASON_RE.source    ## "inline" helper for embedding in other regexes - keep? why? why not?
-
-
-    ## note: if pattern includes directory add here
-    ##     (otherwise move to more "generic" datafile) - why? why not?
-    MATCH_RE = %r{ (?: ^|/ )      # beginning (^) or beginning of path (/)
-                       #{SEASON}
-                     /[a-z0-9_-]+\.txt$  ## txt e.g /1-premierleague.txt
-                }x
-
-
-def find( path, pattern=MATCH_RE )
-    datafiles = []
-
-    ## check all txt files
-    ## note: incl. files starting with dot (.)) as candidates (normally excluded with just *)
-    candidates = Dir.glob( "#{path}/**/{*,.*}.txt" )
-    ## pp candidates
-    candidates.each do |candidate|
-      datafiles << candidate    if pattern.match( candidate )
-    end
-
-    ## pp datafiles
-    datafiles
- end
-
-
-
-
 
 
  args = ARGV
@@ -86,25 +54,6 @@ p args
 
 
 
-def expand_args( args )
-    paths = []
-
-    args.each do |arg|
-        ## check if directory
-        if Dir.exist?( arg )
-            datafiles = find( arg )
-            puts
-            puts "  found #{datafiles.size} match txt datafiles in #{arg}"
-            pp datafiles
-            paths += datafiles
-        else
-              ## assume it's a file
-            paths << arg
-        end
-    end
-
-    paths
-end
 
 
 paths =  if args.empty?
@@ -116,7 +65,7 @@ paths =  if args.empty?
             ## check for directories
             ##   and auto-expand
              
-            expand_args( args )
+            SportDb::Parser::Opts.expand_args( args )
          end
 
 
@@ -125,17 +74,19 @@ SportDb::Parser::Linter.debug = true    if opts[:debug]
 
 linter = SportDb::Parser::Linter.new
 
-
+errors = []
 
 paths.each_with_index do |path,i|
     puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
     linter.read( path, parse: !opts[:metal] )
+
+    errors += linter.errors    if linter.errors?
 end
 
-if linter.errors?
+if errors.size > 0
     puts
-    pp linter.errors
-    puts "!!   #{linter.errors.size} parse error(s) in #{paths.size} datafiles(s)"
+    pp errors
+    puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
 else
     puts "OK   no parse errors found in #{paths.size} datafile(s)"
 end

data/lib/sportdb/parser/linter.rb

@@ -10,12 +10,6 @@ def self.debug=(value) @@debug = value; end
 def self.debug?() @@debug ||= false; end  ## note: default is FALSE
 def debug?()  self.class.debug?; end   
     
-## keep typed - why? why not? 
-## - used anywhere? 
-def self.typed=(value) @@typed = value; end
-def self.typed?() @@typed ||= true; end   ## note: default is TRUE
-def typed?()  self.class.typed?; end   
-
 
 
 attr_reader :errors
@@ -58,6 +52,9 @@ def errors?() @errors.size > 0; end
 ## parse - false (default) - tokenize (only)
 ##       - true            - tokenize & parse                
 def read( path, parse: false )
+  ## note: every (new) read call - resets errors list to empty
+  @errors = []
+
   nodes = OutlineReader.read( path ) 
 
   ##  process nodes
@@ -94,9 +91,8 @@ def read( path, parse: false )
 
 
         ## skip new (experimental attrib syntax)
-        m = nil
         if attrib_found == false && 
-            m=ATTRIB_RE.match( line )
+            ATTRIB_RE.match?( line )
           ## note: check attrib regex AFTER group def e.g.:
           ##         Group A: 
           ##         Group B:  etc.

data/lib/sportdb/parser/opts.rb

@@ -0,0 +1,70 @@
+
+module SportDb
+class Parser
+
+###
+## note - Opts Helpers for now nested inside Parser - keep here? why? why not?
+class Opts
+
+    SEASON_RE = %r{ (?:
+                       \d{4}-\d{2}
+                     | \d{4}(--[a-z0-9_-]+)?
+                    )
+                  }x
+    SEASON = SEASON_RE.source    ## "inline" helper for embedding in other regexes - keep? why? why not?
+
+
+    ## note: if pattern includes directory add here
+    ##     (otherwise move to more "generic" datafile) - why? why not?
+    MATCH_RE = %r{ (?: ^|/ )      # beginning (^) or beginning of path (/)
+                       #{SEASON}
+                     /[a-z0-9_-]+\.txt$  ## txt e.g /1-premierleague.txt
+                }x
+
+
+def self.find( path )
+    datafiles = []
+
+    ## note: normalize path - use File.expand_path ??
+    ##    change all backslash to slash for now
+    ## path = path.gsub( "\\", '/' )
+    path = File.expand_path( path )
+    
+    ## check all txt files
+    ## note: incl. files starting with dot (.)) as candidates 
+    ##     (normally excluded with just *)
+    candidates = Dir.glob( "#{path}/**/{*,.*}.txt" )
+    ## pp candidates
+    candidates.each do |candidate|
+      datafiles << candidate    if MATCH_RE.match( candidate )
+    end
+
+    ## pp datafiles
+    datafiles
+end
+
+
+def self.expand_args( args )
+    paths = []
+
+    args.each do |arg|
+        ## check if directory
+        if Dir.exist?( arg )
+            datafiles = find( arg )
+            puts
+            puts "  found #{datafiles.size} match txt datafiles in #{arg}"
+            pp datafiles
+            paths += datafiles
+        else
+              ## assume it's a file
+            paths << arg
+        end
+    end
+
+    paths
+end
+end  # class Opts
+
+
+end   # class Parser
+end   # module SportDb

data/lib/sportdb/parser/outline_reader.rb

@@ -73,7 +73,7 @@ class OutlineReader
            start_para = true
 
            heading_marker = m[:marker]
-           heading_level  = m[:marker].length   ## count number of = for heading level
+           heading_level  = heading_marker.length   ## count number of = for heading level
            heading        = m[:text].strip
 
            puts "heading #{heading_level} >#{heading}<"   if debug?

data/lib/sportdb/parser/token-date.rb

@@ -37,22 +37,24 @@ def self.build_names( lines )
 end
 
 
+def self.build_map( lines, downcase: false )
+   ## note: downcase name!!!
+  ## build a lookup map that maps the word to the index (line no) plus 1 e.g.
+  ##  {"january" => 1,  "jan" => 1,
+  ##   "february" => 2, "feb" => 2,
+  ##   "march" => 3,    "mar" => 3,
+  ##   "april" => 4,    "apr" => 4,
+  ##   "may" => 5,
+  ##   "june" => 6,     "jun" => 6, ...
+  lines.each_with_index.reduce( {} ) do |h,(line,i)|
+    line.each do |name| 
+       h[ downcase ? name.downcase : name ] = i+1 
+    end  ## note: start mapping with 1 (and NOT zero-based, that is, 0)
+    h
+  end
+end
+
 
-## add normalize option (for downcase) - why? why not?
-def self.build_map( lines )
-    ## note: downcase name!!!
-   ## build a lookup map that maps the word to the index (line no) plus 1 e.g.
-   ##  {"january" => 1,  "jan" => 1,
-   ##   "february" => 2, "feb" => 2,
-   ##   "march" => 3,    "mar" => 3,
-   ##   "april" => 4,    "apr" => 4,
-   ##   "may" => 5,
-   ##   "june" => 6,     "jun" => 6, ...
-   lines.each_with_index.reduce( {} ) do |h,(line,i)|
-     line.each { |name| h[ name.downcase ] = i+1 }  ## note: start mapping with 1 (and NOT zero-based, that is, 0)
-     h
-   end
- end
 
 
 MONTH_LINES = parse_names( <<TXT )
@@ -72,7 +74,7 @@ TXT
 
 MONTH_NAMES = build_names( MONTH_LINES )
 # pp MONTH_NAMES
-MONTH_MAP   = build_map( MONTH_LINES )
+MONTH_MAP   = build_map( MONTH_LINES, downcase: true )
 # pp MONTH_MAP
 
 
@@ -89,7 +91,7 @@ TXT
 
 DAY_NAMES = build_names( DAY_LINES )
 # pp DAY_NAMES
-DAY_MAP   = build_map( DAY_LINES )
+DAY_MAP   = build_map( DAY_LINES, downcase: true )
 # pp DAY_MAP
 
 

data/lib/sportdb/parser/version.rb

@@ -0,0 +1,24 @@
+
+module SportDb
+  module Module
+    module Parser
+  MAJOR = 0    ## todo: namespace inside version or something - why? why not??
+  MINOR = 1
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  def self.banner
+    "sportdb-parser/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
+  end
+
+  def self.root
+    File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )
+  end
+
+    end   # module Parser
+  end
+end

data/lib/sportdb/parser.rb

@@ -1,3 +1,7 @@
+## pulls in   
+require 'cocos' 
+require 'season/formats'  # e.g. Season() support machinery
+
 
 
 ####
@@ -11,7 +15,7 @@
 ##  text - change text to name - why? why not?
 
 
-
+require_relative 'parser/version'
 require_relative 'parser/token-score'
 require_relative 'parser/token-date'
 require_relative 'parser/token-text'
@@ -23,6 +27,7 @@ require_relative 'parser/parser'
 ## more
 require_relative 'parser/outline_reader'
 require_relative 'parser/linter'
+require_relative 'parser/opts'
 
 
 ###
@@ -39,6 +44,5 @@ end  # module SportDb
 =end
 
 
-
-
+puts SportDb::Module::Parser.banner    # say hello
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-14 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocos
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: season-formats
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -62,12 +90,14 @@ files:
 - lib/sportdb/parser.rb
 - lib/sportdb/parser/lang.rb
 - lib/sportdb/parser/linter.rb
+- lib/sportdb/parser/opts.rb
 - lib/sportdb/parser/outline_reader.rb
 - lib/sportdb/parser/parser.rb
 - lib/sportdb/parser/token-date.rb
 - lib/sportdb/parser/token-score.rb
 - lib/sportdb/parser/token-text.rb
 - lib/sportdb/parser/token.rb
+- lib/sportdb/parser/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain