colorls 1.4.7.pre.120 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 720fa6e3cf54d8b133c503d0a1a85549ba7d1666ad3e7707551c34a1595cffe6
-  data.tar.gz: f42057e127321fff8887e76bd51b2cd6cfa8089726b4c0d4487ba332f000f3a7
+  metadata.gz: 0e67c80f0f7dbc910811f38d1d9253e51bc53d811e22b86a979ecbc0d23f11be
+  data.tar.gz: b53e2a6878499522c938334d2698a0d77c817fae92265121052f439e32be1b1e
 SHA512:
-  metadata.gz: d15c81052df356b5a735d512d0d27ee1808eb21afe8468637ad1963b4a4522d83fe753be4fc8260f696242f6fdb492b40cafe14fd2b0aae6cc55d9f5e5d55fd2
-  data.tar.gz: 7855c5c398cf19b0d2d5db9b1fe52aae1ad3ab40ef00a426728feb0939a52f4f1814bdca5a1fe1f7a018710bb19265658f2f23467eb72ac32b4107aef975de56
+  metadata.gz: 68af6daf21bedeb04cc09955eedf8c7469ac2efe78b100245e996c25ec8017c6f4fb8d93bc22a2e64063547495f91200c15d9f8c8ea9298ab27a9c0d162d139e
+  data.tar.gz: 3006b1acc16c0a61155b969591e054ee2d849e802548845e1f1c9efa55806f5e7c010c814728e0b9a8b122bab6f491fcda7dd8e16a902dc77a1ba61ec6413832

data/.rubocop.yml

@@ -113,6 +113,9 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 8
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 # TODO -----------------------------------------------------------------
 
 Style/Documentation:

data/README.md

@@ -113,6 +113,11 @@ Man pages have been added. Checkout `man colorls`.
 
   ![image](https://user-images.githubusercontent.com/17109060/32149084-9eb2a416-bd25-11e7-8fb7-a9d336c6e038.png)
 
+- Using `--non-human-readable` with `-l` :
+  - This will print the file sizes in bytes (non-human readable format)
+
+  ![image](https://user-images.githubusercontent.com/19269206/234581461-1e1fdd90-a362-4cea-ab82-5ca360746be8.png)
+
 # Installation
 
 [(Back to top)](#table-of-contents)

data/colorls.gemspec

@@ -25,11 +25,10 @@ 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']
+  build_number = ENV.fetch('GITHUB_RUN_NUMBER', nil)
 
   spec.name          = 'colorls'
   spec.version       = if build_number && is_origin && !is_tagged
@@ -70,17 +69,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codecov', '~> 0.1'
-  spec.add_development_dependency 'diffy', '~> 3'
+  spec.add_development_dependency 'diffy', '3.4.2'
   spec.add_development_dependency 'rake', '~> 13'
   spec.add_development_dependency 'rdoc', '~> 6.1'
   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.50.1'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.17.1'
   spec.add_development_dependency 'rubocop-rake', '~> 0.5'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.10.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.20.0'
   spec.add_development_dependency 'rubygems-tasks', '~> 0'
-  spec.add_development_dependency 'simplecov', '~> 0.21.2'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
 end
-# rubocop:enable Metrics/BlockLength

data/lib/colorls/core.rb

@@ -24,11 +24,13 @@ module ColorLS
     @screen_width
   end
 
-  class Core
+  class Core # rubocop:disable Metrics/ClassLength
+    MIN_SIZE_CHARS = 4
+
     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: {})
+      indicator_style: 'slash', long_style_options: {}, icons: true)
       @count = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
       @almost_all   = almost_all
@@ -46,14 +48,16 @@ module ColorLS
       @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)
+      @icons = icons
 
       init_colors colors
-
       init_icons
     end
 
+    def additional_chars_per_item
+      12 + (@show_git ? 4 : 0) + (@show_inode ? 10 : 0)
+    end
+
     def ls_dir(info)
       if @tree[:mode]
         print "\n"
@@ -118,6 +122,7 @@ module ColorLS
       layout.each_line do |line, widths|
         ls_line(line, widths)
       end
+      clear_chars_for_size
     end
 
     def init_colors(colors)
@@ -137,6 +142,9 @@ module ColorLS
       @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_symbol_dest = long_style_options.key?(:show_symbol_dest) ? long_style_options[:show_symbol_dest] : false
+      @show_human_readable_size =
+        long_style_options.key?(:human_readable_size) ? long_style_options[:human_readable_size] : true
     end
 
     def init_git_status(show_git)
@@ -155,7 +163,7 @@ module ColorLS
     end
 
     def item_widths
-      @contents.map { |item| Unicode::DisplayWidth.of(item.show) + @additional_chars_per_item }
+      @contents.map { |item| Unicode::DisplayWidth.of(item.show) + additional_chars_per_item }
     end
 
     def filter_hidden_contents
@@ -251,14 +259,36 @@ module ColorLS
     end
 
     def size_info(filesize)
-      size = Filesize.new(filesize).pretty.split
-      size = "#{size[0][0..-4].rjust(4,' ')} #{size[1].ljust(3,' ')}"
+      filesize = Filesize.new(filesize)
+      size = @show_human_readable_size ? filesize.pretty : filesize.to_s
+      size = size.split
+      size = justify_size_info(size)
       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 chars_for_size
+      @chars_for_size ||= if @show_human_readable_size
+                            MIN_SIZE_CHARS
+                          else
+                            max_size = @contents.max_by(&:size).size
+                            reqd_chars = max_size.to_s.length
+                            [reqd_chars, MIN_SIZE_CHARS].max
+                          end
+    end
+
+    def justify_size_info(size)
+      size_num = size[0][0..-4].rjust(chars_for_size, ' ')
+      size_unit = @show_human_readable_size ? size[1].ljust(3, ' ') : size[1]
+      "#{size_num} #{size_unit}"
+    end
+
+    def clear_chars_for_size
+      @chars_for_size = nil
+    end
+
     def mtime_info(file_mtime)
       mtime = @time_style.start_with?('+') ? file_mtime.strftime(@time_style.delete_prefix('+')) : file_mtime.asctime
       now = Time.now
@@ -315,7 +345,7 @@ module ColorLS
       line_array.push links if @hard_links_count
       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)]
+      line_array.push(size_info(content.size), mtime_info(content.mtime))
       line_array.join('   ')
     end
 
@@ -331,6 +361,15 @@ module ColorLS
       end
     end
 
+    def update_content_if_show_symbol_dest(content, show_symbol_dest_flag)
+      return content unless show_symbol_dest_flag
+      return content unless content.symlink?
+      return content if content.link_target.nil?
+      return content if content.dead?
+
+      FileInfo.info(content.link_target)
+    end
+
     def out_encode(str)
       str.encode(Encoding.default_external, undef: :replace, replace: '')
     end
@@ -341,10 +380,13 @@ module ColorLS
       logo  = value.gsub(/\\u[\da-f]{4}/i) { |m| [m[-4..].to_i(16)].pack('U') }
       name = @hyperlink ? make_link(content) : content.show
       name += content.directory? && @indicator_style != 'none' ? '/' : ' '
-      entry = "#{out_encode(logo)}  #{out_encode(name)}"
+      entry = @icons ? "#{out_encode(logo)}  #{out_encode(name)}" : out_encode(name).to_s
       entry = entry.bright if !content.directory? && content.executable?
 
-      "#{inode(content)} #{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
+      symlink_info_string = symlink_info(content)
+      content = update_content_if_show_symbol_dest(content,@show_symbol_dest)
+
+      "#{inode(content)} #{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info_string}"
     end
 
     def ls_line(chunk, widths)
@@ -354,7 +396,7 @@ module ColorLS
         entry = fetch_string(content, *options(content))
         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) - additional_chars_per_item
       end
       print line << "\n"
     end

