Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rubocop from 0.52.1 to 0.53.0 #438

Merged
merged 1 commit into from
Mar 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ gem "minitest", "~> 5.11"
gem "pry", "0.11.3"
gem "rake", "~> 12.3"
gem "rake-compiler", "~> 1.0"
gem "rubocop", "0.52.1"
gem "rubocop", "0.53.0"
gem "simplecov", "0.15.1"
gem "yard", "0.9.12"
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GEM
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ast (2.3.0)
ast (2.4.0)
chandler (0.7.0)
netrc
octokit (>= 2.2.0)
Expand All @@ -31,8 +31,8 @@ GEM
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
parser (2.5.0.2)
ast (~> 2.4.0)
powerpack (0.1.1)
pry (0.11.3)
coderay (~> 1.1.0)
Expand All @@ -42,9 +42,9 @@ GEM
rake (12.3.0)
rake-compiler (1.0.4)
rake
rubocop (0.52.1)
rubocop (0.53.0)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
Expand Down Expand Up @@ -73,7 +73,7 @@ DEPENDENCIES
pry (= 0.11.3)
rake (~> 12.3)
rake-compiler (~> 1.0)
rubocop (= 0.52.1)
rubocop (= 0.53.0)
simplecov (= 0.15.1)
yard (= 0.9.12)

Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/helpers/bin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def executable_file_extensions
ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
end

def real_executable?(f)
File.executable?(f) && !File.directory?(f)
def real_executable?(file)
File.executable?(file) && !File.directory?(file)
end
end
end
Expand Down
14 changes: 7 additions & 7 deletions lib/byebug/helpers/eval.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,22 @@ def safe_eval(str, binding)
yield(e)
end

def msg(e)
msg = Setting[:stack_on_error] ? error_msg(e) : warning_msg(e)
def msg(exception)
msg = Setting[:stack_on_error] ? error_msg(exception) : warning_msg(exception)

pr("eval.exception", text_message: msg)
end

def error_msg(e)
at = e.backtrace
def error_msg(exception)
at = exception.backtrace

locations = ["#{at.shift}: #{warning_msg(e)}"]
locations = ["#{at.shift}: #{warning_msg(exception)}"]
locations += at.map { |path| " from #{path}" }
locations.join("\n")
end

def warning_msg(e)
"#{e.class} Exception: #{e.message}"
def warning_msg(exception)
"#{exception.class} Exception: #{exception.message}"
end

#
Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/helpers/frame.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def direction(step)
#
# @param i [Integer] Integer to be converted in a proper positive index.
#
def index_from_start(i)
i >= 0 ? i : context.stack_size + i
def index_from_start(index)
index >= 0 ? index : context.stack_size + index
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions lib/byebug/history.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def restore
def save
n_cmds = Setting[:histsize] > size ? size : Setting[:histsize]

open(Setting[:histfile], "w") do |file|
File.open(Setting[:histfile], "w") do |file|
n_cmds.times { file.puts(pop) }
end

Expand Down Expand Up @@ -91,10 +91,10 @@ def to_s(n_cmds)
end

#
# Array of ids of the last n commands.
# Array of ids of the last +number+ commands.
#
def last_ids(n)
(1 + size - n..size).to_a
def last_ids(number)
(1 + size - number..size).to_a
end

#
Expand Down
2 changes: 1 addition & 1 deletion lib/byebug/printers/plain.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def print_collection(path, collection, &block)
lines.join
end

def print_variables(variables, *_)
def print_variables(variables, *_unused)
print_collection("variable.variable", variables) do |(key, value), _|
value = value.nil? ? "nil" : value.to_s
if "#{key} = #{value}".size > Setting[:width]
Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/settings/autoirb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def banner
"Invoke IRB on every stop"
end

def value=(v)
IrbCommand.always_run = v ? 1 : 0
def value=(val)
IrbCommand.always_run = val ? 1 : 0
end

def value
Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/settings/autolist.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def banner
"Invoke list command on every stop"
end

def value=(v)
ListCommand.always_run = v ? 1 : 0
def value=(val)
ListCommand.always_run = val ? 1 : 0
end

def value
Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/settings/autopry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def banner
"Invoke Pry on every stop"
end

def value=(v)
PryCommand.always_run = v ? 1 : 0
def value=(val)
PryCommand.always_run = val ? 1 : 0
end

def value
Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/settings/linetrace.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def banner
"Enable line execution tracing"
end

def value=(v)
Byebug.tracing = v
def value=(val)
Byebug.tracing = val
end

def value
Expand Down
4 changes: 2 additions & 2 deletions lib/byebug/settings/post_mortem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def banner
"Enable/disable post-mortem mode"
end

def value=(v)
Byebug.post_mortem = v
def value=(val)
Byebug.post_mortem = val
end

def value
Expand Down