colorls 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4985c3a5528c2e34ab5e8ccac1efbbd139e5d5a1
-  data.tar.gz: b54dc73e35b4d524b648c1348222dce052175b09
+  metadata.gz: 1466b9e0c4a5e7e722f61b3bc23c72393c84b209
+  data.tar.gz: 2e7fb89508e0e73a5ebf2c895d9054bb2961ea91
 SHA512:
-  metadata.gz: 6ee0668a87a81f540e2e828a3f01e43f05180d16a9447b92d6eb65c14e9f0cd7afe1c23b6d1ac3a918748b2f8a9e5e11f5a51e7e9777ce9e80a572b315e01234
-  data.tar.gz: 5859c0c78a18285d9cbea49b4197d1173cfb1dbf3cfc452a4455d53d5b04ba311e057dc2776120f2a715c888d59be2b13b750280d07f7bb0d975bdeb236b6874
+  metadata.gz: 5e9549e3bb540525c3b7118eae86ac2b77bd4d325e5c0e1764866cc82274ffc80010b997b0996c9173f9b921afdbd4afcf1c364e0e67ccee3ec77161db1b43d4
+  data.tar.gz: f8f3c48565b330c01dd075b8a1a9e056913d7d1079c196aa7adf350645c8d0fd9fc80264f3393d7334c212f8f168535cc6f8aba22ef332e1005b5cae7357a534

data/lib/colorls.rb

@@ -7,3 +7,4 @@ require 'filesize'
 
 require 'colorls/core'
 require 'colorls/flags'
+require 'colorls/load_from_yaml'

data/lib/colorls/core.rb

@@ -1,7 +1,7 @@
 module ColorLS
   class Core
     def initialize(input=nil, all: false, report: false, sort: false, show: false,
-      one_per_line: false, long: false, almost_all: false, tree: false)
+      one_per_line: false, long: false, almost_all: false, tree: false, colors: [])
       @input        = input || Dir.pwd
       @count        = {folders: 0, recognized_files: 0, unrecognized_files: 0}
       @all          = all
@@ -13,6 +13,7 @@ module ColorLS
       @long         = long
       @tree         = tree
       @screen_width = ::TermInfo.screen_size.last
+      @colors       = colors
 
       @contents   = init_contents(@input)
       @max_widths = @contents.map(&:length)
@@ -20,7 +21,7 @@ module ColorLS
     end
 
     def ls
-      return print "\n   Nothing to show here\n".colorize(:yellow) if @contents.empty?
+      return print "\n   Nothing to show here\n".colorize(@colors[:empty]) if @contents.empty?
 
       if @tree
         print "\n"
@@ -52,8 +53,8 @@ module ColorLS
       @total_content_length = @contents.length
 
       return @contents unless @long
-      init_user_lengths
-      init_group_lengths
+      init_user_lengths(path)
+      init_group_lengths(path)
       @contents
     end
 
@@ -62,25 +63,25 @@ module ColorLS
       @contents.keep_if { |x| !x.start_with? '.' } unless @all || @almost_all
     end
 
-    def init_user_lengths
+    def init_user_lengths(path)
       @userlength = @contents.map do |c|
-        next 0 unless File.exist?("#{@input}/#{c}")
+        next 0 unless File.exist?("#{path}/#{c}")
         begin
-          user = Etc.getpwuid(File.stat("#{@input}/#{c}").uid).name
+          user = Etc.getpwuid(File.stat("#{path}/#{c}").uid).name
         rescue ArgumentError
-          user = File.stat("#{@input}/#{c}").uid
+          user = File.stat("#{path}/#{c}").uid
         end
         user.to_s.length
       end.max
     end
 
-    def init_group_lengths
+    def init_group_lengths(path)
       @grouplength = @contents.map do |c|
-        next 0 unless File.exist?("#{@input}/#{c}")
+        next 0 unless File.exist?("#{path}/#{c}")
         begin
-          group = Etc.getgrgid(File.stat("#{@input}/#{c}").gid).name
+          group = Etc.getgrgid(File.stat("#{path}/#{c}").gid).name
         rescue ArgumentError
-          group = File.stat("#{@input}/#{c}").gid
+          group = File.stat("#{path}/#{c}").gid
         end
         group.to_s.length
       end.max
@@ -113,10 +114,10 @@ module ColorLS
     end
 
     def init_icons
-      @files          = load_from_yaml('files.yaml')
-      @file_aliases   = load_from_yaml('file_aliases.yaml', true)
-      @folders        = load_from_yaml('folders.yaml')
-      @folder_aliases = load_from_yaml('folder_aliases.yaml', true)
+      @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)
 
       @file_keys          = @files.keys
       @file_aliase_keys   = @file_aliases.keys
@@ -148,32 +149,32 @@ module ColorLS
     end
 
     def in_line(chunk_size)
-      return false if @max_widths.sum + 7 * chunk_size > @screen_width
+      return false if @max_widths.sum + 8 * chunk_size > @screen_width
       true
     end
 
     def display_report
       print "\n   Found #{@total_content_length} contents in directory "
-        .colorize(:white)
+        .colorize(@colors[:report])
 
-      print File.expand_path(@input).to_s.colorize(:blue)
+      print File.expand_path(@input).to_s.colorize(@colors[:dir])
 
       puts  "\n\n\tFolders\t\t\t: #{@count[:folders]}"\
         "\n\tRecognized files\t: #{@count[:recognized_files]}"\
         "\n\tUnrecognized files\t: #{@count[:unrecognized_files]}"
-        .colorize(:white)
+        .colorize(@colors[:report])
     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(:gray)
+          mode += '-'.colorize(@colors[:no_access])
         else
           case (i % 3)
-          when 0 then mode += 'r'.colorize(:yellow)
-          when 1 then mode += 'w'.colorize(:magenta)
-          when 2 then mode += 'x'.colorize(:cyan)
+          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
@@ -187,7 +188,7 @@ module ColorLS
         user = stat.uid
       end
       user = user.to_s.ljust(@userlength, ' ')
-      user.colorize(:green) if user == Etc.getlogin
+      user.colorize(@colors[:user]) if user == Etc.getlogin
     end
 
     def group_info(stat)
@@ -196,71 +197,61 @@ module ColorLS
       rescue ArgumentError
         group = stat.gid
       end
-      group.to_s.ljust(@grouplength, ' ')
+      group.to_s.ljust(@grouplength, ' ').colorize(@colors[:normal])
     end
 
     def size_info(stat)
       size = Filesize.from("#{stat.size} B").pretty.split(' ')
-      "#{size[0][0..-4].rjust(3,' ')} #{size[1].ljust(3,' ')}"
+      "#{size[0][0..-4].rjust(3,' ')} #{size[1].ljust(3,' ')}".colorize(@colors[:normal])
     end
 
     def mtime_info(stat)
-      mtime = stat.mtime.asctime
-      mtime = mtime.colorize(:yellow) if Time.now - stat.mtime < 24 * 60 * 60
-      mtime = mtime.colorize(:green)  if Time.now - stat.mtime < 60 * 60
+      mtime = stat.mtime.asctime.colorize(@colors[:no_modifier])
+      mtime = mtime.colorize(@colors[:day_old]) if Time.now - stat.mtime < 24 * 60 * 60
+      mtime = mtime.colorize(@colors[:hour_old]) if Time.now - stat.mtime < 60 * 60
       mtime
     end
 
-    def long_info(content)
+    def long_info(path, content)
       return '' unless @long
-      unless File.exist?("#{@input}/#{content}")
-        return '[No Info]'.colorize(:red) + ' ' * (39 + @userlength + @grouplength)
+      unless File.exist?("#{path}/#{content}")
+        return '[No Info]'.colorize(@colors[:error]) + ' ' * (39 + @userlength + @grouplength)
       end
-      stat = File.stat("#{@input}/#{content}")
+      stat = File.stat("#{path}/#{content}")
       [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)
+    def symlink_info(path, content)
+      return '' unless @long && File.lstat("#{path}/#{content}").symlink?
+      if File.exist?("#{path}/#{content}")
+        " ⇒ #{File.readlink("#{path}/#{content}")}/".colorize(@colors[:link])
       else
-        ' ⇒ [Dead link]'.colorize(:red)
+        ' ⇒ [Dead link]'.colorize(@colors[:dead_link])
       end
     end
 
-    def slash?(content)
-      Dir.exist?("#{@input}/#{content}") ? '/'.colorize(:blue) : ' '
+    def slash?(path, content)
+      Dir.exist?("#{path}/#{content}") ? '/'.colorize(@colors[:dir]) : ' '
     end
 
-    def fetch_string(content, key, color, increment)
+    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') }
 
       [
-        long_info(content),
+        long_info(path, content),
         logo.colorize(color),
-        "#{content.colorize(color)}#{slash?(content)}#{symlink_info(content)}"
+        "#{content.colorize(color)}#{slash?(path, content)}#{symlink_info(path, content)}"
       ].join('  ')
     end
 
-    def load_from_yaml(filename, aliase=false)
-      filepath = File.join(File.dirname(__FILE__),"../yaml/#{filename}")
-      yaml     = YAML.safe_load(File.read(filepath)).symbolize_keys
-      return yaml unless aliase
-      yaml
-        .to_a
-        .map! { |k, v| [k, v.to_sym] }
-        .to_h
-    end
-
     def ls_line(chunk)
       print "\n"
       chunk.each_with_index do |content, i|
         break if content.empty?
 
-        print "  #{fetch_string(content, *options(@input, content))}"
+        print "  #{fetch_string(@input, content, *options(@input, content))}"
         print ' ' * (@max_widths[i] - content.length) unless @one_per_line || @long
       end
     end
@@ -268,29 +259,28 @@ module ColorLS
     def options(path, content)
       if Dir.exist?("#{path}/#{content}")
         key = content.to_sym
-        return %i[folder blue folders] unless @all_folders.include?(key)
+        color = @colors[:dir]
+        return [:folder, color, :folders] unless @all_folders.include?(key)
         key = @folder_aliases[key] unless @folder_keys.include?(key)
-        return [key, :blue, :folders]
+        return [key, color, :folders]
       end
 
-      key = content.downcase.to_sym
-
-      return [key, :green, :recognized_files] if @file_keys.include?(key)
+      color = @colors[:recognized_file]
+      return [content.downcase.to_sym, color, :recognized_files] if @file_keys.include?(key)
 
       key = content.split('.').last.downcase.to_sym
-
-      return %i[file yellow unrecognized_files] unless @all_files.include?(key)
+      return [:file, @colors[:unrecognized_file], :unrecognized_files] unless @all_files.include?(key)
 
       key = @file_aliases[key] unless @file_keys.include?(key)
-      [key, :green, :recognized_files]
+      [key, color, :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"
+        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}"
         tree_traverse("#{path}/#{content}", prespace + indent, indent)
       end

data/lib/colorls/flags.rb

@@ -2,6 +2,8 @@ module ColorLS
   class Flags
     def initialize(*args)
       @args = args
+      set_color_opts
+
       @opts = {
         show: fetch_show_opts,
         sort: fetch_sort_opts,
@@ -10,7 +12,8 @@ module ColorLS
         report: flag_given?(%w[-r --report]),
         one_per_line: flag_given?(%w[-1]) || !STDOUT.tty?,
         long: flag_given?(%w[-l --long]),
-        tree: flag_given?(%w[-t --tree])
+        tree: flag_given?(%w[-t --tree]),
+        colors: @colors
       }
 
       @args.keep_if { |arg| !arg.start_with?('-') }
@@ -35,13 +38,30 @@ module ColorLS
       false
     end
 
+    def set_color_opts
+      light_colors = flag_given? %w[--light]
+      dark_colors  = flag_given? %w[--dark]
+
+      if light_colors && dark_colors
+        @colors = ColorLS.load_from_yaml('dark_colors.yaml', true)
+        STDERR.puts "\n Restrain from using --light and --dark flags together."
+          .colorize(@colors[:error])
+      elsif light_colors
+        @colors = ColorLS.load_from_yaml('light_colors.yaml', true)
+      else # default colors
+        @colors = ColorLS.load_from_yaml('dark_colors.yaml', true)
+      end
+
+      @colors
+    end
+
     def fetch_show_opts
       show_dirs_only   = flag_given? %w[-d --dirs]
       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."
-          .colorize(:red)
+        STDERR.puts "\n  Restrain from using -d and -f flags together."
+          .colorize(@colors[:error])
         return nil
       else
         return :files if show_files_only
@@ -55,8 +75,8 @@ 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."
-          .colorize(:red)
+        STDERR.puts "\n  Restrain from using -sd and -sf flags together."
+          .colorize(@colors[:error])
         return nil
       else
         return :files if sort_files_first

data/lib/colorls/load_from_yaml.rb

@@ -0,0 +1,11 @@
+module ColorLS
+  def self.load_from_yaml(filename, aliase=false)
+    filepath = File.join(File.dirname(__FILE__),"../yaml/#{filename}")
+    yaml     = YAML.safe_load(File.read(filepath)).symbolize_keys
+    return yaml unless aliase
+    yaml
+      .to_a
+      .map! { |k, v| [k, v.to_sym] }
+      .to_h
+  end
+end

data/lib/colorls/version.rb

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

data/lib/yaml/dark_colors.yaml

@@ -0,0 +1,26 @@
+# Main Colors
+unrecognized_file: yellow
+recognized_file:   green
+dir:               blue
+
+# Link
+dead_link: red
+link:      cyan
+
+# Access Modes
+write:     magenta
+read:      yellow
+exec:      cyan
+no_access: grey
+
+# Age
+day_old:     yellow
+hour_old:    green
+no_modifier: white
+
+# Random
+report: white
+user:   green
+tree:   cyan
+empty:  yellow
+normal: white

data/lib/yaml/light_colors.yaml

@@ -0,0 +1,26 @@
+# Main Colors
+unrecognized_file: yellow
+recognized_file:   green
+dir:               blue
+
+# Link
+dead_link: red
+link:      cyan
+
+# Access Modes
+write:     red
+read:      yellow
+exec:      blue
+no_access: black
+
+# Age
+day_old:     yellow
+hour_old:    green
+no_modifier: black
+
+# Random
+report: black
+user:   green
+tree:   cyan
+empty:  yellow
+normal: black

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -158,11 +158,14 @@ files:
 - lib/colorls.rb
 - lib/colorls/core.rb
 - lib/colorls/flags.rb
+- lib/colorls/load_from_yaml.rb
 - lib/colorls/version.rb
+- lib/yaml/dark_colors.yaml
 - lib/yaml/file_aliases.yaml
 - lib/yaml/files.yaml
 - lib/yaml/folder_aliases.yaml
 - lib/yaml/folders.yaml
+- lib/yaml/light_colors.yaml
 - readme/pending.png
 - readme/usage1.png
 - readme/usage2.png