Skip to content

Commit 18fdf48

Browse files
author
Ale Paredes
authored
Revert "Updated channel and documentation to Rubocop v0.60 (#139)" (#140)
This reverts commit f697d0b.
1 parent f697d0b commit 18fdf48

File tree

157 files changed

+434
-2892
lines changed

Some content is hidden

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

157 files changed

+434
-2892
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ source 'https://rubygems.org'
44

55
gem "activesupport", require: false
66
gem "mry", "~> 0.52.0", require: false
7-
gem "parser"
7+
gem "parser", "~> 2.4.0"
88
gem "pry", require: false
9-
gem "rubocop", "~> 0.60", require: false
9+
gem "rubocop", "~> 0.52.1", require: false
1010
gem "rubocop-migrations", require: false
1111
gem "rubocop-rspec", require: false
1212
gem "safe_yaml"

Gemfile.lock

+14-16
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@ GEM
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
ast (2.4.0)
9+
ast (2.3.0)
1010
coderay (1.1.2)
1111
concurrent-ruby (1.0.5)
1212
diff-lcs (1.3)
1313
i18n (0.9.1)
1414
concurrent-ruby (~> 1.0)
15-
jaro_winkler (1.5.1)
1615
method_source (0.9.0)
1716
minitest (5.10.3)
1817
mry (0.52.0.0)
1918
rubocop (>= 0.41.0)
2019
parallel (1.12.1)
21-
parser (2.5.3.0)
22-
ast (~> 2.4.0)
23-
powerpack (0.1.2)
20+
parser (2.4.0.2)
21+
ast (~> 2.3)
22+
powerpack (0.1.1)
2423
pry (0.11.3)
2524
coderay (~> 1.1.0)
2625
method_source (~> 0.9.0)
@@ -39,39 +38,38 @@ GEM
3938
diff-lcs (>= 1.2.0, < 2.0)
4039
rspec-support (~> 3.7.0)
4140
rspec-support (3.7.0)
42-
rubocop (0.60.0)
43-
jaro_winkler (~> 1.5.1)
41+
rubocop (0.52.1)
4442
parallel (~> 1.10)
45-
parser (>= 2.5, != 2.5.1.1)
43+
parser (>= 2.4.0.2, < 3.0)
4644
powerpack (~> 0.1)
4745
rainbow (>= 2.2.2, < 4.0)
4846
ruby-progressbar (~> 1.7)
49-
unicode-display_width (~> 1.4.0)
47+
unicode-display_width (~> 1.0, >= 1.0.1)
5048
rubocop-migrations (0.1.2)
5149
rubocop (~> 0.41)
52-
rubocop-rspec (1.30.1)
53-
rubocop (>= 0.60.0)
54-
ruby-progressbar (1.10.0)
50+
rubocop-rspec (1.21.0)
51+
rubocop (>= 0.52.0)
52+
ruby-progressbar (1.9.0)
5553
safe_yaml (1.0.4)
5654
thread_safe (0.3.6)
5755
tzinfo (1.2.4)
5856
thread_safe (~> 0.1)
59-
unicode-display_width (1.4.0)
57+
unicode-display_width (1.3.0)
6058

6159
PLATFORMS
6260
ruby
6361

6462
DEPENDENCIES
6563
activesupport
6664
mry (~> 0.52.0)
67-
parser
65+
parser (~> 2.4.0)
6866
pry
6967
rake
7068
rspec
71-
rubocop (~> 0.60)
69+
rubocop (~> 0.52.1)
7270
rubocop-migrations
7371
rubocop-rspec
7472
safe_yaml
7573

7674
BUNDLED WITH
77-
1.16.6
75+
1.16.1

config/contents/bundler/gem_comment.md

-11
This file was deleted.

config/contents/bundler/insecure_protocol_source.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The symbol argument `:gemcutter`, `:rubygems`, and `:rubyforge`
1+
The symbol argument `:gemcutter`, `:rubygems` and `:rubyforge`
22
are deprecated. So please change your source to URL string that
33
'https://rubygems.org' if possible, or 'http://rubygems.org' if not.
44

config/contents/gemspec/duplicated_assignment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ in a gemspec.
33

44
Assigning to an attribute with the same name using `spec.foo =` will be
55
an unintended usage. On the other hand, duplication of methods such
6-
as `spec.requirements`, `spec.add_runtime_dependency`, and others are
6+
as `spec.requirements`, `spec.add_runtime_dependency` and others are
77
permitted because it is the intended use of appending values.
88

99
### Example:

config/contents/layout/align_hash.md

+39-114
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Check that the keys, separators, and values of a multi-line hash
22
literal are aligned according to configuration. The configuration
33
options are:
44

5-
- key (left align keys, one space before hash rockets and values)
5+
- key (left align keys)
66
- separator (align hash rockets and colons, right align keys)
77
- table (left align keys, hash rockets, and values)
88

@@ -14,156 +14,81 @@ can also be configured. The options are:
1414
- ignore_implicit (without curly braces)
1515
- ignore_explicit (with curly braces)
1616

17-
### Example: EnforcedHashRocketStyle: key (default)
18-
# bad
19-
{
20-
:foo => bar,
21-
:ba => baz
22-
}
23-
{
24-
:foo => bar,
25-
:ba => baz
26-
}
17+
### Example:
18+
19+
# EnforcedHashRocketStyle: key (default)
20+
# EnforcedColonStyle: key (default)
2721

2822
# good
2923
{
30-
:foo => bar,
31-
:ba => baz
24+
foo: bar,
25+
ba: baz
3226
}
33-
34-
### Example: EnforcedHashRocketStyle: separator
35-
# bad
3627
{
3728
:foo => bar,
3829
:ba => baz
3930
}
40-
{
41-
:foo => bar,
42-
:ba => baz
43-
}
4431

45-
# good
32+
# bad
4633
{
47-
:foo => bar,
48-
:ba => baz
34+
foo: bar,
35+
ba: baz
4936
}
50-
51-
### Example: EnforcedHashRocketStyle: table
52-
# bad
5337
{
5438
:foo => bar,
5539
:ba => baz
5640
}
5741

58-
# good
59-
{
60-
:foo => bar,
61-
:ba => baz
62-
}
42+
### Example:
6343

64-
### Example: EnforcedColonStyle: key (default)
65-
# bad
44+
# EnforcedHashRocketStyle: separator
45+
# EnforcedColonStyle: separator
46+
47+
#good
6648
{
6749
foo: bar,
6850
ba: baz
6951
}
7052
{
71-
foo: bar,
72-
ba: baz
53+
:foo => bar,
54+
:ba => baz
7355
}
7456

75-
# good
57+
#bad
7658
{
7759
foo: bar,
7860
ba: baz
7961
}
80-
81-
### Example: EnforcedColonStyle: separator
82-
# bad
8362
{
84-
foo: bar,
85-
ba: baz
63+
:foo => bar,
64+
:ba => baz
8665
}
87-
88-
# good
8966
{
90-
foo: bar,
91-
ba: baz
67+
:foo => bar,
68+
:ba => baz
9269
}
9370

94-
### Example: EnforcedColonStyle: table
95-
# bad
71+
### Example:
72+
73+
# EnforcedHashRocketStyle: table
74+
# EnforcedColonStyle: table
75+
76+
#good
9677
{
9778
foo: bar,
98-
ba: baz
79+
ba: baz
80+
}
81+
{
82+
:foo => bar,
83+
:ba => baz
9984
}
10085

101-
# good
86+
#bad
10287
{
10388
foo: bar,
104-
ba: baz
89+
ba: baz
10590
}
106-
107-
### Example: EnforcedLastArgumentHashStyle: always_inspect (default)
108-
# Inspect both implicit and explicit hashes.
109-
110-
# bad
111-
do_something(foo: 1,
112-
bar: 2)
113-
114-
# bad
115-
do_something({foo: 1,
116-
bar: 2})
117-
118-
# good
119-
do_something(foo: 1,
120-
bar: 2)
121-
122-
# good
123-
do_something(
124-
foo: 1,
125-
bar: 2
126-
)
127-
128-
# good
129-
do_something({foo: 1,
130-
bar: 2})
131-
132-
# good
133-
do_something({
134-
foo: 1,
135-
bar: 2
136-
})
137-
138-
### Example: EnforcedLastArgumentHashStyle: always_ignore
139-
# Ignore both implicit and explicit hashes.
140-
141-
# good
142-
do_something(foo: 1,
143-
bar: 2)
144-
145-
# good
146-
do_something({foo: 1,
147-
bar: 2})
148-
149-
### Example: EnforcedLastArgumentHashStyle: ignore_implicit
150-
# Ignore only implicit hashes.
151-
152-
# bad
153-
do_something({foo: 1,
154-
bar: 2})
155-
156-
# good
157-
do_something(foo: 1,
158-
bar: 2)
159-
160-
### Example: EnforcedLastArgumentHashStyle: ignore_explicit
161-
# Ignore only explicit hashes.
162-
163-
# bad
164-
do_something(foo: 1,
165-
bar: 2)
166-
167-
# good
168-
do_something({foo: 1,
169-
bar: 2})
91+
{
92+
:foo => bar,
93+
:ba => baz
94+
}

config/contents/layout/block_alignment.md

-58
This file was deleted.

config/contents/layout/class_structure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ possible to group categories of macros.
9898
end
9999
end
100100
101-
@see https://github.com/rubocop-hq/ruby-style-guide#consistent-classes
101+
@see https://github.com/bbatsov/ruby-style-guide#consistent-classes

0 commit comments

Comments
 (0)