git-status-tree 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 261d0c82a5a74d301f58b8524456d4c2fbe29feac0f120e459f2ebd154a0ca57
-  data.tar.gz: dbe0de28748947459d8a6d1be0a535f69c7c72abb445565a4d05d667d99925dd
+  metadata.gz: d8090f4d4d90afb6b0fedbb5ca793aac7badc80bac59f30c580cc89804822124
+  data.tar.gz: 505b37d46f5ad80c3cad0deb34c67bc8deaf70e188ab90b8023c74f92fee9636
 SHA512:
-  metadata.gz: f0283802e22db622c566a797487849add4b5d08d607e8bed7bdc406be7da782f353a464894e0b45f62434c78d314785e98e674cb0bbc56b3dba3087250ce200e
-  data.tar.gz: 1282ceceb1e13cfacec5292c9c705b4c2ad2981559bf705b6dc3d1513987b2d54c8a4c3d85142df870c245ebedd290f69c2ca7a1f9dfe07a63754cbe1eaf05af
+  metadata.gz: 909be6e6800f62f52803e865426b276511f9e17b252dcae4c0d2326e9ecc752e5f05f9c53a3e7b4bf61debc0dd3eaa06e59def4014ac55e6f5edca498839b8fb
+  data.tar.gz: ecf289d4983dd92adac996462ed60cd8e31053c53475690df3908633fd5a430ce6baf1e636362807e36711c86aef0795c04bf7793d69b91a0bfcd1f7c39b8a0d

data/VERSION

@@ -0,0 +1 @@
+3.2.0

data/bin/git-status-tree

@@ -5,9 +5,15 @@ 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('-v', '--version', 'Show version') do
     puts "git-status-tree #{GitStatusTree::VERSION}"
     exit 0
@@ -27,4 +33,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 "!sh -c \"$BIN_DIR/git-status-tree \\\"\\\$@\\\"\" --"
 echo '#############################'
 echo '# "git tree" has been added #'
 echo '# Run: git tree             #'

data/ext/git_tree/extconf.rb

@@ -8,7 +8,7 @@ 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') {}
+File.write(compile, '')
 
 # Install "git tree"
 puts `../../bin/git_add_alias_tree`

data/lib/node.rb

@@ -5,7 +5,7 @@ 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 Node
   class << self
     attr_accessor :indent
   end
@@ -39,6 +39,62 @@ class Node # rubocop:disable Metrics/ClassLength
 
   def self.node_from_gs(gs_porcelain)
     status = status(gs_porcelain)
+
+    # Handle renamed files specially
+    if status.include?('R')
+      node_from_renamed_file(gs_porcelain, status)
+    else
+      # Original logic for non-renamed files
+      node_from_regular_file(gs_porcelain, status)
+    end
+  end
+
+  def self.node_from_renamed_file(gs_porcelain, status)
+    paths_part = gs_porcelain[3..]
+    return node_from_regular_file(gs_porcelain, status) unless paths_part.include?(' -> ')
+
+    old_path, new_path = paths_part.split(' -> ')
+    old_dir = File.dirname(old_path)
+
+    rename_display = build_rename_display(old_path, new_path)
+
+    build_node_structure(old_dir, rename_display, status)
+  end
+
+  private_class_method :node_from_renamed_file
+
+  def self.build_rename_display(old_path, new_path)
+    old_dir = File.dirname(old_path)
+    new_dir = File.dirname(new_path)
+    old_filename = File.basename(old_path)
+    new_filename = File.basename(new_path)
+
+    if old_dir == new_dir
+      "#{old_filename} -> #{new_filename}"
+    else
+      "#{old_filename} -> #{new_path}"
+    end
+  end
+  private_class_method :build_rename_display
+
+  def self.build_node_structure(dir_path, leaf_name, status)
+    if dir_path == '.'
+      # File is in root directory
+      new(leaf_name, nil, status)
+    else
+      # File is in subdirectory
+      ary_nodes = "./#{dir_path}".split(%r{/})
+
+      name = ary_nodes.shift
+      # Add the leaf_name as the last element
+      ary_nodes << leaf_name
+      children = NodesCollection.create_from_array(ary_nodes, status)
+      new(name, children)
+    end
+  end
+  private_class_method :build_node_structure
+
+  def self.node_from_regular_file(gs_porcelain, status)
     ary_nodes = "./#{gs_porcelain[3..]}".split(%r{/})
 
     name = ary_nodes.shift
@@ -49,6 +105,7 @@ class Node # rubocop:disable Metrics/ClassLength
       new(name, nil, status)
     end
   end
+  private_class_method :node_from_regular_file
 
   private_class_method :node_from_gs
 
@@ -76,13 +133,9 @@ class Node # rubocop:disable Metrics/ClassLength
   end
 
   def valid?
-    return valid_dir? if dir?
-    return valid_file? if file?
-
-    false
+    file? ? valid_file? : valid_dir?
   end
 
-  # @return [NodesCollection]
   def +(other)
     raise 'not valid' unless valid? && other.valid?
     raise "not a #{self.class}" unless other.is_a?(self.class)
@@ -94,10 +147,8 @@ class Node # rubocop:disable Metrics/ClassLength
 
   def <=>(other)
     return (name <=> other.name) if file? == other.file?
-    return -1 if dir? && other.file?
-    return 1 if file? && other.dir?
 
-    0
+    dir? && other.file? ? -1 : 1
   end
 
   def to_tree_s(depth = 0, open_parents = [0], last: true)
@@ -111,42 +162,34 @@ class Node # rubocop:disable Metrics/ClassLength
     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
@@ -161,7 +204,8 @@ class Node # rubocop:disable Metrics/ClassLength
     raise NodeNameError, msg if name.empty?
 
     msg = '"name" must not contain "/", use create_from_string.'
-    raise NodeNameError, msg if name =~ %r{/}
+    # Allow forward slashes in rename displays (containing " -> ")
+    raise NodeNameError, msg if name =~ %r{/} && !name.include?(' -> ')
   end
 
   def color_name
@@ -176,21 +220,18 @@ class Node # rubocop:disable Metrics/ClassLength
     color_name + BashColor::NONE
   end
 
-  # Has a valid name?
   def name_valid?
     name.is_a?(String) &&
       name.length.positive? &&
-      name.match(%r{/}).nil?
+      (name.match(%r{/}).nil? || name.include?(' -> '))
   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?

data/lib/nodes_collection.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-# error class for invalid NodeCollection types
 class NodesCollectionTypeError < StandardError
 end
 
-# collection of nodes
-class NodesCollection # rubocop:disable Metrics/ClassLength
+# A collection of Node objects representing a git status tree structure
+class NodesCollection
   attr_accessor :nodes
 
   def self.create_from_string(str_nodes, status = '   ')
@@ -73,7 +72,6 @@ class NodesCollection # rubocop:disable Metrics/ClassLength
     @nodes = nodes
   end
 
-  # @return [NodesCollection]
   def +(other)
     raise 'not a Node or NodesCollection' unless other.is_a?(Node) || other.is_a?(self.class)
 
@@ -85,12 +83,10 @@ class NodesCollection # rubocop:disable Metrics/ClassLength
     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)
@@ -100,7 +96,6 @@ class NodesCollection # rubocop:disable Metrics/ClassLength
     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)
@@ -113,16 +108,10 @@ class NodesCollection # rubocop:disable Metrics/ClassLength
     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
+    return merge_nodes_with_node(other) if other.is_a?(Node)
 
-    nodes_merged
+    merge_nodes_with_collection(other)
   end
 
   def files

data/lib/version.rb

@@ -1,6 +1,5 @@
 # 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'

data/src/git_status_tree.rb

@@ -3,16 +3,15 @@
 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'
+require File.join File.dirname(__FILE__), '../lib/version'
 
-# GitStatusTree
-# use GitStatusTree.new.to_s to print the current git-status-tree
+# Main class for generating and displaying git status as a tree structure
 class GitStatusTree
   attr_reader :files, :nodes, :tree
 
   def initialize(options = {})
     Node.indent = indent(options)
-    @files = `git status --porcelain`.split(/\n/)
+    @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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-status-tree
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Wolfgang Teuber
@@ -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
@@ -29,12 +30,13 @@ files:
 - lib/rubygems_plugin.rb
 - lib/version.rb
 - src/git_status_tree.rb
-homepage: https://github.com/knugie/git-status-tree
+homepage: https://github.com/wteuber/git-status-tree
 licenses:
 - MIT
 - GPL-2.0
 metadata:
-  source_code_uri: https://github.com/knugie/git-status-tree
+  source_code_uri: https://github.com/wteuber/git-status-tree
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib