Skip to content

Commit ba66f66

Browse files
eitoballeitoball
authored
Merge pull request #134 from comma-csv/dependabot/bundler/tzinfo-2.0.5
Bump tzinfo from 1.2.7 to 2.0.5
2 parents d584cf6 + 3b471fa commit ba66f66

21 files changed

+218
-148
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,37 @@ jobs:
77
ruby: ['2.5', '2.6', '2.7', '3.0']
88
gemfile: ['active6.0.3.6', 'active6.1.3.1', 'rails6.0.3.6', 'rails6.1.3.1']
99
include:
10-
- ruby: 2.5
10+
- ruby: '2.5'
1111
gemfile: active5.2.5
12-
- ruby: 2.6
12+
- ruby: '2.6'
1313
gemfile: active5.2.5
14-
- ruby: 2.7
14+
- ruby: '2.7'
1515
gemfile: active5.2.5
16-
- ruby: 2.5
16+
- ruby: '2.5'
1717
gemfile: rails5.2.5
18-
- ruby: 2.6
18+
- ruby: '2.6'
1919
gemfile: rails5.2.5
20-
- ruby: 2.7
20+
- ruby: '2.7'
2121
gemfile: rails5.2.5
22-
- ruby: 2.7
22+
- ruby: '2.7'
2323
gemfile: active7.0.0
24-
- ruby: 3.0
24+
- ruby: '3.0'
2525
gemfile: active7.0.0
26-
- ruby: 2.7
26+
- ruby: '2.7'
2727
gemfile: rails7.0.0
28-
- ruby: 3.0
28+
- ruby: '3.0'
2929
gemfile: rails7.0.0
3030
runs-on: ubuntu-latest
3131
env:
3232
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
33+
RUBY_OPT: --disable=did_you_mean
3334
services:
3435
mongodb:
3536
image: mongo:4.4.10
3637
ports:
3738
- 8081:8081
3839
steps:
39-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4041
- uses: ruby/setup-ruby@v1
4142
with:
4243
ruby-version: ${{ matrix.ruby }}

‎.rubocop.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ require: rubocop-performance
44

55
AllCops:
66
DisplayCopNames: true
7-
TargetRubyVersion: 2.3
87
Exclude:
98
- 'gemfiles/**/*'
109
- 'vendor/**/*'
10+
NewCops: enable
11+
TargetRubyVersion: 2.5
1112

1213
Metrics/LineLength:
1314
IgnoreCopDirectives: true

‎.rubocop_todo.yml‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# Offense count: 2
1010
Metrics/AbcSize:
11-
Max: 21
11+
Max: 22
1212

1313
# Offense count: 3
1414
# Configuration parameters: CountComments.
@@ -43,10 +43,11 @@ Style/Documentation:
4343
- 'lib/comma/object.rb'
4444
- 'lib/comma/relation.rb'
4545

46-
Style/MethodMissingSuper:
46+
Lint/MissingSuper:
4747
Exclude:
4848
- 'lib/comma/data_extractor.rb'
4949
- 'lib/comma/header_extractor.rb'
50+
- 'spec/comma/comma_spec.rb'
5051

5152
Style/MissingRespondToMissing:
5253
Exclude:
@@ -59,3 +60,40 @@ Style/MissingRespondToMissing:
5960
Naming/VariableName:
6061
Exclude:
6162
- 'spec/comma/comma_spec.rb'
63+
64+
Style/StringConcatenation:
65+
Exclude:
66+
- 'spec/comma/comma_spec.rb'
67+
- 'spec/comma/rails/active_record_spec.rb'
68+
- 'spec/spec_helper.rb'
69+
70+
Lint/NonDeterministicRequireOrder:
71+
Exclude:
72+
- 'spec/spec_helper.rb'
73+
74+
Style/RedundantBegin:
75+
Exclude:
76+
- 'spec/spec_helper.rb'
77+
78+
Layout/SpaceAroundMethodCallOperator:
79+
Exclude:
80+
- 'spec/controllers/users_controller_spec.rb'
81+
82+
Lint/ConstantDefinitionInBlock:
83+
Exclude:
84+
- 'spec/comma/comma_spec.rb'
85+
- 'spec/comma/rails/active_record_spec.rb'
86+
- 'spec/comma/rails/data_mapper_collection_spec.rb'
87+
- 'spec/comma/rails/mongoid_spec.rb'
88+
89+
Layout/EmptyLinesAroundAttributeAccessor:
90+
Exclude:
91+
- 'spec/comma/comma_spec.rb'
92+
93+
Migration/DepartmentName:
94+
Exclude:
95+
- spec/comma/comma_spec.rb
96+
97+
Gemspec/RequiredRubyVersion:
98+
Exclude:
99+
- comma.gemspec

‎Gemfile.lock‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (6.0.3.1)
11-
activesupport (= 6.0.3.1)
12-
activesupport (6.0.3.1)
10+
activemodel (7.0.3.1)
11+
activesupport (= 7.0.3.1)
12+
activesupport (7.0.3.1)
1313
concurrent-ruby (~> 1.0, >= 1.0.2)
14-
i18n (>= 0.7, < 2)
15-
minitest (~> 5.1)
16-
tzinfo (~> 1.1)
17-
zeitwerk (~> 2.2, >= 2.2.2)
14+
i18n (>= 1.6, < 2)
15+
minitest (>= 5.1)
16+
tzinfo (~> 2.0)
1817
appraisal (1.0.3)
1918
bundler
2019
rake
2120
thor (>= 0.14.0)
2221
ast (2.4.0)
2322
colorize (0.7.5)
24-
concurrent-ruby (1.1.6)
23+
concurrent-ruby (1.1.10)
2524
coveralls (0.5.8)
2625
colorize
2726
json
@@ -34,7 +33,7 @@ GEM
3433
unf (>= 0.0.5, < 1.0.0)
3534
http-cookie (1.0.3)
3635
domain_name (~> 0.5)
37-
i18n (1.8.3)
36+
i18n (1.12.0)
3837
concurrent-ruby (~> 1.0)
3938
jaro_winkler (1.5.2)
4039
json (2.3.1)
@@ -92,14 +91,12 @@ GEM
9291
simplecov-html (0.9.0)
9392
sqlite3 (1.3.11)
9493
thor (0.19.1)
95-
thread_safe (0.3.6)
96-
tzinfo (1.2.7)
97-
thread_safe (~> 0.1)
94+
tzinfo (2.0.5)
95+
concurrent-ruby (~> 1.0)
9896
unf (0.1.4)
9997
unf_ext
10098
unf_ext (0.0.7.6)
10199
unicode-display_width (1.5.0)
102-
zeitwerk (2.3.0)
103100

104101
PLATFORMS
105102
ruby

‎gemfiles/active5.2.5.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "coveralls", :require => false
6-
gem "rubocop", "~> 0.67.2", :require => false
6+
gem "rubocop", "~> 1.0.0", :require => false
77
gem "rubocop-performance", :require => false
88
gem "sqlite3"
99
gem "activesupport", "5.2.5"

‎gemfiles/active5.2.5.gemfile.lock‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ GEM
3535
docile (1.4.0)
3636
i18n (1.8.11)
3737
concurrent-ruby (~> 1.0)
38-
jaro_winkler (1.5.4)
3938
json (2.6.1)
4039
minitest (5.14.4)
41-
parallel (1.21.0)
42-
parser (3.0.2.0)
40+
parallel (1.22.1)
41+
parser (3.1.2.0)
4342
ast (~> 2.4.1)
44-
psych (3.3.0)
45-
rainbow (3.0.0)
43+
rainbow (3.1.1)
4644
rake (13.0.6)
45+
regexp_parser (2.5.0)
46+
rexml (3.2.5)
4747
rspec (3.5.0)
4848
rspec-core (~> 3.5.0)
4949
rspec-expectations (~> 3.5.0)
@@ -64,16 +64,20 @@ GEM
6464
diff-lcs (>= 1.2.0, < 2.0)
6565
rspec-support (~> 3.5.0)
6666
rspec-support (3.5.0)
67-
rubocop (0.67.2)
68-
jaro_winkler (~> 1.5.1)
67+
rubocop (1.0.0)
6968
parallel (~> 1.10)
70-
parser (>= 2.5, != 2.5.1.1)
71-
psych (>= 3.1.0)
69+
parser (>= 2.7.1.5)
7270
rainbow (>= 2.2.2, < 4.0)
71+
regexp_parser (>= 1.8)
72+
rexml
73+
rubocop-ast (>= 0.6.0)
7374
ruby-progressbar (~> 1.7)
74-
unicode-display_width (>= 1.4.0, < 1.6)
75-
rubocop-performance (1.1.0)
76-
rubocop (>= 0.67.0)
75+
unicode-display_width (>= 1.4.0, < 2.0)
76+
rubocop-ast (1.17.0)
77+
parser (>= 3.1.1.0)
78+
rubocop-performance (1.10.2)
79+
rubocop (>= 0.90.0, < 2.0)
80+
rubocop-ast (>= 0.4.0)
7781
ruby-progressbar (1.11.0)
7882
simplecov (0.16.1)
7983
docile (~> 1.1)
@@ -90,7 +94,7 @@ GEM
9094
sync
9195
tzinfo (1.2.9)
9296
thread_safe (~> 0.1)
93-
unicode-display_width (1.5.0)
97+
unicode-display_width (1.8.0)
9498

