colorls 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baadf69e664b9bab7c78f96af16d833f7d03302c
-  data.tar.gz: e72d0b65aefd804aec27dab9865fb9066e9c56d1
+  metadata.gz: 8c4e2dd3d9823e5c27fe6a41124dfc6511320df5
+  data.tar.gz: 6ec38c1e754d1435363e03c4f86a6533e062f408
 SHA512:
-  metadata.gz: 5234ec2b037d9b50f82eac2cfdec97b0befc6f25f563fecd55a25b0f312b6b54acfe9ff573c73a636e6902b2e08dfba8cdff8d89e41182733d9d700a1b07ba10
-  data.tar.gz: b6d1d437c80186e03850a8c184892b78cf98ecd261ac41820033a294e3899a671eb0b0d96f4fccdfa6322149653945cd3f9f64ee65611353e80ad9f9e4983eb9
+  metadata.gz: 74cca11860e9251eb41d953f0d98fb40f7b8e0b9ad189c9b1a4c258a277cc4d9849a5c361b80e36d86255ad72d3f6f6a08aea980a97e5a9997096a7223cbcf1d
+  data.tar.gz: 2c8cd7f0c111826a0a257b2122cdcceda32dc02c7dafcd880fa3f461a92e447368f02815a3c67ec9c9810718fe343e4c31473cd996848c3fa12d01841e6c1cb9

data/colorls.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'colorls/version'
 

data/lib/colorls/core.rb

@@ -218,45 +218,35 @@ module ColorLS
     def git_info(path, content)
       return '' unless @git_status
 
-      # puts "\n\n"
+      real_path = File.realdirpath(content.name, path)
+
+      return '    ' unless real_path.start_with? path
 
-      relative_path = path.remove(@git_root_path+'/')
-      relative_path = relative_path==path ? '' : relative_path+'/'
-      content_path  = "#{relative_path}#{content}"
+      relative_path = real_path.remove(Regexp.new('^' + Regexp.escape(@git_root_path) + '/?'))
 
       if content.directory?
-        git_dir_info(content_path)
+        git_dir_info(relative_path)
       else
-        git_file_info(content_path)
+        git_file_info(relative_path)
       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], @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
+      Git.colored_status_symbols(@git_status[path].uniq, @colors)
     end
 
     def git_dir_info(path)
-      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?
+      direct_status = @git_status.fetch("#{path}/", nil)
+
+      return Git.colored_status_symbols(direct_status.uniq, @colors) unless direct_status.nil?
+
+      modes = @git_status.select { |file, mode| file.start_with?(path) && mode != '!!' }
 
-      modes = (present-ignored).map { |file| @git_status[file] }-[nil]
       return '  ✓ '.colorize(@colors[:unchanged]) if modes.empty?
-      Git.colored_status_symbols(modes.join.uniq, @colors)
+
+      Git.colored_status_symbols(modes.values.join.uniq, @colors)
     end
 
     def long_info(content)

data/lib/colorls/git.rb

@@ -3,9 +3,14 @@ module ColorLS
     def self.status(repo_path)
       @git_status = {}
 
-      IO.popen(['git', '-C', repo_path, 'status', '--porcelain', '-z', '-uall', '--ignored']) do |output|
-        output.read.split("\x0").map { |x| x.split(' ', 2) }.each do |mode, file|
+      IO.popen(['git', '-C', repo_path, 'status', '--porcelain', '-z', '-unormal', '--ignored']) do |output|
+        while (status_line = output.gets "\x0")
+          mode, file = status_line.chomp("\x0").split(' ', 2)
+
           @git_status[file] = mode
+
+          # skip the next \x0 separated original path for renames, issue #185
+          output.gets("\x0") if mode.start_with? 'R'
         end
       end
       warn "git status failed in #{repo_path}" unless $CHILD_STATUS.success?
@@ -14,13 +19,7 @@ module ColorLS
     end
 
     def self.colored_status_symbols(modes, colors)
-      modes =
-        case modes.length
-        when 1 then "  #{modes} "
-        when 2 then " #{modes} "
-        when 3 then "#{modes} "
-        when 4 then modes
-        end
+      modes = modes.rjust(3).ljust(4)
 
       modes
         .gsub('?', '?'.colorize(colors[:untracked]))

data/lib/colorls/version.rb

@@ -1,3 +1,3 @@
 module ColorLS
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/lib/yaml/file_aliases.yaml

@@ -2,8 +2,11 @@ apk:              android
 gradle:           android
 ds_store:         apple
 localized:        apple
+flac:             audio
+m4a:              audio
 mp3:              audio
 ogg:              audio
+wav:              audio
 editorconfig:     conf
 scss:             css
 docx:             doc
@@ -24,7 +27,10 @@ ico:              image
 jpeg:             image
 jpg:              image
 png:              image
+pxm:              image
 svg:              image
+tiff:             image
+webp:             image
 jar:              java
 properties:       json
 tsx:              jsx
@@ -35,6 +41,7 @@ rdoc:             md
 readme:           md
 gslides:          ppt
 pptx:             ppt
+ipynb:            py
 pyc:              py
 rdata:            r
 rds:              r
@@ -62,7 +69,9 @@ zshrc:            shell
 stylus:           styl
 cls:              tex
 avi:              video
+flv:              video
 mkv:              video
+mov:              video
 mp4:              video
 ogv:              video
 webm:             video

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale