Skip to content

Commit f83beec

Browse files
authored
Rubocop fixes (#148)
* Update rubocop-disable_syntax gem to 0.2.0 * Fix rubocop warnings * Upgrade rubocop config * Fix rubocop warning * Fix rubocop warnings * Update rubocop config * Fix rubocop warnings * Fix rubocop warnings * Ruby 3.4 * Add workflow_dispatch: {}
1 parent 30befeb commit f83beec

File tree

9 files changed

+79
-62
lines changed

9 files changed

+79
-62
lines changed

.github/workflows/rspec.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
pull_request:
99
branches:
1010
- main
11+
workflow_dispatch: {}
1112
schedule:
1213
- cron: "0 21 * * 6"
1314

@@ -21,7 +22,7 @@ jobs:
2122
strategy:
2223
fail-fast: false
2324
matrix:
24-
ruby: ["4.0", "head"]
25+
ruby: ["3.4", "4.0", "head"]
2526

2627
steps:
2728
- name: Harden the runner (Audit all outbound calls)

.rubocop.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
require:
2-
- rubocop-disable_syntax
3-
41
plugins:
52
- rubocop-performance
63
- rubocop-rake
74
- rubocop-rspec
5+
- rubocop-disable_syntax
86

97
AllCops:
10-
TargetRubyVersion: 4.0
8+
TargetRubyVersion: 3.4
119
NewCops: enable
1210

1311
# We use standard as a linter and formatter instead Rubocop.
@@ -346,6 +344,18 @@ RSpec/IndexedLet:
346344
RSpec/NamedSubject:
347345
Enabled: false
348346

347+
# Ignore example length
348+
RSpec/ExampleLength:
349+
Enabled: false
350+
351+
# Ignore maximum example group nesting
352+
RSpec/NestedGroups:
353+
Enabled: false
354+
355+
# Ignore subject after let declarations
356+
RSpec/LeadingSubject:
357+
Enabled: false
358+
349359
# Naming rules:
350360

351361
# Disable anonymous block forwarding.

.standard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby_version: 4.0
1+
ruby_version: 3.4

Gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ GEM
4848
rubocop-ast (1.49.0)
4949
parser (>= 3.3.7.2)
5050
prism (~> 1.7)
51-
rubocop-disable_syntax (0.1.1)
52-
rubocop (>= 1.50)
51+
rubocop-disable_syntax (0.2.0)
52+
lint_roller
53+
rubocop (>= 1.72.0)
5354
rubocop-performance (1.26.1)
5455
lint_roller (~> 1.1)
5556
rubocop (>= 1.75.0, < 2.0)
@@ -121,7 +122,7 @@ CHECKSUMS
121122
rspec-support (3.13.6) sha256=2e8de3702427eab064c9352fe74488cc12a1bfae887ad8b91cba480ec9f8afb2
122123
rubocop (1.82.1) sha256=09f1a6a654a960eda767aebea33e47603080f8e9c9a3f019bf9b94c9cab5e273
123124
rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
124-
rubocop-disable_syntax (0.1.1) sha256=fba0b24edbd3de049ccaac8473c18fed308b5bd991e389a3368965f6cb88edbb
125+
rubocop-disable_syntax (0.2.0) sha256=1e61645773b3fc2f74e995ec65f605f7db59437c274fdfd4f385f60bf86af73e
125126
rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
126127
rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
127128
rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
@@ -136,4 +137,4 @@ CHECKSUMS
136137
unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
137138

138139
BUNDLED WITH
139-
4.0.4
140+
4.0.4

errbit_plugin.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
1212
spec.description = "Base to create an errbit plugin"
1313
spec.homepage = "https://github.com/errbit/errbit_plugin"
1414
spec.license = "MIT"
15-
spec.required_ruby_version = ">= 4.0.0"
15+
spec.required_ruby_version = ">= 3.4.0"
1616

1717
spec.metadata["homepage_uri"] = spec.homepage
1818
spec.metadata["source_code_uri"] = spec.homepage

lib/errbit_plugin/issue_tracker_validator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def implements_instance_methods?
3737
end
3838
end
3939

40-
impl.all? { |value| value == true }
40+
impl.all?(true)
4141
end
4242

4343
def implements_class_methods?
@@ -50,7 +50,7 @@ def implements_class_methods?
5050
end
5151
end
5252

53-
impl.all? { |value| value == true }
53+
impl.all?(true)
5454
end
5555

5656
def instance

lib/errbit_plugin/registry.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Registry
1111
def self.add_issue_tracker(klass)
1212
key = klass.label
1313

14-
if issue_trackers.has_key?(key)
14+
if issue_trackers.key?(key)
1515
raise AlreadyRegisteredError,
1616
"issue_tracker '#{key}' already registered"
1717
end

spec/errbit_plugin/issue_tracker_validator_spec.rb

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def url
4444
end
4545

4646
it "valid" do
47-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be true
47+
expect(described_class.new(klass).valid?).to eq(true)
4848
end
4949
end
5050

@@ -91,13 +91,13 @@ def url
9191
end
9292

9393
it "not valid" do
94-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
94+
expect(described_class.new(klass).valid?).to eq(false)
9595
end
9696

9797
it "says :not_inherited" do
98-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
98+
is = described_class.new(klass)
9999
is.valid?
100-
expect(is.errors).to eql [[:not_inherited]]
100+
expect(is.errors).to eq([[:not_inherited]])
101101
end
102102
end
103103

@@ -137,13 +137,13 @@ def url
137137
end
138138

139139
it "not valid" do
140-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
140+
expect(described_class.new(klass).valid?).to eq(false)
141141
end
142142

143143
it "say not implement label method" do
144-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
144+
is = described_class.new(klass)
145145
is.valid?
146-
expect(is.errors).to eql [[:class_method_missing, :label]]
146+
expect(is.errors).to eq([[:class_method_missing, :label]])
147147
end
148148
end
149149

@@ -183,13 +183,13 @@ def url
183183
end
184184

185185
it "not valid" do
186-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
186+
expect(described_class.new(klass).valid?).to eq(false)
187187
end
188188

189189
it "say not implement icons method" do
190-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
190+
is = described_class.new(klass)
191191
is.valid?
192-
expect(is.errors).to eql [[:class_method_missing, :icons]]
192+
expect(is.errors).to eq([[:class_method_missing, :icons]])
193193
end
194194
end
195195

@@ -229,13 +229,13 @@ def url
229229
end
230230

231231
it "not valid" do
232-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
232+
expect(described_class.new(klass).valid?).to eq(false)
233233
end
234234

235235
it "say not implement fields method" do
236-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
236+
is = described_class.new(klass)
237237
is.valid?
238-
expect(is.errors).to eql [[:class_method_missing, :fields]]
238+
expect(is.errors).to eq([[:class_method_missing, :fields]])
239239
end
240240
end
241241

@@ -275,13 +275,13 @@ def url
275275
end
276276

277277
it "not valid" do
278-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
278+
expect(described_class.new(klass).valid?).to eq(false)
279279
end
280280

281281
it "say not implement configured? method" do
282-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
282+
is = described_class.new(klass)
283283
is.valid?
284-
expect(is.errors).to eql [[:instance_method_missing, :configured?]]
284+
expect(is.errors).to eq([[:instance_method_missing, :configured?]])
285285
end
286286
end
287287

@@ -321,13 +321,13 @@ def url
321321
end
322322

323323
it "not valid" do
324-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
324+
expect(described_class.new(klass).valid?).to eq(false)
325325
end
326326

327327
it "say not implement errors method" do
328-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
328+
is = described_class.new(klass)
329329
is.valid?
330-
expect(is.errors).to eql [[:instance_method_missing, :errors]]
330+
expect(is.errors).to eq([[:instance_method_missing, :errors]])
331331
end
332332
end
333333

@@ -367,12 +367,13 @@ def url
367367
end
368368

369369
it "not valid" do
370-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
370+
expect(described_class.new(klass).valid?).to eq(false)
371371
end
372+
372373
it "say not implement create_issue method" do
373-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
374+
is = described_class.new(klass)
374375
is.valid?
375-
expect(is.errors).to eql [[:instance_method_missing, :create_issue]]
376+
expect(is.errors).to eq([[:instance_method_missing, :create_issue]])
376377
end
377378
end
378379

@@ -413,12 +414,13 @@ def url
413414
end
414415

415416
it "is valid" do
416-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be true
417+
expect(described_class.new(klass).valid?).to eq(true)
417418
end
419+
418420
it "not say not implement close_issue method" do
419-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
421+
is = described_class.new(klass)
420422
is.valid?
421-
expect(is.errors).not_to eql [[:instance_method_missing, :close_issue]]
423+
expect(is.errors).not_to eq([[:instance_method_missing, :close_issue]])
422424
end
423425
end
424426

@@ -458,13 +460,13 @@ def close_issue
458460
end
459461

460462
it "not valid" do
461-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
463+
expect(described_class.new(klass).valid?).to eq(false)
462464
end
463465

464466
it "say not implement url method" do
465-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
467+
is = described_class.new(klass)
466468
is.valid?
467-
expect(is.errors).to eql [[:instance_method_missing, :url]]
469+
expect(is.errors).to eq([[:instance_method_missing, :url]])
468470
end
469471
end
470472

@@ -504,13 +506,13 @@ def url
504506
end
505507

506508
it "not valid" do
507-
expect(ErrbitPlugin::IssueTrackerValidator.new(klass).valid?).to be false
509+
expect(described_class.new(klass).valid?).to eq(false)
508510
end
509511

510512
it "say not implement note method" do
511-
is = ErrbitPlugin::IssueTrackerValidator.new(klass)
513+
is = described_class.new(klass)
512514
is.valid?
513-
expect(is.errors).to eql [[:class_method_missing, :note]]
515+
expect(is.errors).to eq([[:class_method_missing, :note]])
514516
end
515517
end
516518
end

spec/errbit_plugin/registry_spec.rb

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44

55
RSpec.describe ErrbitPlugin::Registry do
66
before do
7-
ErrbitPlugin::Registry.clear_issue_trackers
7+
described_class.clear_issue_trackers
88
end
99

10-
let(:tracker) {
10+
let(:tracker) do
1111
tracker = Class.new(ErrbitPlugin::IssueTracker) do
1212
def self.label
1313
"something"
1414
end
1515
end
16+
1617
tracker
17-
}
18+
end
1819

1920
describe ".add_issue_tracker" do
2021
context "with issue_tracker class valid" do
@@ -24,18 +25,22 @@ def self.label
2425
.with(tracker)
2526
.and_return(double(valid?: true, message: ""))
2627
end
28+
2729
it "add new issue_tracker plugin" do
28-
ErrbitPlugin::Registry.add_issue_tracker(tracker)
29-
expect(ErrbitPlugin::Registry.issue_trackers).to eq({
30+
described_class.add_issue_tracker(tracker)
31+
32+
expect(described_class.issue_trackers).to eq({
3033
"something" => tracker
3134
})
3235
end
36+
3337
context "with already issue_tracker with this key" do
3438
it "raise ErrbitPlugin::AlreadyRegisteredError" do
35-
ErrbitPlugin::Registry.add_issue_tracker(tracker)
36-
expect {
37-
ErrbitPlugin::Registry.add_issue_tracker(tracker)
38-
}.to raise_error(ErrbitPlugin::AlreadyRegisteredError)
39+
described_class.add_issue_tracker(tracker)
40+
41+
expect do
42+
described_class.add_issue_tracker(tracker)
43+
end.to raise_error(ErrbitPlugin::AlreadyRegisteredError)
3944
end
4045
end
4146
end
@@ -46,9 +51,10 @@ def self.label
4651
.to receive(:new)
4752
.with(tracker)
4853
.and_return(double(valid?: false, message: "foo", errors: []))
49-
expect {
50-
ErrbitPlugin::Registry.add_issue_tracker(tracker)
51-
}.to raise_error(ErrbitPlugin::IncompatibilityError)
54+
55+
expect do
56+
described_class.add_issue_tracker(tracker)
57+
end.to raise_error(ErrbitPlugin::IncompatibilityError)
5258
end
5359

5460
it "puts the errors in the exception message" do
@@ -57,11 +63,8 @@ def self.label
5763
.with(tracker)
5864
.and_return(double(valid?: false, message: "foo", errors: ["one", "two"]))
5965

60-
begin
61-
ErrbitPlugin::Registry.add_issue_tracker(tracker)
62-
rescue ErrbitPlugin::IncompatibilityError => e
63-
expect(e.message).to eq("one; two")
64-
end
66+
expect { described_class.add_issue_tracker(tracker) }
67+
.to raise_error(ErrbitPlugin::IncompatibilityError, "one; two")
6568
end
6669
end
6770
end

0 commit comments

Comments
 (0)