colorls 1.2.1.pre.598 → 1.2.1.pre.600

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f791b5b1272ebedaa236767c69c8711b55ebb867e5ae5bc091f049e07892537d
-  data.tar.gz: f8e4cd333aee378279bf500c981523aaa5db675e19c3b33402f90e8a1da702fa
+  metadata.gz: 1cce6a6d2fc6e45ce4fcc87135a13edc7442ab041475339d2b89b1e14c3bce94
+  data.tar.gz: 954dccdc0786131ceb3fc23d70679bafd7877868344a516ed9d00a897afb0883
 SHA512:
-  metadata.gz: f816d42fbbcad3d147db9cd8349dd56b5652b2c9165b4f1771b90ada78b1975949a66ce991b0a8287d582010e004c170bc768a6fea4a92b8e3f949847dc8a442
-  data.tar.gz: dcc023d6829ab75f81364144b32c75f6313aaa0c6732cc647f2a09d063c2a9d5db0d8f46dd028c99f59fc1610c41f2496f5fb6999cec2f755bc45e763743c42c
+  metadata.gz: f8409394b3bb49344b1231a671966be47dc97deef8909bbac0611db39e83475574288e14f539a9f11bdd995008e7569fa3df51b885ee12fc2ec92f325e843a30
+  data.tar.gz: 22987f1296da307242ca4b9709345c9c64979f3a2f59feb1d6e238a2afdc2372f00a2a2f2e04a68fe25419b4676c977d64ab8929d9f60386d339d6a799c2c4cf

data/lib/colorls/core.rb

@@ -247,23 +247,19 @@ module ColorLS
     def git_file_info(path)
       return '  ✓ '.colorize(@colors[:unchanged]) unless @git_status[path]
 
-      Git.colored_status_symbols(@git_status[path].uniq, @colors)
+      Git.colored_status_symbols(@git_status[path], @colors)
     end
 
     def git_dir_info(path)
-      return '    ' if path == '..'
+      modes = if path == '.'
+                Set.new(@git_status.values).flatten
+              else
+                @git_status.fetch(path, nil)
+              end
 
-      direct_status = @git_status.fetch("#{path}/", nil)
+      return Git.colored_status_symbols(modes, @colors) unless modes.nil?
 
-      return Git.colored_status_symbols(direct_status.uniq, @colors) unless direct_status.nil?
-
-      prefix = path == '.' ? '' : path + '/'
-
-      modes = @git_status.select { |file, mode| file.start_with?(prefix) && mode != '!!' }.values
-
-      return '  ✓ '.colorize(@colors[:unchanged]) if modes.empty?
-
-      Git.colored_status_symbols(modes.join.uniq, @colors)
+      '    '
     end
 
     def long_info(content)

data/lib/colorls/git.rb

@@ -1,20 +1,25 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module ColorLS
   module Git
     def self.status(repo_path)
-      prefix = IO.popen(['git', '-C', repo_path, 'rev-parse', '--show-prefix'], err: :close, &:gets)
+      prefix = git_prefix(repo_path)
 
       return unless $CHILD_STATUS.success?
 
-      prefix.chomp!
-      git_status = {}
+      prefix = Pathname.new(prefix.chomp)
+
+      git_status = Hash.new { |hash, key| hash[key] = Set.new }
 
-      IO.popen(['git', '-C', repo_path, 'status', '--porcelain', '-z', '-unormal', '--ignored', '.']) do |output|
+      git_subdir_status(repo_path) do |output|
         while (status_line = output.gets "\x0")
           mode, file = status_line.chomp("\x0").split(' ', 2)
 
-          git_status[file.delete_prefix(prefix)] = mode
+          path = Pathname.new(file).relative_path_from(prefix)
+
+          git_status[path.descend.first.cleanpath.to_s].add(mode)
 
           # skip the next \x0 separated original path for renames, issue #185
           output.gets("\x0") if mode.start_with? 'R'
@@ -26,7 +31,9 @@ module ColorLS
     end
 
     def self.colored_status_symbols(modes, colors)
-      modes = modes.rjust(3).ljust(4)
+      return '  ✓ '.colorize(colors[:unchanged]) if modes.empty?
+
+      modes = modes.to_a.join.uniq.rjust(3).ljust(4)
 
       modes
         .gsub('?', '?'.colorize(colors[:untracked]))
@@ -35,5 +42,17 @@ module ColorLS
         .gsub('D', 'D'.colorize(colors[:deletion]))
         .tr('!', ' ')
     end
+
+    class << self
+      private
+
+      def git_prefix(repo_path)
+        IO.popen(['git', '-C', repo_path, 'rev-parse', '--show-prefix'], err: :close, &:gets)
+      end
+
+      def git_subdir_status(repo_path)
+        IO.popen(['git', '-C', repo_path, 'status', '--porcelain', '-z', '-unormal', '--ignored', '.'])
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.2.1.pre.598
+  version: 1.2.1.pre.600
 platform: ruby
 authors:
 - Athitya Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocale