colorls 1.3.4.pre.660 → 1.3.4.pre.670

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a6690688c4362a266953238b6bf231438a23f55192f5cfd1cc53c0305342893
-  data.tar.gz: 4c2f0bbf5e38a210b353e0b12b69f59750898dbba907799bfe9f24c3ce8722d1
+  metadata.gz: f249b8fa5de108d3c989ab6790dd0eeb0f0606a6d48f8837c4a27aad786e2502
+  data.tar.gz: d60bc4c540b32113f6f30d48e19d2fc2c5517061ec8767390d5929c68c99bc96
 SHA512:
-  metadata.gz: 415f22cb137bab6044e70743ad5637505dda28d80d00226f554258d37b5138975fbade4d46ebe2b416d8e280339b42d28a477096bc0f165e72731feb293fa2df
-  data.tar.gz: 6bbdd3fa18e6fc396c95b03335dae515ea023e220854c32603fbfc77a05fa8e8e1d7e743ff8881494f4500e10ae8c55fcb3f8d96a959b0c94c20d69b4f76d4bc
+  metadata.gz: 44a0a3ba40c74096526b25283a9eb745d074daefaf7f5d3f00a476596f7e62c0cc98f8f41c0e16c04bd72e03609543e76bfdca1d855876e3b83d6be6e4aee1e3
+  data.tar.gz: cef18047297eecf989f9dee0f3583d1216759fe2c8bd0bd4ae7b1670c62407537b5361a28655a91e1f324f458eb0a5e3bd9da513477eef41e047319d18d0182b

data/.travis.yml

@@ -56,6 +56,8 @@ script:
   - colorls --color=always
   - colorls --tree
   - colorls --tree=1
+  - LC_ALL=C colorls spec/fixtures/
+  - LC_ALL=C colorls --git spec/fixtures/
 
 deploy:
   provider: rubygems

data/colorls.gemspec

@@ -47,7 +47,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files         = IO.popen(
+    %w[git ls-files -z], external_encoding: Encoding::ASCII_8BIT
+  ).read.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 

data/lib/colorls/core.rb

@@ -72,14 +72,14 @@ module ColorLS
     CHARS_PER_ITEM = 12
 
     def item_widths
-      @contents.map { |item| item.name.size + CHARS_PER_ITEM }
+      @contents.map { |item| item.show.size + CHARS_PER_ITEM }
     end
 
     def init_contents(path)
       info = FileInfo.new(path, link_info = @long)
 
       if info.directory?
-        @contents = Dir.entries(path)
+        @contents = Dir.entries(path, encoding: Encoding::ASCII_8BIT)
 
         filter_hidden_contents
 
@@ -239,7 +239,11 @@ module ColorLS
     end
 
     def git_file_info(path)
-      return '  ✓ '.colorize(@colors[:unchanged]) unless @git_status[path]
+      unless @git_status[path]
+        return '  ✓ '
+               .encode(Encoding.default_external, undef: :replace, replace: '=')
+               .colorize(@colors[:unchanged])
+      end
 
       Git.colored_status_symbols(@git_status[path], @colors)
     end
@@ -283,10 +287,10 @@ module ColorLS
       @count[increment] += 1
       value = increment == :folders ? @folders[key] : @files[key]
       logo  = value.gsub(/\\u[\da-f]{4}/i) { |m| [m[-4..-1].to_i(16)].pack('U') }
-      name = content.name
+      name = content.show
       name = make_link(path, name) if @hyperlink
       name += content.directory? ? '/' : ' '
-      entry = logo + '  ' + name
+      entry = logo.encode(Encoding.default_external, undef: :replace, replace: '') + '  ' + name
 
       "#{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
     end
@@ -295,9 +299,10 @@ module ColorLS
       padding = 0
       line = +''
       chunk.each_with_index do |content, i|
+        entry = fetch_string(@input, content, *options(content))
         line << ' ' * padding
-        line << '  ' << fetch_string(@input, content, *options(content))
-        padding = widths[i] - content.name.length - CHARS_PER_ITEM
+        line << '  ' << entry.encode(Encoding.default_external, undef: :replace)
+        padding = widths[i] - content.show.length - CHARS_PER_ITEM
       end
       print line << "\n"
     end

data/lib/colorls/fileinfo.rb

@@ -16,6 +16,8 @@ module ColorLS
       @name = File.basename(path)
       @stats = File.lstat(path)
 
+      @show_name = nil
+
       handle_symlink(path) if link_info && @stats.symlink?
     end
 
@@ -23,6 +25,13 @@ module ColorLS
       FileInfo.new(path)
     end
 
+    def show
+      return @show_name unless @show_name.nil?
+
+      @show_name = @name.encode(Encoding.find('filesystem'), Encoding.default_external,
+                                invalid: :replace, undef: :replace)
+    end
+
     def dead?
       @dead
     end

data/lib/colorls/git.rb

@@ -31,7 +31,11 @@ module ColorLS
     end
 
     def self.colored_status_symbols(modes, colors)
-      return '  ✓ '.colorize(colors[:unchanged]) if modes.empty?
+      if modes.empty?
+        return '  ✓ '
+               .encode(Encoding.default_external, undef: :replace, replace: '=')
+               .colorize(colors[:unchanged])
+      end
 
       modes = modes.to_a.join.uniq.rjust(3).ljust(4)
 
@@ -51,7 +55,10 @@ module ColorLS
       end
 
       def git_subdir_status(repo_path)
-        yield IO.popen(['git', '-C', repo_path, 'status', '--porcelain', '-z', '-unormal', '--ignored', '.'])
+        yield IO.popen(
+          ['git', '-C', repo_path, 'status', '--porcelain', '-z', '-unormal', '--ignored', '.'],
+          external_encoding: Encoding::ASCII_8BIT
+        )
       end
     end
   end

data/lib/colorls/yaml.rb

@@ -20,7 +20,7 @@ module ColorLS
     end
 
     def read_file(filepath)
-      ::YAML.safe_load(File.read(filepath)).symbolize_keys
+      ::YAML.safe_load(File.read(filepath, encoding: Encoding::UTF_8)).symbolize_keys
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.3.4.pre.660
+  version: 1.3.4.pre.670
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale