colorls 1.1.1 → 1.1.2.pre.557

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c4e2dd3d9823e5c27fe6a41124dfc6511320df5
-  data.tar.gz: 6ec38c1e754d1435363e03c4f86a6533e062f408
+SHA256:
+  metadata.gz: ed1767483b77510e8c8cc835d5473bd292bf89a6cacf40e6102888eb57564539
+  data.tar.gz: edb9edf997d588639534ec82bdc22339fabd55402761f44f2bbdce2beea36a7e
 SHA512:
-  metadata.gz: 74cca11860e9251eb41d953f0d98fb40f7b8e0b9ad189c9b1a4c258a277cc4d9849a5c361b80e36d86255ad72d3f6f6a08aea980a97e5a9997096a7223cbcf1d
-  data.tar.gz: 2c8cd7f0c111826a0a257b2122cdcceda32dc02c7dafcd880fa3f461a92e447368f02815a3c67ec9c9810718fe343e4c31473cd996848c3fa12d01841e6c1cb9
+  metadata.gz: 22f3b7dbbb858b6b9d4b6d18c1fc6113158f8bde7a9899959f5eb777b404ddd8ba5779428f64d981e95b14ebaf1e91facc13cae39008ccb6d7c2fc490a15af34
+  data.tar.gz: be6c052a532e51b2b45059f2c6f3c6cb1c3fa015b5c3dae7810a248563d1531fb1f58ce34e6e736b3eb56680696e93d610e7325d167c2ff643d98defb0ca10ce

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - 'lib/yaml/*'
     - 'lib/**/*.sh'
   DisplayCopNames: true
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
 
 # Preferred codebase style ---------------------------------------------
 

data/.travis.yml

@@ -1,17 +1,30 @@
+conditions: v1
+
+if: branch = master OR tag IS present
+
 language:
   ruby
 
+cache:
+  bundler
+
 rvm:
-  - '2.1'
-  - '2.2'
-  - '2.3.0'
-  - '2.4.0'
-  - '2.5.0'
+  - '2.3'
+  - '2.4'
+  - '2.5'
+  - '2.6'
+
+before_install:
+  - gem update --system
+  - gem --version
+  - gem install bundler -v '~> 2'
 
 script:
   - bundle exec rubocop
-  - bundle exec rspec
-  - rake install
+  - bundle exec rake spec
+  - bundle exec rake install
+  - bundle binstubs colorls
+  - PATH=$PWD/bin:$PATH
   - colorls
   - colorls -1
   - colorls -a
@@ -25,6 +38,7 @@ script:
   - colorls -r
   - colorls --sd
   - colorls --sf
+  - colorls --hyperlink
   - colorls -t
   - colorls --sort=time
   - colorls -U
@@ -37,7 +51,19 @@ script:
   - colorls README.md
   - colorls *
   - colorls | grep /
+  - colorls --color
+  - colorls --color=auto
+  - colorls --color=never
+  - colorls --color=always
+  - colorls --tree
+  - colorls --tree=1
 
-install:
-  - gem install bundler
-  - bundle install
+deploy:
+  provider: rubygems
+  api_key:
+    secure: iHo85pvy3iIp0/r8mbP0q0VPCFyYcwaQb19YUxwIGbMrksswIJPe2bsdAQTvd1fU3U+uwAgyzfaLMWgY6T1evVjv5GGXW0zmNthgWuaCbTBmzx3q6OPV6zJLsinKSJ4xbKjmTOi6BIhXTtc09dRRNp1d9U8HtmM9KyvD5ORm5M9W0/WxP3+8oOe0/yl3DOVNgCQ0j64KEqowLlfdJXe2q5iSUkZEvf+o5F6pz0g7dFiVHPVpJbZ9sOchPzYNMjLCx4jPt42J806oAH7TMeRC4lFpKgJr9U05LRGb22jiokHH6gl17RpuGRYJIexWkf3jb5iy9bivT2S2fGo9/BBKO5BvQAaL7McCwpdKM2QEyVy7RVbUz5D8vfXkJNIJankQj3Ikuz7qYyDglucGCpSGjecNCqL61NoBag7ORJ0RMWg7zklKjR59zeT4oks8rByx688y5Oi4f9Z98SPfc9NIJbHxbrDHtr13gm509cEXxwOLuVePa9J+mDGq2Uawi/PuIon1x2ztHUgvTx0DSYtwv96HzXet8QqXHwRKKjddxEApvCvGvaJV3akeUVjcsyei892ajHP6CffaKazPtogotfsu68g8WmKFWHFRkdmS6NIqg7MrnMRCjDkxAoQYYzt6cl95aBk4G7CTbjtXgIct1LGMM/WjE6K/jpeF0YLsVR4=
+  gem: colorls
+  on:
+    repo: athityakumar/colorls
+    rvm: '2.6'
+    os: linux

data/CONTRIBUTORS.md

@@ -0,0 +1,81 @@
+Color LS contributors (sorted alphabetically)
+============================================
+
+* **[Ace Dimasuhid](https://github.com/adimasuhid)**
+
+* **[Adnan](https://github.com/udnaan)**
+
+* **[Alex Johnson](https://github.com/alexpjohnson)**
+
+* **[Alexander Arvidsson](https://github.com/Metamist)**
+
+* **[Andy](https://github.com/acarl005)**
+
+* **[Anthony Jean](https://github.com/lewazo)**
+
+* **[Athitya Kumar](https://github.com/athityakumar)**
+
+* **[Balaji Ravichandran](https://github.com/balogic)**
+
+* **[Claudio Bley](https://github.com/avdv)**
+
+* **[Eric Soldierer](https://github.com/EricSoldierer)**
+
+* **[Fatih Erikli](https://github.com/fatiherikli)**
+
+* **[Gary Traffanstedt](https://github.com/blimey85)**
+
+* **[Henré Botha](https://github.com/henrebotha)**
+
+* **[hirowatari](https://github.com/hirowatari)**
+
+* **[Igor Souza](https://github.com/igordcsouza)**
+
+* **[Kaustubh Hiware](https://github.com/kaustubhhiware)**
+
+* **[Khải](https://github.com/KSXGitHub)**
+
+* **[Liam Hockley](https://github.com/xdega)**
+
+* **[Mamonu](https://github.com/mamonu)**
+
+* **[Mariel Frank](https://github.com/marielfrank)**
+
+* **[mashehu](https://github.com/mashehu)**
+
+* **[Matthew Vincent](https://github.com/neshmi)**
+
+* **[Michael](https://github.com/mscottnelson)**
+
+* **[Michael Dungan](https://github.com/xxx)**
+
+* **[Michael McMahon](https://github.com/TechnologyClassroom)**
+
+* **[Oskar](https://github.com/GladOSkar)**
+
+* **[Paulo](https://github.com/redcinelli)**
+
+* **[Pranit Bauva](https://github.com/pranitbauva1997)**
+
+* **[Rohit Ner](https://github.com/rohitner)**
+
+* **[Ryan L McIntyre](https://github.com/ryanoasis)**
+
+* **[Sam Lazarus](https://github.com/sl)**
+
+* **[Sam Umbach](https://github.com/sumbach)**
+
+* **[sergeant-wizard](https://github.com/sergeant-wizard)**
+
+* **[Stephen Wentling](https://github.com/swentling87)**
+
+* **[Tom Lazar](https://github.com/tomlazar)**
+
+* **[Tomasz](https://github.com/rubikonx9)**
+
+* **[Vincent](https://github.com/trivett)**
+
+* **[Vladislav Isakov](https://github.com/bladebhs)**
+
+
+**[Full contributors list](https://github.com/athityakumar/colorls/graphs/contributors).**

data/README.md

@@ -26,10 +26,11 @@ A Ruby script that colorizes the `ls` output with color and icons. Here are the
     - `-h`   (or) `--help`
     - `-l`   (or) `--long`
     - `-r`   (or) `--report`
-    - `-t`   (or) `--tree`
+    - `--tree` (or) `--tree=[DEPTH]`
     - `--gs` (or) `--git-status`
     - `--sd` (or) `--sort-dirs` or `--group-directories-first`
     - `--sf` (or) `--sort-files`
+    - `-t`
   - [Combination of flags](#combination-of-flags)
 - [Installation](#installation)
 - [Recommended configurations](#recommended-configurations)
@@ -79,7 +80,7 @@ Man pages have been added. Checkout `man colorls`.
 
   ![image](https://user-images.githubusercontent.com/17109060/32149082-96a83fec-bd25-11e7-9081-7f77e4c90e90.png)
 
-- With `-t` (or) `--tree` : Shows tree view of the directory
+- With `--tree` (or) `--tree=[DEPTH]` : Shows tree view of the directory with the specified depth (default 3)
 
   ![image](https://user-images.githubusercontent.com/17109060/32149051-32e596e4-bd25-11e7-93a9-5e50c8d2bb19.png)
 
@@ -95,6 +96,8 @@ Man pages have been added. Checkout `man colorls`.
 
   ![image](https://user-images.githubusercontent.com/17109060/32149071-6b379de4-bd25-11e7-8764-a0c577e526a1.png)
 
+- With `-t` : Sort by modification time, newest first (NEED TO ADD IMAGE)
+
 - 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
@@ -118,7 +121,7 @@ Man pages have been added. Checkout `man colorls`.
 1. Install Ruby (preferably, version > 2.1)
 2. Install the patched fonts of powerline nerd-font and/or font-awesome. Have a look at the [Nerd Font README](https://github.com/ryanoasis/nerd-fonts/blob/master/readme.md) for more installation instructions.
 
-    *Note for `iTerm2` users - Please enable the Nerd Font at iTerm2 > Preferences > Profiles > Text > Non-ASCII font > Knack Regular Nerd Font Complete.*
+    *Note for `iTerm2` users - Please enable the Nerd Font at iTerm2 > Preferences > Profiles > Text > Non-ASCII font > Hack Regular Nerd Font Complete.*
 
 3. Install the [colorls](https://rubygems.org/gems/colorls/) ruby gem with `gem install colorls`
 
@@ -188,6 +191,11 @@ You can overwrite the existing icons and colors mapping by copying the yaml file
   swift: "\uF179"
   ```
 
+- User contributed alias configurations :
+
+  - [@rjhilgefort](https://gist.github.com/rjhilgefort/51ea47dd91bcd90cd6d9b3b199188c16)
+
+
 # Updating
 
 [(Back to top)](#table-of-contents)

data/Rakefile

@@ -3,7 +3,9 @@ require 'rubygems/tasks'
 Gem::Tasks.new
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--warnings"
+end
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new do |task|
@@ -13,6 +15,7 @@ end
 desc 'Build the manual'
 file 'man/colorls.1' => ['man/colorls.1.ronn', 'lib/colorls/flags.rb'] do
   require 'colorls'
+  require 'date'
   require 'ronn'
 
   flags = ColorLS::Flags.new

data/colorls.gemspec

@@ -2,7 +2,7 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'colorls/version'
 
-ColorLS::POST_INSTALL_MESSAGE = %(
+POST_INSTALL_MESSAGE = %(
   *******************************************************************
     Changes introduced in colorls
 
@@ -25,14 +25,28 @@ ColorLS::POST_INSTALL_MESSAGE = %(
 
 # rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
+  is_tagged = ENV['TRAVIS_TAG'] == "v#{ColorLS::VERSION}"
+  is_origin = ENV['TRAVIS_REPO_SLUG'] == 'athityakumar/colorls'
+  build_number = ENV['TRAVIS_BUILD_NUMBER']
+
   spec.name          = 'colorls'
-  spec.version       = ColorLS::VERSION
+  spec.version       = if build_number && is_origin && !is_tagged
+                         # Prereleasing on Travis CI
+                         digits = ColorLS::VERSION.to_s.split '.'
+                         digits[-1] = digits[-1].to_s.succ
+
+                         digits.join('.') + ".pre.#{build_number}"
+                       else
+                         ColorLS::VERSION
+                       end
   spec.authors       = ['Athitya Kumar']
   spec.email         = ['athityakumar@gmail.com']
   spec.summary       = "A Ruby CLI gem that beautifies the terminal's ls command, with color and font-awesome icons."
   spec.homepage      = 'https://github.com/athityakumar/colorls'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '>= 2.3.0'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -41,22 +55,24 @@ Gem::Specification.new do |spec|
   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_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'
+  spec.post_install_message = POST_INSTALL_MESSAGE
+
+  spec.add_runtime_dependency 'clocale', '~> 0'
+  spec.add_runtime_dependency 'filesize', '~> 0'
+  spec.add_runtime_dependency 'manpages', '~> 0'
+  spec.add_runtime_dependency 'rainbow', '>= 2.2', '< 4.0'
+
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'codecov', '~> 0.1'
+  spec.add_development_dependency 'diffy', '~> 3'
+  spec.add_development_dependency 'rake', '~> 12'
+  spec.add_development_dependency 'rdoc', '~> 6.1'
+  spec.add_development_dependency 'ronn', '~> 0'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'rubocop', '~> 0.65.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.27'
+  spec.add_development_dependency 'rubygems-tasks', '~> 0'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'
 end
 # rubocop:enable Metrics/BlockLength

data/exe/colorls

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'colorls'
 

data/lib/colorls.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'etc'
 require 'English'

data/lib/colorls/core.rb

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
+
 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)
+      reverse: false, hyperlink: false, tree_depth: nil)
       @input        = File.absolute_path(input)
       @count        = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
       @almost_all   = almost_all
+      @hyperlink    = hyperlink
       @report       = report
       @sort         = sort
       @reverse      = reverse
@@ -14,13 +17,13 @@ module ColorLS
       @show         = show
       @one_per_line = mode == :one_per_line
       @long         = mode == :long
-      @tree         = mode == :tree
+      @tree         = {mode: mode == :tree, depth: tree_depth}
       process_git_status_details(git_status)
 
       @screen_width = IO.console.winsize[1]
       @screen_width = 80 if @screen_width.zero?
 
-      @colors       = colors
+      init_colors colors
 
       @contents   = init_contents(input)
       @max_widths = @contents.map { |c| c.name.length }
@@ -30,9 +33,9 @@ module ColorLS
     def ls
       return print "\n   Nothing to show here\n".colorize(@colors[:empty]) if @contents.empty?
 
-      if @tree
+      if @tree[:mode]
         print "\n"
-        tree_traverse(@input, 0, 2)
+        tree_traverse(@input, 0, 1, 2)
       else
         @contents = chunkify
         @contents.each { |chunk| ls_line(chunk) }
@@ -43,6 +46,19 @@ module ColorLS
 
     private
 
+    def init_colors(colors)
+      @colors  = colors
+      @modes = Hash.new do |hash, key|
+        color = case key
+                when 'r' then :read
+                when 'w' then :write
+                when '-' then :no_access
+                when 'x', 's', 'S', 't', 'T' then :exec
+                end
+        hash[key] = key.colorize(@colors[color]).freeze
+      end
+    end
+
     def init_contents(path)
       info = FileInfo.new(path, link_info = @long)
 
@@ -62,6 +78,7 @@ module ColorLS
       @total_content_length = @contents.length
 
       return @contents unless @long
+
       init_user_lengths
       init_group_lengths
       @contents
@@ -92,6 +109,13 @@ module ColorLS
 
     def sort_contents
       case @sort
+      when :extension
+        @contents.sort_by! do |f|
+          name = f.name
+          ext = File.extname(name)
+          name = name.chomp(ext) unless ext.empty?
+          [ext, name].map { |s| CLocale.strxfrm(s) }
+        end
       when :time
         @contents.sort_by! { |a| -a.mtime.to_f }
       when :size
@@ -118,14 +142,6 @@ module ColorLS
       @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
-      @folder_keys        = @folders.keys
-      @folder_aliase_keys = @folder_aliases.keys
-
-      @all_files   = @file_keys + @file_aliase_keys
-      @all_folders = @folder_keys + @folder_aliase_keys
     end
 
     def chunkify
@@ -164,25 +180,28 @@ module ColorLS
         .colorize(@colors[:report])
     end
 
+    def format_mode(rwx, special, char)
+      m_r = (rwx & 4).zero? ? '-' : 'r'
+      m_w = (rwx & 2).zero? ? '-' : 'w'
+      m_x = if special
+              (rwx & 1).zero? ? char.upcase : char
+            else
+              (rwx & 1).zero? ? '-' : 'x'
+            end
+
+      @modes[m_r] + @modes[m_w] + @modes[m_x]
+    end
+
     def mode_info(stat)
-      mode = ''
-      stat.mode.to_s(2).rjust(16, '0')[-9..-1].each_char.with_index do |c, i|
-        if c == '0'
-          mode += '-'.colorize(@colors[:no_access])
-        else
-          case (i % 3)
-          when 0 then mode += 'r'.colorize(@colors[:read])
-          when 1 then mode += 'w'.colorize(@colors[:write])
-          when 2 then mode += 'x'.colorize(@colors[:exec])
-          end
-        end
-      end
-      mode
+      m = stat.mode
+
+      format_mode(m >> 6, stat.setuid?, 's') +
+        format_mode(m >> 3, stat.setgid?, 's') +
+        format_mode(m, stat.sticky?, 't')
     end
 
     def user_info(content)
-      user = content.owner.ljust(@userlength, ' ')
-      user.colorize(@colors[:user]) if content.owned?
+      content.owner.ljust(@userlength, ' ').colorize(@colors[:user])
     end
 
     def group_info(group)
@@ -191,9 +210,10 @@ module ColorLS
 
     def size_info(filesize)
       size = Filesize.from("#{filesize} B").pretty.split(' ')
-      size = "#{size[0][0..-4].rjust(3,' ')} #{size[1].ljust(3,' ')}"
+      size = "#{size[0][0..-4].rjust(4,' ')} #{size[1].ljust(3,' ')}"
       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
 
@@ -202,38 +222,31 @@ module ColorLS
       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
-
-      @git_root_path = IO.popen(['git', '-C', @input, 'rev-parse', '--show-toplevel'], err: :close, &:gets)
-
-      return false unless $CHILD_STATUS.success?
-
-      @git_status = Git.status(@git_root_path.chomp!)
+      @git_status = case
+                    when !git_status then nil
+                    when File.directory?(@input) then Git.status(@input)
+                    else Git.status(File.dirname(@input))
+                    end
     end
 
-    def git_info(path, content)
+    def git_info(content)
       return '' unless @git_status
 
-      real_path = File.realdirpath(content.name, path)
-
-      return '    ' unless real_path.start_with? path
-
-      relative_path = real_path.remove(Regexp.new('^' + Regexp.escape(@git_root_path) + '/?'))
-
       if content.directory?
-        git_dir_info(relative_path)
+        git_dir_info(content.name)
       else
-        git_file_info(relative_path)
+        git_file_info(content.name)
       end
-      # puts "\n\n"
     end
 
     def git_file_info(path)
       return '  ✓ '.colorize(@colors[:unchanged]) unless @git_status[path]
+
       Git.colored_status_symbols(@git_status[path].uniq, @colors)
     end
 
@@ -251,12 +264,14 @@ module ColorLS
 
     def long_info(content)
       return '' unless @long
+
       [mode_info(content.stats), user_info(content), group_info(content.group),
        size_info(content.size), mtime_info(content.mtime)].join('  ')
     end
 
     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])
@@ -273,12 +288,14 @@ module ColorLS
       @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
 
       [
         long_info(content),
-        " #{git_info(path,content)} ",
+        " #{git_info(content)} ",
         logo.colorize(color),
-        "  #{content.name.colorize(color)}#{slash?(content)}#{symlink_info(content)}"
+        "  #{name.colorize(color)}#{slash?(content)}#{symlink_info(content)}"
       ].join
     end
 
@@ -292,39 +309,60 @@ module ColorLS
       print "\n"
     end
 
+    def file_color(file, key)
+      color_key = case
+                  when file.chardev? then :chardev
+                  when file.blockdev? then :blockdev
+                  when file.socket? then :socket
+                  else
+                    @files.key?(key) ? :recognized_file : :unrecognized_file
+                  end
+      @colors[color_key]
+    end
+
     def options(content)
       if content.directory?
         key = content.name.to_sym
+        key = @folder_aliases[key] unless @folders.key? key
+        key = :folder if key.nil?
         color = @colors[:dir]
-        return [:folder, color, :folders] unless @all_folders.include?(key)
-        key = @folder_aliases[key] unless @folder_keys.include?(key)
-        return [key, color, :folders]
+        group = :folders
+      else
+        key = content.name.split('.').last.downcase.to_sym
+        key = @file_aliases[key] unless @files.key? key
+        key = :file if key.nil?
+        color = file_color(content, key)
+        group = @files.key?(key) ? :recognized_files : :unrecognized_files
       end
 
-      color = @colors[:recognized_file]
-      return [content.downcase.to_sym, color, :recognized_files] if @file_keys.include?(key)
-
-      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)
-      [key, color, :recognized_files]
+      [key, color, group]
     end
 
-    def tree_traverse(path, prespace, indent)
+    def tree_traverse(path, prespace, depth, indent)
       contents = init_contents(path)
       contents.each do |content|
         icon = content == contents.last || content.directory? ? ' └──' : ' ├──'
         print tree_branch_preprint(prespace, indent, icon).colorize(@colors[:tree])
         print " #{fetch_string(path, content, *options(content))} \n"
         next unless content.directory?
-        tree_traverse("#{path}/#{content}", prespace + indent, indent)
+
+        tree_traverse("#{path}/#{content}", prespace + indent, depth + 1, indent) if keep_going(depth)
       end
     end
 
+    def keep_going(depth)
+      @tree[:depth].nil? || depth < @tree[:depth]
+    end
+
     def tree_branch_preprint(prespace, indent, prespace_icon)
       return prespace_icon if prespace.zero?
+
       ' │ ' * (prespace/indent) + prespace_icon + '─' * indent
     end
+
+    def make_link(path, name)
+      href = "file://#{path}/#{name}"
+      "\033]8;;#{href}\007#{name}\033]8;;\007"
+    end
   end
 end