colorls 1.4.3.pre.747 → 1.4.3.pre.801

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7951522bc03cc9a29373d1e40b97bfaf1ec003a4dff66a9f75b9ef2c5e4740
-  data.tar.gz: 365ff0c92dc521435e437540f2c2bbed3207c84ebd59b8653e5d865cea350fe3
+  metadata.gz: 2505bfb33ca4e7aa00cc804d283a8f60e3be7477ecd428d365e1c3a0d41a1e40
+  data.tar.gz: 784cab859c93aa8d6499f15655ec29db306a01c1b1eeb2ad2bd652063e1b4c36
 SHA512:
-  metadata.gz: 9acae1cd2bdfe84ac5b088c1c4ae3d17e4b5076b107e0f7507001a1ac10302dc7d8952087a74316757ac950998731e451d45e5ba60eaa6061faefaeadcc2b7ca
-  data.tar.gz: da8436074eaaa53281948f0d0df153e7e53af8273104d181ffa1b6d412da40c201a9e437312e41e9773055f4742f1f2abfbc4703643e0a3deab08be67e273351
+  metadata.gz: 467ff43b04c5c26c20fb531bd9cd77cc21682f27f1faf7a0053aa421d7014c2a334d2f460ac5c1c47ea81bec3195488a22fac5b4370db3258c5d6107c7ddaec2
+  data.tar.gz: 04f016ba06f91d799f0b382099c3b9b3f6712058ec39191691b8d3b6e9021721eaf5ce8829916ffb7f7d181196cd38df97148b4a842f61a7d1567854a817c5e6

data/.travis.yml

@@ -5,8 +5,10 @@ if: branch = master OR tag IS present
 language:
   ruby
 
-cache:
-  bundler
+os:
+  - linux
+
+cache: bundler
 
 rvm:
   - '2.5'
@@ -16,9 +18,41 @@ rvm:
 
 jobs:
   fast_finish: true
+
   allow_failures:
     - rvm: truffleruby-head
 
+  include:
+    - os: osx
+      rvm: '2.7'
+
+    - os: windows
+      language: bash
+      before_cache:
+        - |-
+          # https://unix.stackexchange.com/a/137322/107554
+          pacman --sync --clean --noconfirm
+        - bundle clean
+      before_install:
+        - ruby --version
+        - gem --version
+        - |
+          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 --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
   - gem install bundler -v '~> 2'
@@ -59,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.91.0'
+  spec.add_development_dependency 'rubocop', '~> 0.92.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/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,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

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