colorls 1.4.3.pre.833 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae10b489eb11d679a8609075cb11018b4e5168301b953fb8438d24cf910e4efa
-  data.tar.gz: d7473d0e9c133423dd2bd0b86f6e40342b22a1a7bab1ab83d2b49aa7575c72ac
+  metadata.gz: 6262614e4d1fc244092d9d8475615bfef90e76a578973f185c77e1b7a1ced3d1
+  data.tar.gz: 8a80bf1393ba0c052bc2679797bbf63331c07bfac2c289c8025fa2a0806dcd09
 SHA512:
-  metadata.gz: d0c98c861a7d490481ecc54c44f9ca958cb1b5ef2ccdb074a1c5f8537e50d680878398ad21374dc442be95f9885ab657cd320d8887a0278df3107f081b6f7660
-  data.tar.gz: e9dae29ef7397270a3a0470b9473d9c635a286d0e61a4329d2075d09139cf9bbe0b992b6328c5f090c2e59914ac0912cfed576834708a8852a460045bbaee2b0
+  metadata.gz: 9d1985b6402cb04850ee8b501d03bc7ed50fe724816e48768824cc6a3fa6d8c7d9975c0f057aa168341c98f3c2807af797b5c1a3dbb715859703210c5ccfb7a3
+  data.tar.gz: 28c10940c031149210950f53cfffe22bff07624506a89d8fbedfc3e45ed0971f3e2c9400b0dc0cc8942b6ef2338f6b6143f7b9d76bef6dc2d5a4a071bc887fe2

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,6 +75,12 @@ 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
 
@@ -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)

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.833
+  version: 1.4.3
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale
@@ -345,9 +345,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key: