Skip to content

Commit c53aa79

Browse files
committed
Update several instances of RuboCop => Standard, update specs
1 parent dba3b70 commit c53aa79

36 files changed

+400
-719
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
machine:
66
docker_layer_caching: true
7-
working_directory: ~/codeclimate/codeclimate-rubocop
7+
working_directory: ~/codeclimate/codeclimate-standard
88
steps:
99
- checkout
1010
- run: make image
@@ -13,7 +13,7 @@ jobs:
1313
release_images:
1414
machine:
1515
docker_layer_caching: true
16-
working_directory: ~/codeclimate/codeclimate-rubocop
16+
working_directory: ~/codeclimate/codeclimate-standard
1717
steps:
1818
- checkout
1919
- run:
@@ -30,8 +30,8 @@ jobs:
3030
name: Push image to GCR
3131
command: |
3232
docker tag $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME \
33-
us.gcr.io/code-climate/codeclimate-rubocop:b$CIRCLE_BUILD_NUM
34-
docker push us.gcr.io/code-climate/codeclimate-rubocop:b$CIRCLE_BUILD_NUM
33+
us.gcr.io/code-climate/codeclimate-standard:b$CIRCLE_BUILD_NUM
34+
docker push us.gcr.io/code-climate/codeclimate-standard:b$CIRCLE_BUILD_NUM
3535
3636
workflows:
3737
version: 2
@@ -46,4 +46,4 @@ workflows:
4646
only: /master|channel\/[\w-]+/
4747
notify:
4848
webhooks:
49-
- url: https://cc-slack-proxy.herokuapp.com/circle
49+
- url: https://cc-slack-proxy.herokuapp.com/circle

.codeclimate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
engines:
2-
rubocop:
2+
standard:
33
enabled: true
44
ratings:
55
paths:

.rubocop.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
inherit_from: base_rubocop.yml
22

3-
require: rubocop-rspec
3+
AllCops:
4+
NewCops: disable
5+
TargetRubyVersion: 2.7.1
46

57
Style/FileName:
68
Exclude:
7-
- 'bin/codeclimate-rubocop'
9+
- 'bin/codeclimate-standard'
810

911
Style/StringLiterals:
1012
Enabled: false
1113

12-
Style/TrailingCommaInLiteral:
14+
Style/TrailingCommaInArrayLiteral:
15+
Enabled: false
16+
17+
Style/TrailingCommaInHashLiteral:
1318
Enabled: false
1419

1520
Style/TrailingCommaInArguments:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.3
1+
2.7.1

DEVELOPERS.md

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

55
To run the test suite, use `make test`.
66

7-
Running `make image` will build `codeclimate/codeclimate-rubocop:latest`
7+
Running `make image` will build `codeclimate/codeclimate-standard:latest`
88
locally. It's a good idea to use a locally-built image to QA engine changes
99
against real repos using the Code Climate CLI.
1010

1111
## Releasing a new version
1212

13-
If you are upgrading to a new version of RuboCop, please re-run the doc scraper
13+
If you are upgrading to a new version of Standard, please re-run the doc scraper
1414
to get any new or updated docs:
1515

1616
```sh
1717
docker run \
1818
--rm --volume "$PWD:/usr/src/app" --user root --workdir /usr/src/app \
19-
codeclimate/codeclimate-rubocop bundle exec rake docs:scrape
19+
codeclimate/codeclimate-standard bundle exec rake docs:scrape
2020
sudo chown -R $(id -u):$(id -g) config
2121
```
2222

@@ -29,7 +29,7 @@ the default inferred configuration:
2929
```sh
3030
rm .rubocop.yml
3131
codeclimate init --upgrade
32-
codeclimate analyze -e rubocop
32+
codeclimate analyze -e standard
3333
```
3434

3535
If configuration was changed in the release, this might not succeed, and the

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ruby:2.4-alpine
1+
FROM ruby:2.7.1-alpine
2+
3+
LABEL maintainer="Jacob Frautschi <[email protected]>"
24

35
WORKDIR /usr/src/app
46

@@ -21,4 +23,4 @@ USER app
2123
VOLUME /code
2224
WORKDIR /code
2325

24-
CMD ["/usr/src/app/bin/codeclimate-rubocop"]
26+
CMD ["/usr/src/app/bin/codeclimate-standard"]

Gemfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
# frozen_string_literal: true
2-
3-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
42

53
gem "activesupport", require: false
64
gem "mry", "~> 0.52.0", require: false
7-
gem "parser", "~> 2.4.0"
5+
gem "parser", "~> 2.7.1"
86
gem "pry", require: false
9-
gem "rubocop", "~> 0.52.1", require: false
10-
gem "rubocop-migrations", require: false
11-
gem "rubocop-rspec", require: false
127
gem "safe_yaml"
8+
gem "standard", "~> 0.6.0", require: false
139

1410
group :test do
1511
gem "rake"

Gemfile.lock

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,81 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.1.4)
4+
activesupport (6.0.3.2)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (~> 0.7)
6+
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
ast (2.3.0)
10-
coderay (1.1.2)
11-
concurrent-ruby (1.0.5)
12-
diff-lcs (1.3)
13-
i18n (0.9.1)
9+
zeitwerk (~> 2.2, >= 2.2.2)
10+
ast (2.4.1)
11+
coderay (1.1.3)
12+
concurrent-ruby (1.1.7)
13+
diff-lcs (1.4.4)
14+
i18n (1.8.5)
1415
concurrent-ruby (~> 1.0)
15-
method_source (0.9.0)
16-
minitest (5.10.3)
16+
method_source (1.0.0)
17+
minitest (5.14.2)
1718
mry (0.52.0.0)
1819
rubocop (>= 0.41.0)
19-
parallel (1.12.1)
20-
parser (2.4.0.2)
21-
ast (~> 2.3)
22-
powerpack (0.1.1)
23-
pry (0.11.3)
24-
coderay (~> 1.1.0)
25-
method_source (~> 0.9.0)
20+
parallel (1.19.2)
21+
parser (2.7.1.4)
22+
ast (~> 2.4.1)
23+
pry (0.13.1)
24+
coderay (~> 1.1)
25+
method_source (~> 1.0)
2626
rainbow (3.0.0)
27-
rake (12.3.0)
28-
rspec (3.7.0)
29-
rspec-core (~> 3.7.0)
30-
rspec-expectations (~> 3.7.0)
31-
rspec-mocks (~> 3.7.0)
32-
rspec-core (3.7.0)
33-
rspec-support (~> 3.7.0)
34-
rspec-expectations (3.7.0)
27+
rake (13.0.1)
28+
regexp_parser (1.7.1)
29+
rexml (3.2.4)
30+
rspec (3.9.0)
31+
rspec-core (~> 3.9.0)
32+
rspec-expectations (~> 3.9.0)
33+
rspec-mocks (~> 3.9.0)
34+
rspec-core (3.9.2)
35+
rspec-support (~> 3.9.3)
36+
rspec-expectations (3.9.2)
3537
diff-lcs (>= 1.2.0, < 2.0)
36-
rspec-support (~> 3.7.0)
37-
rspec-mocks (3.7.0)
38+
rspec-support (~> 3.9.0)
39+
rspec-mocks (3.9.1)
3840
diff-lcs (>= 1.2.0, < 2.0)
39-
rspec-support (~> 3.7.0)
40-
rspec-support (3.7.0)
41-
rubocop (0.52.1)
41+
rspec-support (~> 3.9.0)
42+
rspec-support (3.9.3)
43+
rubocop (0.90.0)
4244
parallel (~> 1.10)
43-
parser (>= 2.4.0.2, < 3.0)
44-
powerpack (~> 0.1)
45+
parser (>= 2.7.1.1)
4546
rainbow (>= 2.2.2, < 4.0)
47+
regexp_parser (>= 1.7)
48+
rexml
49+
rubocop-ast (>= 0.3.0, < 1.0)
4650
ruby-progressbar (~> 1.7)
47-
unicode-display_width (~> 1.0, >= 1.0.1)
48-
rubocop-migrations (0.1.2)
49-
rubocop (~> 0.41)
50-
rubocop-rspec (1.21.0)
51-
rubocop (>= 0.52.0)
52-
ruby-progressbar (1.9.0)
53-
safe_yaml (1.0.4)
51+
unicode-display_width (>= 1.4.0, < 2.0)
52+
rubocop-ast (0.3.0)
53+
parser (>= 2.7.1.4)
54+
rubocop-performance (1.8.0)
55+
rubocop (>= 0.87.0)
56+
ruby-progressbar (1.10.1)
57+
safe_yaml (1.0.5)
58+
standard (0.6.0)
59+
rubocop (~> 0.90)
60+
rubocop-performance (~> 1.8.0)
5461
thread_safe (0.3.6)
55-
tzinfo (1.2.4)
62+
tzinfo (1.2.7)
5663
thread_safe (~> 0.1)
57-
unicode-display_width (1.3.0)
64+
unicode-display_width (1.7.0)
65+
zeitwerk (2.4.0)
5866

5967
PLATFORMS
6068
ruby
6169

6270
DEPENDENCIES
6371
activesupport
6472
mry (~> 0.52.0)
65-
parser (~> 2.4.0)
73+
parser (~> 2.7.1)
6674
pry
6775
rake
6876
rspec
69-
rubocop (~> 0.52.1)
70-
rubocop-migrations
71-
rubocop-rspec
7277
safe_yaml
78+
standard (~> 0.6.0)
7379

7480
BUNDLED WITH
75-
1.16.1
81+
2.1.4

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: image test docs bundle
22

3-
IMAGE_NAME ?= codeclimate/codeclimate-rubocop
3+
IMAGE_NAME ?= codeclimate/codeclimate-standard
44

55
image:
66
docker build --rm -t $(IMAGE_NAME) .
@@ -19,4 +19,4 @@ bundle:
1919
docker run --rm \
2020
--entrypoint /bin/sh \
2121
--volume $(PWD):/usr/src/app \
22-
$(IMAGE_NAME) -c "cd /usr/src/app && bundle $(BUNDLE_ARGS)"
22+
$(IMAGE_NAME) -c "cd /usr/src/app && bundle $(BUNDLE_ARGS)"

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
# Code Climate Rubocop Engine
1+
# Code Climate Standard Engine
22

3-
[![Code Climate](https://codeclimate.com/github/codeclimate/codeclimate-rubocop/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/codeclimate-rubocop)
3+
[![Code Climate](https://codeclimate.com/github/codeclimate/codeclimate-standard/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/codeclimate-standard)
44

5-
`codeclimate-rubocop` is a Code Climate engine that wraps the [RuboCop](https://github.com/rubocop-hq/rubocop) static analysis tool. You can run it on your command line using the Code Climate CLI, or on our hosted analysis platform.
5+
`codeclimate-standard` is a Code Climate engine that wraps the [Standard](https://github.com/rubocop-hq/rubocop) static analysis tool. You can run it on your command line using the Code Climate CLI, or on our hosted analysis platform.
66

77
RuboCop helps you enforce many of the guidelines outlined in the community [Ruby Style Guide](https://github.com/rubocop-hq/ruby-style-guide). Most aspects of its behavior can be tweaked via various [configuration options](https://github.com/rubocop-hq/rubocop/blob/master/config/default.yml), which are set in a **.rubocop.yml** file.
88

9-
You can find some basic setup instructions and links to the RuboCop OSS project below. For additional Code Climate-specific config details, check out our [RuboCop engine documentation][cc-docs-rubocop].
9+
You can find some basic setup instructions and links to the Standard OSS project below. For additional Code Climate-specific config details, check out our [Standard engine documentation][cc-docs-standard].
1010

1111
### Installation
1212

1313
1. If you haven't already, [install the Code Climate CLI](https://github.com/codeclimate/codeclimate).
14-
2. Run `codeclimate engines:enable rubocop`. This command both installs the engine and enables it in your `.codeclimate.yml` file.
14+
2. Run `codeclimate engines:enable standard`. This command both installs the engine and enables it in your `.codeclimate.yml` file.
1515
3. You're ready to analyze! Browse into your project's folder and run `codeclimate analyze`.
1616

1717
### Need help?
1818

19-
For help with RuboCop, [check out their documentation](https://github.com/rubocop-hq/rubocop).
19+
For help with Standard, [check out their documentation](https://github.com/testdouble/standard).
2020

21-
If you're running into a Code Climate issue, first check out [our RuboCop engine docs][cc-docs-rubocop] and look over this project's [GitHub Issues](https://github.com/codeclimate/codeclimate-rubocop/issues), as your question may have already been covered. If not, [go ahead and open a support ticket with us](https://codeclimate.com/help).
21+
If you're running into a Code Climate issue, first check out [our Standard engine docs][cc-docs-standard] and look over this project's [GitHub Issues](https://github.com/codeclimate/codeclimate-standard/issues), as your question may have already been covered. If not, [go ahead and open a support ticket with us](https://codeclimate.com/help).
2222

23-
[cc-docs-rubocop]: https://docs.codeclimate.com/docs/rubocop
23+
[cc-docs-standard]: https://docs.codeclimate.com/docs/standard

0 commit comments

Comments
 (0)