diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e674a5c3..4e1adfba 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -239,17 +239,6 @@ Style/EvalWithLocation: - 'spec/commands/watch_expression_spec.rb' - 'spec/method_spec.rb' -# Offense count: 4 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: format, sprintf, percent -Style/FormatString: - Exclude: - - 'lib/pry/commands/gem_stats.rb' - - 'lib/pry/commands/ls/local_vars.rb' - - 'lib/pry/config/behavior.rb' - - 'lib/pry/pry_class.rb' - # Offense count: 9 # Configuration parameters: EnforcedStyle. # SupportedStyles: annotated, template, unannotated diff --git a/lib/pry/commands/gem_stats.rb b/lib/pry/commands/gem_stats.rb index 7d91be68..7dde0f6e 100644 --- a/lib/pry/commands/gem_stats.rb +++ b/lib/pry/commands/gem_stats.rb @@ -65,14 +65,15 @@ VVVVVVVVVVVVVVVVVVVVV #{red('Dependencies')} (development) %{ddependencies} FORMAT - format_str % { + format( + format_str, name: green(h.name), version: bold("v#{h.version}"), downloads: h.downloads, version_downloads: h.version_downloads, rdependencies: format_dependencies(h.dependencies.runtime), ddependencies: format_dependencies(h.dependencies.development) - } + ) end def format_dependencies(rdeps) diff --git a/lib/pry/commands/ls/local_vars.rb b/lib/pry/commands/ls/local_vars.rb index 9b1e14e0..5bdd66b1 100644 --- a/lib/pry/commands/ls/local_vars.rb +++ b/lib/pry/commands/ls/local_vars.rb @@ -31,7 +31,7 @@ class Pry colorized_lhs = color(:local_var, lhs) color_escape_padding = colorized_lhs.size - lhs.size pad = desired_width + color_escape_padding - "%-#{pad}s = %s" % [color(:local_var, colorized_lhs), rhs] + Kernel.format("%-#{pad}s = %s", color(:local_var, colorized_lhs), rhs) end end end diff --git a/lib/pry/config/behavior.rb b/lib/pry/config/behavior.rb index dda5d130..088c6c5b 100644 --- a/lib/pry/config/behavior.rb +++ b/lib/pry/config/behavior.rb @@ -335,7 +335,7 @@ class Pry private def __clip_inspect(obj) - "#{obj.class}:0x%x" % obj.object_id + format("#{obj.class}:0x%x", obj.object_id) end def __try_convert_to_hash(obj) diff --git a/lib/pry/pry_class.rb b/lib/pry/pry_class.rb index 08dae87c..7161a4ea 100644 --- a/lib/pry/pry_class.rb +++ b/lib/pry/pry_class.rb @@ -247,7 +247,7 @@ you can add "Pry.config.windows_console_warning = false" to your pryrc. elsif Pry.config.prompt_safe_contexts.any? { |v| v === obj } && obj.inspect.length <= max obj.inspect else - id == true ? "#<#{obj.class}:0x%x>" % (obj.object_id << 1) : "#<#{obj.class}>" + id ? format("#<#{obj.class}:0x%x>", (obj.object_id << 1)) : "#<#{obj.class}>" end rescue RescuableException "unknown"