Skip to content

Commit 3b5e684

Browse files
terrywbradyterrywbrady
committed
gem updates and rubocop
1 parent 4261c85 commit 3b5e684

File tree

17 files changed

+121
-107
lines changed

17 files changed

+121
-107
lines changed

‎cognito-lambda-nonvpc/Gemfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ GEM
33
specs:
44
ast (2.4.2)
55
aws-eventstream (1.3.0)
6-
aws-partitions (1.916.0)
7-
aws-sdk-cognitoidentityprovider (1.88.0)
8-
aws-sdk-core (~> 3, >= 3.191.0)
6+
aws-partitions (1.922.0)
7+
aws-sdk-cognitoidentityprovider (1.90.0)
8+
aws-sdk-core (~> 3, >= 3.193.0)
99
aws-sigv4 (~> 1.1)
10-
aws-sdk-core (3.192.1)
10+
aws-sdk-core (3.194.0)
1111
aws-eventstream (~> 1, >= 1.3.0)
1212
aws-partitions (~> 1, >= 1.651.0)
1313
aws-sigv4 (~> 1.8)
@@ -18,14 +18,14 @@ GEM
1818
json (2.7.2)
1919
language_server-protocol (3.17.0.3)
2020
parallel (1.24.0)
21-
parser (3.3.0.5)
21+
parser (3.3.1.0)
2222
ast (~> 2.4.1)
2323
racc
2424
racc (1.7.3)
2525
rainbow (3.1.1)
2626
regexp_parser (2.9.0)
2727
rexml (3.2.6)
28-
rubocop (1.63.2)
28+
rubocop (1.63.4)
2929
json (~> 2.3)
3030
language_server-protocol (>= 3.17.0)
3131
parallel (~> 1.10)
@@ -36,8 +36,8 @@ GEM
3636
rubocop-ast (>= 1.31.1, < 2.0)
3737
ruby-progressbar (~> 1.7)
3838
unicode-display_width (>= 2.4.0, < 3.0)
39-
rubocop-ast (1.31.2)
40-
parser (>= 3.3.0.4)
39+
rubocop-ast (1.31.3)
40+
parser (>= 3.3.1.0)
4141
ruby-progressbar (1.13.0)
4242
unicode-display_width (2.5.0)
4343

‎mysql-ruby-lambda/Gemfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ GEM
1313
specs:
1414
ast (2.4.2)
1515
aws-eventstream (1.3.0)
16-
aws-partitions (1.916.0)
17-
aws-sdk-core (3.192.1)
16+
aws-partitions (1.922.0)
17+
aws-sdk-core (3.194.0)
1818
aws-eventstream (~> 1, >= 1.3.0)
1919
aws-partitions (~> 1, >= 1.651.0)
2020
aws-sigv4 (~> 1.8)
2121
jmespath (~> 1, >= 1.6.1)
22-
aws-sdk-ssm (1.166.0)
23-
aws-sdk-core (~> 3, >= 3.191.0)
22+
aws-sdk-ssm (1.168.0)
23+
aws-sdk-core (~> 3, >= 3.193.0)
2424
aws-sigv4 (~> 1.1)
2525
aws-sigv4 (1.8.0)
2626
aws-eventstream (~> 1, >= 1.0.2)
@@ -30,14 +30,14 @@ GEM
3030
logger (1.6.0)
3131
mysql2 (0.5.6)
3232
parallel (1.24.0)
33-
parser (3.3.0.5)
33+
parser (3.3.1.0)
3434
ast (~> 2.4.1)
3535
racc
3636
racc (1.7.3)
3737
rainbow (3.1.1)
3838
regexp_parser (2.9.0)
3939
rexml (3.2.6)
40-
rubocop (1.63.2)
40+
rubocop (1.63.4)
4141
json (~> 2.3)
4242
language_server-protocol (>= 3.17.0)
4343
parallel (~> 1.10)
@@ -48,8 +48,8 @@ GEM
4848
rubocop-ast (>= 1.31.1, < 2.0)
4949
ruby-progressbar (~> 1.7)
5050
unicode-display_width (>= 2.4.0, < 3.0)
51-
rubocop-ast (1.31.2)
52-
parser (>= 3.3.0.4)
51+
rubocop-ast (1.31.3)
52+
parser (>= 3.3.1.0)
5353
ruby-progressbar (1.13.0)
5454
unicode-display_width (2.5.0)
5555
yaml (0.2.1)

‎run_bundle.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,44 @@
11
#!/bin/bash
22
cd mysql-ruby-lambda
3+
echo
4+
pwd
5+
echo '==========='
36
bundle install
47
bundle update
8+
bundle exec rubocop || exit
59
cd ../src-common
10+
echo
11+
pwd
12+
echo '==========='
613
bundle install
714
bundle update
15+
bundle exec rubocop || exit
816
cd ../src-admintool
17+
echo
18+
pwd
19+
echo '==========='
920
bundle install
1021
bundle update
22+
bundle exec rubocop || exit
1123
cd ../src-colladmin
24+
echo
25+
pwd
26+
echo '==========='
1227
rm -rf vendor/bundle/ruby/3*/bundler/gems/mrt-zk*
1328
bundle install
1429
bundle update
30+
bundle exec rubocop || exit
1531
cd ../src-testdriver
32+
echo
33+
pwd
34+
echo '==========='
1635
bundle install
1736
bundle update
37+
bundle exec rubocop || exit
1838
cd ../cognito-lambda-nonvpc
39+
echo
40+
pwd
41+
echo '==========='
1942
bundle install
2043
bundle update
44+
bundle exec rubocop || exit

‎src-admintool/Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ GEM
1313
specs:
1414
ast (2.4.2)
1515
aws-eventstream (1.3.0)
16-
aws-partitions (1.916.0)
17-
aws-sdk-core (3.192.1)
16+
aws-partitions (1.922.0)
17+
aws-sdk-core (3.194.0)
1818
aws-eventstream (~> 1, >= 1.3.0)
1919
aws-partitions (~> 1, >= 1.651.0)
2020
aws-sigv4 (~> 1.8)
2121
jmespath (~> 1, >= 1.6.1)
22-
aws-sdk-kms (1.79.0)
23-
aws-sdk-core (~> 3, >= 3.191.0)
22+
aws-sdk-kms (1.80.0)
23+
aws-sdk-core (~> 3, >= 3.193.0)
2424
aws-sigv4 (~> 1.1)
25-
aws-sdk-s3 (1.147.0)
26-
aws-sdk-core (~> 3, >= 3.192.0)
25+
aws-sdk-s3 (1.149.0)
26+
aws-sdk-core (~> 3, >= 3.194.0)
2727
aws-sdk-kms (~> 1)
2828
aws-sigv4 (~> 1.8)
29-
aws-sdk-ssm (1.166.0)
30-
aws-sdk-core (~> 3, >= 3.191.0)
29+
aws-sdk-ssm (1.168.0)
30+
aws-sdk-core (~> 3, >= 3.193.0)
3131
aws-sigv4 (~> 1.1)
3232
aws-sigv4 (1.8.0)
3333
aws-eventstream (~> 1, >= 1.0.2)
@@ -37,14 +37,14 @@ GEM
3737
logger (1.6.0)
3838
mysql2 (0.5.6)
3939
parallel (1.24.0)
40-
parser (3.3.0.5)
40+
parser (3.3.1.0)
4141
ast (~> 2.4.1)
4242
racc
4343
racc (1.7.3)
4444
rainbow (3.1.1)
4545
regexp_parser (2.9.0)
4646
rexml (3.2.6)
47-
rubocop (1.63.2)
47+
rubocop (1.63.4)
4848
json (~> 2.3)
4949
language_server-protocol (>= 3.17.0)
5050
parallel (~> 1.10)
@@ -55,8 +55,8 @@ GEM
5555
rubocop-ast (>= 1.31.1, < 2.0)
5656
ruby-progressbar (~> 1.7)
5757
unicode-display_width (>= 2.4.0, < 3.0)
58-
rubocop-ast (1.31.2)
59-
parser (>= 3.3.0.4)
58+
rubocop-ast (1.31.3)
59+
parser (>= 3.3.1.0)
6060
ruby-progressbar (1.13.0)
6161
unicode-display_width (2.5.0)
6262
yaml (0.2.1)

‎src-admintool/lambda_function.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,15 @@ def template_parameters(path, myparams)
9999
end
100100

101101
def self.get_collection_map(client)
102-
m = []
103102
stmt = client.prepare(%(
104103
select mnemonic,name from inv.inv_collections
105104
where mnemonic is not null and mnemonic not like '%sla'
106105
order by mnemonic
107106
))
108107
results = stmt.execute
109-
results.each do |r|
110-
m.push({ mnemonic: r.values[0], name: r.values[1] })
108+
results.map do |r|
109+
{ mnemonic: r.values[0], name: r.values[1] }
111110
end
112-
m
113111
end
114112

115113
def get_report_url(key)
@@ -185,11 +183,9 @@ def get_reports_map
185183
rptmap[path] = [] unless rptmap.key?(path)
186184
rptmap[path].push(rpt)
187185
end
188-
maplist = []
189-
rptmap.keys.sort.each do |p|
190-
maplist.push({ path: p, reports: rptmap[p] })
186+
rptmap.keys.sort.map do |p|
187+
{ path: p, reports: rptmap[p] }
191188
end
192-
maplist
193189
end
194190
end
195191
end

‎src-admintool/queries/idlist_compare_query.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ def get_title
1212
end
1313

1414
def get_placeholders
15-
buf = []
16-
get_params.each do |_ark|
17-
buf.append('?')
15+
buf = get_params.map do |_ark|
16+
'?'
1817
end
1918
buf.join(',')
2019
end

‎src-admintool/queries/idlist_query.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ def get_title
1212
end
1313

1414
def get_placeholders
15-
buf = []
16-
get_params.each do |_ark|
17-
buf.append('?')
15+
buf = get_params.map do |_ark|
16+
'?'
1817
end
1918
buf.join(',')
2019
end

‎src-admintool/queries/invoices_query.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,13 @@ def campus_params(campus)
355355
end
356356

357357
def get_alternative_queries
358-
queries = []
359358
campuses = @campus.empty? ? %w[UCB UCD UCI UCLA UCM UCR UCSB UCSC UCSD UCSF] : ['']
360-
campuses.each do |campus|
361-
queries.append({
359+
campuses.map do |campus|
360+
{
362361
label: campus.empty? ? 'All Campuses' : campus,
363362
url: params_to_str(campus_params(campus)),
364363
class: 'campus'
365-
})
364+
}
366365
end
367-
queries
368366
end
369367
end

‎src-admintool/queries/query.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ def get_headers(results)
9898
end
9999

100100
def get_types(results)
101-
types = []
102-
results.fields.each do
103-
types.push('')
101+
results.fields.map do |_col|
102+
''
104103
end
105104
end
106105

‎src-colladmin/Gemfile.lock

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
GIT
22
remote: https://github.com/CDLUC3/mrt-zk.git
3-
revision: 8221456e59169583047c0bb70510bf997b09762e
4-
ref: 8221456
5-
branch: main
3+
revision: 0666a075c9026c8f81868a1d81c8c4572296c9c1
4+
tag: 1.0.2.a
65
specs:
76
mrt-zk (1.0.1)
87
zk (~> 1.10.0)
@@ -23,27 +22,27 @@ GEM
2322
specs:
2423
ast (2.4.2)
2524
aws-eventstream (1.3.0)
26-
aws-partitions (1.916.0)
27-
aws-sdk-core (3.192.1)
25+
aws-partitions (1.922.0)
26+
aws-sdk-core (3.194.0)
2827
aws-eventstream (~> 1, >= 1.3.0)
2928
aws-partitions (~> 1, >= 1.651.0)
3029
aws-sigv4 (~> 1.8)
3130
jmespath (~> 1, >= 1.6.1)
32-
aws-sdk-ec2 (1.450.0)
33-
aws-sdk-core (~> 3, >= 3.191.0)
31+
aws-sdk-ec2 (1.453.0)
32+
aws-sdk-core (~> 3, >= 3.193.0)
3433
aws-sigv4 (~> 1.1)
35-
aws-sdk-kms (1.79.0)
36-
aws-sdk-core (~> 3, >= 3.191.0)
34+
aws-sdk-kms (1.80.0)
35+
aws-sdk-core (~> 3, >= 3.193.0)
3736
aws-sigv4 (~> 1.1)
38-
aws-sdk-lambda (1.118.0)
39-
aws-sdk-core (~> 3, >= 3.191.0)
37+
aws-sdk-lambda (1.119.0)
38+
aws-sdk-core (~> 3, >= 3.193.0)
4039
aws-sigv4 (~> 1.1)
41-
aws-sdk-s3 (1.147.0)
42-
aws-sdk-core (~> 3, >= 3.192.0)
40+
aws-sdk-s3 (1.149.0)
41+
aws-sdk-core (~> 3, >= 3.194.0)
4342
aws-sdk-kms (~> 1)
4443
aws-sigv4 (~> 1.8)
45-
aws-sdk-ssm (1.166.0)
46-
aws-sdk-core (~> 3, >= 3.191.0)
44+
aws-sdk-ssm (1.168.0)
45+
aws-sdk-core (~> 3, >= 3.193.0)
4746
aws-sigv4 (~> 1.1)
4847
aws-sigv4 (1.8.0)
4948
aws-eventstream (~> 1, >= 1.0.2)
@@ -62,7 +61,7 @@ GEM
6261
mysql2 (0.5.6)
6362
netrc (0.11.0)
6463
parallel (1.24.0)
65-
parser (3.3.0.5)
64+
parser (3.3.1.0)
6665
ast (~> 2.4.1)
6766
racc
6867
racc (1.7.3)
@@ -74,7 +73,7 @@ GEM
7473
mime-types (>= 1.16, < 4.0)
7574
netrc (~> 0.8)
7675
rexml (3.2.6)
77-
rubocop (1.63.2)
76+
rubocop (1.63.4)
7877
json (~> 2.3)
7978
language_server-protocol (>= 3.17.0)
8079
parallel (~> 1.10)
@@ -85,8 +84,8 @@ GEM
8584
rubocop-ast (>= 1.31.1, < 2.0)
8685
ruby-progressbar (~> 1.7)
8786
unicode-display_width (>= 2.4.0, < 3.0)
88-
rubocop-ast (1.31.2)
89-
parser (>= 3.3.0.4)
87+
rubocop-ast (1.31.3)
88+
parser (>= 3.3.1.0)
9089
ruby-progressbar (1.13.0)
9190
unf_ext (0.0.7.7)
9291
unicode-display_width (2.5.0)

‎src-colladmin/actions/ingest_queue_action.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ def register_item(item)
3333
return unless filter_batch.empty? || filter_batch == item.bid
3434
return unless filter_profile.empty? || filter_profile == item.profile
3535
return unless filter_qstatus.empty? || filter_qstatus == item.qstatus
36+
3637
super(item)
3738
end
3839

39-
40-
4140
def get_title
4241
'List Ingest Queues'
4342
end

‎src-colladmin/actions/ingest_queue_profile_action.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def register_item(item)
4040
@profiles[k].append(item)
4141
end
4242

43-
def table_rows(body)
43+
def table_rows(_body)
4444
arr = []
4545
@profiles.keys.sort.each do |k|
4646
ka = k.split(',')

0 commit comments

Comments
 (0)