colorls 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8682c25dbecfcc9ceaac1d2c7f795327e9d463
-  data.tar.gz: 17073384fc2d7c650e745c33690de0a967e011b0
+  metadata.gz: 4985c3a5528c2e34ab5e8ccac1efbbd139e5d5a1
+  data.tar.gz: b54dc73e35b4d524b648c1348222dce052175b09
 SHA512:
-  metadata.gz: dd9f01a4a4366534770b5285e020e32e749392889a12442ac05904c4f6ab76b5913c8518bdd816bec2e2398796258e2225e71ed9a7f1685ca62892e2e82a768c
-  data.tar.gz: 863c44d9919e67f56552f8cdb5825ac41edb05902236737dfd8e3f711b9eeaed44e2e84940610ee718b71619aac5aeca1d58cb15057ab57763c0cf58c9c76d61
+  metadata.gz: 6ee0668a87a81f540e2e828a3f01e43f05180d16a9447b92d6eb65c14e9f0cd7afe1c23b6d1ac3a918748b2f8a9e5e11f5a51e7e9777ce9e80a572b315e01234
+  data.tar.gz: 5859c0c78a18285d9cbea49b4197d1173cfb1dbf3cfc452a4455d53d5b04ba311e057dc2776120f2a715c888d59be2b13b750280d07f7bb0d975bdeb236b6874

data/.travis.yml

@@ -12,16 +12,21 @@ script:
   - bundle exec rspec
   - rake install
   - colorls
+  - colorls -1
   - colorls -a
+  - colorls -A
   - colorls -d
   - colorls -f
+  - colorls -l
+  - colorls -l spec/fixtures/symlinks
+  - colorls -r
   - colorls -sd
   - colorls -sf
-  - colorls -1
-  - colorls -r
-  - colorls -l
+  - colorls -t
+  - colorls spec/fixtures/symlinks
   - colorls README.md
   - colorls *
+  - colorls | grep /
 
 install:
   - gem install bundler

data/lib/colorls/core.rb

@@ -1,58 +1,70 @@
 module ColorLS
   class Core
     def initialize(input=nil, all: false, report: false, sort: false, show: false,
-      one_per_line: false, long: false)
+      one_per_line: false, long: false, almost_all: false, tree: false)
       @input        = input || Dir.pwd
       @count        = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
+      @almost_all   = almost_all
       @report       = report
       @sort         = sort
       @show         = show
       @one_per_line = one_per_line
       @long         = long
+      @tree         = tree
       @screen_width = ::TermInfo.screen_size.last
 
-      init_contents
+      @contents   = init_contents(@input)
       @max_widths = @contents.map(&:length)
       init_icons
     end
 
     def ls
-      if @contents.empty?
-        print "Nothing to show here\n".colorize(:yellow)
+      return print "\n   Nothing to show here\n".colorize(:yellow) if @contents.empty?
+
+      if @tree
+        print "\n"
+        tree_traverse(@input, 0, 2)
       else
         @contents = chunkify
         @max_widths = @contents.transpose.map { |c| c.map(&:length).max }
         @contents.each { |chunk| ls_line(chunk) }
-        print "\n"
-        display_report if @report
       end
+      print "\n"
+      display_report if @report
 
       true
     end
 
     private
 
-    def init_contents
-      @contents = if Dir.exist?(@input)
-                    Dir.entries(@input) - %w[. ..]
+    def init_contents(path)
+      @contents = if Dir.exist?(path)
+                    Dir.entries(path)
                   else
-                    [@input]
+                    [path]
                   end
 
-      @contents.keep_if { |x| !x.start_with? '.' } unless @all
-      filter_contents if @show
-      sort_contents   if @sort
+      filter_hidden_contents
+      filter_contents(path) if @show
+      sort_contents(path)   if @sort
 
       @total_content_length = @contents.length
 
-      return unless @long
+      return @contents unless @long
       init_user_lengths
       init_group_lengths
+      @contents
+    end
+
+    def filter_hidden_contents
+      @contents -= %w[. ..] unless @all
+      @contents.keep_if { |x| !x.start_with? '.' } unless @all || @almost_all
     end
 
     def init_user_lengths
       @userlength = @contents.map do |c|
+        next 0 unless File.exist?("#{@input}/#{c}")
         begin
           user = Etc.getpwuid(File.stat("#{@input}/#{c}").uid).name
         rescue ArgumentError
@@ -64,6 +76,7 @@ module ColorLS
 
     def init_group_lengths
       @grouplength = @contents.map do |c|
+        next 0 unless File.exist?("#{@input}/#{c}")
         begin
           group = Etc.getgrgid(File.stat("#{@input}/#{c}").gid).name
         rescue ArgumentError
@@ -73,20 +86,20 @@ module ColorLS
       end.max
     end
 
-    def filter_contents
+    def filter_contents(path)
       @contents.keep_if do |x|
-        next Dir.exist?("#{@input}/#{x}") if @show == :dirs
-        !Dir.exist?("#{@input}/#{x}")
+        next Dir.exist?("#{path}/#{x}") if @show == :dirs
+        !Dir.exist?("#{path}/#{x}")
       end
     end
 
-    def sort_contents
-      @contents.sort! { |a, b| cmp_by_dirs(a, b) }
+    def sort_contents(path)
+      @contents.sort! { |a, b| cmp_by_dirs(path, a, b) }
     end
 
-    def cmp_by_dirs(a, b)
-      is_a_dir = Dir.exist?("#{@input}/#{a}")
-      is_b_dir = Dir.exist?("#{@input}/#{b}")
+    def cmp_by_dirs(path, a, b)
+      is_a_dir = Dir.exist?("#{path}/#{a}")
+      is_b_dir = Dir.exist?("#{path}/#{b}")
 
       return cmp_by_alpha(a, b) unless is_a_dir ^ is_b_dir
 
@@ -135,7 +148,7 @@ module ColorLS
     end
 
     def in_line(chunk_size)
-      return false if @max_widths.sum + 6 * chunk_size > @screen_width
+      return false if @max_widths.sum + 7 * chunk_size > @screen_width
       true
     end
 
@@ -199,8 +212,25 @@ module ColorLS
     end
 
     def long_info(content)
+      return '' unless @long
+      unless File.exist?("#{@input}/#{content}")
+        return '[No Info]'.colorize(:red) + ' ' * (39 + @userlength + @grouplength)
+      end
       stat = File.stat("#{@input}/#{content}")
-      "#{mode_info(stat)}  #{user_info(stat)}  #{group_info(stat)}  #{size_info(stat)}  #{mtime_info(stat)}  "
+      [mode_info(stat), user_info(stat), group_info(stat), size_info(stat), mtime_info(stat)].join('  ')
+    end
+
+    def symlink_info(content)
+      return '' unless @long && File.lstat("#{@input}/#{content}").symlink?
+      if File.exist?("#{@input}/#{content}")
+        " ⇒ #{File.readlink("#{@input}/#{content}")}/".colorize(:cyan)
+      else
+        ' ⇒ [Dead link]'.colorize(:red)
+      end
+    end
+
+    def slash?(content)
+      Dir.exist?("#{@input}/#{content}") ? '/'.colorize(:blue) : ' '
     end
 
     def fetch_string(content, key, color, increment)
@@ -208,7 +238,11 @@ module ColorLS
       value = increment == :folders ? @folders[key] : @files[key]
       logo  = value.gsub(/\\u[\da-f]{4}/i) { |m| [m[-4..-1].to_i(16)].pack('U') }
 
-      "#{@long ? long_info(content) : ''} #{logo.colorize(color)}  #{content.colorize(color)}"
+      [
+        long_info(content),
+        logo.colorize(color),
+        "#{content.colorize(color)}#{slash?(content)}#{symlink_info(content)}"
+      ].join('  ')
     end
 
     def load_from_yaml(filename, aliase=false)
@@ -226,14 +260,13 @@ module ColorLS
       chunk.each_with_index do |content, i|
         break if content.empty?
 
-        print "  #{fetch_string(content, *options(content))}"
-        print Dir.exist?("#{@input}/#{content}") ? '/'.colorize(:blue) : ' '
-        print ' ' * (@max_widths[i] - content.length)
+        print "  #{fetch_string(content, *options(@input, content))}"
+        print ' ' * (@max_widths[i] - content.length) unless @one_per_line || @long
       end
     end
 
-    def options(content)
-      if Dir.exist?("#{@input}/#{content}")
+    def options(path, content)
+      if Dir.exist?("#{path}/#{content}")
         key = content.to_sym
         return %i[folder blue folders] unless @all_folders.include?(key)
         key = @folder_aliases[key] unless @folder_keys.include?(key)
@@ -251,5 +284,21 @@ module ColorLS
       key = @file_aliases[key] unless @file_keys.include?(key)
       [key, :green, :recognized_files]
     end
+
+    def tree_traverse(path, prespace, indent)
+      contents = init_contents(path)
+      contents.each do |content|
+        icon = content == contents.last || Dir.exist?("#{path}/#{content}") ? ' └──' : ' ├──'
+        print tree_branch_preprint(prespace, indent, icon).colorize(:cyan)
+        print " #{fetch_string(content, *options(path, content))} \n"
+        next unless Dir.exist? "#{path}/#{content}"
+        tree_traverse("#{path}/#{content}", prespace + indent, indent)
+      end
+    end
+
+    def tree_branch_preprint(prespace, indent, prespace_icon)
+      return prespace_icon if prespace.zero?
+      ' │ ' * (prespace/indent) + prespace_icon + '─' * indent
+    end
   end
 end

data/lib/colorls/flags.rb

@@ -6,21 +6,24 @@ module ColorLS
         show: fetch_show_opts,
         sort: fetch_sort_opts,
         all: flag_given?(%w[-a --all]),
+        almost_all: flag_given?(%w[-A --almost-all]),
         report: flag_given?(%w[-r --report]),
-        one_per_line: flag_given?(%w[-1]),
-        long: flag_given?(%w[-l --long])
+        one_per_line: flag_given?(%w[-1]) || !STDOUT.tty?,
+        long: flag_given?(%w[-l --long]),
+        tree: flag_given?(%w[-t --tree])
       }
 
-      return if @opts[:show].nil? || @opts[:sort].nil?
-
       @args.keep_if { |arg| !arg.start_with?('-') }
     end
 
     def process
+      incompatible = report_incompatible_flags
+      return STDERR.puts "\n   #{incompatible}".colorize(:red) if incompatible
+
       return Core.new(@opts).ls if @args.empty?
 
       @args.each do |path|
-        next STDERR.puts "\n  Specified path '#{path}' doesn't exist.".colorize(:red) unless File.exist?(path)
+        next STDERR.puts "\n   Specified path '#{path}' doesn't exist.".colorize(:red) unless File.exist?(path)
         Core.new(path, @opts).ls
       end
     end
@@ -37,7 +40,7 @@ module ColorLS
       show_files_only  = flag_given? %w[-f --files]
 
       if show_files_only && show_dirs_only
-        STDERR.puts "\n  Restrain from using -d and -f flags together."
+        STDERR.puts "\n   Restrain from using -d and -f flags together."
           .colorize(:red)
         return nil
       else
@@ -52,7 +55,7 @@ module ColorLS
       sort_files_first = flag_given? %w[-sf --sort-files]
 
       if sort_dirs_first && sort_files_first
-        STDERR.puts "\n  Restrain from using -sd and -sf flags together."
+        STDERR.puts "\n   Restrain from using -sd and -sf flags together."
           .colorize(:red)
         return nil
       else
@@ -61,5 +64,15 @@ module ColorLS
         false
       end
     end
+
+    def report_incompatible_flags
+      return '' if @opts[:show].nil? || @opts[:sort].nil?
+
+      return 'Restrain from using -t (--tree) and -r (--report) flags together.' if @opts[:tree] && @opts[:report]
+
+      return 'Restrain from using -t (--tree) and -a (--all) flags together.' if @opts[:tree] && @opts[:all]
+
+      nil
+    end
   end
 end

data/lib/colorls/version.rb

@@ -1,3 +1,3 @@
 module ColorLS
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

data/lib/yaml/files.yaml

@@ -59,5 +59,6 @@ vim:          "\ue62b"
 windows:      "\uf17a"
 xls:          "\uf1c3"
 xml:          "\ue619"
+yarn.lock:    "\ue718"
 yml:          "\uf481"
 zip:          "\uf410"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize