colorls 1.2.1.pre.606 → 1.2.1.pre.613

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e0e4f5763d6b85717a9641b9aee9d22673052a36d5db71ff4ee886b6a87ffff
-  data.tar.gz: d146ac598c0ddfd1fe64959b1e44b96f7dc6f4b843bda08dbfc748414bfb233c
+  metadata.gz: ca1363c7e1f385fc4effe36186a63c319d1c9cee648d00f91824a7eae280b36a
+  data.tar.gz: b28a5dc5053606ec1e969ac7a5565e3c8ce5faa2ee94e74b20a313ea054f1dbe
 SHA512:
-  metadata.gz: 2f227bdc38ef847d0a98162c8614beca1bb696dab8f44ac961208665372d2cbd69e0fdcb33618fae17442cd24b61d8c014345849f97fb227bd8cd93516789456
-  data.tar.gz: 4cde5e0b18faec82635dc201a2a45eebc6cb64321de25dfe25e688fe0fa2ad5214ee1731364e321b725558f8327a0eed1ab80e0f0f78a209b858cc142dacbc22
+  metadata.gz: 7efd794bf0de142a9167150fc3b20b489e91127b0f8d2f760d3d747e090c58f2499b1473cd681fe64aeab16a34694cccf4ced2dbbb047ccf3e8e29329d80917c
+  data.tar.gz: d9cf7fb635e51c9dedb03f17c562a54b6e680c1af8124b06879719a4c2b06f877f6d86fb4520acb474577378c5c20e0a6574f121e10c10f6c0becd54bf67ecf9

data/lib/colorls/core.rb

@@ -93,10 +93,8 @@ module ColorLS
       end
       @total_content_length = @contents.length
 
-      return @contents unless @long
+      init_column_lengths
 
-      init_user_lengths
-      init_group_lengths
       @contents
     end
 
@@ -105,16 +103,20 @@ module ColorLS
       @contents.keep_if { |x| !x.start_with? '.' } unless @all || @almost_all
     end
 
-    def init_user_lengths
-      @userlength = @contents.map do |c|
-        c.owner.length
-      end.max
-    end
+    def init_column_lengths
+      return unless @long
+
+      maxlink = maxuser = maxgroup = 0
 
-    def init_group_lengths
-      @grouplength = @contents.map do |c|
-        c.group.length
-      end.max
+      @contents.each do |c|
+        maxlink = c.nlink if c.nlink > maxlink
+        maxuser = c.owner.length if c.owner.length > maxuser
+        maxgroup = c.group.length if c.group.length > maxgroup
+      end
+
+      @linklength = maxlink.digits.length
+      @userlength = maxuser
+      @grouplength = maxgroup
     end
 
     def filter_contents
@@ -257,7 +259,9 @@ module ColorLS
     def long_info(content)
       return '' unless @long
 
-      [mode_info(content.stats), content.nlink, user_info(content), group_info(content.group),
+      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('  ')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.2.1.pre.606
+  version: 1.2.1.pre.613
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale