worldfootball 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c86445bc20b0caf099381fbae9fbf39fa270a66323883873956632759c3ac4f
-  data.tar.gz: b25de731e07a047ac3562bb21d5ea2c26c6eae0eab18ad9ba4d9607a5868b242
+  metadata.gz: 795b62b085497648e27f552f4122df1b984d77ceca2ab21e82b76929476d3994
+  data.tar.gz: f7d42b68d8914b9fbb57ebf12295b762d3cb05a6928e99701183b59051d597cc
 SHA512:
-  metadata.gz: 791384fb869d7ee752b5558b3929a8c55785150ab6308fbbb69f736e832de6911f6cc3ca630af32dad3ace29d83a795dd8d2cd54524966a792d160ffedd92430
-  data.tar.gz: 5494cb8022f2be71c73da4ff3a42fd84e844116b003b52f1108f075bd7371cf774379fcd9d9db4571453b91bfedc8090533ccd7395b827d3b0a9545c5c551749
+  metadata.gz: ecd1b91f7b9f4569d637b16a44844b9e2c46ef7b2c0b0b82bd1774d8962f847d525bf0aa1019a559e1b48faee271983eeb3d325d70b50cdb629cd1bc2aceb724
+  data.tar.gz: 3566a25fac9a4ce695b92b6e924baa3c1d6db2dff19de2d1af35d48b1223cd960802eab0ca6b72ed9ebff1eb09e315d0621fc4930e4004f66a87af5ccc6d365a

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.1
+### 0.2.3
 
 ### 0.0.1 / 2024-07-04
 

data/bin/wfb

@@ -30,6 +30,8 @@ def self.main( args=ARGV )
 opts = {
     cached:  false,
     convert: true,
+    file:    nil,
+    dry:     false,
  }
 
 
@@ -43,19 +45,24 @@ parser = OptionParser.new do |parser|
 ## todo - add a single letter option for offline/cached
 
   parser.on( "--cache", "--cached", "--offline",
-               "use cached data in >#{Webcache.root}<" ) do |cached|
+               "use cached data in #{Webcache.root}" ) do |cached|
     opts[:cached] = cached
   end
 
-  parser.on( "--no-convert",
-               "turn off conversion to .csv in #{Worldfootball.config.convert.out_dir} - default is (#{!opts[:convert]})" ) do |convert|
-    opts[:convert] = !convert
+  parser.on( "--[no-]convert",
+               "turn on/off conversion to .csv in #{Worldfootball.config.convert.out_dir} - default is (#{opts[:convert]})" ) do |convert|
+    opts[:convert] = convert
   end
 
   parser.on( "--dry",
-               "dry run / show league page meta info" ) do |dry|
+                "dry run; do NOT write - default is (#{opts[:dry]})" ) do |dry|
     opts[:dry] = dry
   end
+
+  parser.on( "-f FILE", "--file FILE",
+                "read leagues (and seasons) via .csv file") do |file|
+    opts[:file] = file
+  end
 end
 
 
@@ -76,7 +83,7 @@ if ['cache'].include?( args[0] )
 end
 
 
-if ['league', 'leagues', 'ls'].include?( args[0] || 'leagues' )
+if ['league', 'leagues', 'ls'].include?( args[0] )
     keys = LEAGUES.keys
 
     pp keys
@@ -90,62 +97,66 @@ if ['league', 'leagues', 'ls'].include?( args[0] || 'leagues' )
 end
 
 
+####
+#  assume leagues
 
-league_code = args[0].downcase
-
-league =  find_league!( league_code )  ## league info lookup
-
-if opts[:dry]
-    ## output more page meta info
-    puts "league meta:"
-    pp league
-end
-
-
-## note - default to latest season of league
-##              might be 2024/25 or 2024 or
-#                 for world cup 2022 or such
-season = Season( args[1] || league.seasons.keys[0] )
-
-pages = league.pages!( season: season )
+datasets = if opts[:file]
+              read_datasets( opts[:file] )
+           else
+              parse_datasets_args( args )
+           end
 
 
-puts
-pp [league.key, season.key]
-pp pages
-puts "   #{pages.size} page(s)"
+datasets.each do |league_key, seasons|
 
+  league =  find_league!( league_key )  ## league info lookup
 
-if opts[:dry]
-    ## stop here if dry run
-    exit 0
-end
-
-
-if opts[:cached]
-     # do nothing
-else  ## download to cache
-    pages.each_with_index do |(slug,_),i|
-        puts "==> #{i+1}/#{pages.size} - #{league_code} @ #{slug}..."
-        page = Metal.download_schedule( slug )
-    end
-end
-
-
-pages.each_with_index do |(slug,_),i|
-    puts "==> #{i+1}/#{pages.size} - #{league_code} @ #{slug}..."
-    page = Page::Schedule.from_cache( slug )
-    matches = page.matches
-
-    puts "   #{matches.size} match(es)"
-end
+  if opts[:dry]
+     ## output more page meta info
+     puts "league meta:"
+     pp league
+  end
 
+  ## note - default to latest season of league
+  ##              might be 2024/25 or 2024 or
+  #                 for world cup 2022 or such
+  seasons = [Season(league.seasons.keys[0])]     if seasons.empty?
+
+  seasons.each do |season|
+      pages = league.pages!( season: season )
+      puts
+      pp [league.key, season.key]
+      pp pages
+      puts "   #{pages.size} page(s)"
+
+
+      next  if opts[:dry]    ## stop here if dry run
+
+      if opts[:cached]
+          # do nothing
+      else  ## download to cache
+        pages.each_with_index do |(slug,_),i|
+          puts "==> #{i+1}/#{pages.size} - #{league_key} @ #{slug}..."
+          page = Metal.download_schedule( slug )
+        end
+      end
+
+      pages.each_with_index do |(slug,_),i|
+        puts "==> #{i+1}/#{pages.size} - #{league_key} @ #{slug}..."
+        page = Page::Schedule.from_cache( slug )
+        matches = page.matches
+
+        puts "   #{matches.size} match(es)"
+      end
+
+      if opts[:convert]
+        ## write out (export to) comma-separated values (.csv) datafile
+        convert( league: league_key,
+                 season: season )
+      end
+end # each seasons
+end # each league
 
-if opts[:convert]
-    ## write out (export to) comma-separated values (.csv) datafile
-    convert( league: league_code,
-             season: season )
-end
 end   # def self.main
 end   # module Worldfootball
 

data/lib/worldfootball/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldfootball
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: football-timezones