colorls 1.4.3.pre.775 → 1.4.3.pre.811

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8823a85931d7bb843c8389c63dffc368f5e98324a4c5119045a0ec6ce885b0
-  data.tar.gz: ae496670677fefa0c647d2b7e8eef704ea50640dbf92d04526588ffaa33e58b6
+  metadata.gz: 97cd65cf999c31c827853a8193487937844a8b5e363acb9cdcea95efc9fcd960
+  data.tar.gz: 292a06dba83f5648f6d93b7552349b5d2df7e21765399128ed77d9c2834a2830
 SHA512:
-  metadata.gz: a09991ebb8e84a732a729fe6f06bde0b671b00a07b4ea749c829d2d62a53b8f3e71770423d02427fd4197a3843a41dda792b680e0d3e8c0e337b56727a897980
-  data.tar.gz: 0d213e4ad76b85b77c4bdab07860549a497256a3de28681bc61211d36191c346bafc37954a57857bf350d117520af43d74ee87524f1b659ed9e8b630cc573d8f
+  metadata.gz: b9ba32dd908b8c0251c0baf2c7857638dec3939275264fe5e1f38f1b18c629cfe5838d0ec905d06017f8b60012b309cfed0f999a10952e9f06bda8547fa1fae8
+  data.tar.gz: 97d80d822ce105a9f2295b237da64242011d0acf80cdb76f5db989db0d418cce90ccee9a58caab0063d1188b9cb09297f0a94d6d7653a458a7cb59a7ecd80983

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/colorls.gemspec

@@ -72,7 +72,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', '~> 0.92.0'
+  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 'rubygems-tasks', '~> 0'

data/lib/colorls/core.rb

@@ -1,11 +1,18 @@
 # 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,
       reverse: false, hyperlink: false, tree_depth: nil)
-      @input        = File.absolute_path(input)
+      @input        = (+input).force_encoding(ColorLS.file_encoding)
       @count        = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
       @almost_all   = almost_all
@@ -26,7 +33,7 @@ module ColorLS
 
       init_colors colors
 
-      @contents   = init_contents(input)
+      @contents   = init_contents(@input)
       init_icons
     end
 
@@ -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,8 @@ 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)}"
+      entry = entry.bright if !content.directory? && content.executable?
 
       "#{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
     end
@@ -359,7 +371,7 @@ module ColorLS
     end
 
     def make_link(path, name)
-      href = "file://#{path}/#{name}"
+      href = "file://#{File.absolute_path(path)}/#{name}"
       "\033]8;;#{href}\007#{name}\033]8;;\007"
     end
   end

data/lib/colorls/fileinfo.rb

@@ -62,7 +62,8 @@ module ColorLS
       name
     end
 
-    def_delegators :@stats, :directory?, :socket?, :chardev?, :symlink?, :blockdev?, :mtime, :nlink, :size, :owned?
+    def_delegators :@stats, :directory?, :socket?, :chardev?, :symlink?, :blockdev?, :mtime, :nlink, :size, :owned?,\
+                   :executable?
 
     private
 

data/lib/colorls/flags.rb

@@ -157,7 +157,7 @@ module ColorLS
       options.separator ''
       options.separator 'options for compatiblity with ls (ignored):'
       options.separator ''
-      options.on('-h', '--human-readable') {}
+      options.on('-h', '--human-readable') {} # always active
     end
 
     def show_help

data/man/colorls.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "COLORLS" "1" "September 2020" "colorls 1.4.2" "colorls Manual"
+.TH "COLORLS" "1" "October 2020" "colorls 1.4.2" "colorls Manual"
 .
 .SH "NAME"
 \fBcolorls\fR \- list directory contents with colors and icons

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.811
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement