colorls 1.2.1.pre.600 → 1.2.1.pre.603

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cce6a6d2fc6e45ce4fcc87135a13edc7442ab041475339d2b89b1e14c3bce94
-  data.tar.gz: 954dccdc0786131ceb3fc23d70679bafd7877868344a516ed9d00a897afb0883
+  metadata.gz: fbb7f4f4123aa809327372636d3def2506fd78446e4177d8b2ba401aa93a6cc7
+  data.tar.gz: f24be4a1bf2306e84b2dd247eb4dba5b6a8a227c65b525cc9ddae4d4272da3d2
 SHA512:
-  metadata.gz: f8409394b3bb49344b1231a671966be47dc97deef8909bbac0611db39e83475574288e14f539a9f11bdd995008e7569fa3df51b885ee12fc2ec92f325e843a30
-  data.tar.gz: 22987f1296da307242ca4b9709345c9c64979f3a2f59feb1d6e238a2afdc2372f00a2a2f2e04a68fe25419b4676c977d64ab8929d9f60386d339d6a799c2c4cf
+  metadata.gz: 1ab762d41a7d746ffe9e992c7cf432577f8901d50fae7080446654eba5ad9c2a694158f4f3c3b63d073c2aa87c94f923024239f7ac6f13c47563f793da5a83cf
+  data.tar.gz: fb3563bb2a6da81520b6775518302a73ffcc46c1bbe36fa7b047431f64365a05ba9b032d8d27627257173a23f3cdb70bb30044335736ac38c1f1d4ea6f2143ab

data/lib/colorls.rb

@@ -11,6 +11,7 @@ require 'clocale'
 require 'colorls/core'
 require 'colorls/fileinfo'
 require 'colorls/flags'
+require 'colorls/layout'
 require 'colorls/yaml'
 require 'colorls/monkeys'
 require 'colorls/git'

data/lib/colorls/core.rb

@@ -18,6 +18,7 @@ module ColorLS
       @one_per_line = mode == :one_per_line
       @long         = mode == :long
       @tree         = {mode: mode == :tree, depth: tree_depth}
+      @horizontal   = mode == :horizontal
       process_git_status_details(git_status)
 
       @screen_width = IO.console.winsize[1]
@@ -26,20 +27,28 @@ module ColorLS
       init_colors colors
 
       @contents   = init_contents(input)
-      @max_widths = @contents.map { |c| c.name.length }
       init_icons
     end
 
     def ls
       return print "\n   Nothing to show here\n".colorize(@colors[:empty]) if @contents.empty?
 
-      if @tree[:mode]
-        print "\n"
-        tree_traverse(@input, 0, 1, 2)
-      else
-        @contents = chunkify
-        @contents.each { |chunk| ls_line(chunk) }
+      layout = case
+               when @tree[:mode] then
+                 print "\n"
+                 return tree_traverse(@input, 0, 1, 2)
+               when @horizontal then
+                 HorizontalLayout.new(@contents, item_widths, @screen_width)
+               when @one_per_line || @long then
+                 SingleColumnLayout.new(@contents)
+               else
+                 VerticalLayout.new(@contents, item_widths, @screen_width)
+               end
+
+      layout.each_line do |line, widths|
+        ls_line(line, widths)
       end
+
       display_report if @report
       true
     end
@@ -59,6 +68,13 @@ module ColorLS
       end
     end
 
+    # how much characters an item occupies besides its name
+    CHARS_PER_ITEM = 12
+
+    def item_widths
+      @contents.map { |item| item.name.size + CHARS_PER_ITEM }
+    end
+
     def init_contents(path)
       info = FileInfo.new(path, link_info = @long)
 
@@ -144,30 +160,6 @@ module ColorLS
       @folder_aliases = ColorLS::Yaml.new('folder_aliases.yaml').load(aliase: true)
     end
 
-    def chunkify
-      return @contents.zip if @one_per_line || @long
-
-      chunk_size = @contents.size
-      max_widths = @max_widths
-
-      until in_line(chunk_size, max_widths) || chunk_size <= 1
-        chunk_size -= 1
-        max_widths      = @max_widths.each_slice(chunk_size).to_a
-        max_widths[-1] += [0] * (chunk_size - max_widths.last.size)
-        max_widths      = max_widths.transpose.map(&:max)
-      end
-      @max_widths = max_widths
-      @contents = get_chunk(chunk_size)
-    end
-
-    def get_chunk(chunk_size)
-      @contents.each_slice(chunk_size).to_a
-    end
-
-    def in_line(chunk_size, max_widths)
-      (max_widths.sum + 12 * chunk_size <= @screen_width)
-    end
-
     def display_report
       print "\n   Found #{@total_content_length} contents in directory "
         .colorize(@colors[:report])
@@ -280,33 +272,27 @@ module ColorLS
       end
     end
 
-    def slash?(content)
-      content.directory? ? '/'.colorize(@colors[:dir]) : ' '
-    end
-
     def fetch_string(path, 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..-1].to_i(16)].pack('U') }
       name = content.name
       name = make_link(path, name) if @hyperlink
+      name += content.directory? ? '/' : ' '
+      entry = logo + '  ' + name
 
-      [
-        long_info(content),
-        " #{git_info(content)} ",
-        logo.colorize(color),
-        "  #{name.colorize(color)}#{slash?(content)}#{symlink_info(content)}"
-      ].join
+      "#{long_info(content)} #{git_info(content)} #{entry.colorize(color)}#{symlink_info(content)}"
     end
 
-    def ls_line(chunk)
+    def ls_line(chunk, widths)
+      padding = 0
+      line = +''
       chunk.each_with_index do |content, i|
-        break if content.name.empty?
-
-        print "  #{fetch_string(@input, content, *options(content))}"
-        print ' ' * (@max_widths[i] - content.name.length) unless @one_per_line || @long
+        line << ' ' * padding
+        line << '  ' << fetch_string(@input, content, *options(content))
+        padding = widths[i] - content.name.length - CHARS_PER_ITEM
       end
-      print "\n"
+      print line << "\n"
     end
 
     def file_color(file, key)

data/lib/colorls/flags.rb

@@ -15,7 +15,7 @@ module ColorLS
         sort: true,
         reverse: false,
         group: nil,
-        mode: STDOUT.tty? || :one_per_line,
+        mode: STDOUT.tty? ? :vertical : :one_per_line,
         all: false,
         almost_all: false,
         report: false,
@@ -106,22 +106,24 @@ module ColorLS
 
     def add_format_options(options)
       options.on(
-        '--format=WORD', %w[accross horizontal long single-column],
-        'use format: accross (-x), horizontal (-x), long (-l), single-column (-1)'
+        '--format=WORD', %w[across horizontal long single-column],
+        'use format: across (-x), horizontal (-x), long (-l), single-column (-1), vertical (-C)'
       ) do |word|
         case word
-        when 'accross', 'horizontal' then @opts[:mode] = true
+        when 'across', 'horizontal' then @opts[:mode] = :horizontal
+        when 'vertical' then @opts[:mode] = :vertical
         when 'long' then @opts[:mode] = :long
         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('-x', 'list entries by lines instead of by columns')     { @opts[:mode] = true }
       options.on('--tree=[DEPTH]', Integer, 'shows tree view of the directory') do |depth|
         @opts[:tree_depth] = depth
         @opts[:mode] = :tree
       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 }
     end
 
     def add_general_options(options)

data/lib/colorls/layout.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module ColorLS
+  class Layout
+    def initialize(contents, widths, line_size)
+      @max_widths = widths
+      @contents = contents
+      @screen_width = line_size
+    end
+
+    def each_line
+      return if @contents.empty?
+
+      get_chunks(chunk_size).each { |line| yield(line.compact, @max_widths) }
+    end
+
+    private
+
+    def chunk_size
+      min_size = @max_widths.min
+      max_chunks = [1, @screen_width / min_size].max
+      max_chunks = [max_chunks, @max_widths.size].min
+      min_chunks = 1
+
+      loop do
+        mid = ((max_chunks + min_chunks).to_f / 2).ceil
+
+        size, max_widths = column_widths(mid)
+
+        if min_chunks < max_chunks && not_in_line(max_widths)
+          max_chunks = mid - 1
+        elsif min_chunks < mid
+          min_chunks = mid
+        else
+          @max_widths = max_widths
+          return size
+        end
+      end
+    end
+
+    def not_in_line(max_widths)
+      max_widths.sum > @screen_width
+    end
+  end
+
+  class SingleColumnLayout < Layout
+    def initialize(contents)
+      super(contents, [1], 1)
+    end
+
+    private
+
+    def chunk_size
+      1
+    end
+
+    def get_chunks(_chunk_size)
+      @contents.each_slice(1)
+    end
+  end
+
+  class HorizontalLayout < Layout
+    private
+
+    def column_widths(mid)
+      max_widths = @max_widths.each_slice(mid).to_a
+      last_size = max_widths.last.size
+      max_widths.last.fill(0, last_size, max_widths.first.size - last_size)
+      [mid, max_widths.transpose.map!(&:max)]
+    end
+
+    def get_chunks(chunk_size)
+      @contents.each_slice(chunk_size)
+    end
+  end
+
+  class VerticalLayout < Layout
+    private
+
+    def column_widths(mid)
+      chunk_size = (@max_widths.size.to_f / mid).ceil
+      [chunk_size, @max_widths.each_slice(chunk_size).map(&:max).to_a]
+    end
+
+    def get_chunks(chunk_size)
+      columns = @contents.each_slice(chunk_size).to_a
+      columns.last[chunk_size - 1] = nil if columns.last.size < chunk_size
+      columns.transpose
+    end
+  end
+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" "March 2019" "colorls 1.2.0" "colorls Manual"
+.TH "COLORLS" "1" "July 2019" "colorls 1.2.0" "colorls Manual"
 .
 .SH "NAME"
 \fBcolorls\fR \- list directory contents with colors and icons
@@ -48,7 +48,7 @@ show brief report
 .
 .TP
 \fB\-\-format\fR
-use format: accross (\-x), horizontal (\-x), long (\-l), single\-column (\-1)
+use format: across (\-x), horizontal (\-x), long (\-l), single\-column (\-1), vertical (\-C)
 .
 .TP
 \fB\-1\fR
@@ -59,12 +59,16 @@ list one file per line
 use a long listing format
 .
 .TP
+\fB\-\-tree\fR
+shows tree view of the directory
+.
+.TP
 \fB\-x\fR
 list entries by lines instead of by columns
 .
 .TP
-\fB\-\-tree\fR
-shows tree view of the directory
+\fB\-C\fR
+list entries by columns instead of by lines
 .
 .TP
 \fB\-\-sd\fR, \fB\-\-sort\-dirs\fR, \fB\-\-group\-directories\-first\fR

data/zsh/_colorls

@@ -15,12 +15,13 @@ _arguments -s -S \
   "--gs[show git status for each file]" \
   "--git-status[show git status for each file]" \
   "--report[show brief report]" \
-  "--format[use format: accross (-x), horizontal (-x), long (-l), single-column (-1)]" \
+  "--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]" \
-  "-x[list entries by lines instead of by columns]" \
   "--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]" \
   "--sd[sort directories first]" \
   "--sort-dirs[sort directories first]" \
   "--group-directories-first[sort directories first]" \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.2.1.pre.600
+  version: 1.2.1.pre.603
 platform: ruby
 authors:
 - Athitya Kumar
@@ -283,6 +283,7 @@ files:
 - lib/colorls/fileinfo.rb
 - lib/colorls/flags.rb
 - lib/colorls/git.rb
+- lib/colorls/layout.rb
 - lib/colorls/monkeys.rb
 - lib/colorls/version.rb
 - lib/colorls/yaml.rb