9599
PLATFORMS
96100
ruby
@@ -106,7 +110,7 @@ DEPENDENCIES
106110
rspec (~> 3.5.0)
107111
rspec-activemodel-mocks
108112
rspec-its
109-
rubocop (~> 0.67.2)
113+
rubocop (~> 1.0.0)
110114
rubocop-performance
111115
sqlite3
112116

‎gemfiles/active6.0.3.6.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "coveralls", :require => false
6-
gem "rubocop", "~> 0.67.2", :require => false
6+
gem "rubocop", "~> 1.0.0", :require => false
77
gem "rubocop-performance", :require => false
88
gem "sqlite3"
99
gem "activesupport", "6.0.3.6"

‎gemfiles/active6.0.3.6.gemfile.lock‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ GEM
3434
docile (1.4.0)
3535
i18n (1.8.11)
3636
concurrent-ruby (~> 1.0)
37-
jaro_winkler (1.5.4)
3837
json (2.6.1)
3938
minitest (5.14.4)
40-
parallel (1.21.0)
41-
parser (3.0.2.0)
39+
parallel (1.22.1)
40+
parser (3.1.2.0)
4241
ast (~> 2.4.1)
43-
psych (3.3.0)
44-
rainbow (3.0.0)
42+
rainbow (3.1.1)
4543
rake (13.0.6)
44+
regexp_parser (2.5.0)
45+
rexml (3.2.5)
4646
rspec (3.5.0)
4747
rspec-core (~> 3.5.0)
4848
rspec-expectations (~> 3.5.0)
@@ -63,16 +63,20 @@ GEM
6363
diff-lcs (>= 1.2.0, < 2.0)
6464
rspec-support (~> 3.5.0)
6565
rspec-support (3.5.0)
66-
rubocop (0.67.2)
67-
jaro_winkler (~> 1.5.1)
66+
rubocop (1.0.0)
6867
parallel (~> 1.10)
69-
parser (>= 2.5, != 2.5.1.1)
70-
psych (>= 3.1.0)
68+
parser (>= 2.7.1.5)
7169
rainbow (>= 2.2.2, < 4.0)
70+
regexp_parser (>= 1.8)
71+
rexml
72+
rubocop-ast (>= 0.6.0)
7273
ruby-progressbar (~> 1.7)
73-
unicode-display_width (>= 1.4.0, < 1.6)
74-
rubocop-performance (1.1.0)
75-
rubocop (>= 0.67.0)
74+
unicode-display_width (>= 1.4.0, < 2.0)
75+
rubocop-ast (1.17.0)
76+
parser (>= 3.1.1.0)
77+
rubocop-performance (1.10.2)
78+
rubocop (>= 0.90.0, < 2.0)
79+
rubocop-ast (>= 0.4.0)
7680
ruby-progressbar (1.11.0)
7781
simplecov (0.16.1)
7882
docile (~> 1.1)
@@ -89,7 +93,7 @@ GEM
8993
sync
9094
tzinfo (1.2.9)
9195
thread_safe (~> 0.1)
92-
unicode-display_width (1.5.0)
96+
unicode-display_width (1.8.0)
9397
zeitwerk (2.5.1)
9498

9599
PLATFORMS
@@ -106,7 +110,7 @@ DEPENDENCIES
106110
rspec (~> 3.5.0)
107111
rspec-activemodel-mocks
108112
rspec-its
109-
rubocop (~> 0.67.2)
113+
rubocop (~> 1.0.0)
110114
rubocop-performance
111115
sqlite3
112116

‎gemfiles/active6.1.3.1.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "coveralls", :require => false
6-
gem "rubocop", "~> 0.67.2", :require => false
6+
gem "rubocop", "~> 1.0.0", :require => false
77
gem "rubocop-performance", :require => false
88
gem "sqlite3"
99
gem "activesupport", "6.1.3.1"

0 commit comments

Comments
 (0)