colorls 1.4.3.pre.821 → 1.4.4.pre.837

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0f04e149971cc9d610cb08f7364bec9f3b63187d976b304afbec9bcb8afdcc
-  data.tar.gz: 29543b60604940bafaedffb592eb3b9311c39a2aadd0616bb6cf73b4f43957cc
+  metadata.gz: 8b424cb09f3f8d4f46564313c314eac175b346ba97ca2da148dd313f553bc404
+  data.tar.gz: 315afc8e524855f08c9fdc419fd670ecae8c1c48fd768659e18f72193a4ce57b
 SHA512:
-  metadata.gz: a661090a205b799ed4242a574cbb628c9b0bb6041f69cf424b395716d3dfbbb9c191755a13741f3c7007d543d9ec545deda7cbcccc7652e33d93a5bc7b9aaa51
-  data.tar.gz: 6fb59bc86a79ea97db9f9129dcbe74357a9a8c55106fc6f9bd4195af400b0451458ca855fea53946900e12a87a899abd6d0b33f5657b6742245b7e570f4d42f7
+  metadata.gz: 503219ef596b7aac7ebb6d0c38127ebe8b5d6bba12d08a64ef963a016aad60074706e41d9cc270384a56fa985b6d1fb44f352c3889631dbbc42d2bf98297be58
+  data.tar.gz: 3d732a88f8f0b6f12fc545fa92b5397d38fe1ea69a09f341f9f4ec9fef15b62a6a2a8e6daafac6c27708ae73ba58d9900342c2ad4af23adca86b11842cd875cc

data/colorls.gemspec

@@ -63,6 +63,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'filesize', '~> 0'
   spec.add_runtime_dependency 'manpages', '~> 0'
   spec.add_runtime_dependency 'rainbow', '>= 2.2', '< 4.0'
+  spec.add_runtime_dependency 'unicode-display_width', '~> 1.7'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codecov', '~> 0.1'
@@ -72,10 +73,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.3.0'
+  spec.add_development_dependency 'rubocop', '~> 1.5.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.9.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
   spec.add_development_dependency 'rubygems-tasks', '~> 0'
-  spec.add_development_dependency 'simplecov', '~> 0.19.0'
+  spec.add_development_dependency 'simplecov', '~> 0.20.0'
 end
 # rubocop:enable Metrics/BlockLength

data/lib/colorls.rb

@@ -7,6 +7,7 @@ require 'filesize'
 require 'io/console'
 require 'rainbow/ext/string'
 require 'clocale'
+require 'unicode/display_width'
 
 require 'colorls/core'
 require 'colorls/fileinfo'

data/lib/colorls/core.rb

@@ -11,7 +11,7 @@ module ColorLS
   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)
+      reverse: false, hyperlink: false, tree_depth: nil, show_group: true, show_user: true)
       @input        = (+input).force_encoding(ColorLS.file_encoding)
       @count        = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
@@ -23,7 +23,7 @@ module ColorLS
       @group        = group
       @show         = show
       @one_per_line = mode == :one_per_line
-      @long         = mode == :long
+      init_long_format(mode,show_group,show_user)
       @tree         = {mode: mode == :tree, depth: tree_depth}
       @horizontal   = mode == :horizontal
       process_git_status_details(git_status)
@@ -75,11 +75,17 @@ module ColorLS
       end
     end
 
+    def init_long_format(mode,show_group,show_user)
+      @long = mode == :long
+      @show_group = show_group
+      @show_user = show_user
+    end
+
     # how much characters an item occupies besides its name
     CHARS_PER_ITEM = 12
 
     def item_widths
-      @contents.map { |item| item.show.size + CHARS_PER_ITEM }
+      @contents.map { |item| Unicode::DisplayWidth.of(item.show) + CHARS_PER_ITEM }
     end
 
     def init_contents(path)
@@ -210,7 +216,7 @@ module ColorLS
     end
 
     def size_info(filesize)
-      size = Filesize.from("#{filesize} B").pretty.split(' ')
+      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
@@ -274,8 +280,11 @@ module ColorLS
 
       links = content.nlink.to_s.rjust(@linklength)
 
-      [mode_info(content.stats), links, user_info(content), group_info(content.group),
-       size_info(content.size), mtime_info(content.mtime)].join('  ')
+      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)]
+      line_array.join('   ')
     end
 
     def symlink_info(content)
@@ -314,7 +323,7 @@ module ColorLS
         entry = fetch_string(@input, content, *options(content))
         line << ' ' * padding
         line << '  ' << entry.encode(Encoding.default_external, undef: :replace)
-        padding = widths[i] - content.show.length - CHARS_PER_ITEM
+        padding = widths[i] - Unicode::DisplayWidth.of(content.show) - CHARS_PER_ITEM
       end
       print line << "\n"
     end

data/lib/colorls/flags.rb

@@ -10,19 +10,7 @@ module ColorLS
       @args = args
       @light_colors = false
 
