colorls 1.4.3.pre.815 → 1.4.3.pre.829

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d06b8dab87ac13338be9d7de375ade3d857aef788665b46fe65c4a560803e4fd
-  data.tar.gz: acb039e77063c8afbe84b655f99dbbbe147609da97ed55f12b5caafbda087faf
+  metadata.gz: 713609dccfe604c93184d11ed9a902797e233329b1bcba8cceef2071523fd93f
+  data.tar.gz: ea8c479eb4d8cf7aed3f7de1004a6065ffc502086b72f4a763cb1f68f9173eb8
 SHA512:
-  metadata.gz: 3d7d32ccd6438ab1635a792eb117e1993a8aea9d2d0b6f34c45b785c5f11336061c3eb738a9bd8848eff37f20b234862d2d163caa497d3fa97adc795b8ccc69b
-  data.tar.gz: d3f6d1520ae0ae9255108c16cf9ebc6ab94cfc8801868415954c6d6a38437e91660207b8def811e1aff95c4e1d0e2d5eed12a2f5548d4bc1587e66228bf496a5
+  metadata.gz: a50aea94461c162771f65ec61f706e7ff4fd1e32bacb8f2b5358ed5532f6081c33f40a675557bc29e2aafcbdc398be98eb34171e6683986ca226dc580301ff79
+  data.tar.gz: d522fac8d2e05f0e3706aa3bc656e252156391fee26f9caf9788666665234240ebe2e02b6e17fbbe2718cdb53ea3cd548f8c501e5bde1eb71bce16ba2fd43b12

data/colorls.gemspec

@@ -63,6 +63,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'filesize', '~> 0'
   spec.add_runtime_dependency 'manpages', '~> 0'
   spec.add_runtime_dependency 'rainbow', '>= 2.2', '< 4.0'
+  spec.add_runtime_dependency 'unicode-display_width', '~> 1.7'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codecov', '~> 0.1'
@@ -72,9 +73,9 @@ 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.2.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.8.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.27'
+  spec.add_development_dependency 'rubocop', '~> 1.4.2'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.9.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
   spec.add_development_dependency 'rubygems-tasks', '~> 0'
   spec.add_development_dependency 'simplecov', '~> 0.19.0'
 end

data/lib/colorls.rb

@@ -7,6 +7,7 @@ require 'filesize'
 require 'io/console'
 require 'rainbow/ext/string'
 require 'clocale'
+require 'unicode/display_width'
 
 require 'colorls/core'
 require 'colorls/fileinfo'

data/lib/colorls/core.rb

@@ -79,7 +79,7 @@ module ColorLS
     CHARS_PER_ITEM = 12
 
     def item_widths
-      @contents.map { |item| item.show.size + CHARS_PER_ITEM }
+      @contents.map { |item| Unicode::DisplayWidth.of(item.show) + CHARS_PER_ITEM }
     end
 
     def init_contents(path)
@@ -210,7 +210,7 @@ module ColorLS
     end
 
     def size_info(filesize)
-      size = Filesize.from("#{filesize} B").pretty.split(' ')
+      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
@@ -314,7 +314,7 @@ module ColorLS
         entry = fetch_string(@input, content, *options(content))
         line << ' ' * padding
         line << '  ' << entry.encode(Encoding.default_external, undef: :replace)
-        padding = widths[i] - content.show.length - CHARS_PER_ITEM
+        padding = widths[i] - Unicode::DisplayWidth.of(content.show) - CHARS_PER_ITEM
       end
       print line << "\n"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.4.3.pre.815
+  version: 1.4.3.pre.829
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale
@@ -72,6 +72,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,42 +204,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement