Merge pull request #595 from ayushpoddar/color-hidden-files

Colorise hidden files and directories

lib/colorls/core.rb

@@ -407,6 +407,7 @@ def file_color(file, key)
                   when file.blockdev?   then :blockdev
                   when file.socket?     then :socket
                   when file.executable? then :executable_file
+                  when file.hidden?     then :hidden
                   when @files.key?(key) then :recognized_file
                   else                       :unrecognized_file
                   end
@@ -415,20 +416,32 @@ def file_color(file, key)
 
     def options(content)
       if content.directory?
-        key = content.name.downcase.to_sym
-        key = @folder_aliases[key] unless @folders.key? key
-        key = :folder if key.nil?
-        color = @colors[:dir]
-        group = :folders
+        options_directory(content).values_at(:key, :color, :group)
       else
-        key = File.extname(content.name).delete_prefix('.').downcase.to_sym
-        key = @file_aliases[key] unless @files.key? key
-        color = file_color(content, key)
-        group = @files.key?(key) ? :recognized_files : :unrecognized_files
-        key = :file if key.nil?
+        options_file(content).values_at(:key, :color, :group)
       end
+    end
+
+    def options_directory(content)
+      key = content.name.downcase.to_sym
+      key = @folder_aliases[key] unless @folders.key?(key)
+      key = :folder if key.nil?
+
+      color = content.hidden? ? @colors[:hidden_dir] : @colors[:dir]
+
+      {key: key, color: color, group: :folders}
+    end
+
+    def options_file(content)
+      key = File.extname(content.name).delete_prefix('.').downcase.to_sym
+      key = @file_aliases[key] unless @files.key?(key)
+
+      color = file_color(content, key)
+      group = @files.key?(key) ? :recognized_files : :unrecognized_files
+
+      key = :file if key.nil?
 
-      [key, color, group]
+      {key: key, color: color, group: group}
     end
 
     def tree_contents(path)

lib/colorls/fileinfo.rb

@@ -40,6 +40,10 @@ def dead?
       @dead
     end
 
+    def hidden?
+      @name.start_with?('.')
+    end
+
     def owner
       return @@users[@stats.uid] if @@users.key? @stats.uid
 

lib/yaml/dark_colors.yaml

@@ -9,9 +9,11 @@ dead_link: red
 link:      cyan
 
 # special files
-socket:    green
-blockdev:  green
-chardev:   green
+socket:     green
+blockdev:   green
+chardev:    green
+hidden:     burlywood
+hidden_dir: slategray
 
 # Access Modes
 write:     darkkhaki

lib/yaml/light_colors.yaml

@@ -9,9 +9,11 @@ dead_link: red
 link:      cyan
 
 # special files
-socket:    darkgray
-blockdev:  darkgray
-chardev:   darkgray
+socket:     darkgray
+blockdev:   darkgray
+chardev:    darkgray
+hidden:     seagreen
+hidden_dir: royalblue
 
 # Access Modes
 write:     red

spec/color_ls/core_spec.rb

@@ -25,6 +25,7 @@
         chardev?: false,
         socket?: false,
         symlink?: false,
+        hidden?: false,
         stats: instance_double(File::Stat,
                                mode: 0o444, # read for user, owner, other
                                setuid?: false,
@@ -47,6 +48,7 @@
         chardev?: false,
         socket?: false,
         symlink?: false,
+        hidden?: false,
         stats: instance_double(File::Stat,
                                mode: 0o444, # read for user, owner, other
                                setuid?: false,
@@ -77,6 +79,7 @@
         chardev?: false,
         socket?: false,
         symlink?: false,
+        hidden?: true,
         executable?: false
       )
 

spec/color_ls/flags_spec.rb

@@ -26,6 +26,7 @@
       chardev?: false,
       socket?: false,
       symlink?: false,
+      hidden?: false,
       stats: instance_double(File::Stat,
                              mode: 0o444, # read for user, owner, other
                              setuid?: true,
@@ -467,6 +468,7 @@
         chardev?: false,
         socket?: false,
         symlink?: true,
+        hidden?: false,
         link_target: "#{FIXTURES}/z.txt",
         dead?: false,
         executable?: false