git-status-tree 1.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee588f3827fbbc7ce9a9d78bc8b4a3452d17bfc5a9426abe4246c617f52e9ee3
-  data.tar.gz: 45bff253438b38d1464566fe9540b5d91f75505bee41575e4f26b106b4a48c47
+  metadata.gz: 261d0c82a5a74d301f58b8524456d4c2fbe29feac0f120e459f2ebd154a0ca57
+  data.tar.gz: dbe0de28748947459d8a6d1be0a535f69c7c72abb445565a4d05d667d99925dd
 SHA512:
-  metadata.gz: f09d66715e49aff087232e2b1b770935a595647753d5f8dcdfa72813b854885661fd25f89e47b201802dbf75dfb06b95de0a15f184847605b12717b4b202b606
-  data.tar.gz: b45b6f3aa2884014934795361670401b1b98027ae98076049c135f8267e57c4f139dfe574039f2d77cfabc067c770467514fb2ece6a95a09829fbd43fbdb54a3
+  metadata.gz: f0283802e22db622c566a797487849add4b5d08d607e8bed7bdc406be7da782f353a464894e0b45f62434c78d314785e98e674cb0bbc56b3dba3087250ce200e
+  data.tar.gz: 1282ceceb1e13cfacec5292c9c705b4c2ad2981559bf705b6dc3d1513987b2d54c8a4c3d85142df870c245ebedd290f69c2ca7a1f9dfe07a63754cbe1eaf05af

data/bin/git-status-tree

@@ -1,6 +1,30 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
-require File.join File.dirname(__FILE__), '../src/git-status-tree'
+require 'optparse'
+require File.join File.dirname(__FILE__), '../src/git_status_tree'
+require File.join File.dirname(__FILE__), '../lib/version'
 
-puts GitStatusTree.new.to_s
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: git-status-tree [options]'
+
+  opts.on('-v', '--version', 'Show version') do
+    puts "git-status-tree #{GitStatusTree::VERSION}"
+    exit 0
+  end
+
+  opts.on('-h', '--help', 'Show this help message') do
+    puts opts
+    exit 0
+  end
+end
+
+begin
+  parser.parse!
+rescue OptionParser::InvalidOption => e
+  puts "Error: #{e.message}"
+  puts parser
+  exit 1
+end
+
+puts GitStatusTree.new

data/ext/git_tree/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 
 find_executable('bash')
@@ -5,11 +7,11 @@ find_executable('git')
 find_executable('make')
 
 # Trick Rubygems into thinking the generated Makefile was executed
-compile = File.join(Dir.pwd, 'git_tree.' + RbConfig::CONFIG['DLEXT'])
-File.open(compile, "w") {}
+compile = File.join(Dir.pwd, "git_tree.#{RbConfig::CONFIG['DLEXT']}")
+File.open(compile, 'w') {}
 
 # Install "git tree"
 puts `../../bin/git_add_alias_tree`
 
 # Trick Rubygems into thinking the Makefile was executed
-$makefile_created = true
+$makefile_created = true # rubocop:disable Style/GlobalVars

data/lib/bash_color.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module BashColor
   NONE = "\033[0m"

data/lib/node.rb

@@ -1,208 +1,223 @@
-# encoding: utf-8
-
-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
-  class << self
-    attr_accessor :indent
-  end
-
-  attr_accessor :status, :name, :children
-
-  def initialize(name, children = nil, status = nil)
-    self.class.indent ||= 4
-    msg = '"name" must be a String.'
-    raise NodeNameError, msg unless name.is_a? String
-    msg = '"name" must have at least one character.'
-    raise NodeNameError, msg if name.empty?
-    msg = '"name" must not contain "/", use create_from_string.'
-    raise NodeNameError, msg if name =~ /\//
-    msg = '"children" must be a NodesCollection or nil.'
-    valid_nodes_collection = children.nil? || children.is_a?(NodesCollection)
-    raise NodeChildrenError, msg unless valid_nodes_collection
-
-    @name = name
-    @children = children
-    @status = status || '??'
-  end
-
-  def self.create_from_string(gs_porcelain)
-    msg = '"str_node" must be String.'
-    raise NodeTypeError, msg unless gs_porcelain.is_a? String
-    raise NodeNameError, '"str_node" too short.' if gs_porcelain.length < 4
-    status = if gs_porcelain[1..1] == ' '
-               gs_porcelain[0..0] + '+'
-             else
-               gs_porcelain[1..1]
-             end
-    path = './' + gs_porcelain[3..-1]
-    ary_nodes = path.split(/\//)
-    name = ary_nodes.shift
-
-    if ary_nodes.any?
-      children = NodesCollection.create_from_array(ary_nodes, status)
-      node = self.new(name, children)
-    else
-      node = self.new(name, nil, status)
-    end
-
-    node
-  end
-
-  def self.instances?
-    lambda { |node| node.is_a?(Node) }
-  end
-
-  def to_primitive
-    if dir?
-      {name => children.to_primitive}
-    else
-      name
-    end
-  end
-
-  def file?
-    children.nil?
-  end
-
-  def dir?
-    !file?
-  end
-
-  def valid?
-    return valid_dir? if dir?
-    return valid_file? if file?
-    false
-  end
-
-  # @return [NodesCollection]
-  def +(other)
-    raise 'not valid' unless self.valid? && other.valid?
-    raise 'not a ' + self.class.to_s unless other.is_a?(self.class)
-
-    tmp_children = [self.children, other.children].compact.inject(&:+)
-
-    NodesCollection.new([self.class.new(self.name, tmp_children)])
-  end
-
-  def <=>(other)
-    return (self.name <=> other.name) if self.file? == other.file?
-    return -1 if (self.dir? && other.file?)
-    return 1 if (self.file? && other.dir?)
-    0
-  end
-
-  def to_tree_s(depth = 0, open_parents = [0], last = true)
-    open_parents << depth
-
-    pre = pre_tree(depth, open_parents, last)
-
-    color_name = ''
-    if dir?
-      color_name += BashColor::EMB + name
-    else #file?
-      if staged?
-        color_name += BashColor::G
-      else
-        color_name += BashColor::R
-      end
-      color_name += name + ' (' + status + ')'
-    end
-    color_name +=  BashColor::NONE
-
-
-    str_tree = pre + color_name + "\n"
-    str_tree << children.to_tree_s(depth + 1, open_parents) if children
-
-    str_tree
-  end
-
-  #   'M'  modified
-  def modified?
-    self.status.include?('M')
-  end
-
-  #   'A'  added
-  def added?
-    self.status.include?('A')
-  end
-
-  #   'D'  deleted
-  def deleted?
-    self.status.include?('D')
-  end
-
-  #   'R'  renamed
-  def renamed?
-    self.status.include?('R')
-  end
-
-  #   'C'  copied
-  def copied?
-    self.status.include?('C')
-  end
-
-  #   'U'  updated but unmerged
-  def unmerged?
-    self.status.include?('U')
-  end
-
-  #   '?' new
-  def new?
-    self.status.include?('?')
-  end
-
-  #   '+' staged
-  def staged?
-    self.status.include?('+')
-  end
-
-  private
-  # Has a valid name?
-  def name_valid?
-    name &&
-      name.is_a?(String) &&
-      (name.length > 0) &&
-      name.match(/\//).nil?
-  end
-
-  # Is a valid dir?
-  def valid_dir?
-    name_valid? &&
-      children.is_a?(NodesCollection) &&
-      children.valid?
-  end
-
-  # Is a valid file?
-  def valid_file?
-    name_valid? &&
-      children.nil?
-  end
-
-  def pre_tree(depth, open_parents, last)
-    if depth == 0
-      ''
-    elsif depth > 0
-      pre_ary = Array.new(depth).fill('    ')
-
-      indent = self.class.indent - 2
-      open_parents.each do |idx|
-        pre_ary[idx] = '│' + (' ' * indent) + ' ' if pre_ary[idx] == '    '
-      end
-
-      if last
-        pre_ary[-1] = '└'
-        open_parents.delete(depth-1)
-      else
-        pre_ary[-1] = '├'
-      end
-      pre_ary[-1] += ('─' * indent) + ' '
-
-
-      pre_ary * ''
-    end
-  end
-end
+# frozen_string_literal: true
+
+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 # rubocop:disable Metrics/ClassLength
+  class << self
+    attr_accessor :indent
+  end
+
+  attr_accessor :status, :name, :children
+
+  def initialize(name, children = nil, status = nil)
+    self.class.indent ||= 4
+    validate_name!(name)
+
+    msg = '"children" must be a NodesCollection or nil.'
+    valid_nodes_collection = children.nil? || children.is_a?(NodesCollection)
+    raise NodeChildrenError, msg unless valid_nodes_collection
+
+    @name = name
+    @children = children
+    @status = status || '??'
+  end
+
+  def self.create_from_string(gs_porcelain)
+    msg = '"str_node" must be String.'
+    raise NodeTypeError, msg unless gs_porcelain.is_a? String
+    raise NodeNameError, '"str_node" too short.' if gs_porcelain.length < 4
+
+    node_from_gs(gs_porcelain)
+  end
+
+  def self.instances?
+    ->(node) { node.is_a?(Node) }
+  end
+
+  def self.node_from_gs(gs_porcelain)
+    status = status(gs_porcelain)
+    ary_nodes = "./#{gs_porcelain[3..]}".split(%r{/})
+
+    name = ary_nodes.shift
+    if ary_nodes.any?
+      children = NodesCollection.create_from_array(ary_nodes, status)
+      new(name, children)
+    else
+      new(name, nil, status)
+    end
+  end
+
+  private_class_method :node_from_gs
+
+  def self.status(gs_porcelain)
+    status = "#{gs_porcelain[0]}+" if gs_porcelain[1] == ' '
+    status = gs_porcelain[1] unless gs_porcelain[1] == ' '
+    status
+  end
+  private_class_method :status
+
+  def to_primitive
+    if dir?
+      { name => children.to_primitive }
+    else
+      name
+    end
+  end
+
+  def file?
+    children.nil?
+  end
+
+  def dir?
+    !file?
+  end
+
+  def valid?
+    return valid_dir? if dir?
+    return valid_file? if file?
+
+    false
+  end
+
+  # @return [NodesCollection]
+  def +(other)
+    raise 'not valid' unless valid? && other.valid?
+    raise "not a #{self.class}" unless other.is_a?(self.class)
+
+    tmp_children = [children, other.children].compact.inject(&:+)
+
+    NodesCollection.new([self.class.new(name, tmp_children)])
+  end
+
+  def <=>(other)
+    return (name <=> other.name) if file? == other.file?
+    return -1 if dir? && other.file?
+    return 1 if file? && other.dir?
+
+    0
+  end
+
+  def to_tree_s(depth = 0, open_parents = [0], last: true)
+    open_parents << depth
+
+    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
+
+  #   'M'  modified
+  def modified?
+    status.include?('M')
+  end
+
+  #   'A'  added
+  def added?
+    status.include?('A')
+  end
+
+  #   'D'  deleted
+  def deleted?
+    status.include?('D')
+  end
+
+  #   'R'  renamed
+  def renamed?
+    status.include?('R')
+  end
+
+  #   'C'  copied
+  def copied?
+    status.include?('C')
+  end
+
+  #   'U'  updated but unmerged
+  def unmerged?
+    status.include?('U')
+  end
+
+  #   '?' new
+  def new?
+    status.include?('?')
+  end
+
+  #   '+' staged
+  def staged?
+    status.include?('+')
+  end
+
+  private
+
+  def validate_name!(name)
+    msg = '"name" must be a String.'
+    raise NodeNameError, msg unless name.is_a? String
+
+    msg = '"name" must have at least one character.'
+    raise NodeNameError, msg if name.empty?
+
+    msg = '"name" must not contain "/", use create_from_string.'
+    raise NodeNameError, msg if name =~ %r{/}
+  end
+
+  def color_name
+    color_name = ''
+    if dir?
+      color_name += BashColor::EMB + name
+    else
+      color_name += BashColor::G if staged?
+      color_name += BashColor::R unless staged?
+      color_name += "#{name} (#{status})"
+    end
+    color_name + BashColor::NONE
+  end
+
+  # Has a valid name?
+  def name_valid?
+    name.is_a?(String) &&
+      name.length.positive? &&
+      name.match(%r{/}).nil?
+  end
+
+  # Is a valid dir?
+  def valid_dir?
+    name_valid? &&
+      children.is_a?(NodesCollection) &&
+      children.valid?
+  end
+
+  # Is a valid file?
+  def valid_file?
+    name_valid? &&
+      children.nil?
+  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
+
+      open_parents.each { |idx| pre_ary[idx] = "│#{' ' * indent} " if pre_ary[idx] == '    ' }
+
+      sibling(depth, indent, last, open_parents, pre_ary)
+
+      pre_ary * ''
+    end
+  end
+
+  def sibling(depth, indent, last, open_parents, pre_ary)
+    if last
+      pre_ary[-1] = '└'
+      open_parents.delete(depth - 1)
+    else
+      pre_ary[-1] = '├'
+    end
+    pre_ary[-1] += "#{'─' * indent} "
+  end
+end

data/lib/nodes_collection.rb

@@ -1,179 +1,194 @@
-# encoding: utf-8
-
-# error class for invalid NodeCollection types
-class NodesCollectionTypeError < StandardError;
-end
-
-# collection of nodes
-class NodesCollection
-  attr_accessor :nodes
-
-  def self.create_from_string(str_nodes, status = '   ')
-    msg = '"str_nodes" must be String.'
-    raise NodesCollectionTypeError, msg unless str_nodes.is_a? String
-
-    ary_nodes = str_nodes.split(/\//)
-    create_from_valid_array(ary_nodes, status)
-  end
-
-  def self.create_from_array(ary_nodes, status)
-    ary_nodes = [ary_nodes].flatten(1)
-
-    msg = '"ary_nodes" must only contain Strings.'
-    are_strings = lambda { |node| node.is_a?(String) }
-    raise NodesCollectionTypeError, msg unless ary_nodes.all? &are_strings
-
-    create_from_valid_array(ary_nodes, status)
-  end
-
-  def self.new_from_nodes_array(nodes)
-    raise msg unless nodes.all? &Node.instances?
-
-    all_nodes = nodes.group_by(&:name)
-
-    plain_nodes = []
-    all_nodes.each { |_, nodes| plain_nodes << nodes if nodes.length == 1 }
-    plain_nodes.flatten!(1)
-
-    merged_nodes = []
-    all_nodes.each do |_, nodes|
-      if nodes.length == 2
-        merged_nodes << (nodes[0] + nodes[1]).nodes[0]
-      end
-    end
-
-    self.new(plain_nodes + merged_nodes)
-  end
-
-  def self.create_from_valid_array(ary_nodes, status)
-    name = ary_nodes.shift
-    node = if ary_nodes.any?
-             children = create_from_valid_array(ary_nodes, status)
-             Node.new(name, children)
-           else
-             Node.new(name, nil, status)
-           end
-    self.new([node])
-  end
-
-  private_class_method :create_from_valid_array
-
-  def initialize(nodes = [])
-    nodes = [nodes].flatten(1)
-
-    msg = '"nodes" must only contain Nodes.'
-    are_nodes = lambda { |node| node.is_a?(Node) }
-    raise NodesCollectionTypeError, msg unless nodes.all? &are_nodes
-    @nodes = nodes
-  end
-
-  # @return [NodesCollection]
-  def +(other)
-    unless other.is_a?(Node) || other.is_a?(self.class)
-      raise 'not a Node or NodesCollection'
-    end
-
-    all_nodes = merge_nodes_with other
-    all_dirs = all_nodes.select(&:dir?)
-    all_files = all_nodes.select(&:file?)
-
-    dirs_collection = self.class.new_from_nodes_array all_dirs
-    files_collection = self.class.new all_files
-
-
-    dir_nodes = dirs_collection.sort!
-    file_nodes = files_collection.sort!
-
-    self.class.new(dir_nodes + file_nodes)
-  end
-
-  # @return [Integer]
-  def <=>(other)
-    self.to_primitive <=> other.to_primitive
-  end
-
-  # @return [Array<Node>]
-  def nodes_not_in(other)
-    self_names = self.nodes.map(&:name)
-    other_names = other.nodes.map(&:name)
-
-    self_only_names = self_names - (self_names & other_names)
-
-    self.nodes.select { |node| self_only_names.include?(node.name) }
-  end
-
-  # @return [Array<Node>]
-  def merge_common_nodes_with(other)
-    self_names = self.nodes.map(&:name)
-    other_names = other.nodes.map(&:name)
-
-    common_names = self_names & other_names
-    all_nodes = self.nodes + other.nodes
-
-    common_names.map do |name|
-      all_nodes.select { |node| node.name == name }.reduce(&:+).nodes[0]
-    end
-  end
-
-  # @return [Array<Node>]
-  def merge_nodes_with(other)
-    if other.is_a? Node
-      if self.nodes.map(&:name).include?(other.name)
-        equal_names = lambda { |node| node.name == other.name }
-        collection_merged = self.nodes.select(&equal_names)[0] + other
-        other = collection_merged.nodes[0]
-      end
-
-      nodes_merged = self.nodes + [other]
-    elsif other.is_a? NodesCollection
-      self_dedicated_nodes = self.nodes_not_in other
-      other_dedicated_nodes = other.nodes_not_in self
-      common_nodes = self.merge_common_nodes_with other
-
-      nodes_merged = self_dedicated_nodes + common_nodes + other_dedicated_nodes
-    end
-
-    nodes_merged
-  end
-
-  def files
-    nodes.select(&:file?)
-  end
-
-  def dirs
-    nodes.select(&:dir?)
-  end
-
-  def sort!
-    nodes.sort!
-  end
-
-  def to_primitive
-    nodes.map(&:to_primitive)
-  end
-
-  def valid?
-    nodes &&
-        nodes.is_a?(Array) &&
-        nodes.all? { |node| node.is_a?(Node) } &&
-        nodes.all?(&:valid?)
-    #TODO compare uniqueness of file and dir names.
-  end
-
-  def to_tree_s(depth = 0, open_parents = [])
-    tree_s = ''
-
-    if nodes.length > 1
-      to_tree_s = lambda { |node| node.to_tree_s(depth, open_parents, false) }
-      tree_s << nodes[0..-2].map(&to_tree_s) * ''
-    end
-    tree_s << nodes.last.to_tree_s(depth, open_parents)
-
-    tree_s
-  end
-
-  private
-  def add_node(other)
-  end
-
-end
+# frozen_string_literal: true
+
+# error class for invalid NodeCollection types
+class NodesCollectionTypeError < StandardError
+end
+
+# collection of nodes
+class NodesCollection # rubocop:disable Metrics/ClassLength
+  attr_accessor :nodes
+
+  def self.create_from_string(str_nodes, status = '   ')
+    msg = '"str_nodes" must be String.'
+    raise NodesCollectionTypeError, msg unless str_nodes.is_a? String
+
+    ary_nodes = str_nodes.split(%r{/})
+    create_from_valid_array(ary_nodes, status)
+  end
+
+  def self.create_from_array(ary_nodes, status)
+    ary_nodes = [ary_nodes].flatten(1)
+
+    msg = '"ary_nodes" must only contain Strings.'
+    are_strings = ->(node) { node.is_a?(String) }
+    raise NodesCollectionTypeError, msg unless ary_nodes.all?(&are_strings)
+
+    create_from_valid_array(ary_nodes, status)
+  end
+
+  def self.new_from_nodes_array(all_nodes)
+    raise msg unless all_nodes.all?(&Node.instances?)
+
+    grouped_nodes = all_nodes.group_by(&:name)
+    plain_nodes = plain_nodes(grouped_nodes)
+    merged_nodes = merged_nodes(grouped_nodes)
+
+    new(plain_nodes + merged_nodes)
+  end
+
+  def self.create_from_valid_array(ary_nodes, status)
+    name = ary_nodes.shift
+    node = if ary_nodes.any?
+             children = create_from_valid_array(ary_nodes, status)
+             Node.new(name, children)
+           else
+             Node.new(name, nil, status)
+           end
+    new([node])
+  end
+
+  private_class_method :create_from_valid_array
+
+  def self.merged_nodes(grouped_nodes)
+    merged_nodes = []
+    grouped_nodes.each_value do |nodes|
+      merged_nodes << (nodes[0] + nodes[1]).nodes[0] if nodes.length == 2
+    end
+    merged_nodes
+  end
+  private_class_method :merged_nodes
+
+  def self.plain_nodes(grouped_nodes)
+    grouped_nodes.filter { |_, nodes| nodes.length == 1 }.values.flatten(1)
+  end
+  private_class_method :plain_nodes
+
+  def initialize(nodes = [])
+    nodes = [nodes].flatten(1)
+
+    msg = '"nodes" must only contain Nodes.'
+    are_nodes = ->(node) { node.is_a?(Node) }
+    raise NodesCollectionTypeError, msg unless nodes.all?(&are_nodes)
+
+    @nodes = nodes
+  end
+
+  # @return [NodesCollection]
+  def +(other)
+    raise 'not a Node or NodesCollection' unless other.is_a?(Node) || other.is_a?(self.class)
+
+    all_nodes = merge_nodes_with other
+
+    dir_nodes = dir_nodes(all_nodes)
+    file_nodes = file_nodes(all_nodes)
+
+    self.class.new(dir_nodes + file_nodes)
+  end
+
+  # @return [Integer]
+  def <=>(other)
+    to_primitive <=> other.to_primitive
+  end
+
+  # @return [Array<Node>]
+  def nodes_not_in(other)
+    self_names = nodes.map(&:name)
+    other_names = other.nodes.map(&:name)
+
+    self_only_names = self_names - (self_names & other_names)
+
+    nodes.select { |node| self_only_names.include?(node.name) }
+  end
+
+  # @return [Array<Node>]
+  def merge_common_nodes_with(other)
+    self_names = nodes.map(&:name)
+    other_names = other.nodes.map(&:name)
+
+    common_names = self_names & other_names
+    all_nodes = nodes + other.nodes
+
+    common_names.map do |name|
+      all_nodes.select { |node| node.name == name }.reduce(&:+).nodes[0]
+    end
+  end
+
+  # @return [Array<Node>]
+  def merge_nodes_with(other)
+    case other
+    when Node
+      nodes_merged = merge_nodes_with_node(other)
+    when NodesCollection
+      nodes_merged = merge_nodes_with_collection(other)
+    end
+
+    nodes_merged
+  end
+
+  def files
+    nodes.select(&:file?)
+  end
+
+  def dirs
+    nodes.select(&:dir?)
+  end
+
+  def sort!
+    nodes.sort!
+  end
+
+  def to_primitive
+    nodes.map(&:to_primitive)
+  end
+
+  def valid?
+    nodes.is_a?(Array) &&
+      nodes.all? { |node| node.is_a?(Node) } &&
+      nodes&.all?(&:valid?)
+    # TODO: compare uniqueness of file and dir names.
+  end
+
+  def to_tree_s(depth = 0, open_parents = [])
+    tree_s = ''
+
+    if nodes.length > 1
+      to_tree_s = ->(node) { node.to_tree_s(depth, open_parents, last: false) }
+      tree_s += nodes[0..-2].map(&to_tree_s) * ''
+    end
+    tree_s += nodes.last.to_tree_s(depth, open_parents)
+
+    tree_s
+  end
+
+  def file_nodes(all_nodes)
+    all_files = all_nodes.select(&:file?)
+    files_collection = self.class.new all_files
+    files_collection.sort!
+  end
+
+  def dir_nodes(all_nodes)
+    all_dirs = all_nodes.select(&:dir?)
+    dirs_collection = self.class.new_from_nodes_array all_dirs
+    dirs_collection.sort!
+  end
+
+  def merge_nodes_with_collection(other)
+    self_dedicated_nodes = nodes_not_in other
+    other_dedicated_nodes = other.nodes_not_in self
+    common_nodes = merge_common_nodes_with other
+
+    self_dedicated_nodes + common_nodes + other_dedicated_nodes
+  end
+
+  def merge_nodes_with_node(other)
+    if nodes.map(&:name).include?(other.name)
+      equal_names = ->(node) { node.name == other.name }
+      collection_merged = nodes.select(&equal_names)[0] + other
+      other = collection_merged.nodes[0]
+    end
+
+    nodes + [other]
+  end
+
+  def add_node(other); end
+end

data/lib/rubygems_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem.pre_uninstall do |uninstaller|
   bin_dir = uninstaller.spec.bin_dir
   git_remove_alias_tree = File.join(bin_dir, 'git_remove_alias_tree')

data/lib/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Version information for git-status-tree
+class GitStatusTree
+  VERSION_FILE = File.expand_path('../VERSION', __dir__)
+  VERSION = File.exist?(VERSION_FILE) ? File.read(VERSION_FILE).strip : 'unknown'
+end

data/src/git_status_tree.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
+require File.join File.dirname(__FILE__), '../lib/node'
+require File.join File.dirname(__FILE__), '../lib/nodes_collection'
+require File.join File.dirname(__FILE__), '../lib/bash_color'
+require File.join File.dirname(__FILE__), '../src/git_status_tree'
+
 # GitStatusTree
 # use GitStatusTree.new.to_s to print the current git-status-tree
 class GitStatusTree
   attr_reader :files, :nodes, :tree
 
   def initialize(options = {})
-    config = %x(git config --global status-tree.indent).strip
-    config = (config =~ /\A\d+\z/) ? config.to_i : nil
-    indent = options[:indent] || config || 4
-    indent = 2 if indent < 2
-    indent = 10 if indent > 10
-    Node.indent = indent
-    @files = (%x(git status --porcelain)).split(/\n/)
-    @nodes = files.map{|file| Node.create_from_string file}
-    @tree = nodes.reduce{|a, i| (a+i).nodes[0]}
+    Node.indent = indent(options)
+    @files = `git status --porcelain`.split(/\n/)
+    @nodes = files.map { |file| Node.create_from_string file }
+    @tree = nodes.reduce { |a, i| (a + i).nodes[0] }
   end
 
   def to_s
@@ -22,4 +24,18 @@ class GitStatusTree
       tree.to_tree_s
     end
   end
+
+  private
+
+  def indent(options)
+    indent = options[:indent] || config || 4
+    indent = 2 if indent < 2
+    indent = 10 if indent > 10
+    indent
+  end
+
+  def config
+    config = `git config --global status-tree.indent`.strip
+    config =~ /\A\d+\z/ ? config.to_i : nil
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: git-status-tree
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Wolfgang Teuber
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2025-06-25 00:00:00.000000000 Z
 dependencies: []
 description: git-status-tree is a command line tool that shows git repository changes
   in a file tree.
@@ -28,7 +27,7 @@ files:
 - lib/node.rb
 - lib/nodes_collection.rb
 - lib/rubygems_plugin.rb
-- src/git-status-tree.rb
+- lib/version.rb
 - src/git_status_tree.rb
 homepage: https://github.com/knugie/git-status-tree
 licenses:
@@ -36,7 +35,6 @@ licenses:
 - GPL-2.0
 metadata:
   source_code_uri: https://github.com/knugie/git-status-tree
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -44,15 +42,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: git status in file tree format
 test_files: []

data/src/git-status-tree.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-require File.join File.dirname(__FILE__), '../lib/node'
-require File.join File.dirname(__FILE__), '../lib/nodes_collection'
-require File.join File.dirname(__FILE__), '../lib/bash_color'
-require File.join File.dirname(__FILE__), '../src/git_status_tree'
-
-# GIT STATUS
-#   ' '  unmodified
-#   'M'  modified
-#   'A'  added
-#   'D'  deleted
-#   'R'  renamed
-#   'C'  copied
-#   'U'  updated but unmerged
-#   '??' other