colorls 1.4.3.pre.771 → 1.4.3.pre.805

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3385439e2e05f2e82bd276bac5e8d32e9aa44bbe55b5bf76f80efdc9883c85d1
-  data.tar.gz: 2e234af67e79f5da9b5108d77fac2e75699eb33689517f6adf69696ca6225eb2
+  metadata.gz: 26833e0f293ed9c86e0036bc03bc48afd7e3711ae6c8607c74d7c2a71c6d1368
+  data.tar.gz: fd2af23570e63957fc0adb34ade924cd089659719cef4adf51eb2b2da5011479
 SHA512:
-  metadata.gz: 4033c867f7e4d583f1f73cdaefaed131c08620ce1e2ea272233519b93abc5de4056c01424aee439dc9e39db734d899c196289322d59787050d0e0120fbf4f22b
-  data.tar.gz: a233a6fa860abf55c1c34e29315f5e32c59395e103fe37a5f422b54f9557f80a8accf2ad5833a9906483728ae9feafb9a0c999be885a507447e3fe6e7354e5c9
+  metadata.gz: 57f8373d93844d14ab724f5bba5d998b1bafd8fc44c9617d4290db896ba6ae0368e955f70e224e8d723cccf7107abfe097cd027b4dbaab96e732d62c8cad02d8
+  data.tar.gz: 174377141373abe3d31c5a9541d66c0147a574b133c4f8dca376056f616b5b6f4b40f038a060324a333fd08d16a058db3ab799f78413fa6785b98fbac8e4f63f

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,22 +21,37 @@ jobs:
 
   allow_failures:
     - rvm: truffleruby-head
-    - os: windows
 
   include:
+    - os: osx
+      rvm: '2.7'
+
     - os: windows
       language: bash
       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
@@ -82,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,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,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

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.771
+  version: 1.4.3.pre.805
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-23 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