From 4afbce9aba4775a626d873ad2e9bc1fce7de4608 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 23:11:28 +0000 Subject: [PATCH 1/2] Update rubocop requirement from ~> 1.20.0 to ~> 1.21.0 Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.20.0...v1.21.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- colorls.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colorls.gemspec b/colorls.gemspec index f655c3e..cc5b9b4 100644 --- a/colorls.gemspec +++ b/colorls.gemspec @@ -76,7 +76,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'ronn', '~> 0' spec.add_development_dependency 'rspec', '~> 3.7' spec.add_development_dependency 'rspec-its', '~> 1.2' - spec.add_development_dependency 'rubocop', '~> 1.20.0' + spec.add_development_dependency 'rubocop', '~> 1.21.0' spec.add_development_dependency 'rubocop-performance', '~> 1.11.0' spec.add_development_dependency 'rubocop-rake', '~> 0.5' spec.add_development_dependency 'rubocop-rspec', '~> 2.0' From c9f93173e6c992eb09c293cb7f0de97fa821ea27 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 14 Sep 2021 13:49:50 +0200 Subject: [PATCH 2/2] Fix Lint/AmbiguousOperatorPrecedence offenses --- lib/colorls/core.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/colorls/core.rb b/lib/colorls/core.rb index 3dd5d74..5d90fcc 100644 --- a/lib/colorls/core.rb +++ b/lib/colorls/core.rb @@ -242,8 +242,8 @@ module ColorLS def size_info(filesize) size = Filesize.new(filesize).pretty.split size = "#{size[0][0..-4].rjust(4,' ')} #{size[1].ljust(3,' ')}" - return size.colorize(@colors[:file_large]) if filesize >= 512 * 1024 ** 2 - return size.colorize(@colors[:file_medium]) if filesize >= 128 * 1024 ** 2 + return size.colorize(@colors[:file_large]) if filesize >= 512 * (1024 ** 2) + return size.colorize(@colors[:file_medium]) if filesize >= 128 * (1024 ** 2) size.colorize(@colors[:file_small]) end @@ -335,7 +335,7 @@ module ColorLS line = +'' chunk.each_with_index do |content, i| entry = fetch_string(content, *options(content)) - line << ' ' * padding + line << (' ' * padding) line << ' ' << entry.encode(Encoding.default_external, undef: :replace) padding = widths[i] - Unicode::DisplayWidth.of(content.show) - CHARS_PER_ITEM end @@ -405,7 +405,7 @@ module ColorLS def tree_branch_preprint(prespace, indent, prespace_icon) return prespace_icon if prespace.zero? - ' │ ' * (prespace/indent) + prespace_icon + '─' * indent + (' │ ' * (prespace/indent)) + prespace_icon + ('─' * indent) end def make_link(content)