-      @opts = {
-        show: false,
-        sort: true,
-        reverse: false,
-        group: nil,
-        mode: STDOUT.tty? ? :vertical : :one_per_line, # rubocop:disable Style/GlobalStdStream
-        all: false,
-        almost_all: false,
-        report: false,
-        git_status: false,
-        colors: [],
-        tree_depth: 3
-      }
+      @opts = default_opts
 
       parse_options
 
@@ -81,6 +69,24 @@ module ColorLS
       warn "WARN: #{e}, check your locale settings"
     end
 
+    def default_opts
+      {
+        show: false,
+        sort: true,
+        reverse: false,
+        group: nil,
+        mode: STDOUT.tty? ? :vertical : :one_per_line, # rubocop:disable Style/GlobalStdStream
+        all: false,
+        almost_all: false,
+        report: false,
+        git_status: false,
+        colors: [],
+        tree_depth: 3,
+        show_group: true,
+        show_user: true
+      }
+    end
+
     def add_sort_options(options)
       options.separator ''
       options.separator 'sorting options:'
@@ -126,8 +132,7 @@ module ColorLS
         when 'single-column' then @opts[:mode] = :one_per_line
         end
       end
-      options.on('-1', 'list one file per line')                          { @opts[:mode] = :one_per_line }
-      options.on('-l', '--long', 'use a long listing format')             { @opts[:mode] = :long }
+      options.on('-1', 'list one file per line') { @opts[:mode] = :one_per_line }
       options.on('--tree=[DEPTH]', Integer, 'shows tree view of the directory') do |depth|
         @opts[:tree_depth] = depth
         @opts[:mode] = :tree
@@ -136,6 +141,19 @@ module ColorLS
       options.on('-C', 'list entries by columns instead of by lines')     { @opts[:mode] = :vertical }
     end
 
+    def add_long_style_options(options)
+      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
+        @opts[:show_group] = false
+      end
+      options.on('-g', 'use a long listing format without owner information') do
+        @opts[:mode] = :long
+        @opts[:show_user] = false
+      end
+      options.on('-G', '--no-group', 'show no group information in a long listing') { @opts[:show_group] = false }
+    end
+
     def add_general_options(options)
       options.separator ''
       options.separator 'general options:'
@@ -196,17 +214,22 @@ module ColorLS
 EXAMPLES
     end
 
+    def assign_each_options(opts)
+      add_common_options(opts)
+      add_format_options(opts)
+      add_long_style_options(opts)
+      add_sort_options(opts)
+      add_compatiblity_options(opts)
+      add_general_options(opts)
+      add_help_option(opts)
+    end
+
     def parse_options
       @parser = OptionParser.new do |opts|
         opts.banner = 'Usage:  colorls [OPTION]... [FILE]...'
         opts.separator ''
 
-        add_common_options(opts)
-        add_format_options(opts)
-        add_sort_options(opts)
-        add_compatiblity_options(opts)
-        add_general_options(opts)
-        add_help_option(opts)
+        assign_each_options(opts)
 
         opts.on_tail('--version', 'show version') do
           puts ColorLS::VERSION

data/lib/colorls/version.rb

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

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" "October 2020" "colorls 1.4.2" "colorls Manual"
+.TH "COLORLS" "1" "November 2020" "colorls 1.4.2" "colorls Manual"
 .
 .SH "NAME"
 \fBcolorls\fR \- list directory contents with colors and icons
@@ -55,10 +55,6 @@ use format: across (\-x), horizontal (\-x), long (\-l), single\-column (\-1), ve
 list one file per line
 .
 .TP
-\fB\-l\fR, \fB\-\-long\fR
-use a long listing format
-.
-.TP
 \fB\-\-tree\fR
 shows tree view of the directory
 .
@@ -71,6 +67,22 @@ list entries by lines instead of by columns
 list entries by columns instead of by lines
 .
 .TP
+\fB\-l\fR, \fB\-\-long\fR
+use a long listing format
+.
+.TP
+\fB\-o\fR
+use a long listing format without group information
+.
+.TP
+\fB\-g\fR
+use a long listing format without owner information
+.
+.TP
+\fB\-G\fR, \fB\-\-no\-group\fR
+show no group information in a long listing
+.
+.TP
 \fB\-\-sd\fR, \fB\-\-sort\-dirs\fR, \fB\-\-group\-directories\-first\fR
 sort directories first
 .

data/zsh/_colorls

@@ -17,11 +17,15 @@ _arguments -s -S \
   "--report[show brief report]" \
   "--format[use format: across (-x), horizontal (-x), long (-l), single-column (-1), vertical (-C)]" \
   "-1[list one file per line]" \
-  "-l[use a long listing format]" \
-  "--long[use a long listing format]" \
   "--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]" \
+  "-l[use a long listing format]" \
+  "--long[use a long listing format]" \
+  "-o[use a long listing format without group information]" \
+  "-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]" \
   "--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.3.pre.821
+  version: 1.4.4.pre.837
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale
@@ -72,6 +72,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -246,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 description: 
 email:
 - athityakumar@gmail.com