colorls 1.4.3.pre.773 → 1.4.3.pre.808

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f198ac8a3e7f2d71f62a6adfbf214253cbef8653597096d7879d1515400d98
-  data.tar.gz: cd669c0c3a9671905e40961f1d30fdebb7a30267133fd9306cd216d8e18d6f4a
+  metadata.gz: 0676ffe485c1a032ca9ed8008988e16645cf4803eb9661d5a8c974d4639cfd5e
+  data.tar.gz: f2d5c975e556ab42735db900d66e807987ea141f7726f69c614630bbb8d50863
 SHA512:
-  metadata.gz: aae55d1624789599bb902cf945483cb85402e508eb7ba25c89681786fa96977ebe3c5c2068799445d3ce20693f035df844c914d4f442dd455d21070c4c1d22d0
-  data.tar.gz: d76fa70f1c02ac115851cee9627db77bf6d5fb6513065cc98d27afac7596c37dcdbe63fb522463c856cc1bab731f7d5bbf584ea9e317df6b7e9b4d80868ee124
+  metadata.gz: bd8b4ebcfade1d320d2820776a9f373d2d46f785d33581db54b868673b046c333857aa65a6c953003dbd9b34ff93e97cc1faf51a07acdbd4bfe86235a6363f16
+  data.tar.gz: 6e02ec60ad4d07aa8098c52fa4a77cda1bc5d6125185419aaecdbc5fc08f2350a7fe08bfdf8dd30d971a27d669166b43cff548d06cd9273ee23ce2b3eda27655

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,10 +93,21 @@ 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/
+  - |
+    if colorls does-not-exist; then
+      echo "expected error!"
+      exit 1
+    else
+      ret=$?
+      if [ $ret -ne 2 ]; then
+        echo "unexpected error: $ret"
+        exit 1
+      fi
+    fi
 
 deploy:
   provider: rubygems

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', '~> 0.93.1'
   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/exe/colorls

@@ -23,4 +23,4 @@ require 'colorls'
 $loading = false
 # rubocop:enable Style/GlobalVars
 
-ColorLS::Flags.new(*ARGV).process
+exit ColorLS::Flags.new(*ARGV).process

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

@@ -40,8 +40,13 @@ module ColorLS
       init_locale
 
       @args = ['.'] if @args.empty?
+      exit_status_code = 0
       @args.sort!.each_with_index do |path, i|
-        next $stderr.puts "\n   Specified path '#{path}' doesn't exist.".colorize(:red) unless File.exist?(path)
+        unless File.exist?(path)
+          $stderr.puts "\n   Specified path '#{path}' doesn't exist.".colorize(:red)
+          exit_status_code = 2
+          next
+        end
 
         puts '' if i.positive?
         puts "\n#{path}:" if Dir.exist?(path) && @args.size > 1
@@ -49,6 +54,7 @@ module ColorLS
       rescue SystemCallError => e
         $stderr.puts "#{path}: #{e}".colorize(:red)
       end
+      exit_status_code
     end
 
     def options

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" "May 2020" "colorls 1.4.2" "colorls Manual"
+.TH "COLORLS" "1" "September 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.773
+  version: 1.4.3.pre.808
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-26 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: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 0.93.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement