Fix indentation alignment issue when using custom indent values

Author: wteuber

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed indentation alignment issue when using custom indent values
+  - Tree drawing characters now properly align with specified indentation
+
+### Changed
+- Refactored `Node#pre_tree` method to reduce complexity
+- Converted multiple methods to Ruby 3.0+ shorthand notation for cleaner code
 
 ## [3.2.0] - 2025-06-25
 

README.md

@@ -32,7 +32,7 @@ git tree
 ```
 -i, --indent INDENT    Set indentation (2-10 spaces)
 -v, --version          Show version
--h                     Show help message
+-h, --help             Show help message
 ```
 
 **Note:** Due to how git handles aliases, when using `git tree --help`, git will show the alias expansion instead of the help message. Use `git tree -h` to see the help message.

lib/node.rb

@@ -124,13 +124,9 @@ def to_primitive
     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?
@@ -162,37 +158,14 @@ def to_tree_s(depth = 0, open_parents = [0], last: true)
     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?('?')
-  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 +211,24 @@ def valid_file?
   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)