data/lib/colorls/fileinfo.rb

@@ -11,20 +11,21 @@ module ColorLS
 
     attr_reader :stats, :name, :path, :parent
 
-    def initialize(name:, parent:, path: nil, link_info: true)
+    def initialize(name:, parent:, path: nil, link_info: true, show_filepath: false)
       @name = name
       @parent = parent
       @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?
+      set_show_name(use_path: show_filepath)
     end
 
-    def self.info(path, link_info: true)
-      FileInfo.new(name: File.basename(path), parent: File.dirname(path), path: path, link_info: link_info)
+    def self.info(path, link_info: true, show_filepath: false)
+      FileInfo.new(name: File.basename(path), parent: File.dirname(path), path: path, link_info: link_info,
+                   show_filepath: show_filepath)
     end
 
     def self.dir_entry(dir, child, link_info: true)
@@ -32,10 +33,7 @@ module ColorLS
     end
 
     def show
-      return @show_name unless @show_name.nil?
-
-      @show_name = @name.encode(Encoding.find('filesystem'), Encoding.default_external,
-                                invalid: :replace, undef: :replace)
+      @show_name
     end
 
     def dead?
@@ -69,7 +67,7 @@ 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
@@ -80,5 +78,21 @@ module ColorLS
     rescue SystemCallError => e
       $stderr.puts "cannot read symbolic link: #{e}"
     end
+
+    def show_basename
+      @name.encode(Encoding.find('filesystem'), Encoding.default_external,
+                   invalid: :replace, undef: :replace)
+    end
+
+    def show_relative_path
+      @path.encode(Encoding.find('filesystem'), Encoding.default_external,
+                   invalid: :replace, undef: :replace)
+    end
+
+    def set_show_name(use_path: false)
+      @show_name = show_basename unless use_path
+      @show_name = show_basename if directory?
+      @show_name = show_relative_path if use_path
+    end
   end
 end

data/lib/colorls/flags.rb

@@ -2,7 +2,6 @@
 
 require 'optparse'
 require 'colorls/version'
-require 'ostruct'
 
 module ColorLS
   class Flags
@@ -31,6 +30,8 @@ module ColorLS
       process_args
     end
 
+    Option = Struct.new(:flags, :desc)
+
     def options
       list = @parser.top.list + @parser.base.list
 
@@ -40,7 +41,7 @@ module ColorLS
         flags = o.short + o.long
         next if flags.empty?
 
-        OpenStruct.new(flags: flags, desc: o.desc)
+        Option.new(flags, o.desc)
       end
 
       result.compact
@@ -57,7 +58,7 @@ module ColorLS
 
     def group_files_and_directories
       infos = @args.flat_map do |arg|
-        FileInfo.info(arg)
+        FileInfo.info(arg, show_filepath: true)
       rescue Errno::ENOENT
         $stderr.puts "colorls: Specified path '#{arg}' doesn't exist.".colorize(:red)
         @exit_status_code = 2
@@ -174,6 +175,7 @@ module ColorLS
       end
       options.on('-x', 'list entries by lines instead of by columns')     { @opts[:mode] = :horizontal }
       options.on('-C', 'list entries by columns instead of by lines')     { @opts[:mode] = :vertical }
+      options.on('--without-icons', 'list entries without icons')         { @opts[:icons] = false }
     end
 
     def default_long_style_options
@@ -181,13 +183,30 @@ module ColorLS
         show_group: true,
         show_user: true,
         time_style: '',
-        hard_links_count: true
+        hard_links_count: true,
+        show_symbol_dest: false,
+        human_readable_size: 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 }
+      long_style_options = set_long_style_user_and_group_options(options, long_style_options)
+      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
+      end
+      long_style_options = get_long_style_symlink_options(options, long_style_options)
+      options.on('--non-human-readable', 'show file sizes in bytes only') do
+        long_style_options[:human_readable_size] = false
+      end
+      @opts[:long_style_options] = long_style_options
+    end
+
+    def set_long_style_user_and_group_options(options, long_style_options)
       options.on('-o', 'use a long listing format without group information') do
         @opts[:mode] = :long
         long_style_options[:show_group] = false
@@ -199,13 +218,14 @@ module ColorLS
       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
+      long_style_options
+    end
+
+    def get_long_style_symlink_options(options, long_style_options)
+      options.on('-L', 'show information on the destination of symbolic links') do
+        long_style_options[:show_symbol_dest] = true
       end
-      @opts[:long_style_options] = long_style_options
+      long_style_options
     end
 
     def add_general_options(options)

data/lib/colorls/git.rb

@@ -52,7 +52,7 @@ module ColorLS
 
       def git_prefix(repo_path)
         [
-          IO.popen(['git', '-C', repo_path, 'rev-parse', '--show-prefix'], err: :close, &:gets)&.chomp,
+          IO.popen(['git', '-C', repo_path, 'rev-parse', '--show-prefix'], err: File::NULL, &:gets)&.chomp,
           $CHILD_STATUS.success?
         ]
       rescue Errno::ENOENT

data/lib/colorls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ColorLS
-  VERSION = '1.4.6'
+  VERSION = '1.5.0'
 end

data/lib/yaml/file_aliases.yaml

@@ -91,3 +91,4 @@ yaml:             yml
 gz:               zip
 rar:              zip
 tar:              zip
+tgz:              zip

data/lib/yaml/files.yaml

@@ -48,6 +48,7 @@ py:           ""
 r:            ""
 rb:           ""
 rdb:          ""
+react:        "ﰆ"
 rss:          ""
 rubydoc:      ""
 sass:         ""
@@ -61,6 +62,7 @@ twig:         ""
 txt:          ""
 video:        ""
 vim:          ""
+vue:          "﵂"
 windows:      ""
 xls:          ""
 xml:          ""

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.6" "colorls Manual"
+.TH "COLORLS" "1" "April 2023" "colorls 1.5.0" "colorls Manual"
 .
 .SH "NAME"
 \fBcolorls\fR \- list directory contents with colors and icons
@@ -79,6 +79,10 @@ list entries by lines instead of by columns
 list entries by columns instead of by lines
 .
 .TP
+\fB\-\-without\-icons\fR
+list entries without icons
+.
+.TP
 \fB\-l\fR, \fB\-\-long\fR
 use a long listing format
 .
@@ -103,6 +107,14 @@ use time display format
 show no hard links count in a long listing
 .
 .TP
+\fB\-L\fR
+show information on the destination of symbolic links
+.
+.TP
+\fB\-\-non\-human\-readable\fR
+show file sizes in bytes only
+.
+.TP
 \fB\-\-sd\fR, \fB\-\-sort\-dirs\fR, \fB\-\-group\-directories\-first\fR
 sort directories first
 .

data/zsh/_colorls

@@ -24,6 +24,7 @@ _arguments -s -S \
   "--tree[shows tree view of the directory]" \
   "-x[list entries by lines instead of by columns]" \
   "-C[list entries by columns instead of by lines]" \
+  "--without-icons[list entries without icons]" \
   "-l[use a long listing format]" \
   "--long[use a long listing format]" \
   "-o[use a long listing format without group information]" \
@@ -32,6 +33,8 @@ _arguments -s -S \
   "--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]" \
+  "-L[show information on the destination of symbolic links]" \
+  "--non-human-readable[show file sizes in bytes only]" \
   "--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.7.pre.120
+  version: 1.5.0
 platform: ruby
 authors:
 - Athitya Kumar
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -138,16 +138,16 @@ dependencies:
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -224,28 +224,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.50.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.50.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.17.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.10.0
+        version: 2.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -294,15 +294,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
-description: 
+        version: 0.22.0
+description:
 email:
 - athityakumar@gmail.com
 executables:
@@ -378,12 +378,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: A Ruby CLI gem that beautifies the terminal's ls command, with color and
   font-awesome icons.