colorls 1.4.3.pre.813 → 1.4.3.pre.825

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e11c9169b933cd193730db1c9cca92325ef99923b9df72f3b8090e8253ceec
-  data.tar.gz: e671ac2d6118b5498358640ed195f28424ed8139cc6302e8738932e55c898853
+  metadata.gz: 965021195cb427059d932bc5164b16943ebeb9b79c98334b254f00d9de62d90b
+  data.tar.gz: 84f2f5711662567c359d16540bb7aedbecebe222547837715ae03196587584db
 SHA512:
-  metadata.gz: 0d254c71f917bd1a9d82bad74a830b4608793df122e5bd35a3602f832988ca5d0781e8acb98c8763ea12dc2614aedafb0a53aa3655b10779dec5b852d9630159
-  data.tar.gz: fa1511174d7d06fdc1a5ea330bdd2471747ce7c9e66bd919b86e47d4b01d60dfb032903c4b9c323a2f6d8fb523c4bc3e113ec18fd2c1fc084228555da5d01d20
+  metadata.gz: 64ee3d8e4b993f6913eead77361697f27446c8d855d3732e5933e89512f28aa4df501e12fb6a5727269883fac2b59a1fe5c0103c23dcfdcab16210ada78cdad5
+  data.tar.gz: 97048afd38b462990a2d4178bad7301752741a5722174307565e1ef6694d7ed9f71f468f6a6ad02317745f48a81b017df38cc8da6ea978eb650bfb68c25c5a07

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.1.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.8.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.27'
+  spec.add_development_dependency 'rubocop', '~> 1.3.0'
+  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)
@@ -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.813
+  version: 1.4.3.pre.825
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-23 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.1.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !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