git-status-tree 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eaa4e24f5f6fed7c2340c5a4ae93e1cf51247be86881d043688755dc4796e76
-  data.tar.gz: 6b7916c3a0d9ca337884e336c3eb47a021bde591fc2287bf08048bd3e61855a5
+  metadata.gz: 1b5f775e1ebd97220c6705c47a171091da213c9959c925ebef136ff5a5a29733
+  data.tar.gz: 6c2d2dd1e7549110a29ce0abdd599b9c87a64aec3428a92ef06f927fa9e1a21c
 SHA512:
-  metadata.gz: b3bac80ae5b85406a6ba49dd584af3c7afa92ccbfa3c29b38206f00d7852aa3df60efe2e3ff8291d73af62a64bf8eaa0692f2a5cc8c91eb96317cd4902cd0e02
-  data.tar.gz: ebf4bfae6b713928c5fb6ef8b3d61459ee27398701346a13546dad8f62222c42b791c3ff22ae187a6b7865fba734ac7e3e0437ead298e43c96bc3fed531e4ad5
+  metadata.gz: 063414646c8c96d17705a7db7cc380797bda2116e24e045876b14020ad854418cffcd6ddaf4a320ef7992245e8d4bb7de1b00632a51d557f0b76235881e305bd
+  data.tar.gz: 7f3fcc689ce71d0221a2e0e640253c272437c2ab94210f5e6c6af4f45752538cd310b1fc11605f77f04f4f3fa0cfb8b381ac1478099f28dca3fc2124f50210ae

data/VERSION

@@ -0,0 +1 @@
+3.3.0

data/bin/git-status-tree

@@ -5,9 +5,19 @@ require 'optparse'
 require File.join File.dirname(__FILE__), '../src/git_status_tree'
 require File.join File.dirname(__FILE__), '../lib/version'
 
+options = {}
+
 parser = OptionParser.new do |opts|
   opts.banner = 'Usage: git-status-tree [options]'
 
+  opts.on('-i', '--indent INDENT', Integer, 'Set indentation (2-10 spaces)') do |indent|
+    options[:indent] = indent
+  end
+
+  opts.on('-c', '--collapse', 'Collapse directories containing only another directory') do
+    options[:collapse] = true
+  end
+
   opts.on('-v', '--version', 'Show version') do
     puts "git-status-tree #{GitStatusTree::VERSION}"
     exit 0
@@ -27,4 +37,4 @@ rescue OptionParser::InvalidOption => e
   exit 1
 end
 
-puts GitStatusTree.new
+puts GitStatusTree.new(options)

data/bin/git_add_alias_tree

@@ -5,7 +5,7 @@ BIN_DIR=`pwd`
 popd > /dev/null
 
 git config --global status-tree.indent 4
-git config --global alias.tree "!sh -c \"$BIN_DIR/git-status-tree\""
+git config --global alias.tree "!exec $BIN_DIR/git-status-tree"
 echo '#############################'
 echo '# "git tree" has been added #'
 echo '# Run: git tree             #'

data/lib/node.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
+require_relative 'node_collapsing'
+
 class NodeNameError < StandardError; end
 class NodeChildrenError < StandardError; end
 class NodeTypeError < StandardError; end
 
 # A Node represents a file or directory in the git-status-tree
 class Node
+  include NodeCollapsing
+
   class << self
-    attr_accessor :indent
+    attr_accessor :indent, :collapse_dirs
   end
 
   attr_accessor :status, :name, :children
 
   def initialize(name, children = nil, status = nil)
     self.class.indent ||= 4
+    self.class.collapse_dirs ||= false
     validate_name!(name)
 
     msg = '"children" must be a NodesCollection or nil.'
@@ -124,13 +129,9 @@ class Node
     end
   end
 
-  def file?
-    children.nil?
-  end
+  def file? = children.nil?
 
-  def dir?
-    !file?
-  end
+  def dir? = !file?
 
   def valid?
     file? ? valid_file? : valid_dir?
@@ -156,43 +157,25 @@ class Node
 
     pre = pre_tree(depth, open_parents, last)
 
-    str_tree = "#{pre}#{color_name}\n"
-    str_tree += children.to_tree_s(depth + 1, open_parents) if children
-
-    str_tree
-  end
-
-  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?('?')
+    # Handle directory collapsing if enabled
+    if self.class.collapse_dirs && collapsible?
+      render_collapsed_tree(pre, depth, open_parents)
+    else
+      # Normal rendering
+      str_tree = "#{pre}#{color_name}\n"
+      str_tree += children.to_tree_s(depth + 1, open_parents) if children
+      str_tree
+    end
   end
 
-  def staged?
-    status.include?('+')
-  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?('+')
 
   private
 
@@ -238,18 +221,24 @@ class Node
   end
 
   def pre_tree(depth, open_parents, last)
-    if depth.zero?
-      ''
-    elsif depth.positive?
-      pre_ary = Array.new(depth).fill('    ')
-      indent = self.class.indent - 2
+    return '' if depth.zero?
+    return '' unless depth.positive?
 
-      open_parents.each { |idx| pre_ary[idx] = "│#{' ' * indent} " if pre_ary[idx] == '    ' }
+    pre_ary = build_pre_array(depth, open_parents)
+    sibling(depth, self.class.indent - 2, last, open_parents, pre_ary)
+    pre_ary * ''
+  end
 
-      sibling(depth, indent, last, open_parents, pre_ary)
+  def build_pre_array(depth, open_parents)
+    spaces = ' ' * self.class.indent
+    pre_ary = Array.new(depth).fill(spaces)
+    indent = self.class.indent - 2
 
-      pre_ary * ''
+    open_parents.each do |idx|
+      pre_ary[idx] = "│#{' ' * indent} " if pre_ary[idx] == spaces
     end
+
+    pre_ary
   end
 
   def sibling(depth, indent, last, open_parents, pre_ary)

data/lib/node_collapsing.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+# Module for directory collapsing functionality
+module NodeCollapsing
+  # Check if this directory can be collapsed (only contains one child, either file or directory)
+  def collapsible?
+    return false unless dir?
+    return false unless children && children.nodes.length == 1
+    return false if name == '.' # Never collapse the root node
+
+    true
+  end
+
+  # Get the collapsed path for display
+  def collapsed_path
+    return name unless collapsible?
+
+    path_parts = [name]
+    build_collapsed_path_parts(path_parts)
+    path_parts.join('/')
+  end
+
+  # Get the deepest node in a collapsible chain
+  def deepest_collapsible_node
+    current = self
+
+    current = current.children.nodes.first while current.collapsible? && current.children.nodes.first.dir?
+
+    current
+  end
+
+  # Check if this is a collapsed path ending with a file
+  def collapsed_with_file?
+    return false unless collapsible?
+
+    deepest = deepest_collapsible_node
+    deepest.children && deepest.children.nodes.length == 1 && deepest.children.nodes.first.file?
+  end
+
+  private
+
+  def build_collapsed_path_parts(path_parts)
+    current = self
+
+    # Traverse through collapsible directories
+    while current.collapsible? && current.children.nodes.first.dir?
+      child = current.children.nodes.first
+      path_parts << child.name
+      current = child
+    end
+
+    # Add file if the last child is a file
+    append_file_to_path(current, path_parts)
+  end
+
+  def append_file_to_path(node, path_parts)
+    return unless node.children && node.children.nodes.length == 1
+
+    child = node.children.nodes.first
+    path_parts << child.name if child.file?
+  end
+
+  def render_collapsed_tree(pre, depth, open_parents)
+    display_name = collapsed_path
+
+    if collapsed_with_file?
+      render_collapsed_file(pre, display_name)
+    else
+      render_collapsed_directory(pre, display_name, depth, open_parents)
+    end
+  end
+
+  def render_collapsed_file(pre, display_name)
+    deepest = deepest_collapsible_node
+    file_node = deepest.children.nodes.first
+    "#{pre}#{color_collapsed_file(display_name, file_node.status)}\n"
+  end
+
+  def render_collapsed_directory(pre, display_name, depth, open_parents)
+    str_tree = "#{pre}#{color_collapsed_name(display_name)}\n"
+    deepest = deepest_collapsible_node
+    # Only render children if they exist and have nodes
+    str_tree += deepest.children.to_tree_s(depth + 1, open_parents) if deepest.children&.nodes&.any?
+    str_tree
+  end
+
+  def color_collapsed_name(display_name)
+    BashColor::EMB + display_name + BashColor::NONE
+  end
+
+  def color_collapsed_file(display_path, status)
+    # Split the path to separate directories from the file
+    parts = display_path.split('/')
+    file_name = parts.pop
+    dir_path = parts.join('/')
+
+    if dir_path.empty?
+      # No directories, just the file
+      color_file_with_status(file_name, status)
+    else
+      # Directories in blue, file colored by status
+      "#{BashColor::EMB}#{dir_path}/#{BashColor::NONE}#{color_file_with_status(file_name, status)}"
+    end
+  end
+
+  def color_file_with_status(file_name, status)
+    color = status.include?('+') ? BashColor::G : BashColor::R
+    "#{color}#{file_name} (#{status})#{BashColor::NONE}"
+  end
+end

data/src/git_status_tree.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require File.join File.dirname(__FILE__), '../lib/node'
+require File.join File.dirname(__FILE__), '../lib/node_collapsing'
 require File.join File.dirname(__FILE__), '../lib/nodes_collection'
 require File.join File.dirname(__FILE__), '../lib/bash_color'
 require File.join File.dirname(__FILE__), '../lib/version'
@@ -11,6 +12,7 @@ class GitStatusTree
 
   def initialize(options = {})
     Node.indent = indent(options)
+    Node.collapse_dirs = options[:collapse] || false
     @files = `git status --porcelain`.split("\n")
     @nodes = files.map { |file| Node.create_from_string file }
     @tree = nodes.reduce { |a, i| (a + i).nodes[0] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: git-status-tree
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Wolfgang Teuber
 bindir: bin
 cert_chain: []
-date: 2025-06-25 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies: []
 description: git-status-tree is a command line tool that shows git repository changes
   in a file tree.
@@ -18,6 +18,7 @@ extensions:
 - ext/git_tree/extconf.rb
 extra_rdoc_files: []
 files:
+- VERSION
 - bin/git-status-tree
 - bin/git_add_alias_tree
 - bin/git_remove_alias_tree
@@ -25,6 +26,7 @@ files:
 - ext/git_tree/extconf.rb
 - lib/bash_color.rb
 - lib/node.rb
+- lib/node_collapsing.rb
 - lib/nodes_collection.rb
 - lib/rubygems_plugin.rb
 - lib/version.rb