Skip to content

Commit

Permalink
Merge tonsky#241
Browse files Browse the repository at this point in the history
241: Fix various rubocop/codeclimate issues r=bronzdoc a=bronzdoc

rubygems/gemstash#238 Squashed :shipit: 

Co-authored-by: Tony Chia <tchia04@gmail.com>
  • Loading branch information
bundlerbot[bot] and tchia04 committed Jun 19, 2019
2 parents ba885ca + f3a6e8e commit b67e8ec
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
17 changes: 10 additions & 7 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
---
engines:
version: "2"

plugins:
duplication:
enabled: true
config:
languages:
- ruby
- ruby
fixme:
enabled: true
rubocop:
enabled: true
ratings:
paths:
- "**.rb"
exclude_paths:
- spec/
# Available channels: https://docs.codeclimate.com/docs/rubocop
channel: "rubocop-0-67"

exclude_patterns:
- vendor/
- '*.log'
4 changes: 1 addition & 3 deletions .rubocop-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Style/TrailingCommaInHashLiteral:

Style/TrailingCommaInArguments:
EnforcedStyleForMultiline: comma
Enabled: false

Style/FrozenStringLiteralComment:
EnforcedStyle: always
Expand Down Expand Up @@ -90,9 +91,6 @@ Style/EachWithObject:
Style/SpecialGlobalVars:
Enabled: false

Style/TrailingCommaInArguments:
Enabled: false

Naming/VariableNumber:
EnforcedStyle: 'snake_case'

Expand Down
4 changes: 2 additions & 2 deletions gemstash.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +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.70.0"
spec.add_development_dependency "rubocop-performance", "~> 1.1"
spec.add_development_dependency "rubocop", "= 0.67.2"
spec.add_development_dependency "rubocop-performance", "~> 1.1.0"
end
2 changes: 1 addition & 1 deletion lib/gemstash/gem_source.rb
Original file line number Diff line number Diff line change
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
2 changes: 1 addition & 1 deletion spec/gemstash/http_client_spec.rb
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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 b67e8ec

Please sign in to comment.