Skip to content

Commit 5d96dff

Browse files
msuliqmsuliq
committed
clean up
1 parent d1efc1f commit 5d96dff

File tree

6 files changed

+119
-164
lines changed

6 files changed

+119
-164
lines changed

‎.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
ruby: ['2.7', '3.0', '3.1', '3.2']
17+
ruby: ['2.7.6']
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222

2323
- name: Setup Ruby
2424
uses: ruby/setup-ruby@v1
2525
with:
2626
ruby-version: ${{ matrix.ruby }}
27-
bundler-cache: true
27+
bundler-cache: false
28+
29+
- name: Update RubyGems and install dependencies
30+
run: |
31+
gem update --system 3.3.22
32+
bundle config set --local force_ruby_platform true
33+
bundle install --jobs 4 --retry 3
2834
2935
- name: Run Tests
3036
run: bundle exec rspec
3137

3238
- name: Rubocop
33-
run: bundle exec rubocop
39+
run: bundle exec rubocop

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL

‎.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 2.7.3
1+
ruby 2.7.7

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
ruby '>= 2.7.6'
44

5-
gem 'activerecord', '>= 4.2.5', '< 8', require: false
5+
gem 'activerecord', '>= 4.2.5', require: false
66
gem 'rake', require: false
77

88
group :development do

‎Gemfile.lock

+105-156
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,47 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (5.2.8.1)
5-
activesupport (= 5.2.8.1)
6-
activerecord (5.2.8.1)
7-
activemodel (= 5.2.8.1)
8-
activesupport (= 5.2.8.1)
9-
arel (>= 9.0)
10-
activesupport (5.2.8.1)
4+
activemodel (7.1.5.1)
5+
activesupport (= 7.1.5.1)
6+
activerecord (7.1.5.1)
7+
activemodel (= 7.1.5.1)
8+
activesupport (= 7.1.5.1)
9+
timeout (>= 0.4.0)
10+
activesupport (7.1.5.1)
11+
base64
12+
benchmark (>= 0.3)
13+
bigdecimal
1114
concurrent-ruby (~> 1.0, >= 1.0.2)
12-
i18n (>= 0.7, < 2)
13-
minitest (~> 5.1)
14-
tzinfo (~> 1.1)
15-
addressable (2.8.1)
16-
public_suffix (>= 2.0.2, < 6.0)
17-
arel (9.0.0)
15+
connection_pool (>= 2.2.5)
16+
drb
17+
i18n (>= 1.6, < 2)
18+
logger (>= 1.4.2)
19+
minitest (>= 5.1)
20+
mutex_m
21+
securerandom (>= 0.3)
22+
tzinfo (~> 2.0)
23+
addressable (2.8.7)
24+
public_suffix (>= 2.0.2, < 7.0)
1825
ast (2.4.2)
26+
base64 (0.2.0)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.9)
1929
bump (0.10.0)
2030
byebug (11.1.3)
21-
childprocess (4.1.0)
22-
codeclimate-test-reporter (1.0.7)
23-
simplecov
31+
childprocess (5.1.0)
32+
logger (~> 1.5)
2433
coderay (1.1.3)
25-
concurrent-ruby (1.1.10)
26-
coveralls (0.8.23)
27-
json (>= 1.8, < 3)
28-
simplecov (~> 0.16.1)
29-
term-ansicolor (~> 1.3)
30-
thor (>= 0.19.4, < 2.0)
31-
tins (~> 1.6)
32-
diff-lcs (1.5.0)
33-
docile (1.4.0)
34-
faraday (1.10.2)
35-
faraday-em_http (~> 1.0)
36-
faraday-em_synchrony (~> 1.0)
37-
faraday-excon (~> 1.1)
38-
faraday-httpclient (~> 1.0)
39-
faraday-multipart (~> 1.0)
40-
faraday-net_http (~> 1.0)
41-
faraday-net_http_persistent (~> 1.0)
42-
faraday-patron (~> 1.0)
43-
faraday-rack (~> 1.0)
44-
faraday-retry (~> 1.0)
45-
ruby2_keywords (>= 0.0.4)
46-
faraday-em_http (1.0.0)
47-
faraday-em_synchrony (1.0.0)
48-
faraday-excon (1.1.0)
49-
faraday-httpclient (1.0.1)
50-
faraday-multipart (1.0.4)
51-
multipart-post (~> 2)
52-
faraday-net_http (1.0.1)
53-
faraday-net_http_persistent (1.2.0)
54-
faraday-patron (1.0.0)
55-
faraday-rack (1.0.0)
56-
faraday-retry (1.0.3)
57-
faraday_middleware (1.2.0)
58-
faraday (~> 1.0)
59-
ffi (1.15.5)
60-
files (0.4.0)
34+
concurrent-ruby (1.3.4)
35+
connection_pool (2.4.1)
36+
diff-lcs (1.5.1)
37+
docile (1.4.1)
38+
drb (2.2.1)
39+
ffi (1.17.0)
6140
formatador (1.1.0)
62-
gh (0.18.0)
63-
activesupport (~> 5.0)
64-
addressable (~> 2.4)
65-
faraday (~> 1.0)
66-
faraday_middleware (~> 1.0)
67-
multi_json (~> 1.0)
68-
net-http-persistent (~> 2.9)
69-
net-http-pipeline
70-
git (1.13.0)
41+
git (1.19.1)
7142
addressable (~> 2.8)
7243
rchardet (~> 1.8)
73-
guard (2.18.0)
44+
guard (2.19.0)
7445
formatador (>= 0.2.4)
7546
listen (>= 2.7, < 4.0)
7647
lumberjack (>= 1.0.12, < 2.0)
@@ -84,148 +55,126 @@ GEM
8455
guard (~> 2.1)
8556
guard-compat (~> 1.1)
8657
rspec (>= 2.99.0, < 4.0)
87-
highline (2.0.3)
88-
i18n (1.12.0)
58+
i18n (1.14.6)
8959
concurrent-ruby (~> 1.0)
9060
iniparse (1.5.0)
91-
json (2.6.3)
92-
json_pure (2.6.3)
93-
launchy (2.4.3)
94-
addressable (~> 2.3)
95-
listen (3.7.1)
61+
json (2.9.1)
62+
language_server-protocol (3.17.0.3)
63+
listen (3.9.0)
9664
rb-fsevent (~> 0.10, >= 0.10.3)
9765
rb-inotify (~> 0.9, >= 0.9.10)
98-
lumberjack (1.2.8)
99-
method_source (1.0.0)
66+
logger (1.6.4)
67+
lumberjack (1.2.10)
68+
method_source (1.1.0)
10069
mg (0.0.8)
10170
rake
102-
minitest (5.16.3)
103-
multi_json (1.15.0)
104-
multipart-post (2.2.3)
71+
minitest (5.25.4)
72+
mutex_m (0.3.0)
10573
nenv (0.3.0)
106-
net-http-persistent (2.9.4)
107-
net-http-pipeline (1.0.1)
10874
notiffany (0.1.3)
10975
nenv (~> 0.1)
11076
shellany (~> 0.0)
111-
overcommit (0.59.1)
112-
childprocess (>= 0.6.3, < 5)
77+
overcommit (0.64.1)
78+
childprocess (>= 0.6.3, < 6)
11379
iniparse (~> 1.4)
114-
rexml (~> 3.2)
115-
parallel (1.22.1)
116-
parser (3.1.3.0)
80+
rexml (>= 3.3.9)
81+
parallel (1.26.3)
82+
parser (3.3.6.0)
11783
ast (~> 2.4.1)
118-
pry (0.14.1)
84+
racc
85+
pry (0.15.2)
11986
coderay (~> 1.1)
12087
method_source (~> 1.0)
121-
pry-byebug (3.10.1)
88+
pry-byebug (3.8.0)
12289
byebug (~> 11.0)
123-
pry (>= 0.13, < 0.15)
124-
public_suffix (5.0.1)
125-
pusher-client (0.6.2)
126-
json
127-
websocket (~> 1.0)
90+
pry (~> 0.10)
91+
public_suffix (5.1.1)
92+
racc (1.8.1)
12893
rainbow (3.1.1)
129-
rake (13.0.6)
94+
rake (13.2.1)
13095
rb-fsevent (0.11.2)
131-
rb-inotify (0.10.1)
96+
rb-inotify (0.11.1)
13297
ffi (~> 1.0)
13398
rchardet (1.8.0)
134-
regexp_parser (2.6.1)
135-
rexml (3.2.5)
136-
rspec (3.12.0)
137-
rspec-core (~> 3.12.0)
138-
rspec-expectations (~> 3.12.0)
139-
rspec-mocks (~> 3.12.0)
140-
rspec-core (3.12.0)
141-
rspec-support (~> 3.12.0)
142-
rspec-expectations (3.12.1)
99+
regexp_parser (2.10.0)
100+
rexml (3.4.0)
101+
rspec (3.13.0)
102+
rspec-core (~> 3.13.0)
103+
rspec-expectations (~> 3.13.0)
104+
rspec-mocks (~> 3.13.0)
105+
rspec-core (3.13.2)
106+
rspec-support (~> 3.13.0)
107+
rspec-expectations (3.13.3)
143108
diff-lcs (>= 1.2.0, < 2.0)
144-
rspec-support (~> 3.12.0)
145-
rspec-mocks (3.12.1)
109+
rspec-support (~> 3.13.0)
110+
rspec-mocks (3.13.2)
146111
diff-lcs (>= 1.2.0, < 2.0)
147-
rspec-support (~> 3.12.0)
148-
rspec-support (3.12.0)
149-
rubocop (1.12.1)
112+
rspec-support (~> 3.13.0)
113+
rspec-support (3.13.2)
114+
rubocop (1.59.0)
115+
json (~> 2.3)
116+
language_server-protocol (>= 3.17.0)
150117
parallel (~> 1.10)
151-
parser (>= 3.0.0.0)
118+
parser (>= 3.2.2.4)
152119
rainbow (>= 2.2.2, < 4.0)
153120
regexp_parser (>= 1.8, < 3.0)
154-
rexml
155-
rubocop-ast (>= 1.2.0, < 2.0)
121+
rexml (>= 3.2.5, < 4.0)
122+
rubocop-ast (>= 1.30.0, < 2.0)
156123
ruby-progressbar (~> 1.7)
157-
unicode-display_width (>= 1.4.0, < 3.0)
158-
rubocop-ast (1.24.0)
159-
parser (>= 3.1.1.0)
124+
unicode-display_width (>= 2.4.0, < 3.0)
125+
rubocop-ast (1.37.0)
126+
parser (>= 3.3.1.0)
127+
rubocop-capybara (2.21.0)
128+
rubocop (~> 1.41)
129+
rubocop-factory_bot (2.26.0)
130+
rubocop (~> 1.41)
160131
rubocop-rake (0.6.0)
161132
rubocop (~> 1.0)
162-
rubocop-rspec (2.2.0)
163-
rubocop (~> 1.0)
164-
rubocop-ast (>= 1.1.0)
165-
ruby-progressbar (1.11.0)
166-
ruby2_keywords (0.0.5)
167-
ruby_dep (1.5.0)
133+
rubocop-rspec (2.25.0)
134+
rubocop (~> 1.40)
135+
rubocop-capybara (~> 2.17)
136+
rubocop-factory_bot (~> 2.22)
137+
ruby-progressbar (1.13.0)
138+
securerandom (0.3.2)
168139
shellany (0.0.1)
169-
simplecov (0.16.1)
140+
simplecov (0.22.0)
170141
docile (~> 1.1)
171-
json (>= 1.8, < 3)
172-
simplecov-html (~> 0.10.0)
173-
simplecov-html (0.10.2)
174-
sync (0.5.0)
175-
term-ansicolor (1.7.1)
176-
tins (~> 1.0)
142+
simplecov-html (~> 0.11)
143+
simplecov_json_formatter (~> 0.1)
144+
simplecov-html (0.13.1)
145+
simplecov_json_formatter (0.1.4)
177146
terminal-notifier-guard (1.7.0)
178-
thor (1.2.1)
179-
thread_safe (0.3.6)
180-
tins (1.32.1)
181-
sync
182-
travis (1.11.1)
183-
faraday (~> 1.0)
184-
faraday_middleware (~> 1.0)
185-
gh (~> 0.13)
186-
highline (~> 2.0)
187-
json_pure (~> 2.3)
188-
launchy (~> 2.1, < 2.5.0)
189-
pusher-client (~> 0.4)
190-
tzinfo (1.2.10)
191-
thread_safe (~> 0.1)
192-
unicode-display_width (2.3.0)
193-
webrick (1.7.0)
194-
websocket (1.2.9)
195-
yard (0.9.28)
196-
webrick (~> 1.7.0)
147+
thor (1.3.2)
148+
timeout (0.4.3)
149+
tzinfo (2.0.6)
150+
concurrent-ruby (~> 1.0)
151+
unicode-display_width (2.6.0)
152+
yard (0.9.37)
197153

198154
PLATFORMS
199-
arm64-darwin-21
200-
arm64-darwin-22
201-
x86_64-linux
155+
ruby
202156

203157
DEPENDENCIES
204-
activerecord (>= 4.2.5, < 6)
158+
activerecord (>= 4.2.5)
205159
bump
206160
byebug
207-
codeclimate-test-reporter
208-
coveralls
209-
files
210161
git
211162
guard-rspec
212163
mg
213164
overcommit
214165
pry
215166
pry-byebug
216-
rake (>= 13.0.6)
167+
rake
217168
rspec
218-
rubocop (~> 1.12.0)
169+
rubocop (~> 1.59.0)
219170
rubocop-rake
220-
rubocop-rspec (~> 2.2.0)
221-
ruby_dep (= 1.5.0)
171+
rubocop-rspec (~> 2.25.0)
222172
simplecov
223173
terminal-notifier-guard
224-
travis
225174
yard
226175

227176
RUBY VERSION
228-
ruby 2.7.6p219
177+
ruby 2.7.7p221
229178

230179
BUNDLED WITH
231-
2.4.1
180+
2.1.4

‎annotate.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
2121
s.summary = 'Annotates Rails Models, routes, fixtures, and others based on the database schema.'
2222

2323
s.add_runtime_dependency(%q<rake>, '>= 10.4', '< 14.0')
24-
s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 8.0'])
24+
s.add_runtime_dependency(%q<activerecord>, ['>= 3.2'])
2525

2626
s.metadata = {
2727
"bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",

0 commit comments

Comments
 (0)