colorls 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4071319ab261196949f1a3cf87ebe1c55d7582c
-  data.tar.gz: 40c07660304acb180e356b0bfaa4e7ecb6bbe2fc
+  metadata.gz: baadf69e664b9bab7c78f96af16d833f7d03302c
+  data.tar.gz: e72d0b65aefd804aec27dab9865fb9066e9c56d1
 SHA512:
-  metadata.gz: fcacb48be3c568c7cc64815de3847c7b093950f4d834de0b55e9c969aaf791fa0d6fb7547bf347f7211872f5b9c14f035ae7044c64496d0a55c02a85c327cbed
-  data.tar.gz: edca7e18cef76348a81313431016de823b83b3f79d3579890db0bd0329605f53ee0c7e2c97a46fdfb9b9873e2a5c674801c5d03eba8e6dda2302bb20c45fcbf8
+  metadata.gz: 5234ec2b037d9b50f82eac2cfdec97b0befc6f25f563fecd55a25b0f312b6b54acfe9ff573c73a636e6902b2e08dfba8cdff8d89e41182733d9d700a1b07ba10
+  data.tar.gz: b6d1d437c80186e03850a8c184892b78cf98ecd261ac41820033a294e3899a671eb0b0d96f4fccdfa6322149653945cd3f9f64ee65611353e80ad9f9e4983eb9

data/.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
   TargetRubyVersion: 2.1
 
 # Preferred codebase style ---------------------------------------------
+
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
@@ -46,7 +47,7 @@ Metrics/ModuleLength:
   Max: 200
 
 Metrics/ClassLength:
-  Max: 300
+  Max: 350
 
 Metrics/ParameterLists:
   Max: 15

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - '2.2'
   - '2.3.0'
   - '2.4.0'
+  - '2.5.0'
 
 script:
   - bundle exec rubocop
@@ -25,6 +26,11 @@ script:
   - colorls --sd
   - colorls --sf
   - colorls -t
+  - colorls --sort=time
+  - colorls -U
+  - colorls --sort=none
+  - colorls -S
+  - colorls --sort=size
   - colorls -h
   - colorls --gs
   - colorls spec/fixtures/symlinks

data/CONTRIBUTING.md

@@ -7,7 +7,7 @@ Before sending a Pull Request, please make sure that you're assigned the task on
 - If a relevant issue already exists, discuss on the issue and get it assigned to yourself on GitHub.
 - If no relevant issue exists, open a new issue and get it assigned to yourself on GitHub.
 
-Please proceed with a Pull Request only after you're assigned. It'd be sad if your Pull Request (and your hardwork) isn't accepted just because it isn't idealogically compatible.
+Please proceed with a Pull Request only after you're assigned. It'd be sad if your Pull Request (and your hardwork) isn't accepted just because it isn't ideologically compatible.
 
 # Developing the gem
 

data/README.md

@@ -6,16 +6,31 @@
 [![Gem Version](https://badge.fury.io/rb/colorls.svg)](https://badge.fury.io/rb/colorls)
 [![Build Status](https://travis-ci.org/athityakumar/colorls.svg?branch=master)](https://travis-ci.org/athityakumar/colorls)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=shields)](http://makeapullrequest.com)
+[![Stories in Ready](https://badge.waffle.io/athityakumar/colorls.png?label=next)](https://waffle.io/athityakumar/colorls?utm_source=badge)
 
 A Ruby script that colorizes the `ls` output with color and icons. Here are the screenshots of working example on an iTerm2 terminal (Mac OS), `oh-my-zsh` with `powerlevel9k` theme and `powerline nerd-font + awesome-config` font with the `Solarized Dark` color theme.
 
-![Example #1](readme/usage1.png)
+ ![image](https://user-images.githubusercontent.com/17109060/32149040-04f3125c-bd25-11e7-8003-66fd29bc18d4.png)
 
 *If you're interested in knowing the powerlevel9k configuration to get this prompt, have a look at [this gist](https://gist.github.com/athityakumar/1bd5e9e24cd2a1891565573a893993eb).*
 
 # Table of contents
 
 - [Usage](#usage)
+  - [Flags](#flags)
+    - `-1`
+    - `-a`   (or) `--all`
+    - `-A`   (or) `--almost-all`
+    - `-d`   (or) `--dirs`
+    - `-f`   (or) `--files`
+    - `-h`   (or) `--help`
+    - `-l`   (or) `--long`
+    - `-r`   (or) `--report`
+    - `-t`   (or) `--tree`
+    - `--gs` (or) `--git-status`
+    - `--sd` (or) `--sort-dirs` or `--group-directories-first`
+    - `--sf` (or) `--sort-files`
+  - [Combination of flags](#combination-of-flags)
 - [Installation](#installation)
 - [Recommended configurations](#recommended-configurations)
 - [Custom configurations](#custom-configurations)
@@ -28,34 +43,73 @@ A Ruby script that colorizes the `ls` output with color and icons. Here are the
 
 [(Back to top)](#table-of-contents)
 
-- With `-a` : `lc` prints all directories, files and dotfiles in current directory.
+Man pages have been added. Checkout `man colorls`.
 
-  ![Usage #1](readme/usage1.png)
+### Flags
 
-- With paths : `lc path(s) -a` prints all directories, files and dotfiles in given directory / directories.
+- With `-1` : Lists one entry per line
 
-  ![Usage #2](readme/usage2.png)
+  ![image](https://user-images.githubusercontent.com/17109060/32149062-4f0547ca-bd25-11e7-98b6-587467379704.png)
 
-- With `--report` or `-r` flag : `lc path(s) -r -a` : Prints all directories, files and dotfiles in directories, along with a brief report about number of files and folders shown.
+- With `-a` (or) `--all` : Does not ignore entries starting with '.'
 
-  ![Usage #3](readme/usage3.png)
-  ![Usage #4](readme/usage4.png)
+  ![image](https://user-images.githubusercontent.com/17109060/32149045-182eb39e-bd25-11e7-83d4-897cb14bcff3.png)
 
-- With `--sort-dirs` / `-sd` or `--sort-files` / `-sf` : Entries are sorted directories-first or files-first, and then alphabetically (case-insensitively) before being printed.
+- With `-A` (or) `--almost-all` : Does not ignore entries starting with '.', except `./` and `../`
 
-  ![Usage #5](readme/usage5.png)
-  ![Usage #6](readme/usage6.png)
+  ![image](https://user-images.githubusercontent.com/17109060/32149046-1ef7664e-bd25-11e7-8bd9-bfc3c8b27b74.png)
 
-- With `--dirs` / `-d` or `--files` / `-f` : Entries are filtered so that only directories or files are shown.
+- With `-d` (or) `--dirs` : Shows only directories
 
-  ![Usage #7](readme/usage7.png)
-  ![Usage #8](readme/usage8.png)
+  ![image](https://user-images.githubusercontent.com/17109060/32149066-5f842aa8-bd25-11e7-9bf0-23313b717182.png)
 
-- With `-1` : Entries are printed in a column (one per line), just like `ls -1` does.
+- With `-f` (or) `--files` : Shows only files
 
-  ![Usage #9](readme/usage9.png)
+  ![image](https://user-images.githubusercontent.com/17109060/32149065-5a27c9d4-bd25-11e7-9a2b-fd731d76a058.png)
 
-- Additional flags: `--almost-all` or `-A`, `--long` or `-l`, `--tree` or `-t`
+- With `-h` (or) `--help` : Prints a very helpful help menu
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149096-cf2cf5b0-bd25-11e7-84b6-909d79099c98.png)
+
+- With `-l` (or) `--long` : Shows in long listing format
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149049-2a63ae48-bd25-11e7-943c-5ceed25bd693.png)
+
+- With `-r` (or) `--report` : Shows brief report about number of files and folders shown
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149082-96a83fec-bd25-11e7-9081-7f77e4c90e90.png)
+
+- With `-t` (or) `--tree` : Shows tree view of the directory
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149051-32e596e4-bd25-11e7-93a9-5e50c8d2bb19.png)
+
+- With `--gs` (or) `--git-status` : Shows git status for each entry
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149075-7a1a1954-bd25-11e7-964e-1adb173aa2b9.png)
+
+- With `--sd` (or) `--sort-dirs` or `--group-directories-first` : Shows directories first, followed by files
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149068-65117fc0-bd25-11e7-8ada-0b055603e3fd.png)
+
+- With `--sf` (or) `--sort-files` : Shows files first, followed by directories
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149071-6b379de4-bd25-11e7-8764-a0c577e526a1.png)
+
+- With color options : `--light` or `--dark` can be passed as a flag, to choose the appropriate color scheme. By default, the dark color scheme is chosen. In order to tweak any color, read [Custom configurations](#custom-configurations).
+
+### Combination of flags
+
+- Using `--gs` with `-t` :
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149076-8423c864-bd25-11e7-816e-8642643d2c27.png)
+
+- Using `--gs` with `-l` :
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149078-899b0622-bd25-11e7-9810-d398eaa77e32.png)
+
+- Using `--sd` with `-l` and `-A` :
+
+  ![image](https://user-images.githubusercontent.com/17109060/32149084-9eb2a416-bd25-11e7-8fb7-a9d336c6e038.png)
 
 # Installation
 
@@ -82,16 +136,17 @@ A Ruby script that colorizes the `ls` output with color and icons. Here are the
 
 5. Start using `colorls` :tada:
 
-6. Have a look at [Recommended configurations](#recommended-configurations).
+6. Have a look at [Recommended configurations](#recommended-configurations) and [Custom configurations](#custom-configurations).
 
 # Recommended configurations
 
 [(Back to top)](#table-of-contents)
 
-1. To add some short command (say, `lc`) with some flag options (say, `-r`)b y default, add this to your shell configuration file (`~/.bashrc`, `~/.zshrc` or `~/.fishrc`) :
+1. To add some short command (say, `lc`) with some flag options (say, `-l`, `-A`, `--sd`) by default, add this to your shell configuration file (`~/.bashrc`, `~/.zshrc`, etc.) :
     ```sh
-    alias lc='colorls -r'
+    alias lc='colorls -lA --sd'
     ```
+
 2. For changing the icon(s) to other unicode icons of choice (select icons from [here](https://nerdfonts.com/)), change the YAML files in a text editor of your choice (say, `subl`)
 
     ```sh
@@ -102,17 +157,36 @@ A Ruby script that colorizes the `ls` output with color and icons. Here are the
 
 [(Back to top)](#table-of-contents)
 
-You can overwrite the existing icons and colors mapping by creating yaml files in ~/.config/lscolors.
+You can overwrite the existing icons and colors mapping by copying the yaml files from `$(dirname $(gem which colorls))/yaml` into `~/.config/colorls`, and changing them.
 
-Each .yaml file inside the lib/colorls/yaml directory of this repo can be overwrited.
+- To overwrite color mapping :
 
-Let's say you want to add an icon for swift files, you might create a `files.yaml` inside `~/.config/lscolors` and add the following:
+  Please have a look at the [list of supported color names](https://github.com/sickill/rainbow#color-list). Let's say that you're using the dark color scheme and would like to change the color of untracked file (`??`) in the `--git-status` flag to yellow. Copy the defaut `dark_colors.yaml` and change it.
+
+  ```sh
+  cp $(dirname $(gem which colorls))/yaml/dark_colors.yaml ~/.config/colorls/dark_colors.yaml`
+  ```
+
+  In the `~/.config/colorls/dark_colors.yaml` file, change the color set for `untracked` from `darkorange` to `yellow`, and save the change.
+
+  ```
+  untracked: yellow
+  ```
+
+- To overwrite icon mapping :
+
+  Please have a look at the [list of supported icons](https://nerdfonts.com/). Let's say you want to add an icon for swift files. Copy the default `files.yaml` and change it.
+
+  ```sh
+  cp $(dirname $(gem which colorls))/yaml/files.yaml ~/.config/colorls/files.yaml`
+  ```
+
+  In the `~/.config/colorls/files.yaml` file, add a new icon / change an existing icon, and save the change.
 
-```
-swift: "\uF179"
-```
 
-Which will add the Apple logo to swift files.
+  ```
+  swift: "\uF179"
+  ```
 
 # Updating
 

data/Rakefile

@@ -6,6 +6,40 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
 require 'rubocop/rake_task'
-RuboCop::RakeTask.new
+RuboCop::RakeTask.new do |task|
+  task.requires << 'rubocop-rspec'
+end
+
+desc 'Build the manual'
+file 'man/colorls.1' => ['man/colorls.1.ronn', 'lib/colorls/flags.rb'] do
+  require 'colorls'
+  require 'ronn'
+
+  flags = ColorLS::Flags.new
+  attributes = {
+    date: Date.iso8601(`git log -1 --pretty=format:%aI -- man/colorls.1`),
+    manual: 'colorls Manual',
+    organization: "colorls #{ColorLS::VERSION}"
+  }
+  doc = Ronn::Document.new(nil, attributes) do
+    template = IO.read('man/colorls.1.ronn')
+
+    section = ''
+    flags.options.each do |o|
+      section += <<OPTION
+  * `#{o.flags.join('`, `')}`:
+     #{o.desc.join("<br>\n")}
+
+OPTION
+    end
+    template.sub('{{ OPTIONS }}', section)
+  end
+  IO.write('man/colorls.1', doc.convert('roff'))
+end
+
+desc 'Build the Zsh completion file'
+file 'zsh/_colorls' => ['lib/colorls/flags.rb'] do
+  ruby "exe/colorls '--*-completion-zsh=colorls' > zsh/_colorls"
+end
 
 task default: %w[spec rubocop]

data/colorls.gemspec

@@ -14,9 +14,16 @@ ColorLS::POST_INSTALL_MESSAGE = %(
     Help menu     : `colorls -h` provides all possible flag options
 
     Tab completion enabled for flags
+
+    -t flag : Previously short for --tree, has been re-allocated to sort results by time
+    -r flag : Previously short for --report, has been re-allocated to reverse sort results
+
+    Man pages have been added. Checkout `man colorls`.
+
   *******************************************************************
 ).freeze
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'colorls'
   spec.version       = ColorLS::VERSION
@@ -29,20 +36,27 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+
   spec.bindir        = 'exe'
   spec.executables   = 'colorls'
   spec.require_paths = ['lib']
 
   spec.post_install_message = ColorLS::POST_INSTALL_MESSAGE
 
+  spec.add_runtime_dependency 'clocale'
   spec.add_runtime_dependency 'filesize'
+  spec.add_runtime_dependency 'manpages'
   spec.add_runtime_dependency 'rainbow'
-  spec.add_runtime_dependency 'rake'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'diffy'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'ronn'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'rubygems-tasks'
+  spec.add_development_dependency 'simplecov'
 end
+# rubocop:enable Metrics/BlockLength

data/exe/colorls

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'colorls'
+
 ColorLS::Flags.new(*ARGV).process
 true

data/lib/colorls.rb

@@ -1,10 +1,14 @@
 require 'yaml'
 require 'etc'
+require 'English'
 require 'filesize'
+require 'io/console'
 require 'rainbow/ext/string'
+require 'clocale'
 
 require 'colorls/core'
+require 'colorls/fileinfo'
 require 'colorls/flags'
-require 'colorls/load_from_yaml'
+require 'colorls/yaml'
 require 'colorls/monkeys'
 require 'colorls/git'

data/lib/colorls/core.rb

@@ -1,23 +1,29 @@
 module ColorLS
   class Core
-    def initialize(input=nil, all: false, report: false, sort: false, show: false,
-      one_per_line: false, git_status: false,long: false, almost_all: false, tree: false, colors: [])
-      @input        = init_input_path(input)
+    def initialize(input, all: false, report: false, sort: false, show: false,
+      mode: nil, git_status: false, almost_all: false, colors: [], group: nil,
+      reverse: false)
+      @input        = File.absolute_path(input)
       @count        = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
       @almost_all   = almost_all
       @report       = report
       @sort         = sort
+      @reverse      = reverse
+      @group        = group
       @show         = show
-      @one_per_line = one_per_line
-      @long         = long
-      @tree         = tree
+      @one_per_line = mode == :one_per_line
+      @long         = mode == :long
+      @tree         = mode == :tree
       process_git_status_details(git_status)
-      @screen_width = `tput cols`.chomp.to_i
+
+      @screen_width = IO.console.winsize[1]
+      @screen_width = 80 if @screen_width.zero?
+
       @colors       = colors
 
-      @contents   = init_contents(@input)
-      @max_widths = @contents.map(&:length)
+      @contents   = init_contents(input)
+      @max_widths = @contents.map { |c| c.name.length }
       init_icons
     end
 
@@ -29,45 +35,35 @@ module ColorLS
         tree_traverse(@input, 0, 2)
       else
         @contents = chunkify
-        @max_widths = @contents.transpose.map { |c| c.map(&:length).max }
         @contents.each { |chunk| ls_line(chunk) }
       end
-      print "\n"
       display_report if @report
       true
     end
 
     private
 
-    def init_input_path(input)
-      return Dir.pwd unless input
-      return input unless Dir.exist?(input)
+    def init_contents(path)
+      info = FileInfo.new(path, link_info = @long)
 
-      actual = Dir.pwd
-      Dir.chdir(input)
-      input = Dir.pwd
-      Dir.chdir(actual)
-      input
-    end
+      if info.directory?
+        @contents = Dir.entries(path)
 
-    def init_contents(path)
-      is_directory = Dir.exist?(path)
-      @contents = if is_directory
-                    Dir.entries(path)
-                  else
-                    @input = File.dirname(path)
-                    [File.basename(path)]
-                  end
+        filter_hidden_contents
 
-      filter_hidden_contents if is_directory
-      filter_contents(path) if @show
-      sort_contents(path)   if @sort
+        @contents.map! { |e| FileInfo.new(File.join(path, e), link_info = @long) }
 
+        filter_contents if @show
+        sort_contents   if @sort
+        group_contents  if @group
+      else
+        @contents = [info]
+      end
       @total_content_length = @contents.length
 
       return @contents unless @long
-      init_user_lengths(path)
-      init_group_lengths(path)
+      init_user_lengths
+      init_group_lengths
       @contents
     end
 
@@ -76,61 +72,52 @@ module ColorLS
       @contents.keep_if { |x| !x.start_with? '.' } unless @all || @almost_all
     end
 
-    def init_user_lengths(path)
+    def init_user_lengths
       @userlength = @contents.map do |c|
-        next 0 unless File.exist?("#{path}/#{c}")
-        begin
-          user = Etc.getpwuid(File.stat("#{path}/#{c}").uid).name
-        rescue ArgumentError
-          user = File.stat("#{path}/#{c}").uid
-        end
-        user.to_s.length
+        c.owner.length
       end.max
     end
 
-    def init_group_lengths(path)
+    def init_group_lengths
       @grouplength = @contents.map do |c|
-        next 0 unless File.exist?("#{path}/#{c}")
-        begin
-          group = Etc.getgrgid(File.stat("#{path}/#{c}").gid).name
-        rescue ArgumentError
-          group = File.stat("#{path}/#{c}").gid
-        end
-        group.to_s.length
+        c.group.length
       end.max
     end
 
-    def filter_contents(path)
+    def filter_contents
       @contents.keep_if do |x|
-        next Dir.exist?("#{path}/#{x}") if @show == :dirs
-        !Dir.exist?("#{path}/#{x}")
+        x.directory? == (@show == :dirs)
       end
     end
 
-    def sort_contents(path)
-      @contents.sort! { |a, b| cmp_by_dirs(path, a, b) }
+    def sort_contents
+      case @sort
+      when :time
+        @contents.sort_by! { |a| -a.mtime.to_f }
+      when :size
+        @contents.sort_by! { |a| -a.size }
+      else
+        @contents.sort_by! { |a| CLocale.strxfrm(a.name) }
+      end
+      @contents.reverse! if @reverse
     end
 
-    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
+    def group_contents
+      return unless @group
 
-      result = is_a_dir ? -1 : 1
-      result *= -1 if @sort == :files
-      result
-    end
+      dirs, files = @contents.partition(&:directory?)
 
-    def cmp_by_alpha(a, b)
-      a.downcase <=> b.downcase
+      @contents = case @group
+                  when :dirs then dirs.push(*files)
+                  when :files then files.push(*dirs)
+                  end
     end
 
     def init_icons
-      @files          = ColorLS.load_from_yaml('files.yaml')
-      @file_aliases   = ColorLS.load_from_yaml('file_aliases.yaml', true)
-      @folders        = ColorLS.load_from_yaml('folders.yaml')
-      @folder_aliases = ColorLS.load_from_yaml('folder_aliases.yaml', true)
+      @files          = ColorLS::Yaml.new('files.yaml').load
+      @file_aliases   = ColorLS::Yaml.new('file_aliases.yaml').load(aliase: true)
+      @folders        = ColorLS::Yaml.new('folders.yaml').load
+      @folder_aliases = ColorLS::Yaml.new('folder_aliases.yaml').load(aliase: true)
 
       @file_keys          = @files.keys
       @file_aliase_keys   = @file_aliases.keys
@@ -144,25 +131,25 @@ module ColorLS
     def chunkify
       return @contents.zip if @one_per_line || @long
 
-      chunk_size = @contents.count
+      chunk_size = @contents.size
+      max_widths = @max_widths
 
-      until in_line(chunk_size) || chunk_size <= 1
+      until in_line(chunk_size, max_widths) || chunk_size <= 1
         chunk_size -= 1
-        chunk       = get_chunk(chunk_size)
+        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
-
-      chunk || [@contents]
+      @max_widths = max_widths
+      @contents = get_chunk(chunk_size)
     end
 
     def get_chunk(chunk_size)
-      chunk       = @contents.each_slice(chunk_size).to_a
-      chunk[-1]  += [''] * (chunk_size - chunk.last.count)
-      @max_widths = chunk.transpose.map { |c| c.map(&:length).max }
-      chunk
+      @contents.each_slice(chunk_size).to_a
     end
 
-    def in_line(chunk_size)
-      (@max_widths.sum + 12 * chunk_size <= @screen_width)
+    def in_line(chunk_size, max_widths)
+      (max_widths.sum + 12 * chunk_size <= @screen_width)
     end
 
     def display_report
@@ -193,54 +180,39 @@ module ColorLS
       mode
     end
 
-    def user_info(stat)
-      begin
-        user = Etc.getpwuid(stat.uid).name
-      rescue ArgumentError
-        user = stat.uid
-      end
-      user = user.to_s.ljust(@userlength, ' ')
-      user.colorize(@colors[:user]) if user == Etc.getlogin
+    def user_info(content)
+      user = content.owner.ljust(@userlength, ' ')
+      user.colorize(@colors[:user]) if content.owned?
     end
 
-    def group_info(stat)
-      begin
-        group = Etc.getgrgid(stat.gid).name
-      rescue ArgumentError
-        group = stat.gid
-      end
+    def group_info(group)
       group.to_s.ljust(@grouplength, ' ').colorize(@colors[:normal])
     end
 
-    def size_info(stat)
-      size = Filesize.from("#{stat.size} B").pretty.split(' ')
+    def size_info(filesize)
+      size = Filesize.from("#{filesize} B").pretty.split(' ')
       size = "#{size[0][0..-4].rjust(3,' ')} #{size[1].ljust(3,' ')}"
-      return size.colorize(@colors[:file_large])  if stat.size >= 512 * 1024 ** 2
-      return size.colorize(@colors[:file_medium]) if stat.size >= 128 * 1024 ** 2
+      return size.colorize(@colors[:file_large])  if filesize >= 512 * 1024 ** 2
+      return size.colorize(@colors[:file_medium]) if filesize >= 128 * 1024 ** 2
       size.colorize(@colors[:file_small])
     end
 
-    def mtime_info(stat)
-      mtime = stat.mtime.asctime
-      return mtime.colorize(@colors[:hour_old]) if Time.now - stat.mtime < 60 * 60
-      return mtime.colorize(@colors[:day_old])  if Time.now - stat.mtime < 24 * 60 * 60
+    def mtime_info(file_mtime)
+      mtime = file_mtime.asctime
+      now = Time.now
+      return mtime.colorize(@colors[:hour_old]) if now - file_mtime < 60 * 60
+      return mtime.colorize(@colors[:day_old])  if now - file_mtime < 24 * 60 * 60
       mtime.colorize(@colors[:no_modifier])
     end
 
     def process_git_status_details(git_status)
       return false unless git_status
 
-      actual_path = Dir.pwd
-      Dir.chdir(@input)
-      until File.exist?('.git') # check whether the repository is git controlled
-        return false if Dir.pwd=='/'
-        Dir.chdir('..')
-      end
+      @git_root_path = IO.popen(['git', '-C', @input, 'rev-parse', '--show-toplevel'], err: :close, &:gets)
 
-      @git_root_path = Dir.pwd
-      Dir.chdir(actual_path)
+      return false unless $CHILD_STATUS.success?
 
-      @git_status = Git.status(@git_root_path)
+      @git_status = Git.status(@git_root_path.chomp!)
     end
 
     def git_info(path, content)
@@ -248,14 +220,14 @@ module ColorLS
 
       # puts "\n\n"
 
-      Dir.chdir(@git_root_path)
       relative_path = path.remove(@git_root_path+'/')
       relative_path = relative_path==path ? '' : relative_path+'/'
       content_path  = "#{relative_path}#{content}"
-      content_type  = Dir.exist?("#{@git_root_path}/#{content_path}") ? :dir : :file
 
-      if content_type == :file then git_file_info(content_path)
-      else git_dir_info(content_path)
+      if content.directory?
+        git_dir_info(content_path)
+      else
+        git_file_info(content_path)
       end
       # puts "\n\n"
     end
@@ -265,34 +237,46 @@ module ColorLS
       Git.colored_status_symbols(@git_status[path], @colors)
     end
 
+    Dir.class_eval do
+      def self.deep_entries(path)
+        (Dir.entries(path) - ['.', '..']).map do |entry|
+          if Dir.exist?("#{path}/#{entry}")
+            Dir.deep_entries("#{path}/#{entry}")
+          else
+            entry
+          end
+        end.flatten
+      end
+    end
+
     def git_dir_info(path)
-      modes = @git_status.select { |file, _mode| file.start_with?(path) }.values
+      ignored = @git_status.select { |file, mode| file.start_with?(path) && mode=='!!' }.keys
+      present = Dir.deep_entries(path).map { |p| "#{path}/#{p}" }
+      return '    ' if (present-ignored).empty?
 
+      modes = (present-ignored).map { |file| @git_status[file] }-[nil]
       return '  ✓ '.colorize(@colors[:unchanged]) if modes.empty?
       Git.colored_status_symbols(modes.join.uniq, @colors)
     end
 
-    def long_info(path, content)
+    def long_info(content)
       return '' unless @long
-      unless File.exist?("#{path}/#{content}")
-        return '[No Info]'.colorize(@colors[:error]) + ' ' * (38 + @userlength + @grouplength)
-      end
-      stat = File.stat("#{path}/#{content}")
-      [mode_info(stat), user_info(stat), group_info(stat), size_info(stat), mtime_info(stat)]
-        .join('  ')
+      [mode_info(content.stats), user_info(content), group_info(content.group),
+       size_info(content.size), mtime_info(content.mtime)].join('  ')
     end
 
-    def symlink_info(path, content)
-      return '' unless @long && File.symlink?("#{path}/#{content}")
-      if File.exist?("#{path}/#{content}")
-        " ⇒ #{File.readlink("#{path}/#{content}")}/".colorize(@colors[:link])
+    def symlink_info(content)
+      return '' unless @long && content.symlink?
+      link_info = " ⇒ #{content.link_target}"
+      if content.dead?
+        "#{link_info} [Dead link]".colorize(@colors[:dead_link])
       else
-        ' ⇒ [Dead link]'.colorize(@colors[:dead_link])
+        link_info.colorize(@colors[:link])
       end
     end
 
-    def slash?(path, content)
-      Dir.exist?("#{path}/#{content}") ? '/'.colorize(@colors[:dir]) : ' '
+    def slash?(content)
+      content.directory? ? '/'.colorize(@colors[:dir]) : ' '
     end
 
     def fetch_string(path, content, key, color, increment)
@@ -301,26 +285,26 @@ module ColorLS
       logo  = value.gsub(/\\u[\da-f]{4}/i) { |m| [m[-4..-1].to_i(16)].pack('U') }
 
       [
-        long_info(path, content),
+        long_info(content),
         " #{git_info(path,content)} ",
         logo.colorize(color),
-        "  #{content.colorize(color)}#{slash?(path, content)}#{symlink_info(path, content)}"
+        "  #{content.name.colorize(color)}#{slash?(content)}#{symlink_info(content)}"
       ].join
     end
 
     def ls_line(chunk)
-      print "\n"
       chunk.each_with_index do |content, i|
-        break if content.empty?
+        break if content.name.empty?
 
-        print "  #{fetch_string(@input, content, *options(@input, content))}"
-        print ' ' * (@max_widths[i] - content.length) unless @one_per_line || @long
+        print "  #{fetch_string(@input, content, *options(content))}"
+        print ' ' * (@max_widths[i] - content.name.length) unless @one_per_line || @long
       end
+      print "\n"
     end
 
-    def options(path, content)
-      if Dir.exist?("#{path}/#{content}")
-        key = content.to_sym
+    def options(content)
+      if content.directory?
+        key = content.name.to_sym
         color = @colors[:dir]
         return [:folder, color, :folders] unless @all_folders.include?(key)
         key = @folder_aliases[key] unless @folder_keys.include?(key)
@@ -330,7 +314,7 @@ module ColorLS
       color = @colors[:recognized_file]
       return [content.downcase.to_sym, color, :recognized_files] if @file_keys.include?(key)
 
-      key = content.split('.').last.downcase.to_sym
+      key = content.name.split('.').last.downcase.to_sym
       return [:file, @colors[:unrecognized_file], :unrecognized_files] unless @all_files.include?(key)
 
       key = @file_aliases[key] unless @file_keys.include?(key)
@@ -340,10 +324,10 @@ module ColorLS
     def tree_traverse(path, prespace, indent)
       contents = init_contents(path)
       contents.each do |content|
-        icon = content == contents.last || Dir.exist?("#{path}/#{content}") ? ' └──' : ' ├──'
+        icon = content == contents.last || content.directory? ? ' └──' : ' ├──'
         print tree_branch_preprint(prespace, indent, icon).colorize(@colors[:tree])
-        print " #{fetch_string(path, content, *options(path, content))} \n"
-        next unless Dir.exist? "#{path}/#{content}"
+        print " #{fetch_string(path, content, *options(content))} \n"
+        next unless content.directory?
         tree_traverse("#{path}/#{content}", prespace + indent, indent)
       end
     end