Skip to content

Commit 42ba1cd

Browse files
committed
Update CI for rubocop and fix lint issues
1 parent 1af0fff commit 42ba1cd

File tree

8 files changed

+18
-10
lines changed

8 files changed

+18
-10
lines changed

.github/workflows/lint.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ name: Lint Ruby
33
on:
44
push:
55
branches:
6-
- master
6+
- '**'
7+
tags-ignore:
8+
- 'v*'
79
paths:
810
- "gemfiles/*"
911
- "Gemfile"
@@ -20,12 +22,15 @@ on:
2022

2123
jobs:
2224
rubocop:
25+
# Skip running tests for local pull requests (use push event instead), run only for foreign ones
26+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
27+
name: RuboCop
2328
runs-on: ubuntu-latest
2429
steps:
25-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
2631
- uses: ruby/setup-ruby@v1
2732
with:
28-
ruby-version: 3.2
33+
ruby-version: "3.3"
2934
bundler-cache: true
3035
- name: Lint Ruby code with RuboCop
3136
run: |

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ group :development, :test do
1616
gem "pry"
1717
gem "pry-byebug", platform: :mri
1818

19-
gem "rubocop", "~> 1.0"
20-
gem "rubocop-rspec"
19+
gem "rubocop", "~> 1.0", require: false
20+
gem "rubocop-rspec", require: false
2121
end

lib/yabeda.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def default_tags
6767
def register_adapter(name, instance)
6868
adapters[name] = instance
6969
# NOTE: Pretty sure there is race condition
70-
metrics.each do |_, metric|
70+
metrics.each_value do |metric|
7171
instance.register!(metric)
7272
end
7373
end

lib/yabeda/counter.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Counter < Metric
66
def increment(tags, by: 1)
77
all_tags = ::Yabeda::Tags.build(tags, group)
88
values[all_tags] += by
9-
::Yabeda.adapters.each do |_, adapter|
9+
::Yabeda.adapters.each_value do |adapter|
1010
adapter.perform_counter_increment!(self, all_tags, by)
1111
end
1212
values[all_tags]

lib/yabeda/gauge.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Gauge < Metric
66
def set(tags, value)
77
all_tags = ::Yabeda::Tags.build(tags, group)
88
values[all_tags] = value
9-
::Yabeda.adapters.each do |_, adapter|
9+
::Yabeda.adapters.each_value do |adapter|
1010
adapter.perform_gauge_set!(self, all_tags, value)
1111
end
1212
value

lib/yabeda/histogram.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def measure(tags, value = nil)
2020

2121
all_tags = ::Yabeda::Tags.build(tags, group)
2222
values[all_tags] = value
23-
::Yabeda.adapters.each do |_, adapter|
23+
::Yabeda.adapters.each_value do |adapter|
2424
adapter.perform_histogram_measure!(self, all_tags, value)
2525
end
2626
value

lib/yabeda/summary.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def observe(tags, value = nil)
1818

1919
all_tags = ::Yabeda::Tags.build(tags, group)
2020
values[all_tags] = value
21-
::Yabeda.adapters.each do |_, adapter|
21+
::Yabeda.adapters.each_value do |adapter|
2222
adapter.perform_summary_observe!(self, all_tags, value)
2323
end
2424
value

spec/spec_helper.rb

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
c.syntax = :expect
1818
end
1919

20+
config.filter_run focus: true
21+
config.run_all_when_everything_filtered = true
22+
2023
config.after do
2124
Yabeda.reset! # Undo call to +Yabeda.configure!+
2225
end

0 commit comments

Comments
 (0)