Skip to content

Commit

Permalink
Merge tonsky#233
Browse files Browse the repository at this point in the history
233: Update rubocop requirement from = 0.67.2 to = 0.68.0 r=olleolleolle a=dependabot[bot]

Updates the requirements on [rubocop](https://github.com/rubocop-hq/rubocop) to permit the latest version.
<details>
<summary>Release notes</summary>

*Sourced from [rubocop's releases](https://github.com/rubocop-hq/rubocop/releases).*

> ## RuboCop 0.68
> ### New features
> 
> * [#6973](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6973): Add `always_braces` to `Style/BlockDelimiter`. ([@&#8203;iGEL][])
> * [#6841](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6841): Node patterns can now match children in any order using `<>`. ([@&#8203;marcandre][])
> * [#6928](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6928): Add `--init` option for generate `.rubocop.yml` file in the current directory. ([@&#8203;koic][])
> * Add new `Layout/HeredocArgumentClosingParenthesis` cop. ([@&#8203;maxh][])
> * [#6895](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6895): Add support for XDG config home for user-config. ([@&#8203;Mange][], [@&#8203;tejasbubane][])
> * Add initial autocorrection support to `Metrics/LineLength`. ([@&#8203;maxh][])
> * Add `Layout/IndentFirstParameter`. ([@&#8203;maxh][])
> * [#6974](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6974): Make `Layout/FirstMethodArgumentLineBreak` aware of calling using `super`. ([@&#8203;koic][])
> * Add new `Lint/HeredocMethodCallPosition` cop. ([@&#8203;maxh][])
> 
> 
> ### Bug fixes
> 
> * Do not annotate message with cop name in JSON output. ([@&#8203;elebow][])
> * [#6914](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6914): Fix an error for `Rails/RedundantAllowNil` when with interpolations. ([[@&#8203;Blue](https://github.com/Blue)-Pix][])
> * [#6888](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6888): Fix an error for `Rails/ActiveRecordOverride ` when no `parent_class` present. ([@&#8203;diachini][])
> * [#6941](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6941): Add missing absence validations to `Rails/Validation`. ([@&#8203;jmanian][])
> * [#6926](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6926): Allow nil values to unset config defaults. ([@&#8203;dduugg][])
> * [#6946](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6946): Allow `Rails/ReflectionClassName` to use string interpolation for `class_name`. ([@&#8203;r7kamura][])
> * [#6778](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6778): Fix a false positive in `Style/HashSyntax` cop when a hash key is an interpolated string and EnforcedStyle is ruby19_no_mixed_keys. ([@&#8203;tatsuyafw][])
> * [#6902](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6902): Fix a bug where `Naming/RescuedExceptionsVariableName` would handle an only first rescue for multiple rescue groups. ([@&#8203;tatsuyafw][])
> * [#6860](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6860): Prevent auto-correct conflict of `Style/InverseMethods` and `Style/Not`. ([@&#8203;hoshinotsuyoshi][])
> * [#6935](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6935): `Layout/AccessModifierIndentation` should ignore access modifiers that apply to specific methods. ([[@&#8203;deivid](https://github.com/deivid)-rodriguez][])
> * [#6956](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6956): Prevent auto-correct confliction of `Lint/Lambda` and `Lint/UnusedBlockArgument`. ([@&#8203;koic][])
> * [#6915](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6915): Fix false positive in `Style/SafeNavigation` when a modifier if is safe guarding a method call being passed to `break`, `fail`, `next`, `raise`, `return`, `throw`, and `yield`. ([@&#8203;rrosenblum][])
> * [#6822](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6822): Fix Lint/LiteralInInterpolation autocorrection for single quotes. ([@&#8203;hoshinotsuyoshi][])
> * [#6985](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6985): Fix an incorrect auto-correct for `Lint/LiteralInInterpolation` if contains array percent literal. ([@&#8203;yakout][])
> 
> ### Changes
> 
> * [#6966](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6966): Mark Rails/TimeZone as unsafe. ([@&#8203;vfonic][])
> * [#5977](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/5977): Remove Performance cops. ([@&#8203;koic][])
> * Add auto-correction to `Naming/RescuedExceptionsVariableName`. ([[@&#8203;anthony](https://github.com/anthony)-robin][])
> * [#6903](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6903): Handle variables prefixed with `_` in `Naming/RescuedExceptionsVariableName` cop. ([[@&#8203;anthony](https://github.com/anthony)-robin][])
> * [#6917](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6917): Bump Bundler dependency to >= 1.15.0. ([@&#8203;koic][])
> * Add `--auto-gen-only-exclude` to the command outputted in `rubocop_todo.yml` if the option is specified. ([@&#8203;dvandersluis][])
> * [#6887](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6887): Allow `Lint/UnderscorePrefixedVariableName` cop to be configured to allow use of block keyword args. ([@&#8203;dduugg][])
> * [#6885](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6885): Revert adding psych >= 3.1 as runtime dependency. ([@&#8203;andreaseger][])
> * Rename `Layout/FirstParameterIndentation` to `Layout/IndentFirstArgument`. ([@&#8203;maxh][])
> * Extract method call argument alignment behavior from `Layout/AlignParameters` into `Layout/AlignArguments`. ([@&#8203;maxh][])
> * Rename `IndentArray` and `IndentHash` to `IndentFirstArrayElement` and `IndentFirstHashElement`. ([@&#8203;maxh][])
> 
> [@&#8203;iGEL]: https://github.com/iGEL
> [@&#8203;marcandre]: https://github.com/marcandre
> [@&#8203;koic]: https://github.com/koic
> [@&#8203;maxh]: https://github.com/maxh
> [@&#8203;Mange]: https://github.com/Mange
></tr></table> ... (truncated)
</details>
<details>
<summary>Changelog</summary>

*Sourced from [rubocop's changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md).*

> ## 0.68.0 (2019-04-29)
> 
> ### New features
> 
> * [#6973](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6973): Add `always_braces` to `Style/BlockDelimiter`. ([@&#8203;iGEL][])
> * [#6841](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6841): Node patterns can now match children in any order using `<>`. ([@&#8203;marcandre][])
> * [#6928](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6928): Add `--init` option for generate `.rubocop.yml` file in the current directory. ([@&#8203;koic][])
> * Add new `Layout/HeredocArgumentClosingParenthesis` cop. ([@&#8203;maxh][])
> * [#6895](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6895): Add support for XDG config home for user-config. ([@&#8203;Mange][], [@&#8203;tejasbubane][])
> * Add initial autocorrection support to `Metrics/LineLength`. ([@&#8203;maxh][])
> * Add `Layout/IndentFirstParameter`. ([@&#8203;maxh][])
> * [#6974](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6974): Make `Layout/FirstMethodArgumentLineBreak` aware of calling using `super`. ([@&#8203;koic][])
> * Add new `Lint/HeredocMethodCallPosition` cop. ([@&#8203;maxh][])
> 
> 
> ### Bug fixes
> 
> * Do not annotate message with cop name in JSON output. ([@&#8203;elebow][])
> * [#6914](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6914): Fix an error for `Rails/RedundantAllowNil` when with interpolations. ([[@&#8203;Blue](https://github.com/Blue)-Pix][])
> * [#6888](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6888): Fix an error for `Rails/ActiveRecordOverride ` when no `parent_class` present. ([@&#8203;diachini][])
> * [#6941](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6941): Add missing absence validations to `Rails/Validation`. ([@&#8203;jmanian][])
> * [#6926](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6926): Allow nil values to unset config defaults. ([@&#8203;dduugg][])
> * [#6946](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6946): Allow `Rails/ReflectionClassName` to use string interpolation for `class_name`. ([@&#8203;r7kamura][])
> * [#6778](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6778): Fix a false positive in `Style/HashSyntax` cop when a hash key is an interpolated string and EnforcedStyle is ruby19_no_mixed_keys. ([@&#8203;tatsuyafw][])
> * [#6902](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6902): Fix a bug where `Naming/RescuedExceptionsVariableName` would handle an only first rescue for multiple rescue groups. ([@&#8203;tatsuyafw][])
> * [#6860](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6860): Prevent auto-correct conflict of `Style/InverseMethods` and `Style/Not`. ([@&#8203;hoshinotsuyoshi][])
> * [#6935](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6935): `Layout/AccessModifierIndentation` should ignore access modifiers that apply to specific methods. ([[@&#8203;deivid](https://github.com/deivid)-rodriguez][])
> * [#6956](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6956): Prevent auto-correct confliction of `Lint/Lambda` and `Lint/UnusedBlockArgument`. ([@&#8203;koic][])
> * [#6915](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6915): Fix false positive in `Style/SafeNavigation` when a modifier if is safe guarding a method call being passed to `break`, `fail`, `next`, `raise`, `return`, `throw`, and `yield`. ([@&#8203;rrosenblum][])
> * [#6822](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6822): Fix Lint/LiteralInInterpolation autocorrection for single quotes. ([@&#8203;hoshinotsuyoshi][])
> * [#6985](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6985): Fix an incorrect auto-correct for `Lint/LiteralInInterpolation` if contains array percent literal. ([@&#8203;yakout][])
> 
> ### Changes
> 
> * [#6966](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6966): Mark Rails/TimeZone as unsafe. ([@&#8203;vfonic][])
> * [#5977](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/5977): Remove Performance cops. ([@&#8203;koic][])
> * Add auto-correction to `Naming/RescuedExceptionsVariableName`. ([[@&#8203;anthony](https://github.com/anthony)-robin][])
> * [#6903](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6903): Handle variables prefixed with `_` in `Naming/RescuedExceptionsVariableName` cop. ([[@&#8203;anthony](https://github.com/anthony)-robin][])
> * [#6917](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6917): Bump Bundler dependency to >= 1.15.0. ([@&#8203;koic][])
> * Add `--auto-gen-only-exclude` to the command outputted in `rubocop_todo.yml` if the option is specified. ([@&#8203;dvandersluis][])
> * [#6887](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6887): Allow `Lint/UnderscorePrefixedVariableName` cop to be configured to allow use of block keyword args. ([@&#8203;dduugg][])
> * [#6885](https://github-redirect.dependabot.com/rubocop-hq/rubocop/pull/6885): Revert adding psych >= 3.1 as runtime dependency. ([@&#8203;andreaseger][])
> * Rename `Layout/FirstParameterIndentation` to `Layout/IndentFirstArgument`. ([@&#8203;maxh][])
> * Extract method call argument alignment behavior from `Layout/AlignParameters` into `Layout/AlignArguments`. ([@&#8203;maxh][])
> * Rename `IndentArray` and `IndentHash` to `IndentFirstArrayElement` and `IndentFirstHashElement`. ([@&#8203;maxh][])
> 
> ## 0.67.2 (2019-04-05)
> 
> ### Bug fixes
> 
></tr></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`9790976`](rubocop/rubocop@9790976) Cut 0.68
- [`0391069`](rubocop/rubocop@0391069) Add HeredocMethodCallPosition cop
- [`557ad20`](rubocop/rubocop@557ad20) [Fix [#6822](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6822)] Fix Lint/LiteralInInterpolation autocorrection for single quotes ...
- [`6b68976`](rubocop/rubocop@6b68976) Fix a typo for `Layout/IndentFirstParameter`
- [`17cdf5a`](rubocop/rubocop@17cdf5a) [Fix [#6985](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6985)] Fix Lint/LiteralInInterpolation's autocorrect  ([#6986](https://github-redirect.dependabot.com/rubocop-hq/rubocop/issues/6986))
- [`666587c`](rubocop/rubocop@666587c) NodePattern: Fix $\<>
- [`87a6ec4`](rubocop/rubocop@87a6ec4) Add always_braces to Style/BlockDelimiters
- [`b1510dd`](rubocop/rubocop@b1510dd) Fix edge case bugs for HeredocArgumentClosingParenthesis
- [`184c2a1`](rubocop/rubocop@184c2a1) Rename IndentArray and IndentHash to IndentFirst*Element
- [`326da99`](rubocop/rubocop@326da99) Add obsolete message for renaming `Layout/FirstParameterIndentation`
- Additional commits viewable in [compare view](rubocop/rubocop@v0.67.2...v0.68.0)
</details>
<br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Co-authored-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Olle Jonsson <olle.jonsson@gmail.com>
  • Loading branch information
3 people committed May 1, 2019
2 parents 69d6060 + 6924440 commit 930cef6
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .rubocop.yml
@@ -1,5 +1,6 @@
inherit_from: .rubocop-bundler.yml

require:
- rubocop-performance
AllCops:
Exclude:
- bin/**/*
Expand Down
3 changes: 2 additions & 1 deletion gemstash.gemspec
Expand Up @@ -59,5 +59,6 @@ you push your own private gems as well."
spec.add_development_dependency "rack-test", "~> 1.1"
spec.add_development_dependency "rake", "~> 12.3"
spec.add_development_dependency "rspec", "~> 3.3"
spec.add_development_dependency "rubocop", "= 0.67.2"
spec.add_development_dependency "rubocop", "= 0.68.1"
spec.add_development_dependency "rubocop-performance", "~> 1.1"
end
2 changes: 1 addition & 1 deletion lib/gemstash/gem_source.rb
Expand Up @@ -29,7 +29,7 @@ class Base
include Gemstash::Logging

def_delegators :@app, :cache_control, :content_type, :env, :halt,
:headers, :http_client_for, :params, :redirect, :request
:headers, :http_client_for, :params, :redirect, :request

def initialize(app)
@app = app
Expand Down
6 changes: 4 additions & 2 deletions lib/gemstash/gem_source/upstream_source.rb
Expand Up @@ -93,8 +93,10 @@ def serve_prerelease_specs
private

def upstream
@upstream ||= Gemstash::Upstream.new(env["gemstash.upstream"],
user_agent: env["gemstash.user-agent"])
@upstream ||= Gemstash::Upstream.new(
env["gemstash.upstream"],
user_agent: env["gemstash.user-agent"]
)
end

def index_upstream
Expand Down
2 changes: 1 addition & 1 deletion spec/gemstash/http_client_spec.rb
Expand Up @@ -82,7 +82,7 @@
context "with a client that specifies a user agent" do
let(:http_client) do
Gemstash::HTTPClient.new(faraday_client,
user_agent: "my-agent 6.6.6")
user_agent: "my-agent 6.6.6")
end

it "forwards the user agent to the remote server" do
Expand Down
2 changes: 1 addition & 1 deletion spec/gemstash/upstream_spec.rb
Expand Up @@ -59,7 +59,7 @@

it "supports getting user agent" do
expect(Gemstash::Upstream.new("https://rubygems.org/",
user_agent: "my_user_agent").user_agent).to eq("my_user_agent")
user_agent: "my_user_agent").user_agent).to eq("my_user_agent")
end

describe ".url" do
Expand Down

0 comments on commit 930cef6

Please sign in to comment.