git-status-tree 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0823206680a82016025ca4859cd9d0b7baf30ec61c51e2f5201f0dceeac9d20
-  data.tar.gz: 731c9421ae4eeffe679b3c65f2bc5816fe949aae33af6aa4082694eb8b133b66
+  metadata.gz: 6ae072cfbbbb61271fe7e85784ec62a447a1d0ebaca8c64849254f82b3dc70e5
+  data.tar.gz: 4c7980522950a903b4619c347be85332a6bf358a869a39b6d7586b8e5b9d93e4
 SHA512:
-  metadata.gz: 050262f9aa55d5768e1a63dfa199f035f2a3cb34d519bd1f703fd2e0405cdef23c5440449e46c3087f3349360107de5045ef60a07052a9d15667905136b56f52
-  data.tar.gz: cb498d741fbf7c4c2cf84475b0d69b0bf1857318e2ea45279dc5bc4fb54adcceb8e2fed576c66aa42e781de2cfdf7a9ba7be99a1686c4d77eb413740bd469aa7
+  metadata.gz: c31c32ffb0c81747f0d16f9d6b6b6f7c958a858aef6311d735cb23520cb10cfd9f7873d90952ede9581e4567f3b5dad44c6736edf1f8a87302fb5f46a0bfe112
+  data.tar.gz: c8aaa7af0c6954eaeb81047ad5d992866692b0bcd2630a29a07a9af58f2f0b34f2c256e80ca5fe7d0a92825805f225a277c0feabb0f9a0127d9263a186e81ba5

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.6.0

data/lib/node.rb

@@ -129,9 +129,13 @@ class Node
     end
   end
 
-  def file? = children.nil?
+  def file?
+    children.nil?
+  end
 
-  def dir? = !file?
+  def dir?
+    !file?
+  end
 
   def valid?
     file? ? valid_file? : valid_dir?
@@ -168,14 +172,37 @@ class Node
     end
   end
 
-  def modified? = status.include?('M')
-  def added? = status.include?('A')
-  def deleted? = status.include?('D')
-  def renamed? = status.include?('R')
-  def copied? = status.include?('C')
-  def unmerged? = status.include?('U')
-  def new? = status.include?('?')
-  def staged? = status.include?('+')
+  def modified?
+    status.include?('M')
+  end
+
+  def added?
+    status.include?('A')
+  end
+
+  def deleted?
+    status.include?('D')
+  end
+
+  def renamed?
+    status.include?('R')
+  end
+
+  def copied?
+    status.include?('C')
+  end
+
+  def unmerged?
+    status.include?('U')
+  end
+
+  def new?
+    status.include?('?')
+  end
+
+  def staged?
+    status.include?('+')
+  end
 
   private
 

data/src/git_status_tree.rb

@@ -13,7 +13,7 @@ class GitStatusTree
   def initialize(options = {})
     Node.indent = indent(options)
     Node.collapse_dirs = collapse(options)
-    @files = `git status --porcelain#{untracked_files(options)}`.split("\n")
+    @files = parse_status(`git status --porcelain -z#{untracked_files(options)}`)
     @nodes = files.map { |file| Node.create_from_string file }
     @tree = nodes.reduce { |a, i| (a + i).nodes[0] }
   end
@@ -28,6 +28,38 @@ class GitStatusTree
 
   private
 
+  # Parse NUL-terminated `git status --porcelain -z` output into porcelain
+  # entry strings. Unlike the default output, -z never quotes or escapes
+  # paths, so names with spaces, non-ASCII characters, quotes, backslashes
+  # or tabs survive intact. Rename/copy entries span two NUL-separated
+  # tokens ("<XY> <dest>\0<orig>\0") and are reassembled into the
+  # "<XY> <orig> -> <dest>" form the node parser expects.
+  def parse_status(raw)
+    # Paths are emitted as raw UTF-8 bytes; tag them so names display literally.
+    tokens = raw.force_encoding('UTF-8').split("\0")
+    files = []
+    index = 0
+    while index < tokens.length
+      entry = tokens[index]
+      index += 1
+      next if entry.nil? || entry.empty?
+
+      if rename_or_copy?(entry)
+        orig = tokens[index]
+        index += 1
+        files << "#{entry[0, 3]}#{orig} -> #{entry[3..]}"
+      else
+        files << entry
+      end
+    end
+    files
+  end
+
+  def rename_or_copy?(entry)
+    status = entry[0, 2]
+    status.include?('R') || status.include?('C')
+  end
+
   def indent(options)
     indent = options[:indent] || config || 4
     indent = 2 if indent < 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-status-tree
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Wolfgang Teuber
@@ -45,14 +45,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: git status in file tree format
 test_files: []