worldfootball 0.3.2 → 0.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1 -1
  3. data/Manifest.txt +1 -0
  4. data/Rakefile +1 -1
  5. data/bin/wfb +13 -11
  6. data/bin/wfbconv +1 -1
  7. data/bin/wfbgen +1 -1
  8. data/bin/wfbsync +10 -10
  9. data/bin/wfbup +1 -1
  10. data/config/leagues/world.csv +6 -0
  11. data/config/rounds.csv +9 -7
  12. data/lib/worldfootball/build.rb +3 -2
  13. data/lib/worldfootball/convert.rb +1 -0
  14. data/lib/worldfootball/leagues.rb +2 -2
  15. data/lib/worldfootball/version.rb +1 -1
  16. data/lib/worldfootball.rb +1 -1
  17. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e84b891950ee051be8ef6ac91b8783f66ded443013729773c6a56af1e57a496c
4
- data.tar.gz: 1c0dacfecd6f124b11829b5dee118a3937f48da67072fa5ad09b4fdcbd1a459b
3
+ metadata.gz: 75755982ccfac637d1757b6163be5e03e9af9f6f024ce567ea4137cb64f5eeea
4
+ data.tar.gz: bd5214b9225b1563d395ab2363a26e21cefadb996c65523e1ce51b647d346fab
5
5
  SHA512:
6
- metadata.gz: ea8e5b931a08163bd30303cad79e8d0d3ec9a6b4aabed00a9638a2a77fc33aa8887646214c965404d2e938050200aaa5e854c7a87c0f79d6b9c8a7f3561d9601
7
- data.tar.gz: 347feb8a6fd95541d73611b328d2608d021d8d06d4549f16ab5f5e2405537d8320e8d9b78bda7e645e9916ec77685849c87968adfd97534efed0d350a1d757ee
6
+ metadata.gz: 6e70b232fc8b5275042174d9576b6c3bf57bfb680470667e5cf7af8c77cfd6160c9a1d1ea0a372bb67673cb8210e035314ebe93108ea974ceb496c44cb1d4e8f
7
+ data.tar.gz: 920bc2041c52cca8445ef4be90d6b4432d4fa1a6518babb0e19e47be6dc7daf4d856fdf709f9dbddfd2614467f300472a726e556767509d59b3db6ebbc93ae85
data/CHANGELOG.md CHANGED
@@ -1,4 +1,4 @@
1
- ### 0.3.2
1
+ ### 0.3.3
2
2
  ### 0.0.1 / 2024-07-04
3
3
 
4
4
  * Everything is new. First release.
data/Manifest.txt CHANGED
@@ -15,6 +15,7 @@ config/leagues/asia.csv
15
15
  config/leagues/europe.csv
16
16
  config/leagues/middle_east.csv
17
17
  config/leagues/pacific.csv
18
+ config/leagues/world.csv
18
19
  config/rounds.csv
19
20
  config/stages.csv
20
21
  lib/worldfootball.rb
data/Rakefile CHANGED
@@ -18,7 +18,7 @@ Hoe.spec 'worldfootball' do
18
18
  self.history_file = 'CHANGELOG.md'
19
19
 
20
20
  self.extra_deps = [
21
- ['football-timezones'],
21
+ ['leagues'],
22
22
  ['fifa'],
23
23
  ['webget'],
24
24
  ['nokogiri'],
data/bin/wfb CHANGED
@@ -8,7 +8,7 @@
8
8
  ## ruby -I wfb/lib wfb/bin/wfb -f max.csv --cached
9
9
 
10
10
 
11
- $LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
11
+ $LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
12
12
  $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
13
13
  require 'worldfootball'
14
14
 
@@ -134,13 +134,23 @@ end
134
134
  ####
135
135
  # assume leagues
136
136
 
137
+ autofiller = ->(league_query) {
138
+ league = find_league!( league_query ) ## league info lookup
139
+ ## note - default to latest season of league
140
+ ## might be 2024/25 or 2024 or
141
+ # for world cup 2022 or such
142
+ league.seasons.keys[0] ## assume first entry is latest season
143
+ }
144
+
145
+
137
146
  datasets = if opts[:file]
138
- read_leagueset( opts[:file] )
147
+ read_leagueset( opts[:file], autofill: autofiller )
139
148
  else
140
- parse_leagueset_args( args )
149
+ parse_leagueset_args( args, autofill: autofiller )
141
150
  end
142
151
 
143
152
 
153
+
144
154
  ## step 0 - validate and fill-up seasons etc.
145
155
  datasets.each do |league_key, seasons|
146
156
 
@@ -149,14 +159,6 @@ datasets.each do |league_key, seasons|
149
159
  ## output more page meta info
150
160
  puts "league meta:"
151
161
  pp league
152
-
153
- ## note - default to latest season of league
154
- ## might be 2024/25 or 2024 or
155
- # for world cup 2022 or such
156
- if seasons.empty?
157
- season = Season(league.seasons.keys[0])
158
- seasons << season
159
- end
160
162
  end
161
163
 
162
164
 
data/bin/wfbconv CHANGED
@@ -10,7 +10,7 @@
10
10
  #
11
11
 
12
12
 
13
- $LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
13
+ $LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
14
14
  $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
15
15
  require 'worldfootball'
16
16
 
data/bin/wfbgen CHANGED
@@ -10,7 +10,7 @@
10
10
  #
11
11
 
12
12
 
13
- $LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
13
+ $LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
14
14
  $LOAD_PATH.unshift( '/sports/sportdb/sportdb-writers/lib' )
15
15
  $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
16
16
 
data/bin/wfbsync CHANGED
@@ -18,7 +18,7 @@
18
18
 
19
19
 
20
20
 
21
- $LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
21
+ $LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
22
22
  $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
23
23
  require 'worldfootball'
24
24
 
@@ -98,8 +98,16 @@ end
98
98
  ####
99
99
  # assume leagues
100
100
 
101
+ autofiller = ->(league_query) {
102
+ league = find_league!( league_query ) ## league info lookup
103
+ ## note - default to latest season of league
104
+ ## might be 2024/25 or 2024 or
105
+ # for world cup 2022 or such
106
+ league.seasons.keys[0] ## assume first entry is latest season
107
+ }
108
+
101
109
  datasets = if opts[:file]
102
- read_leagueset( opts[:file] )
110
+ read_leagueset( opts[:file], autofill: autofiller )
103
111
  else
104
112
  raise ArgumentError, "file required; sorry"
105
113
  end
@@ -114,14 +122,6 @@ datasets.each do |league_key, seasons|
114
122
  ## output more page meta info
115
123
  puts "league meta:"
116
124
  pp league
117
-
118
- ## note - default to latest season of league
119
- ## might be 2024/25 or 2024 or
120
- # for world cup 2022 or such
121
- if seasons.empty?
122
- season = Season(league.seasons.keys[0])
123
- seasons << season
124
- end
125
125
  end
126
126
 
127
127
 
data/bin/wfbup CHANGED
@@ -13,7 +13,7 @@
13
13
  ## - stopping at si.1 2017/18...
14
14
 
15
15
 
16
- $LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
16
+ $LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
17
17
  $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
18
18
  require 'worldfootball'
19
19
 
data/config/leagues/world.csv ADDED
@@ -0,0 +1,6 @@
1
+ key, slug
2
+
3
+
4
+ world.clubs, klub-wm-2025 ## club world cup
5
+
6
+
data/config/rounds.csv CHANGED
@@ -16,13 +16,15 @@ key, name1, name2
16
16
  *, Halbfinale, Semifinals
17
17
  *, Finale, Final
18
18
 
19
- *, Spiel um Platz 6, Match 6th Place
20
- *, Spiel um Platz 3, Match for 3rd place
21
-
22
- *, 11. Platz, Match 11th Place
23
- *, 9. Platz, Match 9th Place
24
- *, 7. Platz, Match 7th Place
25
- *, 5. Platz, Match 5th Place
19
+ *, Spiel um Platz 6, Match 6th place
20
+ *, Spiel um Platz 5, Match 5th place
21
+ *, Spiel um Platz 3, Match 3rd place ## use Match for 3rd place
22
+
23
+ *, 11. Platz, Match 11th place
24
+ *, 9. Platz, Match 9th place
25
+ *, 7. Platz, Match 7th place
26
+ *, 5. Platz, Match 5th place
27
+ *, 3. Platz, Match 3rd place
26
28
 
27
29
 
28
30
  *, Vorrunde, Preliminary round
data/lib/worldfootball/build.rb CHANGED
@@ -15,8 +15,9 @@ def self.build( rows, season:, league:, stage: '' ) ## rename to fixup or such
15
15
  print " - #{stage}" unless stage.empty?
16
16
  print "\n"
17
17
 
18
-
19
- zone = find_zone!( league: league, season: season )
18
+ ## fix - use find_by! - add upstream
19
+ league_info = LeagueCodes.find_by( code: league, season: season )
20
+ zone = league_info['tz']
20
21
 
21
22
 
22
23
  ## note: use only first part from key for lookup
data/lib/worldfootball/convert.rb CHANGED
@@ -101,6 +101,7 @@ def self.convert( league:, season:,
101
101
  'concacaf.cl',
102
102
  'caf.cl',
103
103
  'afl',
104
+ 'world.clubs', ## club worldcup
104
105
  ].include?(league.key) ? true : false
105
106
 
106
107
  ####
data/lib/worldfootball/leagues.rb CHANGED
@@ -134,14 +134,14 @@ end # class LeagueConfig
134
134
 
135
135
 
136
136
 
137
-
138
137
  LEAGUES = LeagueConfig.new
139
138
  ['africa',
140
139
  'america',
141
140
  'asia',
142
141
  'europe',
143
142
  'middle_east',
144
- 'pacific'].each do |name|
143
+ 'pacific',
144
+ 'world'].each do |name|
145
145
  recs = read_csv( "#{Worldfootball.root}/config/leagues/#{name}.csv" )
146
146
  pp recs
147
147
  puts " #{recs.size} league(s) in #{name}"
data/lib/worldfootball/version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  module Worldfootball
3
3
  MAJOR = 0 ## todo: namespace inside version or something - why? why not??
4
4
  MINOR = 3
5
- PATCH = 2
5
+ PATCH = 3
6
6
  VERSION = [MAJOR,MINOR,PATCH].join('.')
7
7
 
8
8
  def self.version
data/lib/worldfootball.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  ## 3rd party (our own)
2
- require 'football/timezones' ## note - pulls in season/formats, cocos & tzinfo
2
+ require 'leagues' ## note - pulls in season/formats, cocos & tzinfo
3
3
  require 'fifa'
4
4
 
5
5
  require 'webget' ## incl. webget, webcache, webclient, etc.
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: worldfootball
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gerald Bauer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-03-26 00:00:00.000000000 Z
11
+ date: 2025-04-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: football-timezones
14
+ name: leagues
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
@@ -148,6 +148,7 @@ files:
148
148
  - config/leagues/europe.csv
149
149
  - config/leagues/middle_east.csv
150
150
  - config/leagues/pacific.csv
151
+ - config/leagues/world.csv
151
152
  - config/rounds.csv
152
153
  - config/stages.csv
153
154
  - lib/worldfootball.rb