colorls 1.4.3.pre.775 → 1.4.3.pre.801

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8823a85931d7bb843c8389c63dffc368f5e98324a4c5119045a0ec6ce885b0
-  data.tar.gz: ae496670677fefa0c647d2b7e8eef704ea50640dbf92d04526588ffaa33e58b6
+  metadata.gz: 2505bfb33ca4e7aa00cc804d283a8f60e3be7477ecd428d365e1c3a0d41a1e40
+  data.tar.gz: 784cab859c93aa8d6499f15655ec29db306a01c1b1eeb2ad2bd652063e1b4c36
 SHA512:
-  metadata.gz: a09991ebb8e84a732a729fe6f06bde0b671b00a07b4ea749c829d2d62a53b8f3e71770423d02427fd4197a3843a41dda792b680e0d3e8c0e337b56727a897980
-  data.tar.gz: 0d213e4ad76b85b77c4bdab07860549a497256a3de28681bc61211d36191c346bafc37954a57857bf350d117520af43d74ee87524f1b659ed9e8b630cc573d8f
+  metadata.gz: 467ff43b04c5c26c20fb531bd9cd77cc21682f27f1faf7a0053aa421d7014c2a334d2f460ac5c1c47ea81bec3195488a22fac5b4370db3258c5d6107c7ddaec2
+  data.tar.gz: 04f016ba06f91d799f0b382099c3b9b3f6712058ec39191691b8d3b6e9021721eaf5ce8829916ffb7f7d181196cd38df97148b4a842f61a7d1567854a817c5e6

data/.travis.yml

@@ -8,11 +8,7 @@ language:
 os:
   - linux
 
-cache:
-  bundler: true
-  directories:
-    - $HOME/AppData/Local/Temp/chocolatey
-    - /C/tools/msys64
+cache: bundler
 
 rvm:
   - '2.5'
@@ -25,7 +21,6 @@ jobs:
 
   allow_failures:
     - rvm: truffleruby-head
-    - os: windows
 
   include:
     - os: osx
@@ -36,14 +31,27 @@ jobs:
       before_cache:
         - |-
           # https://unix.stackexchange.com/a/137322/107554
-          $msys2 pacman --sync --clean --noconfirm
+          pacman --sync --clean --noconfirm
+        - bundle clean
       before_install:
         - ruby --version
         - gem --version
-        - choco install msys2 --params /NoUpdate
-        - powershell -Command 'Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass ; & c:\tools\ruby27\bin\ridk.ps1' install dev_tools
+        - |
+          if [[ ! -f /C/tools/msys64/--msys2-- ]]; then
+             rm -rf /C/tools/msys64
+             choco uninstall -y mingw
+             choco upgrade --no-progress -y msys2 --params /NoUpdate
+             ridk.cmd install dev_tools
+          fi
+        - touch /C/tools/msys64/--msys2--
       install:
-        - bundle install --retry=3
+        - bundle install --path vendor/bundle --retry=3
+        - export MSYS=winsymlinks:nativestrict
+      cache:
+        directories:
+          - $HOME/AppData/Local/Temp/chocolatey
+          - /C/tools/msys64
+          - vendor/bundle
 
 before_install:
   - gem --version
@@ -85,7 +93,7 @@ script:
   - colorls --color=auto
   - colorls --color=never
   - colorls --color=always
-  - colorls --tree
+  - colorls --tree spec
   - colorls --tree=1
   - LC_ALL=C colorls spec/fixtures/
   - LC_ALL=C colorls --git spec/fixtures/

data/lib/colorls/core.rb

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 module ColorLS
+  # on Windows (were the special 'nul' device exists) we need to use UTF-8
+  @file_encoding = File.exist?('nul') ? Encoding::UTF_8 : Encoding::ASCII_8BIT
+
+  def self.file_encoding
+    @file_encoding
+  end
+
   class Core
     def initialize(input, all: false, report: false, sort: false, show: false,
       mode: nil, git_status: false, almost_all: false, colors: [], group: nil,
@@ -79,7 +86,7 @@ module ColorLS
       info = FileInfo.new(path, link_info: @long)
 
       if info.directory?
-        @contents = Dir.entries(path, encoding: Encoding::ASCII_8BIT)
+        @contents = Dir.entries(path, encoding: ColorLS.file_encoding)
 
         filter_hidden_contents
 
@@ -283,6 +290,10 @@ module ColorLS
       end
     end
 
+    def out_encode(str)
+      str.encode(Encoding.default_external, undef: :replace, replace: '')
+    end
+
     def fetch_string(path, content, key, color, increment)
       @count[increment] += 1
       value = increment == :folders ? @folders[key] : @files[key]
@@ -290,7 +301,7 @@ module ColorLS
       name = content.show
       name = make_link(path, name) if @hyperlink
       name += content.directory? ? '/' : ' '
-      entry = "#{logo.encode(Encoding.default_external, undef: :replace, replace: '')}  #{name}"
+      entry = "#{out_encode(logo)}  #{out_encode(name)}"
 
       "#{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.4.3.pre.775
+  version: 1.4.3.pre.801
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale