Icarus-Mod-Tools 2.1.4 → 2.2.0

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 (9) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/Gemfile +1 -1
  4. data/Gemfile.lock +150 -97
  5. data/lib/icarus/mod/cli/sync.rb +1 -1
  6. data/lib/icarus/mod/config.rb +1 -0
  7. data/lib/icarus/mod/tools/sync/helpers.rb +18 -1
  8. data/lib/icarus/mod/version.rb +1 -1
  9. metadata +3 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d6567527e650542f138580d498b0096d41595a10703b25a572ffc624baba6610
4
- data.tar.gz: '09e582fbbd638e722b5bd54a232f491f94d190226015d9d95ca0c26d126d57c8'
3
+ metadata.gz: db2fc2f47e7cb01b3694b407294f2eaf7a309b243ea80f176a81d90f657492e5
4
+ data.tar.gz: 876bad1efb1796450f17ea4e9359ccffb51f28df5189050bdc1d077bdeea815f
5
5
  SHA512:
6
- metadata.gz: 615be569c373d31071b5ee747a4ad28183d5db7cefc0409105a42511bd853ec9a3a89aff3c187a1908b0ca16f83e2f613db88899b329ca3358804542fe0f31fd
7
- data.tar.gz: f496b73c26b7b98afbcc7a8521b1d955116dfb7fedc8b0999d87baaefcb917128310ff0122f35aa8c492f7e358f0c4e59d7e68361cc49ff5a59f700aa4ce9490
6
+ metadata.gz: e7ebb4620d99595413206557bc22bd6b34f8199262c337825c69cf19e62e969ede2e7e791b830e3c65451bc778228e1e47d2e6369741a3dbc465579ffb2e6b5c
7
+ data.tar.gz: 54c5f97421e4657da914e08f56a606e56668f9d7e42b0bed46d1a4754ee57f37b9bb7659b8474c835b9374a4ee8edeee1f249a00c2fe3333c81b986811f8613e
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 3.1.3
1
+ 3.4
data/Gemfile CHANGED
@@ -15,5 +15,5 @@ group :develop do
15
15
  gem "rspec", "~> 3.12"
16
16
  gem "rubocop", "~> 1.41"
17
17
  gem "rubocop-rspec", "~> 2.16", require: false
18
- gem "standard"
18
+ gem "standard", ">= 1.35.1"
19
19
  end
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- Icarus-Mod-Tools (2.1.4)
4
+ Icarus-Mod-Tools (2.2.0)
5
5
  google-cloud-firestore (~> 2.7)
6
6
  octokit (~> 6.0)
7
7
  paint (~> 2.3)
@@ -10,72 +10,94 @@ PATH
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- addressable (2.8.1)
14
- public_suffix (>= 2.0.2, < 6.0)
15
- ast (2.4.2)
13
+ addressable (2.8.7)
14
+ public_suffix (>= 2.0.2, < 7.0)
15
+ ast (2.4.3)
16
+ base64 (0.3.0)
17
+ bigdecimal (3.3.1)
16
18
  coderay (1.1.3)
17
- concurrent-ruby (1.2.2)
18
- diff-lcs (1.5.0)
19
- faraday (2.7.4)
20
- faraday-net_http (>= 2.0, < 3.1)
21
- ruby2_keywords (>= 0.0.4)
22
- faraday-net_http (3.0.2)
23
- faraday-retry (2.1.0)
19
+ concurrent-ruby (1.3.5)
20
+ diff-lcs (1.6.2)
21
+ faraday (2.14.0)
22
+ faraday-net_http (>= 2.0, < 3.5)
23
+ json
24
+ logger
25
+ faraday-net_http (3.4.2)
26
+ net-http (~> 0.5)
27
+ faraday-retry (2.3.2)
24
28
  faraday (~> 2.0)
25
- ffi (1.15.5)
26
- formatador (1.1.0)
29
+ ffi (1.17.2-x86_64-darwin)
30
+ ffi (1.17.2-x86_64-linux-gnu)
31
+ formatador (1.2.2)
32
+ reline
27
33
  fuubar (2.5.1)
28
34
  rspec-core (~> 3.0)
29
35
  ruby-progressbar (~> 1.4)
30
- gapic-common (0.18.0)
36
+ gapic-common (1.2.0)
31
37
  faraday (>= 1.9, < 3.a)
32
38
  faraday-retry (>= 1.0, < 3.a)
33
- google-protobuf (~> 3.14)
34
- googleapis-common-protos (>= 1.3.12, < 2.a)
35
- googleapis-common-protos-types (>= 1.3.1, < 2.a)
36
- googleauth (~> 1.0)
37
- grpc (~> 1.36)
38
- google-cloud-core (1.6.0)
39
- google-cloud-env (~> 1.0)
39
+ google-cloud-env (~> 2.2)
40
+ google-logging-utils (~> 0.1)
41
+ google-protobuf (~> 4.26)
42
+ googleapis-common-protos (~> 1.6)
43
+ googleapis-common-protos-types (~> 1.15)
44
+ googleauth (~> 1.12)
45
+ grpc (~> 1.66)
46
+ google-cloud-core (1.8.0)
47
+ google-cloud-env (>= 1.0, < 3.a)
40
48
  google-cloud-errors (~> 1.0)
41
- google-cloud-env (1.6.0)
42
- faraday (>= 0.17.3, < 3.0)
43
- google-cloud-errors (1.3.1)
44
- google-cloud-firestore (2.11.0)
49
+ google-cloud-env (2.3.1)
50
+ base64 (~> 0.2)
51
+ faraday (>= 1.0, < 3.a)
52
+ google-cloud-errors (1.5.0)
53
+ google-cloud-firestore (2.16.1)
54
+ bigdecimal (~> 3.0)
45
55
  concurrent-ruby (~> 1.0)
46
56
  google-cloud-core (~> 1.5)
47
- google-cloud-firestore-v1 (~> 0.10)
57
+ google-cloud-firestore-v1 (>= 0.10, < 2.a)
48
58
  rbtree (~> 0.4.2)
49
- google-cloud-firestore-v1 (0.10.0)
50
- gapic-common (>= 0.17.1, < 2.a)
59
+ google-cloud-firestore-v1 (1.3.0)
60
+ gapic-common (>= 0.25.0, < 2.a)
51
61
  google-cloud-errors (~> 1.0)
52
- google-cloud-location (>= 0.4, < 2.a)
53
- google-cloud-location (0.4.0)
54
- gapic-common (>= 0.17.1, < 2.a)
62
+ google-cloud-location (>= 0.7, < 2.a)
63
+ google-cloud-location (1.2.1)
64
+ gapic-common (~> 1.2)
55
65
  google-cloud-errors (~> 1.0)
56
- google-protobuf (3.22.2-x86_64-linux)
57
- googleapis-common-protos (1.4.0)
58
- google-protobuf (~> 3.14)
59
- googleapis-common-protos-types (~> 1.2)
60
- grpc (~> 1.27)
61
- googleapis-common-protos-types (1.5.0)
62
- google-protobuf (~> 3.14)
63
- googleauth (1.5.0)
64
- faraday (>= 0.17.3, < 3.a)
65
- jwt (>= 1.4, < 3.0)
66
- memoist (~> 0.16)
66
+ google-logging-utils (0.2.0)
67
+ google-protobuf (4.33.0-x86_64-darwin)
68
+ bigdecimal
69
+ rake (>= 13)
70
+ google-protobuf (4.33.0-x86_64-linux-gnu)
71
+ bigdecimal
72
+ rake (>= 13)
73
+ googleapis-common-protos (1.9.0)
74
+ google-protobuf (~> 4.26)
75
+ googleapis-common-protos-types (~> 1.21)
76
+ grpc (~> 1.41)
77
+ googleapis-common-protos-types (1.22.0)
78
+ google-protobuf (~> 4.26)
79
+ googleauth (1.15.1)
80
+ faraday (>= 1.0, < 3.a)
81
+ google-cloud-env (~> 2.2)
82
+ google-logging-utils (~> 0.1)
83
+ jwt (>= 1.4, < 4.0)
67
84
  multi_json (~> 1.11)
68
85
  os (>= 0.9, < 2.0)
69
86
  signet (>= 0.16, < 2.a)
70
- grpc (1.53.0-x86_64-linux)
71
- google-protobuf (~> 3.21)
87
+ grpc (1.76.0-x86_64-darwin)
88
+ google-protobuf (>= 3.25, < 5.0)
72
89
  googleapis-common-protos-types (~> 1.0)
73
- guard (2.18.0)
90
+ grpc (1.76.0-x86_64-linux-gnu)
91
+ google-protobuf (>= 3.25, < 5.0)
92
+ googleapis-common-protos-types (~> 1.0)
93
+ guard (2.19.1)
74
94
  formatador (>= 0.2.4)
75
95
  listen (>= 2.7, < 4.0)
96
+ logger (~> 1.6)
76
97
  lumberjack (>= 1.0.12, < 2.0)
77
98
  nenv (~> 0.1)
78
99
  notiffany (~> 0.0)
100
+ ostruct (~> 0.6)
79
101
  pry (>= 0.13.0)
80
102
  shellany (~> 0.0)
81
103
  thor (>= 0.18.1)
@@ -84,90 +106,121 @@ GEM
84
106
  guard (~> 2.1)
85
107
  guard-compat (~> 1.1)
86
108
  rspec (>= 2.99.0, < 4.0)
87
- json (2.6.3)
88
- jwt (2.7.0)
89
- language_server-protocol (3.17.0.3)
90
- listen (3.8.0)
109
+ io-console (0.8.1)
110
+ json (2.16.0)
111
+ jwt (3.1.2)
112
+ base64
113
+ language_server-protocol (3.17.0.5)
114
+ lint_roller (1.1.0)
115
+ listen (3.9.0)
91
116
  rb-fsevent (~> 0.10, >= 0.10.3)
92
117
  rb-inotify (~> 0.9, >= 0.9.10)
93
- lumberjack (1.2.8)
94
- memoist (0.16.2)
95
- method_source (1.0.0)
96
- multi_json (1.15.0)
118
+ logger (1.7.0)
119
+ lumberjack (1.4.2)
120
+ method_source (1.1.0)
121
+ multi_json (1.17.0)
97
122
  nenv (0.3.0)
123
+ net-http (0.7.0)
124
+ uri
98
125
  notiffany (0.1.3)
99
126
  nenv (~> 0.1)
100
127
  shellany (~> 0.0)
101
- octokit (6.1.0)
128
+ octokit (6.1.1)
102
129
  faraday (>= 1, < 3)
103
130
  sawyer (~> 0.9)
104
131
  os (1.1.4)
132
+ ostruct (0.6.3)
105
133
  paint (2.3.0)
106
- parallel (1.22.1)
107
- parser (3.2.1.1)
134
+ parallel (1.27.0)
135
+ parser (3.3.10.0)
108
136
  ast (~> 2.4.1)
137
+ racc
138
+ prism (1.6.0)
109
139
  pry (0.14.2)
110
140
  coderay (~> 1.1)
111
141
  method_source (~> 1.0)
112
- public_suffix (5.0.1)
142
+ public_suffix (6.0.2)
143
+ racc (1.8.1)
113
144
  rainbow (3.1.1)
114
- rake (13.0.6)
145
+ rake (13.3.1)
115
146
  rb-fsevent (0.11.2)
116
- rb-inotify (0.10.1)
147
+ rb-inotify (0.11.1)
117
148
  ffi (~> 1.0)
118
149
  rbtree (0.4.6)
119
- regexp_parser (2.7.0)
120
- rexml (3.2.5)
121
- rspec (3.12.0)
122
- rspec-core (~> 3.12.0)
123
- rspec-expectations (~> 3.12.0)
124
- rspec-mocks (~> 3.12.0)
125
- rspec-core (3.12.1)
126
- rspec-support (~> 3.12.0)
127
- rspec-expectations (3.12.2)
150
+ regexp_parser (2.11.3)
151
+ reline (0.6.2)
152
+ io-console (~> 0.5)
153
+ rspec (3.13.2)
154
+ rspec-core (~> 3.13.0)
155
+ rspec-expectations (~> 3.13.0)
156
+ rspec-mocks (~> 3.13.0)
157
+ rspec-core (3.13.6)
158
+ rspec-support (~> 3.13.0)
159
+ rspec-expectations (3.13.5)
128
160
  diff-lcs (>= 1.2.0, < 2.0)
129
- rspec-support (~> 3.12.0)
130
- rspec-mocks (3.12.4)
161
+ rspec-support (~> 3.13.0)
162
+ rspec-mocks (3.13.7)
131
163
  diff-lcs (>= 1.2.0, < 2.0)
132
- rspec-support (~> 3.12.0)
133
- rspec-support (3.12.0)
134
- rubocop (1.48.1)
164
+ rspec-support (~> 3.13.0)
165
+ rspec-support (3.13.6)
166
+ rubocop (1.80.2)
135
167
  json (~> 2.3)
168
+ language_server-protocol (~> 3.17.0.2)
169
+ lint_roller (~> 1.1.0)
136
170
  parallel (~> 1.10)
137
- parser (>= 3.2.0.0)
171
+ parser (>= 3.3.0.2)
138
172
  rainbow (>= 2.2.2, < 4.0)
139
- regexp_parser (>= 1.8, < 3.0)
140
- rexml (>= 3.2.5, < 4.0)
141
- rubocop-ast (>= 1.26.0, < 2.0)
173
+ regexp_parser (>= 2.9.3, < 3.0)
174
+ rubocop-ast (>= 1.46.0, < 2.0)
142
175
  ruby-progressbar (~> 1.7)
143
- unicode-display_width (>= 2.4.0, < 3.0)
144
- rubocop-ast (1.28.0)
145
- parser (>= 3.2.1.0)
146
- rubocop-capybara (2.17.1)
147
- rubocop (~> 1.41)
148
- rubocop-performance (1.16.0)
149
- rubocop (>= 1.7.0, < 2.0)
150
- rubocop-ast (>= 0.4.0)
151
- rubocop-rspec (2.19.0)
152
- rubocop (~> 1.33)
176
+ unicode-display_width (>= 2.4.0, < 4.0)
177
+ rubocop-ast (1.48.0)
178
+ parser (>= 3.3.7.2)
179
+ prism (~> 1.4)
180
+ rubocop-capybara (2.22.1)
181
+ lint_roller (~> 1.1)
182
+ rubocop (~> 1.72, >= 1.72.1)
183
+ rubocop-factory_bot (2.27.1)
184
+ lint_roller (~> 1.1)
185
+ rubocop (~> 1.72, >= 1.72.1)
186
+ rubocop-performance (1.25.0)
187
+ lint_roller (~> 1.1)
188
+ rubocop (>= 1.75.0, < 2.0)
189
+ rubocop-ast (>= 1.38.0, < 2.0)
190
+ rubocop-rspec (2.31.0)
191
+ rubocop (~> 1.40)
153
192
  rubocop-capybara (~> 2.17)
193
+ rubocop-factory_bot (~> 2.22)
194
+ rubocop-rspec_rails (~> 2.28)
195
+ rubocop-rspec_rails (2.29.1)
196
+ rubocop (~> 1.61)
154
197
  ruby-progressbar (1.13.0)
155
- ruby2_keywords (0.0.5)
156
- sawyer (0.9.2)
198
+ sawyer (0.9.3)
157
199
  addressable (>= 2.3.5)
158
200
  faraday (>= 0.17.3, < 3)
159
201
  shellany (0.0.1)
160
- signet (0.17.0)
202
+ signet (0.21.0)
161
203
  addressable (~> 2.8)
162
204
  faraday (>= 0.17.5, < 3.a)
163
- jwt (>= 1.5, < 3.0)
205
+ jwt (>= 1.5, < 4.0)
164
206
  multi_json (~> 1.10)
165
- standard (1.25.3)
207
+ standard (1.51.1)
166
208
  language_server-protocol (~> 3.17.0.2)
167
- rubocop (~> 1.48.1)
168
- rubocop-performance (~> 1.16.0)
169
- thor (1.2.1)
170
- unicode-display_width (2.4.2)
209
+ lint_roller (~> 1.0)
210
+ rubocop (~> 1.80.2)
211
+ standard-custom (~> 1.0.0)
212
+ standard-performance (~> 1.8)
213
+ standard-custom (1.0.2)
214
+ lint_roller (~> 1.0)
215
+ rubocop (~> 1.50)
216
+ standard-performance (1.8.0)
217
+ lint_roller (~> 1.1)
218
+ rubocop-performance (~> 1.25.0)
219
+ thor (1.4.0)
220
+ unicode-display_width (3.2.0)
221
+ unicode-emoji (~> 4.1)
222
+ unicode-emoji (4.1.0)
223
+ uri (1.1.1)
171
224
 
172
225
  PLATFORMS
173
226
  x86_64-darwin-22
@@ -183,7 +236,7 @@ DEPENDENCIES
183
236
  rspec (~> 3.12)
184
237
  rubocop (~> 1.41)
185
238
  rubocop-rspec (~> 2.16)
186
- standard
239
+ standard (>= 1.35.1)
187
240
 
188
241
  BUNDLED WITH
189
242
  2.3.26
data/lib/icarus/mod/cli/sync.rb CHANGED
@@ -144,7 +144,7 @@ module Icarus
144
144
 
145
145
  puts "Deleting outdated items..." if verbose?
146
146
  delete_array.each do |list|
147
- print format("Deleting %-<name>60s", name: "'#{list.author || "NoOne"}/#{list.name || "Unnamed'"}") if verbose > 1
147
+ print "Deleting '#{list.author || "NoOne"}/#{list.name || "Unnamed'"}'#{" " * 20}" if verbose > 1
148
148
  response = sync.delete(list)
149
149
  puts success_or_failure(status: response) if verbose > 1
150
150
  end
data/lib/icarus/mod/config.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "json"
4
+ require "ostruct"
4
5
 
5
6
  module Icarus
6
7
  module Mod
data/lib/icarus/mod/tools/sync/helpers.rb CHANGED
@@ -3,6 +3,7 @@
3
3
  require "uri"
4
4
  require "net/http"
5
5
  require "json"
6
+ require "openssl"
6
7
 
7
8
  module Icarus
8
9
  module Mod
@@ -15,7 +16,23 @@ module Icarus
15
16
  def retrieve_from_url(url)
16
17
  raise RequestFailed, "Invalid URI: '#{url}'" unless url && url =~ URI::DEFAULT_PARSER.make_regexp
17
18
 
18
- res = Net::HTTP.get_response(URI(url))
19
+ uri = URI(url)
20
+ http = Net::HTTP.new(uri.host, uri.port)
21
+
22
+ if uri.scheme == "https"
23
+ http.use_ssl = true
24
+ http.verify_mode = OpenSSL::SSL::VERIFY_PEER
25
+ # Disable CRL checking which is causing the issue
26
+ http.verify_callback = proc { |preverify_ok, ssl_context|
27
+ if ssl_context.error == OpenSSL::X509::V_ERR_UNABLE_TO_GET_CRL
28
+ true
29
+ else
30
+ preverify_ok
31
+ end
32
+ }
33
+ end
34
+
35
+ res = http.get(uri.path.empty? ? "/" : uri.path)
19
36
 
20
37
  raise RequestFailed, "HTTP Request failed for #{url} (#{res.code}): #{res.message}" unless res&.code == "200"
21
38
 
data/lib/icarus/mod/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Icarus
4
4
  module Mod
5
- VERSION = "2.1.4"
5
+ VERSION = "2.2.0"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: Icarus-Mod-Tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.4
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Donovan Young
8
- autorequire:
9
8
  bindir: exe
10
9
  cert_chain: []
11
- date: 2023-03-27 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: google-cloud-firestore
@@ -117,7 +116,6 @@ metadata:
117
116
  source_code_uri: https://github.com/DonovanMods/icarus-mod-tools
118
117
  changelog_uri: https://github.com/DonovanMods/icarus-mod-tools/blob/main/CHANGELOG.md
119
118
  rubygems_mfa_required: 'true'
120
- post_install_message:
121
119
  rdoc_options: []
122
120
  require_paths:
123
121
  - lib
@@ -133,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
133
131
  - !ruby/object:Gem::Version
134
132
  version: '0'
135
133
  requirements: []
136
- rubygems_version: 3.3.26
137
- signing_key:
134
+ rubygems_version: 3.6.9
138
135
  specification_version: 4
139
136
  summary: Various tools for Icarus Modding
140
137
  test_files: []