colorls 1.4.5.pre.96 → 1.4.5.pre.872

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f5ebd51baf7c6a6f737f81def0866922a56ed90e53fe71d7b5de1ba0f7a26f
-  data.tar.gz: cb05ad3b3478b9dd9963d58cb6809e38df913ad0b6b9c2bd41359ffd157024a6
+  metadata.gz: 849c1d2e50807b6ad4667481a74c5bc77aa60112cc06637f141c70f29ddb0fda
+  data.tar.gz: 43530de105df3de16a043f2c6c87ba58c9e9e70aa094be99466b5fdfd7e8c53c
 SHA512:
-  metadata.gz: 9d8ec1933d0f226abfd318724248c9822ef326df8357c0330c2c36d229424125a2f8aa105c69eb4496055e3d82ffb396101b88478d8bb05b7e6a56d5829d0de8
-  data.tar.gz: 1e25ebb29439d503bb50eae499af73f6e138688d10dec91e134a6587fd7efcc251f7954aab47753b9c3e95757610495d43d9b5e461300dbc55063bb8dc6bd6c2
+  metadata.gz: e17c109ad1febe2aeb3c4f64677d74c7ff26ee8ee491dae80853bb98777a1afdfa7afbfcb6d19aa41e184af18c5277cc2c5d2ddd689d3fb603cd14d295e17384
+  data.tar.gz: 40571e64e90e8fc434078875bbc255ce20d3990f5b738de8c0154fc00546375f794e7c1dc76db3368afe7bad7390d082765e5a9b821483b5761cc1d320547781

data/.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
     - 'profile/*'
   DisplayCopNames: true
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
 
 # Preferred codebase style ---------------------------------------------
 
@@ -58,7 +58,7 @@ Metrics/ClassLength:
   Max: 350
 
 Metrics/ParameterLists:
-  Max: 16
+  Max: 15
 
 Naming/FileName:
   Enabled: false

data/.travis.yml

@@ -0,0 +1,123 @@
+conditions: v1
+
+if: branch = master OR tag IS present
+
+language:
+  ruby
+
+os:
+  - linux
+
+cache: bundler
+
+rvm:
+  - '2.5'
+  - '2.6'
+  - '2.7'
+  - 'truffleruby-head'
+
+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 config set path 'vendor/bundle'
+        - bundle install --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'
+
+script:
+  - bundle exec rubocop
+  - bundle exec rake spec
+  - bundle exec rake install
+  - bundle binstubs colorls
+  - PATH=$PWD/bin:$PATH
+  - colorls
+  - colorls -1
+  - colorls -a
+  - colorls -A
+  - colorls -d
+  - colorls -f
+  - colorls -l
+  - colorls -l spec/fixtures/symlinks
+  - ( cd spec/fixtures ; colorls .hidden-file ) | fgrep '.hidden-file'
+  - colorls -l README.md
+  - colorls -r
+  - colorls --sd
+  - colorls --sf
+  - colorls --hyperlink
+  - colorls -t
+  - colorls --sort=time
+  - colorls -U
+  - colorls --sort=none
+  - colorls -S
+  - colorls --sort=size
+  - colorls -h
+  - colorls --gs
+  - colorls spec/fixtures/symlinks
+  - colorls README.md
+  - colorls *
+  - colorls | grep /
+  - colorls --color
+  - colorls --color=auto
+  - colorls --color=never
+  - colorls --color=always
+  - 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
+  api_key:
+    secure: iHo85pvy3iIp0/r8mbP0q0VPCFyYcwaQb19YUxwIGbMrksswIJPe2bsdAQTvd1fU3U+uwAgyzfaLMWgY6T1evVjv5GGXW0zmNthgWuaCbTBmzx3q6OPV6zJLsinKSJ4xbKjmTOi6BIhXTtc09dRRNp1d9U8HtmM9KyvD5ORm5M9W0/WxP3+8oOe0/yl3DOVNgCQ0j64KEqowLlfdJXe2q5iSUkZEvf+o5F6pz0g7dFiVHPVpJbZ9sOchPzYNMjLCx4jPt42J806oAH7TMeRC4lFpKgJr9U05LRGb22jiokHH6gl17RpuGRYJIexWkf3jb5iy9bivT2S2fGo9/BBKO5BvQAaL7McCwpdKM2QEyVy7RVbUz5D8vfXkJNIJankQj3Ikuz7qYyDglucGCpSGjecNCqL61NoBag7ORJ0RMWg7zklKjR59zeT4oks8rByx688y5Oi4f9Z98SPfc9NIJbHxbrDHtr13gm509cEXxwOLuVePa9J+mDGq2Uawi/PuIon1x2ztHUgvTx0DSYtwv96HzXet8QqXHwRKKjddxEApvCvGvaJV3akeUVjcsyei892ajHP6CffaKazPtogotfsu68g8WmKFWHFRkdmS6NIqg7MrnMRCjDkxAoQYYzt6cl95aBk4G7CTbjtXgIct1LGMM/WjE6K/jpeF0YLsVR4=
+  gem: colorls
+  on:
+    all_branches: true
+    condition: $TRAVIS_BRANCH = master || $TRAVIS_TAG =~ ^v[0-9][.]
+    repo: athityakumar/colorls
+    rvm: '2.6'
+    os: linux

data/CONTRIBUTORS.md

@@ -77,7 +77,5 @@ Color LS contributors (sorted alphabetically)
 
 * **[Vladislav Isakov](https://github.com/bladebhs)**
 
-* **[T.Mangoe](https://github.com/t-mangoe)**
-
 
 **[Full contributors list](https://github.com/athityakumar/colorls/graphs/contributors).**

data/README.md

@@ -4,7 +4,7 @@
 [![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](http://forthebadge.com)
 
 [![Gem Version](https://badge.fury.io/rb/colorls.svg)](https://badge.fury.io/rb/colorls)
-[![CI](https://github.com/athityakumar/colorls/actions/workflows/ruby.yml/badge.svg)](https://github.com/athityakumar/colorls/actions/workflows/ruby.yml)
+[![Build Status](https://travis-ci.org/athityakumar/colorls.svg?branch=master)](https://travis-ci.org/athityakumar/colorls)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=shields)](http://makeapullrequest.com)
 
 A Ruby script that colorizes the `ls` output with color and icons. Here are the screenshots of working example on an iTerm2 terminal (Mac OS), `oh-my-zsh` with `powerlevel9k` theme and `powerline nerd-font + awesome-config` font with the `Solarized Dark` color theme.
@@ -117,8 +117,8 @@ Man pages have been added. Checkout `man colorls`.
 
 [(Back to top)](#table-of-contents)
 
-1. Install Ruby (preferably, version >= 2.6)
-2. [Download](https://www.nerdfonts.com/font-downloads) and install a Nerd Font. Have a look at the [Nerd Font README](https://github.com/ryanoasis/nerd-fonts/blob/master/readme.md) for installation instructions.
+1. Install Ruby (preferably, version >= 2.5)
+2. Install the patched fonts of powerline nerd-font and/or font-awesome. Have a look at the [Nerd Font README](https://github.com/ryanoasis/nerd-fonts/blob/master/readme.md) for more installation instructions.
 
     *Note for `iTerm2` users - Please enable the Nerd Font at iTerm2 > Preferences > Profiles > Text > Non-ASCII font > Hack Regular Nerd Font Complete.*
 
@@ -170,7 +170,7 @@ You can overwrite the existing icons and colors mapping by copying the yaml file
   Let's say that you're using the dark color scheme and would like to change the color of untracked file (`??`) in the `--git-status` flag to yellow. Copy the defaut `dark_colors.yaml` and change it.
 
   ```sh
-  cp $(dirname $(gem which colorls))/yaml/dark_colors.yaml ~/.config/colorls/dark_colors.yaml
+  cp $(dirname $(gem which colorls))/yaml/dark_colors.yaml ~/.config/colorls/dark_colors.yaml`
   ```
 
   In the `~/.config/colorls/dark_colors.yaml` file, change the color set for `untracked` from `darkorange` to `yellow`, and save the change.

data/Rakefile

@@ -20,12 +20,12 @@ file 'man/colorls.1' => ['man/colorls.1.ronn', 'lib/colorls/flags.rb'] do
 
   flags = ColorLS::Flags.new
   attributes = {
-    date: Date.iso8601(`git log -1 --pretty=format:%cI -- lib/colorls/flags.rb`),
+    date: Date.iso8601(`git log -1 --pretty=format:%cI -- man/colorls.1`),
     manual: 'colorls Manual',
     organization: "colorls #{ColorLS::VERSION}"
   }
   doc = Ronn::Document.new(nil, attributes) do
-    template = File.read('man/colorls.1.ronn')
+    template = IO.read('man/colorls.1.ronn')
 
     section = ''
     flags.options.each do |o|
@@ -37,14 +37,12 @@ OPTION
     end
     template.sub('{{ OPTIONS }}', section)
   end
-  File.write('man/colorls.1', doc.convert('roff'))
+  IO.write('man/colorls.1', doc.convert('roff'))
 end
 
-directory 'zsh'
-
 desc 'Build the Zsh completion file'
-file 'zsh/_colorls' => %w[zsh lib/colorls/flags.rb] do
+file 'zsh/_colorls' => ['lib/colorls/flags.rb'] do
   ruby "exe/colorls '--*-completion-zsh=colorls' > zsh/_colorls"
 end
 
-task default: %w[spec rubocop man/colorls.1 zsh/_colorls]
+task default: %w[spec rubocop]

data/colorls.gemspec

@@ -27,13 +27,13 @@ POST_INSTALL_MESSAGE = %(
 
 # rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
-  is_tagged = ENV['GITHUB_REF'] == "refs/tags/v#{ColorLS::VERSION}"
-  is_origin = ENV['GITHUB_REPOSITORY_OWNER'] == 'athityakumar'
-  build_number = ENV['GITHUB_RUN_NUMBER']
+  is_tagged = ENV['TRAVIS_TAG'] == "v#{ColorLS::VERSION}"
+  is_origin = ENV['TRAVIS_REPO_SLUG'] == 'athityakumar/colorls'
+  build_number = ENV['TRAVIS_BUILD_NUMBER']
 
   spec.name          = 'colorls'
   spec.version       = if build_number && is_origin && !is_tagged
-                         # Prereleasing on Github
+                         # Prereleasing on Travis CI
                          digits = ColorLS::VERSION.to_s.split '.'
                          digits[-1] = digits[-1].to_s.succ
 
@@ -47,12 +47,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/athityakumar/colorls'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.files = %w[man/colorls.1 man/colorls.1 zsh/_colorls] + IO.popen(
+  spec.files = IO.popen(
     %w[git ls-files -z], external_encoding: Encoding::ASCII_8BIT
   ).read.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features|[.]github)/})
+    f.match(%r{^(test|spec|features)/})
   end
 
   spec.bindir        = 'exe'
@@ -76,10 +76,10 @@ 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', '~> 1.22.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.13.0'
+  spec.add_development_dependency 'rubocop', '~> 1.11.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.10.1'
   spec.add_development_dependency 'rubocop-rake', '~> 0.5'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.9.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
   spec.add_development_dependency 'rubygems-tasks', '~> 0'
   spec.add_development_dependency 'simplecov', '~> 0.21.2'
 end

data/lib/colorls/core.rb

@@ -8,17 +8,8 @@ module ColorLS
     @file_encoding
   end
 
-  def self.terminal_width
-    console = IO.console
-
-    width = IO.console_size[1]
-
-    return width if console.nil? || console.winsize[1].zero?
-
-    console.winsize[1]
-  end
-
-  @screen_width = terminal_width
+  @screen_width = IO.console.winsize[1]
+  @screen_width = 80 if @screen_width.zero?
 
   def self.screen_width
     @screen_width
@@ -26,9 +17,8 @@ module ColorLS
 
   class Core
     def initialize(all: false, sort: false, show: false,
-      mode: nil, show_git: false, almost_all: false, colors: [], group: nil,
-      reverse: false, hyperlink: false, tree_depth: nil, show_inode: false,
-      indicator_style: 'slash', long_style_options: {})
+      mode: nil, git_status: false, almost_all: false, colors: [], group: nil,
+      reverse: false, hyperlink: false, tree_depth: nil, show_group: true, show_user: true)
       @count = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
       @almost_all   = almost_all
@@ -38,16 +28,10 @@ module ColorLS
       @group        = group
       @show         = show
       @one_per_line = mode == :one_per_line
-      @show_inode   = show_inode
-      init_long_format(mode,long_style_options)
+      init_long_format(mode,show_group,show_user)
       @tree         = {mode: mode == :tree, depth: tree_depth}
       @horizontal   = mode == :horizontal
-      @git_status   = init_git_status(show_git)
-      @time_style   = long_style_options.key?(:time_style) ? long_style_options[:time_style] : ''
-      @indicator_style = indicator_style
-      @hard_links_count = long_style_options.key?(:hard_links_count) ? long_style_options[:hard_links_count] : true
-      # how much characters an item occupies besides its name
-      @additional_chars_per_item = 12 + (@show_git ? 4 : 0) + (@show_inode ? 10 : 0)
+      @git_status   = init_git_status(git_status)
 
       init_colors colors
 
@@ -81,24 +65,13 @@ module ColorLS
       ls
     end
 
-    def display_report(report_mode)
-      if report_mode == :short
-        puts <<~REPORT
-
-          \s\s\s\sFolders: #{@count[:folders]}, Files: #{@count[:recognized_files] + @count[:unrecognized_files]}.
-        REPORT
-          .colorize(@colors[:report])
-      else
-        puts <<~REPORT
+    def display_report
+      print "\n   Found #{@count.values.sum} items in total.".colorize(@colors[:report])
 
-              Found #{@count.values.sum} items in total.
-
-          \tFolders\t\t\t: #{@count[:folders]}
-          \tRecognized files\t: #{@count[:recognized_files]}
-          \tUnrecognized files\t: #{@count[:unrecognized_files]}
-        REPORT
-          .colorize(@colors[:report])
-      end
+      puts  "\n\n\tFolders\t\t\t: #{@count[:folders]}"\
+        "\n\tRecognized files\t: #{@count[:recognized_files]}"\
+        "\n\tUnrecognized files\t: #{@count[:unrecognized_files]}"
+        .colorize(@colors[:report])
     end
 
     private
@@ -133,14 +106,13 @@ module ColorLS
       end
     end
 
-    def init_long_format(mode, long_style_options)
+    def init_long_format(mode, show_group, show_user)
       @long = mode == :long
-      @show_group = long_style_options.key?(:show_group) ? long_style_options[:show_group] : true
-      @show_user = long_style_options.key?(:show_user) ? long_style_options[:show_user] : true
+      @show_group = show_group
+      @show_user = show_user
     end
 
     def init_git_status(show_git)
-      @show_git = show_git
       return {}.freeze unless show_git
 
       # stores git status information per directory
@@ -154,8 +126,11 @@ module ColorLS
       end
     end
 
+    # how much characters an item occupies besides its name
+    CHARS_PER_ITEM = 12
+
     def item_widths
-      @contents.map { |item| Unicode::DisplayWidth.of(item.show) + @additional_chars_per_item }
+      @contents.map { |item| Unicode::DisplayWidth.of(item.show) + CHARS_PER_ITEM }
     end
 
     def filter_hidden_contents
@@ -253,14 +228,14 @@ module ColorLS
     def size_info(filesize)
       size = Filesize.new(filesize).pretty.split
       size = "#{size[0][0..-4].rjust(4,' ')} #{size[1].ljust(3,' ')}"
-      return size.colorize(@colors[:file_large])  if filesize >= 512 * (1024 ** 2)
-      return size.colorize(@colors[:file_medium]) if filesize >= 128 * (1024 ** 2)
+      return size.colorize(@colors[:file_large])  if filesize >= 512 * 1024 ** 2
+      return size.colorize(@colors[:file_medium]) if filesize >= 128 * 1024 ** 2
 
       size.colorize(@colors[:file_small])
     end
 
     def mtime_info(file_mtime)
-      mtime = @time_style.start_with?('+') ? file_mtime.strftime(@time_style.delete_prefix('+')) : file_mtime.asctime
+      mtime = file_mtime.asctime
       now = Time.now
       return mtime.colorize(@colors[:hour_old]) if now - file_mtime < 60 * 60
       return mtime.colorize(@colors[:day_old])  if now - file_mtime < 24 * 60 * 60
@@ -300,19 +275,12 @@ module ColorLS
       end
     end
 
-    def inode(content)
-      return '' unless @show_inode
-
-      content.stats.ino.to_s.rjust(10).colorize(@colors[:inode])
-    end
-
     def long_info(content)
       return '' unless @long
 
       links = content.nlink.to_s.rjust(@linklength)
 
-      line_array = [mode_info(content.stats)]
-      line_array.push links if @hard_links_count
+      line_array = [mode_info(content.stats), links]
       line_array.push user_info(content) if @show_user
       line_array.push group_info(content.group) if @show_group
       line_array.concat [size_info(content.size), mtime_info(content.mtime)]
@@ -338,14 +306,14 @@ module ColorLS
     def fetch_string(content, key, color, increment)
       @count[increment] += 1
       value = increment == :folders ? @folders[key] : @files[key]
-      logo  = value.gsub(/\\u[\da-f]{4}/i) { |m| [m[-4..].to_i(16)].pack('U') }
+      logo  = value.gsub(/\\u[\da-f]{4}/i) { |m| [m[-4..-1].to_i(16)].pack('U') }
       name = content.show
       name = make_link(content) if @hyperlink
-      name += content.directory? && @indicator_style != 'none' ? '/' : ' '
+      name += content.directory? ? '/' : ' '
       entry = "#{out_encode(logo)}  #{out_encode(name)}"
       entry = entry.bright if !content.directory? && content.executable?
 
-      "#{inode(content)} #{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
+      "#{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
     end
 
     def ls_line(chunk, widths)
@@ -353,9 +321,9 @@ module ColorLS
       line = +''
       chunk.each_with_index do |content, i|
         entry = fetch_string(content, *options(content))
-        line << (' ' * padding)
+        line << ' ' * padding
         line << '  ' << entry.encode(Encoding.default_external, undef: :replace)
-        padding = widths[i] - Unicode::DisplayWidth.of(content.show) - @additional_chars_per_item
+        padding = widths[i] - Unicode::DisplayWidth.of(content.show) - CHARS_PER_ITEM
       end
       print line << "\n"
     end
@@ -423,7 +391,7 @@ module ColorLS
     def tree_branch_preprint(prespace, indent, prespace_icon)
       return prespace_icon if prespace.zero?
 
-      (' │ ' * (prespace/indent)) + prespace_icon + ('─' * indent)
+      ' │ ' * (prespace/indent) + prespace_icon + '─' * indent
     end
 
     def make_link(content)

data/lib/colorls/fileinfo.rb

@@ -14,12 +14,10 @@ module ColorLS
     def initialize(name:, parent:, path: nil, link_info: true)
       @name = name
       @parent = parent
-      @path = path.nil? ? File.join(parent, name) : +path
+      @path = path.nil? ? File.join(parent, name) : path
       @stats = File.lstat(@path)
       @show_name = nil
 
-      @path.force_encoding(ColorLS.file_encoding)
-
       handle_symlink(@path) if link_info && @stats.symlink?
     end
 

data/lib/colorls/flags.rb

@@ -11,7 +11,7 @@ module ColorLS
       @light_colors = false
 
       @opts = default_opts
-      @report_mode = false
+      @show_report = false
       @exit_status_code = 0
 
       parse_options
@@ -35,7 +35,7 @@ module ColorLS
       list = @parser.top.list + @parser.base.list
 
       result = list.collect do |o|
-        next unless o.respond_to? :desc
+        next unless o.respond_to? 'desc'
 
         flags = o.short + o.long
         next if flags.empty?
@@ -88,7 +88,7 @@ module ColorLS
         $stderr.puts "#{dir}: #{e}".colorize(:red)
       end
 
-      core.display_report(@report_mode) if @report_mode
+      core.display_report if @show_report
 
       @exit_status_code
     end
@@ -102,12 +102,11 @@ module ColorLS
         mode: STDOUT.tty? ? :vertical : :one_per_line, # rubocop:disable Style/GlobalStdStream
         all: false,
         almost_all: false,
-        show_git: false,
+        git_status: false,
         colors: [],
         tree_depth: 3,
-        show_inode: false,
-        indicator_style: 'slash',
-        long_style_options: {}
+        show_group: true,
+        show_user: true
       }
     end
 
@@ -140,19 +139,8 @@ module ColorLS
       options.on('-A', '--almost-all', 'do not list . and ..')            { @opts[:almost_all] = true }
       options.on('-d', '--dirs', 'show only directories')                 { @opts[:show] = :dirs }
       options.on('-f', '--files', 'show only files')                      { @opts[:show] = :files }
-      options.on('--gs', '--git-status', 'show git status for each file') { @opts[:show_git] = true }
-      options.on('-p', 'append / indicator to directories')               { @opts[:indicator_style] = 'slash' }
-      options.on('-i', '--inode', 'show inode number')                    { @opts[:show_inode] = true }
-      options.on('--report=[WORD]', %w[short long], 'show report: short, long (default if omitted)') do |word|
-        word ||= :long
-        @report_mode = word.to_sym
-      end
-      options.on(
-        '--indicator-style=[STYLE]',
-        %w[none slash], 'append indicator with style STYLE to entry names: none, slash (-p) (default)'
-      ) do |style|
-        @opts[:indicator_style] = style
-      end
+      options.on('--gs', '--git-status', 'show git status for each file') { @opts[:git_status] = true }
+      options.on('--report', 'show brief report')                         { @show_report = true }
     end
 
     def add_format_options(options)
@@ -176,36 +164,17 @@ module ColorLS
       options.on('-C', 'list entries by columns instead of by lines')     { @opts[:mode] = :vertical }
     end
 
-    def default_long_style_options
-      {
-        show_group: true,
-        show_user: true,
-        time_style: '',
-        hard_links_count: true
-      }
-    end
-
     def add_long_style_options(options)
-      long_style_options = default_long_style_options
-      options.on('-l', '--long', 'use a long listing format') { @opts[:mode] = :long }
+      options.on('-l', '--long', 'use a long listing format')             { @opts[:mode] = :long }
       options.on('-o', 'use a long listing format without group information') do
         @opts[:mode] = :long
-        long_style_options[:show_group] = false
+        @opts[:show_group] = false
       end
       options.on('-g', 'use a long listing format without owner information') do
         @opts[:mode] = :long
-        long_style_options[:show_user] = false
-      end
-      options.on('-G', '--no-group', 'show no group information in a long listing') do
-        long_style_options[:show_group] = false
-      end
-      options.on('--time-style=FORMAT', String, 'use time display format') do |time_style|
-        long_style_options[:time_style] = time_style
-      end
-      options.on('--no-hardlinks', 'show no hard links count in a long listing') do
-        long_style_options[:hard_links_count] = false
+        @opts[:show_user] = false
       end
-      @opts[:long_style_options] = long_style_options
+      options.on('-G', '--no-group', 'show no group information in a long listing') { @opts[:show_group] = false }
     end
 
     def add_general_options(options)

data/lib/colorls/git.rb

@@ -5,9 +5,6 @@ require 'set'
 
 module ColorLS
   module Git
-    EMPTY_SET = Set.new.freeze
-    private_constant :EMPTY_SET
-
     def self.status(repo_path)
       prefix, success = git_prefix(repo_path)
 
@@ -16,11 +13,10 @@ module ColorLS
       prefix_path = Pathname.new(prefix)
 
       git_status = Hash.new { |hash, key| hash[key] = Set.new }
-      git_status_default = EMPTY_SET
 
       git_subdir_status(repo_path) do |mode, file|
         if file == prefix
-          git_status_default = Set[mode].freeze
+          git_status.default = Set[mode].freeze
         else
           path = Pathname.new(file).relative_path_from(prefix_path)
           git_status[path.descend.first.cleanpath.to_s].add(mode)
@@ -29,7 +25,7 @@ module ColorLS
 
       warn "git status failed in #{repo_path}" unless $CHILD_STATUS.success?
 
-      git_status.default = git_status_default
+      git_status.default = Set.new.freeze if git_status.default.nil?
       git_status.freeze
     end
 

data/lib/colorls/monkeys.rb

@@ -6,6 +6,6 @@ class String
   end
 
   def uniq
-    chars.uniq.join
+    split('').uniq.join
   end
 end

data/lib/colorls.rb

@@ -5,7 +5,6 @@ require 'etc'
 require 'English'
 require 'filesize'
 require 'io/console'
-require 'io/console/size'
 require 'rainbow/ext/string'
 require 'clocale'
 require 'unicode/display_width'

data/lib/yaml/dark_colors.yaml

@@ -36,7 +36,6 @@ tree:   cyan
 empty:  yellow
 error:  red
 normal: darkkhaki
-inode: moccasin
 
 # Git
 addition:     chartreuse

data/lib/yaml/file_aliases.yaml

@@ -11,7 +11,6 @@ editorconfig:     conf
 scss:             css
 docx:             doc
 gdoc:             doc
-odt:              doc
 dockerfile:       docker
 mobi:             ebook
 eot:              font
@@ -28,7 +27,6 @@ gif:              image
 ico:              image
 jpeg:             image
 jpg:              image
-odg:              image
 png:              image
 pxm:              image
 svg:              image
@@ -43,7 +41,6 @@ mkd:              md
 rdoc:             md
 readme:           md
 gslides:          ppt
-odp:              ppt
 pptx:             ppt
 ipynb:            py
 pyc:              py
@@ -84,7 +81,6 @@ exe:              windows
 ini:              windows
 csv:              xls
 gsheet:           xls
-ods:              xls
 xlsx:             xls
 xul:              xml
 yaml:             yml

data/lib/yaml/light_colors.yaml

@@ -36,7 +36,6 @@ tree:   cyan
 empty:  yellow
 error:  red
 normal: black
-inode: black
 
 # Git
 addition:     chartreuse

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" "April 2022" "colorls 1.4.4" "colorls Manual"
+.TH "COLORLS" "1" "January 2021" "colorls 1.4.4" "colorls Manual"
 .
 .SH "NAME"
 \fBcolorls\fR \- list directory contents with colors and icons
@@ -43,20 +43,8 @@ show only files
 show git status for each file
 .
 .TP
-\fB\-p\fR
-append / indicator to directories
-.
-.TP
-\fB\-i\fR, \fB\-\-inode\fR
-show inode number
-.
-.TP
 \fB\-\-report\fR
-show report: short, long (default if omitted)
-.
-.TP
-\fB\-\-indicator\-style\fR
-append indicator with style STYLE to entry names: none, slash (\-p) (default)
+show brief report
 .
 .TP
 \fB\-\-format\fR
@@ -95,14 +83,6 @@ use a long listing format without owner information
 show no group information in a long listing
 .
 .TP
-\fB\-\-time\-style\fR
-use time display format
-.
-.TP
-\fB\-\-no\-hardlinks\fR
-show no hard links count in a long listing
-.
-.TP
 \fB\-\-sd\fR, \fB\-\-sort\-dirs\fR, \fB\-\-group\-directories\-first\fR
 sort directories first
 .

data/zsh/_colorls

@@ -14,11 +14,7 @@ _arguments -s -S \
   "--files[show only files]" \
   "--gs[show git status for each file]" \
   "--git-status[show git status for each file]" \
-  "-p[append / indicator to directories]" \
-  "-i[show inode number]" \
-  "--inode[show inode number]" \
-  "--report[show report: short, long (default if omitted)]" \
-  "--indicator-style[append indicator with style STYLE to entry names: none, slash (-p) (default)]" \
+  "--report[show brief report]" \
   "--format[use format: across (-x), horizontal (-x), long (-l), single-column (-1), vertical (-C)]" \
   "-1[list one file per line]" \
   "--tree[shows tree view of the directory]" \
@@ -30,8 +26,6 @@ _arguments -s -S \
   "-g[use a long listing format without owner information]" \
   "-G[show no group information in a long listing]" \
   "--no-group[show no group information in a long listing]" \
-  "--time-style[use time display format]" \
-  "--no-hardlinks[show no hard links count in a long listing]" \
   "--sd[sort directories first]" \
   "--sort-dirs[sort directories first]" \
   "--group-directories-first[sort directories first]" \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.4.5.pre.96
+  version: 1.4.5.pre.872
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -224,28 +224,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -266,14 +266,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +312,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -375,14 +376,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Ruby CLI gem that beautifies the terminal's ls command, with color and