Skip to content

Commit 815bce3

Browse files
committed
updating gems and running the linter part 1
1 parent edf3696 commit 815bce3

66 files changed

Lines changed: 74 additions & 52 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gemfile.lock

Lines changed: 62 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
entitlements-app (1.0.0)
5-
concurrent-ruby (= 1.1.9)
5+
concurrent-ruby (= 1.3.1)
66
faraday (~> 2.0)
77
net-ldap (~> 0.19)
88
octokit (~> 4.18)
@@ -11,52 +11,69 @@ PATH
1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
activesupport (7.0.7.2)
14+
activesupport (7.1.3.3)
15+
base64
16+
bigdecimal
1517
concurrent-ruby (~> 1.0, >= 1.0.2)
18+
connection_pool (>= 2.2.5)
19+
drb
1620
i18n (>= 1.6, < 2)
1721
minitest (>= 5.1)
22+
mutex_m
1823
tzinfo (~> 2.0)
19-
addressable (2.8.5)
24+
addressable (2.8.6)
2025
public_suffix (>= 2.0.2, < 6.0)
2126
ast (2.4.2)
22-
concurrent-ruby (1.1.9)
23-
crack (0.4.5)
27+
base64 (0.2.0)
28+
bigdecimal (3.1.8)
29+
concurrent-ruby (1.3.1)
30+
connection_pool (2.4.1)
31+
crack (1.0.0)
32+
bigdecimal
2433
rexml
2534
debug (1.8.0)
2635
irb (>= 1.5.0)
2736
reline (>= 0.3.1)
28-
diff-lcs (1.5.0)
37+
diff-lcs (1.5.1)
2938
docile (1.4.0)
39+
drb (2.2.1)
3040
faraday (2.9.0)
3141
faraday-net_http (>= 2.0, < 3.2)
3242
faraday-net_http (3.1.0)
3343
net-http
34-
hashdiff (1.0.1)
35-
i18n (1.14.1)
44+
hashdiff (1.1.0)
45+
i18n (1.14.5)
3646
concurrent-ruby (~> 1.0)
37-
io-console (0.6.0)
38-
irb (1.7.4)
39-
reline (>= 0.3.6)
40-
json (2.6.3)
41-
minitest (5.19.0)
47+
io-console (0.7.2)
48+
irb (1.13.1)
49+
rdoc (>= 4.0.0)
50+
reline (>= 0.4.2)
51+
json (2.7.2)
52+
language_server-protocol (3.17.0.3)
53+
minitest (5.23.1)
54+
mutex_m (0.2.0)
4255
net-http (0.4.1)
4356
uri
4457
net-ldap (0.19.0)
4558
octokit (4.25.1)
4659
faraday (>= 1, < 3)
4760
sawyer (~> 0.9)
4861
optimist (3.0.0)
49-
parallel (1.23.0)
50-
parser (3.2.2.3)
62+
parallel (1.24.0)
63+
parser (3.3.1.0)
5164
ast (~> 2.4.1)
5265
racc
53-
public_suffix (5.0.3)
54-
racc (1.7.1)
55-
rack (3.0.9.1)
66+
psych (5.1.2)
67+
stringio
68+
public_suffix (5.0.5)
69+
racc (1.8.0)
70+
rack (3.0.11)
5671
rainbow (3.1.1)
5772
rake (13.0.6)
58-
regexp_parser (2.8.1)
59-
reline (0.3.8)
73+
rdoc (6.7.0)
74+
psych (>= 4.0.0)
75+
regexp_parser (2.9.2)
76+
reline (0.5.8)
6077
io-console (~> 0.5)
6178
rexml (3.2.8)
6279
strscan (>= 3.0.9)
@@ -73,28 +90,31 @@ GEM
7390
diff-lcs (>= 1.2.0, < 2.0)
7491
rspec-support (~> 3.8.0)
7592
rspec-support (3.8.3)
76-
rubocop (1.29.1)
93+
rubocop (1.64.0)
94+
json (~> 2.3)
95+
language_server-protocol (>= 3.17.0)
7796
parallel (~> 1.10)
78-
parser (>= 3.1.0.0)
97+
parser (>= 3.3.0.2)
7998
rainbow (>= 2.2.2, < 4.0)
8099
regexp_parser (>= 1.8, < 3.0)
81100
rexml (>= 3.2.5, < 4.0)
82-
rubocop-ast (>= 1.17.0, < 2.0)
101+
rubocop-ast (>= 1.31.1, < 2.0)
83102
ruby-progressbar (~> 1.7)
84-
unicode-display_width (>= 1.4.0, < 3.0)
85-
rubocop-ast (1.29.0)
86-
parser (>= 3.2.1.0)
87-
rubocop-github (0.17.0)
88-
rubocop
89-
rubocop-performance
90-
rubocop-rails
91-
rubocop-performance (1.13.3)
92-
rubocop (>= 1.7.0, < 2.0)
93-
rubocop-ast (>= 0.4.0)
94-
rubocop-rails (2.15.2)
103+
unicode-display_width (>= 2.4.0, < 3.0)
104+
rubocop-ast (1.31.3)
105+
parser (>= 3.3.1.0)
106+
rubocop-github (0.20.0)
107+
rubocop (>= 1.37)
108+
rubocop-performance (>= 1.15)
109+
rubocop-rails (>= 2.17)
110+
rubocop-performance (1.21.0)
111+
rubocop (>= 1.48.1, < 2.0)
112+
rubocop-ast (>= 1.31.1, < 2.0)
113+
rubocop-rails (2.25.0)
95114
activesupport (>= 4.2.0)
96115
rack (>= 1.1)
97-
rubocop (>= 1.7.0, < 2.0)
116+
rubocop (>= 1.33.0, < 2.0)
117+
rubocop-ast (>= 1.31.1, < 2.0)
98118
ruby-progressbar (1.13.0)
99119
rugged (1.7.2)
100120
sawyer (0.9.2)
@@ -107,10 +127,11 @@ GEM
107127
simplecov-erb (1.0.1)
108128
simplecov (< 1.0)
109129
simplecov-html (0.10.2)
130+
stringio (3.1.0)
110131
strscan (3.1.0)
111132
tzinfo (2.0.6)
112133
concurrent-ruby (~> 1.0)
113-
unicode-display_width (2.4.2)
134+
unicode-display_width (2.5.0)
114135
uri (0.13.0)
115136
vcr (4.0.0)
116137
webmock (3.4.2)
@@ -120,21 +141,22 @@ GEM
120141

121142
PLATFORMS
122143
ruby
144+
x86_64-linux
123145

124146
DEPENDENCIES
125147
debug (<= 1.8.0)
126148
entitlements-app!
127149
rake (= 13.0.6)
128150
rspec (= 3.8.0)
129151
rspec-core (= 3.8.0)
130-
rubocop (= 1.29.1)
131-
rubocop-github (= 0.17.0)
132-
rubocop-performance (= 1.13.3)
152+
rubocop (~> 1.64)
153+
rubocop-github (~> 0.20)
154+
rubocop-performance (~> 1.21)
133155
rugged (~> 1.7, >= 1.7.2)
134156
simplecov (= 0.16.1)
135157
simplecov-erb (= 1.0.1)
136158
vcr (= 4.0.0)
137159
webmock (= 3.4.2)
138160

139161
BUNDLED WITH
140-
2.3.19
162+
2.5.9

entitlements-app.gemspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
1616

1717
s.required_ruby_version = ">= 3.0.0"
1818

19-
s.add_dependency "concurrent-ruby", "= 1.1.9"
19+
s.add_dependency "concurrent-ruby", "= 1.3.1"
2020
s.add_dependency "faraday", "~> 2.0"
2121
s.add_dependency "net-ldap", "~> 0.19"
2222
s.add_dependency "octokit", "~> 4.18"
@@ -26,9 +26,9 @@ Gem::Specification.new do |s|
2626
s.add_development_dependency "rake", "= 13.0.6"
2727
s.add_development_dependency "rspec", "= 3.8.0"
2828
s.add_development_dependency "rspec-core", "= 3.8.0"
29-
s.add_development_dependency "rubocop", "= 1.29.1"
30-
s.add_development_dependency "rubocop-github", "= 0.17.0"
31-
s.add_development_dependency "rubocop-performance", "= 1.13.3"
29+
s.add_development_dependency "rubocop", "~> 1.64"
30+
s.add_development_dependency "rubocop-github", "~> 0.20"
31+
s.add_development_dependency "rubocop-performance", "~> 1.21"
3232
s.add_development_dependency "rugged", "~> 1.7", ">= 1.7.2"
3333
s.add_development_dependency "simplecov", "= 0.16.1"
3434
s.add_development_dependency "simplecov-erb", "= 1.0.1"

lib/entitlements/data/groups/calculated/text.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def parsed_data
275275
raw_key, operator, val = Regexp.last_match(1), Regexp.last_match(2), Regexp.last_match(3)
276276

277277
key = if filter_keywords.include?(raw_key)
278-
"filter_#{raw_key}"
278+
"filter_#{raw_key}"
279279
elsif MODIFIERS.include?(raw_key)
280280
"modifier_#{raw_key}"
281281
else

lib/entitlements/data/groups/calculated/yaml.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def initialize_filters
6868
end
6969

7070
values = if val.is_a?(String)
71-
[val]
71+
[val]
7272
elsif val.is_a?(Array)
7373
val
7474
else
@@ -164,7 +164,7 @@ def remove_expired_rules(rules_hash)
164164
Contract C::None => C::HashOf[String => C::Any]
165165
def parsed_data
166166
@parsed_data ||= if RubyVersionCheck.ruby_version2?
167-
::YAML.load(File.read(filename)).to_h
167+
::YAML.load(File.read(filename)).to_h
168168
else
169169
::YAML.load(File.read(filename), permitted_classes: [Date]).to_h
170170
end

lib/entitlements/data/people/yaml.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def read(uid = nil)
8080

8181
# :nocov:
8282
raw_person_data = if RubyVersionCheck.ruby_version2?
83-
::YAML.load(File.read(filename)).to_h
83+
::YAML.load(File.read(filename)).to_h
8484
else
8585
::YAML.load(File.read(filename), permitted_classes: [Date]).to_h
8686
end

lib/entitlements/extras/ldap_group/rules/ldap_group.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def self.matches(value:, filename: nil, options: {})
2727
entry = ldap.read(value)
2828
unless entry
2929
message = if filename
30-
"Failed to read ldap_group = #{value} (referenced in #{filename})"
30+
"Failed to read ldap_group = #{value} (referenced in #{filename})"
3131
else
3232
# :nocov:
3333
"Failed to read ldap_group = #{value}"

lib/entitlements/service/ldap.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def self.entry_to_group(entry)
383383
Contract Net::LDAP::Entry => C::ArrayOf[String]
384384
def self.member_array(entry)
385385
members = if entry[:objectclass].include?("groupOfUniqueNames")
386-
entry[:uniquemember]
386+
entry[:uniquemember]
387387
elsif entry[:objectclass].include?("groupOfNames")
388388
entry[:member]
389389
elsif entry[:objectclass].include?("posixGroup")

lib/entitlements/util/override.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def self.override_hash_from_plugin(plugin, group, ldap)
2626
end
2727

2828
file = if plugin["file"] !~ %r{/}
29-
File.expand_path(File.join("../plugins", plugin["file"]), File.dirname(__FILE__))
29+
File.expand_path(File.join("../plugins", plugin["file"]), File.dirname(__FILE__))
3030
elsif plugin["file"].start_with?("/")
3131
plugin["file"]
3232
else

lib/entitlements/util/util.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def self.path_for_group(group)
8181

8282
dir = Entitlements.config["groups"][group]["dir"]
8383
result_dir = if dir.nil?
84-
File.join(Entitlements.config_path, group)
84+
File.join(Entitlements.config_path, group)
8585
elsif dir.start_with?("/")
8686
dir
8787
else
-221 KB
Binary file not shown.

0 commit comments

Comments
 (0)