git 4.0.2 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edf8c0ca68f2c4a5e2ecd4a72cfc49bf30edf8406bd7016ebd8e96e8bb016065
-  data.tar.gz: 76c74e062482a50b780c3af13767e5bbd9d361f7fe4aad44c593d11de53a3acf
+  metadata.gz: aa18499d23585a949951d7e9cec7ffcda07eb1085deb3f43bb1396da678b7ba2
+  data.tar.gz: aa41f2fbc6558e54549ad49381492f0ec952d31b56256f1cb72f0e845df3eb55
 SHA512:
-  metadata.gz: 49d11d3ae7d6a26365c594381f94d426130fa3d62c819d575b1b8868fa9af3f83b42ba81b0a9404e3aeedc422962f13d6f10203bdfd2074e9e9fbc36c1fc3422
-  data.tar.gz: bf6e926d267120715fbfef1d2008dc3f4951130cdfe6266203caceb9fe63bd55c02282b0798a39c3917ea927af6215da805253eb85210a35a531bc066e62ed78
+  metadata.gz: 2d9bffd83ac45d0fc88b5f9f83ca8bd06b447989f74c68b279ea7ad8b35618ec059709d71f391ad1ee75ff3bbc2b40e1eabe7718446b588c68bb77fab4d5e10d
+  data.tar.gz: ba02db38b890b206c68bf8f7b09f3d13758beddd057977ebaf9b0259f20bcc4125f124713c15a230c7822a8c521801e9dfec4181582b58ac82ca873563721798

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "4.0.2"
+  ".": "4.0.5"
 }

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-07-06 21:08:14 UTC using RuboCop version 1.77.0.
+# on 2025-08-17 04:52:22 UTC using RuboCop version 1.79.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,4 +9,4 @@
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 1032
+  Max: 1039

data/CHANGELOG.md

@@ -5,6 +5,54 @@
 
 # Change Log
 
+## [4.0.5](https://github.com/ruby-git/ruby-git/compare/v4.0.4...v4.0.5) (2025-08-20)
+
+
+### Bug Fixes
+
+* Properly parse UTF-8(multibyte) file paths in git output ([8e6a11e](https://github.com/ruby-git/ruby-git/commit/8e6a11e5f3749a25e1d56ffbc0332a98846a395b))
+
+
+### Other Changes
+
+* Document and announce the proposed architectural redesign ([e27255a](https://github.com/ruby-git/ruby-git/commit/e27255ad6d06fbf84c1bc32efc2e0f8eb48290a7))
+* Minor change to the architecture redesign document ([b4634b5](https://github.com/ruby-git/ruby-git/commit/b4634b596d71bd59857b7723d20f393eb5024faa))
+* Rearrange README so that Summary is at the top ([3d2c473](https://github.com/ruby-git/ruby-git/commit/3d2c47388b9d4dc730964fc316afb2fc0fb7c90a))
+* Update ClassLength max in .rubocop_todo.yml for CI passing ([4430478](https://github.com/ruby-git/ruby-git/commit/4430478e087b33839d1a3b307a418b806197f279))
+
+## [4.0.4](https://github.com/ruby-git/ruby-git/compare/v4.0.3...v4.0.4) (2025-07-09)
+
+
+### Bug Fixes
+
+* Remove deprecation from Git::Path ([ab1e207](https://github.com/ruby-git/ruby-git/commit/ab1e20773c6a300b546841f79adf8dd6e707250e))
+* Remove deprecation from Git::Stash ([9da1e91](https://github.com/ruby-git/ruby-git/commit/9da1e9112e38c0e964dd2bc638bda7aebe45ba91))
+
+
+### Other Changes
+
+* Add tests for Git::Base#set_index including deprecation ([e6ccb11](https://github.com/ruby-git/ruby-git/commit/e6ccb11830a794f12235e47032235c3284c84cf6))
+* Add tests for Git::Base#set_working including deprecation ([ee11137](https://github.com/ruby-git/ruby-git/commit/ee1113706a8e34e9631f0e2d89bd602bca87f05f))
+* Add tests to verify Git::Object.new creates the right type of object ([ab17621](https://github.com/ruby-git/ruby-git/commit/ab17621d65a02b70844fde3127c9cbb219add7f5))
+* Verify deprecated Git::Log methods emit a deprecation warning ([abb0efb](https://github.com/ruby-git/ruby-git/commit/abb0efbdb3b6bb49352d097b1fece708477d4362))
+
+## [4.0.3](https://github.com/ruby-git/ruby-git/compare/v4.0.2...v4.0.3) (2025-07-08)
+
+
+### Bug Fixes
+
+* Correct the deprecation horizon for Git deprecations ([b7b7f38](https://github.com/ruby-git/ruby-git/commit/b7b7f38ccb88ba719e8ea7cb3fea14474b19a00c))
+* Fix Rubocop Layout/EmptyLinesAroundClassBody offense ([1de27da](https://github.com/ruby-git/ruby-git/commit/1de27daabed18b47a42539fe69b735d8ee90cbbb))
+* Internally create a Stash with non-deprecated initializer args ([8b9b9e2](https://github.com/ruby-git/ruby-git/commit/8b9b9e2f3b3fa525973785f642331317ade35936))
+* Report correct line number in deprecation warnings ([cca0deb](https://github.com/ruby-git/ruby-git/commit/cca0debb4166c809af76f9dc586e4fd06e142d44))
+* Un-deprecate Git::Diff methods ([761b6ff](https://github.com/ruby-git/ruby-git/commit/761b6ffcd363f4329a9cbafbf1379513a19ff174))
+
+
+### Other Changes
+
+* Make tests that emit a deprecation warning fail ([7e211d7](https://github.com/ruby-git/ruby-git/commit/7e211d7b2b7cc8d9da4a860361bef52280a5e73b))
+* Update all tests to not use deprecated features ([33ab0e2](https://github.com/ruby-git/ruby-git/commit/33ab0e255e229e22d84b14a4d4f5fb829c1fe37c))
+
 ## [4.0.2](https://github.com/ruby-git/ruby-git/compare/v4.0.1...v4.0.2) (2025-07-08)
 
 

data/README.md

@@ -11,9 +11,6 @@
 [![Build Status](https://github.com/ruby-git/ruby-git/workflows/CI/badge.svg?branch=main)](https://github.com/ruby-git/ruby-git/actions?query=workflow%3ACI)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
 
-- [📢 We Now Use RuboCop 📢](#-we-now-use-rubocop-)
-- [📢 Default Branch Rename 📢](#-default-branch-rename-)
-- [📢 We've Switched to Conventional Commits 📢](#-weve-switched-to-conventional-commits-)
 - [Summary](#summary)
 - [Install](#install)
 - [Major Objects](#major-objects)
@@ -23,55 +20,11 @@
 - [Examples](#examples)
 - [Ruby version support policy](#ruby-version-support-policy)
 - [License](#license)
-
-## 📢 We Now Use RuboCop 📢
-
-To improve code consistency and maintainability, the `ruby-git` project has now
-adopted [RuboCop](https://rubocop.org/) as our static code analyzer and formatter.
-
-This integration is a key part of our ongoing commitment to making `ruby-git` a
-high-quality, stable, and easy-to-contribute-to project. All new contributions will
-be expected to adhere to the style guidelines enforced by our RuboCop configuration.
-
- RuboCop can be run from the project's Rakefile:
-
-```shell
-rake rubocop
-```
-
-RuboCop is also run  as part of the default rake task (by running `rake`) that is run
-in our Continuous Integration workflow.
-
-Going forward, any PRs that have any Robocop offenses will not be merged. In
-certain rare cases, it might be acceptable to disable a  RuboCop check for the most
-limited scope possible.
-
-If you have a problem fixing a  RuboCop offense, don't be afraid to ask a contributor.
-
-## 📢 Default Branch Rename 📢
-
-On June 6th, 2025, the default branch was renamed from 'master' to 'main'.
-
-Instructions for renaming your local or forked branch to match can be found in the
-gist [Default Branch Name
-Change](https://gist.github.com/jcouball/580a10e395f7fdfaaa4297bbe816cc7d).
-
-## 📢 We've Switched to Conventional Commits 📢
-
-To enhance our development workflow, enable automated changelog generation, and pave
-the way for Continuous Delivery, the `ruby-git` project has adopted the [Conventional
-Commits standard](https://www.conventionalcommits.org/en/v1.0.0/) for all commit
-messages.
-
-Going forward, all commits to this repository **MUST** adhere to the Conventional
-Commits standard. Commits not adhering to this standard will cause the CI build to
-fail. PRs will not be merged if they include non-conventional commits.
-
-A git pre-commit hook may be installed to validate your conventional commit messages
-before pushing them to GitHub by running `bin/setup` in the project root.
-
-Read more about this change in the [Commit Message Guidelines section of
-CONTRIBUTING.md](CONTRIBUTING.md#commit-message-guidelines)
+- [📢 Project Announcements 📢](#-project-announcements-)
+  - [2025-07-09: Architectural Redesign](#2025-07-09-architectural-redesign)
+  - [2025-07-07: We Now Use RuboCop](#2025-07-07-we-now-use-rubocop)
+  - [2025-06-06: Default Branch Rename](#2025-06-06-default-branch-rename)
+  - [2025-05-15: We've Switched to Conventional Commits](#2025-05-15-weve-switched-to-conventional-commits)
 
 ## Summary
 
@@ -574,9 +527,9 @@ end
 
 This gem will be expected to function correctly on:
 
-* All non-EOL versions of the MRI Ruby on Mac, Linux, and Windows
-* The latest version of JRuby on Linux
-* The latest version of Truffle Ruby on Linus
+- All non-EOL versions of the MRI Ruby on Mac, Linux, and Windows
+- The latest version of JRuby on Linux
+- The latest version of Truffle Ruby on Linus
 
 It is this project's intent to support the latest version of JRuby on Windows
 once the following JRuby bug is fixed:
@@ -587,3 +540,87 @@ jruby/jruby#7515
 
 Licensed under MIT License Copyright (c) 2008  Scott Chacon. See LICENSE for further
 details.
+
+## 📢 Project Announcements 📢
+
+### 2025-07-09: Architectural Redesign
+
+The git gem is undergoing a significant architectural redesign for the upcoming
+v5.0.0 release. The current architecture has several design challenges that make it
+difficult to maintain and evolve. This redesign aims to address these issues by
+introducing a clearer, more robust, and more testable structure.
+
+We have prepared detailed documents outlining the analysis of the current
+architecture and the proposed changes. We encourage our community and contributors to
+review them:
+
+1. [Analysis of the Current Architecture](redesign/1_architecture_existing.md): A
+   breakdown of the existing design and its challenges.
+2. [The Proposed Redesign](redesign/2_architecture_redesign.md): An overview of the
+   new three-layered architecture.
+3. [Implementation Plan](redesign/3_architecture_implementation.md): The step-by-step
+   plan for implementing the redesign.
+
+Your feedback is welcome! Please feel free to open an issue to discuss the proposed
+changes.
+
+> **DON'T PANIC!**
+>
+> While this is a major internal refactoring, our goal is to keep the primary public
+API on the main repository object as stable as possible. Most users who rely on
+documented methods like `g.commit`, `g.add`, and `g.status` should find the
+transition to v5.0.0 straightforward.
+>
+> The breaking changes will primarily affect users who have been relying on the
+internal g.lib accessor, which will be removed as part of this cleanup. For more
+details, please see the "Impact on Users" section in [the redesign
+document](redesign/2_architecture_redesign.md).
+
+### 2025-07-07: We Now Use RuboCop
+
+To improve code consistency and maintainability, the `ruby-git` project has now
+adopted [RuboCop](https://rubocop.org/) as our static code analyzer and formatter.
+
+This integration is a key part of our ongoing commitment to making `ruby-git` a
+high-quality, stable, and easy-to-contribute-to project. All new contributions will
+be expected to adhere to the style guidelines enforced by our RuboCop configuration.
+
+ RuboCop can be run from the project's Rakefile:
+
+```shell
+rake rubocop
+```
+
+RuboCop is also run  as part of the default rake task (by running `rake`) that is run
+in our Continuous Integration workflow.
+
+Going forward, any PRs that have any Robocop offenses will not be merged. In
+certain rare cases, it might be acceptable to disable a  RuboCop check for the most
+limited scope possible.
+
+If you have a problem fixing a  RuboCop offense, don't be afraid to ask a contributor.
+
+### 2025-06-06: Default Branch Rename
+
+On June 6th, 2025, the default branch was renamed from 'master' to 'main'.
+
+Instructions for renaming your local or forked branch to match can be found in the
+gist [Default Branch Name
+Change](https://gist.github.com/jcouball/580a10e395f7fdfaaa4297bbe816cc7d).
+
+### 2025-05-15: We've Switched to Conventional Commits
+
+To enhance our development workflow, enable automated changelog generation, and pave
+the way for Continuous Delivery, the `ruby-git` project has adopted the [Conventional
+Commits standard](https://www.conventionalcommits.org/en/v1.0.0/) for all commit
+messages.
+
+Going forward, all commits to this repository **MUST** adhere to the Conventional
+Commits standard. Commits not adhering to this standard will cause the CI build to
+fail. PRs will not be merged if they include non-conventional commits.
+
+A git pre-commit hook may be installed to validate your conventional commit messages
+before pushing them to GitHub by running `bin/setup` in the project root.
+
+Read more about this change in the [Commit Message Guidelines section of
+CONTRIBUTING.md](CONTRIBUTING.md#commit-message-guidelines)

data/lib/git/diff.rb

@@ -38,38 +38,31 @@ module Git
       @full_diff_files.map { |file| file[1] }.each(&)
     end
 
+    def size
+      stats_provider.total[:files]
+    end
+
     #
     # DEPRECATED METHODS
     #
 
     def name_status
-      Git::Deprecation.warn('Git::Diff#name_status is deprecated. Use Git::Base#diff_path_status instead.')
       path_status_provider.to_h
     end
 
-    def size
-      Git::Deprecation.warn('Git::Diff#size is deprecated. Use Git::Base#diff_stats(...).total[:files] instead.')
-      stats_provider.total[:files]
-    end
-
     def lines
-      Git::Deprecation.warn('Git::Diff#lines is deprecated. Use Git::Base#diff_stats(...).lines instead.')
       stats_provider.lines
     end
 
     def deletions
-      Git::Deprecation.warn('Git::Diff#deletions is deprecated. Use Git::Base#diff_stats(...).deletions instead.')
       stats_provider.deletions
     end
 
     def insertions
-      Git::Deprecation.warn('Git::Diff#insertions is deprecated. Use Git::Base#diff_stats(...).insertions instead.')
       stats_provider.insertions
     end
 
     def stats
-      Git::Deprecation.warn('Git::Diff#stats is deprecated. Use Git::Base#diff_stats instead.')
-      # CORRECTED: Re-create the original hash structure for backward compatibility
       {
         files: stats_provider.files,
         total: stats_provider.total

data/lib/git/lib.rb

@@ -643,7 +643,7 @@ module Git
       args << opts[:path] if opts[:path]
 
       command_lines('ls-tree', *args).each do |line|
-        (info, filenm) = line.split("\t")
+        (info, filenm) = split_status_line(line)
         (mode, type, sha) = info.split
         data[type][filenm] = { mode: mode, sha: sha }
       end
@@ -905,9 +905,9 @@ module Git
       location ||= '.'
       {}.tap do |files|
         command_lines('ls-files', '--stage', location).each do |line|
-          (info, file) = line.split("\t")
+          (info, file) = split_status_line(line)
           (mode, sha, stage) = info.split
-          files[unescape_quoted_path(file)] = {
+          files[file] = {
             path: file, mode_index: mode, sha_index: sha, stage: stage
           }
         end
@@ -956,7 +956,9 @@ module Git
     end
 
     def untracked_files
-      command_lines('ls-files', '--others', '--exclude-standard', chdir: @git_work_dir)
+      command_lines('ls-files', '--others', '--exclude-standard', chdir: @git_work_dir).map do |f|
+        unescape_quoted_path(f)
+      end
     end
 
     def config_remote(name)
@@ -1602,7 +1604,7 @@ module Git
 
     def parse_diff_path_status(args)
       command_lines('diff', *args).each_with_object({}) do |line, memo|
-        status, path = line.split("\t")
+        status, path = split_status_line(line)
         memo[path] = status
       end
     end
@@ -1727,7 +1729,7 @@ module Git
 
     def parse_stat_lines(lines)
       lines.map do |line|
-        insertions_s, deletions_s, filename = line.split("\t")
+        insertions_s, deletions_s, filename = split_status_line(line)
         {
           filename: filename,
           insertions: insertions_s.to_i,
@@ -1736,6 +1738,12 @@ module Git
       end
     end
 
+    def split_status_line(line)
+      parts = line.split("\t")
+      parts[-1] = unescape_quoted_path(parts[-1]) if parts.any?
+      parts
+    end
+
     def build_final_stats_hash(file_stats)
       {
         total: build_total_stats(file_stats),
@@ -1965,7 +1973,7 @@ module Git
       # update index before diffing to avoid spurious diffs
       command('status')
       command_lines(diff_command, *opts).each_with_object({}) do |line, memo|
-        info, file = line.split("\t")
+        info, file = split_status_line(line)
         mode_src, mode_dest, sha_src, sha_dest, type = info.split
 
         memo[file] = {

data/lib/git/log.rb

@@ -90,28 +90,56 @@ module Git
 
     # @deprecated Use {#execute} and call `each` on the result.
     def each(&)
-      deprecate_and_run
+      Git::Deprecation.warn(
+        'Calling Git::Log#each is deprecated. Call #execute and then #each on the result object.'
+      )
+      run_log_if_dirty
       @commits.each(&)
     end
 
     # @deprecated Use {#execute} and call `size` on the result.
     def size
-      deprecate_and_run
+      Git::Deprecation.warn(
+        'Calling Git::Log#size is deprecated. Call #execute and then #size on the result object.'
+      )
+      run_log_if_dirty
       @commits&.size
     end
 
     # @deprecated Use {#execute} and call `to_s` on the result.
     def to_s
-      deprecate_and_run
+      Git::Deprecation.warn(
+        'Calling Git::Log#to_s is deprecated. Call #execute and then #to_s on the result object.'
+      )
+      run_log_if_dirty
       @commits&.map(&:to_s)&.join("\n")
     end
 
     # @deprecated Use {#execute} and call the method on the result.
-    %i[first last []].each do |method_name|
-      define_method(method_name) do |*args|
-        deprecate_and_run
-        @commits&.public_send(method_name, *args)
-      end
+    def first
+      Git::Deprecation.warn(
+        'Calling Git::Log#first is deprecated. Call #execute and then #first on the result object.'
+      )
+      run_log_if_dirty
+      @commits&.first
+    end
+
+    # @deprecated Use {#execute} and call the method on the result.
+    def last
+      Git::Deprecation.warn(
+        'Calling Git::Log#last is deprecated. Call #execute and then #last on the result object.'
+      )
+      run_log_if_dirty
+      @commits&.last
+    end
+
+    # @deprecated Use {#execute} and call the method on the result.
+    def [](index)
+      Git::Deprecation.warn(
+        'Calling Git::Log#[] is deprecated. Call #execute and then #[] on the result object.'
+      )
+      run_log_if_dirty
+      @commits&.[](index)
     end
 
     # @!endgroup
@@ -131,13 +159,5 @@ module Git
       @commits = log_data.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
       @dirty = false
     end
-
-    def deprecate_and_run(method = caller_locations(1, 1)[0].label)
-      Git::Deprecation.warn(
-        "Calling Git::Log##{method} is deprecated. " \
-        "Call #execute and then ##{method} on the result object."
-      )
-      run_log_if_dirty
-    end
   end
 end

data/lib/git/path.rb

@@ -9,17 +9,7 @@ module Git
   class Path
     attr_accessor :path
 
-    def initialize(path, check_path = nil, must_exist: nil)
-      unless check_path.nil?
-        Git::Deprecation.warn(
-          'The "check_path" argument is deprecated and ' \
-          'will be removed in a future version. Use "must_exist:" instead.'
-        )
-      end
-
-      # default is true
-      must_exist = must_exist.nil? && check_path.nil? ? true : must_exist || check_path
-
+    def initialize(path, must_exist: true)
       path = File.expand_path(path)
 
       raise ArgumentError, 'path does not exist', [path] if must_exist && !File.exist?(path)

data/lib/git/stash.rb

@@ -3,16 +3,7 @@
 module Git
   # A stash in a Git repository
   class Stash
-    def initialize(base, message, existing = nil, save: nil)
-      unless existing.nil?
-        Git::Deprecation.warn(
-          'The "existing" argument is deprecated and will be removed in a future version. Use "save:" instead.'
-        )
-      end
-
-      # default is false
-      save = existing.nil? && save.nil? ? false : save | existing
-
+    def initialize(base, message, save: false)
       @base = base
       @message = message
       self.save unless save

data/lib/git/stashes.rb

@@ -12,7 +12,7 @@ module Git
 
       @base.lib.stashes_all.each do |indexed_message|
         _index, message = indexed_message
-        @stashes.unshift(Git::Stash.new(@base, message, true))
+        @stashes.unshift(Git::Stash.new(@base, message, save: true))
       end
     end
 

data/lib/git/version.rb

@@ -3,5 +3,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION = '4.0.2'
+  VERSION = '4.0.5'
 end

data/lib/git.rb

@@ -4,7 +4,7 @@ require 'active_support'
 require 'active_support/deprecation'
 
 module Git
-  Deprecation = ActiveSupport::Deprecation.new('3.0', 'Git')
+  Deprecation = ActiveSupport::Deprecation.new('5.0.0', 'Git')
 end
 
 require 'git/author'

data/redesign/1_architecture_existing.md

@@ -0,0 +1,66 @@
+# Analysis of the Current Git Gem Architecture and Its Challenges
+
+This document provides an in-depth look at the current architecture of the `git` gem, outlining its primary components and the design challenges that have emerged over time. Understanding these challenges is the key motivation for the proposed architectural redesign.
+
+- [1. Overview of the Current Architecture](#1-overview-of-the-current-architecture)
+- [2. Key Architectural Challenges](#2-key-architectural-challenges)
+  - [A. Unclear Separation of Concerns](#a-unclear-separation-of-concerns)
+  - [B. Circular Dependency](#b-circular-dependency)
+  - [C. Undefined Public API Boundary](#c-undefined-public-api-boundary)
+  - [D. Slow and Brittle Test Suite](#d-slow-and-brittle-test-suite)
+
+## 1. Overview of the Current Architecture
+
+The gem's current design is centered around three main classes: `Git`, `Git::Base`, and `Git::Lib`.
+
+- **`Git` (Top-Level Module)**: This module serves as the primary public entry point for creating repository objects. It contains class-level factory methods like `Git.open`, `Git.clone`, and `Git.init`. It also provides an interface for accessing global git configuration settings.
+
+**`Git::Base`**: This is the main object that users interact with after creating or opening a repository. It holds the high-level public API for most git operations (e.g., `g.commit`, `g.add`, `g.status`). It is responsible for managing the repository's state, such as the paths to the working directory and the `.git` directory.
+
+**`Git::Lib`**: This class is intended to be the low-level wrapper around the `git` command-line tool. It contains the methods that build the specific command-line arguments and execute the `git` binary. In practice, it also contains a significant amount of logic for parsing the output of these commands.
+
+## 2. Key Architectural Challenges
+
+While this structure has been functional, several significant design challenges make the codebase difficult to maintain, test, and evolve.
+
+### A. Unclear Separation of Concerns
+
+The responsibilities between Git::Base and Git::Lib are "muddy" and overlap significantly.
+
+- `Git::Base` sometimes contains logic that feels like it should be lower-level.
+
+- `Git::Lib`, which should ideally only be concerned with command execution, is filled with high-level logic for parsing command output into specific Ruby objects (e.g., parsing log output, diff stats, and branch lists).
+
+This blending of responsibilities makes it hard to determine where a specific piece of logic should reside, leading to an inconsistent and confusing internal structure.
+
+### B. Circular Dependency
+
+This is the most critical architectural flaw in the current design.
+
+- A `Git::Base` instance is created.
+
+- The first time a command is run, `Git::Base` lazily initializes a `Git::Lib` instance via its `.lib` accessor method.
+
+- The `Git::Lib` constructor is passed the `Git::Base` instance (`self`) so that it can read the repository's path configuration back from the object that is creating it.
+
+This creates a tight, circular coupling: `Git::Base` depends on `Git::Lib` to execute commands, but `Git::Lib` depends on `Git::Base` for its own configuration. This pattern makes the classes difficula to instantiate or test in isolation and creates a fragile system where changes in one class can have unexpected side effects in the other.
+
+### C. Undefined Public API Boundary
+
+The gem lacks a formally defined public interface. Because `Git::Base` exposes its internal `Git::Lib` instance via the public `g.lib` accessor, many users have come to rely on `Git::Lib` and its methods as if they were part of the public API.
+
+This has two negative consequences:
+
+1. It prevents the gem's maintainers from refactoring or changing the internal implementation of `Git::Lib` without causing breaking changes for users.
+
+2. It exposes complex, internal methods to users, creating a confusing and inconsistent user experience.
+
+### D. Slow and Brittle Test Suite
+
+The current testing strategy, built on `TestUnit`, suffers from two major issues:
+
+- **Over-reliance on Fixtures**: Most tests depend on having a complete, physical git repository on the filesystem to run against. Managing these fixtures is cumbersome.
+
+- **Excessive Shelling Out**: Because the logic for command execution and output parsing are tightly coupled, nearly every test must shell out to the actual `git` command-line tool.
+
+This makes the test suite extremely slow, especially on non-UNIX platforms like Windows where process creation is more expensive. The slow feedback loop discourages frequent testing and makes development more difficult. The brittleness of filesystem-dependent tests also leads to flickering or unreliable test runs.

data/redesign/2_architecture_redesign.md

@@ -0,0 +1,130 @@
+# Proposed Redesigned Architecture for the Git Gem
+
+This document outlines a proposal for a major redesign of the git gem, targeted for version 5.0.0. The goal of this redesign is to modernize the gem's architecture, making it more robust, maintainable, testable, and easier for new contributors to understand.
+
+- [1. Motivation](#1-motivation)
+- [2. The New Architecture: A Three-Layered Approach](#2-the-new-architecture-a-three-layered-approach)
+- [3. Key Design Principles](#3-key-design-principles)
+  - [A. Clear Public vs. Private API](#a-clear-public-vs-private-api)
+  - [B. Dependency Injection](#b-dependency-injection)
+  - [C. Immutable Return Values](#c-immutable-return-values)
+  - [D. Clear Naming for Path Objects](#d-clear-naming-for-path-objects)
+- [4. Testing Strategy Overhaul](#4-testing-strategy-overhaul)
+- [5. Impact on Users: Breaking Changes for v5.0.0](#5-impact-on-users-breaking-changes-for-v500)
+
+## 1. Motivation
+
+The current architecture, while functional, has several design issues that have accrued over time, making it difficult to extend and maintain.
+
+- **Unclear Separation of Concerns**: The responsibilities of the `Git`, `Git::Base`, and `Git::Lib` classes are "muddy." `Git::Base` acts as both a high-level API and a factory, while `Git::Lib` contains a mix of low-level command execution and high-level output parsing.
+
+- **Circular Dependency**: A key architectural flaw is the circular dependency between `Git::Base` and `Git::Lib`. `Git::Base` creates and depends on `Git::Lib`, but `Git::Lib`'s constructor requires an instance of Git::Base to access configuration. This tight coupling makes the classes difficult to reason about and test in isolation.
+
+- **Undefined Public API**: The boundary between the gem's public API and its internal implementation is not clearly defined. This has led some users to rely on internal classes like `Git::Lib`, making it difficult to refactor the internals without introducing breaking changes.
+
+- **Slow and Brittle Test Suite**: The current tests rely heavily on filesystem fixtures and shelling out to the git command line for almost every test case. This makes the test suite slow and difficult to maintain, especially on non-UNIX platforms.
+
+## 2. The New Architecture: A Three-Layered Approach
+
+The new design is built on a clear separation of concerns, dividing responsibilities into three distinct layers: a Facade, an Execution Context, and Command Objects.
+
+1. The Facade Layer: Git::Repository
+
+    This is the primary public interface that users will interact with.
+
+    **Renaming**: `Git::Base` will be renamed to `Git::Repository`. This name is more descriptive and intuitive.
+
+    **Responsibility**: It will serve as a clean, high-level facade for all common git operations. Its methods will be simple, one-line calls that delegate the actual work to an appropriate command object.
+
+    **Scalability**: To prevent this class from growing too large, its methods will be organized into logical modules (e.g., `Git::Repository::Branching`, `Git::Repository::History`) which are then included in the main class. This keeps the core class definition small and the features well-organized. These categories will be inspired by (but not slavishly follow) the git command line reference in [this page](https://git-scm.com/docs).
+
+2. The Execution Layer: Git::ExecutionContext
+
+    This is the low-level, private engine for running commands.
+
+    **Renaming**: `Git::Lib` will be renamed to `Git::ExecutionContext`.
+
+    **Responsibility**: Its sole purpose is to execute raw git commands. It will manage the repository's environment (working directory, .git path, logger) and use the existing `Git::CommandLine` class to interact with the system's git binary. It will have no knowledge of any specific git command's arguments or output.
+
+3. The Logic Layer: Git::Commands
+
+    This is where all the command-specific implementation details will live.
+
+    **New Classes**: For each git operation, a new command class will be created within the `Git::Commands` namespace (e.g., `Git::Commands::Commit`, `Git::Commands::Diff`).
+
+    **Dual Responsibility**: Each command class will be responsible for:
+
+    1. **Building Arguments**: Translating high-level Ruby options into the specific command-line flags and arguments that git expects.
+
+    2. **Parsing Output**: Taking the raw string output from the ExecutionContext and converting it into rich, structured Ruby objects.
+
+    **Handling Complexity**: For commands with multiple behaviors (like git diff), we can use specialized subclasses (e.g., Git::Commands::Diff::NameStatus, Git::Commands::Diff::Stats) to keep each class focused on a single responsibility.
+
+## 3. Key Design Principles
+
+The new architecture will be guided by the following modern design principles.
+
+### A. Clear Public vs. Private API
+
+A primary goal of this redesign is to establish a crisp boundary between the public API and internal implementation details.
+
+- **Public Interface**: The public API will consist of the `Git` module (for factories), the `Git::Repository` class, and the specialized data/query objects it returns (e.g., `Git::Log`, `Git::Status`, `Git::Object::Commit`).
+
+- **Private Implementation**: All other components, including `Git::ExecutionContext` and all classes within the `Git::Commands` namespace, will be considered internal. They will be explicitly marked with the `@api private` YARD tag to discourage external use.
+
+### B. Dependency Injection
+
+The circular dependency will be resolved by implementing a clear, one-way dependency flow.
+
+1. The factory methods (`Git.open`, `Git.clone`) will create and configure an instance of `Git::ExecutionContext`.
+
+2. This `ExecutionContext` instance will then be injected into the constructor of the `Git::Repository` object.
+
+This decouples the `Repository` from its execution environment, making the system more modular and easier to test.
+
+### C. Immutable Return Values
+
+To create a more predictable and robust API, methods will return structured, immutable data objects instead of raw strings or hashes.
+
+This will be implemented using `Data.define` or simple, frozen `Struct`s.
+
+For example, instead of returning a raw string, `repo.config('user.name')` will return a `Git::Config::Value` object containing the key, value, scope, and source path.
+
+### D. Clear Naming for Path Objects
+
+To improve clarity, all classes that represent filesystem paths will be renamed to follow a consistent `...Path` suffix convention.
+
+- `Git::WorkingDirectory` -> `Git::WorkingTreePath`
+
+- `Git::Index` -> `Git::IndexPath`
+
+- The old `Git::Repository` (representing the .git directory/file) -> `Git::RepositoryPath`
+
+## 4. Testing Strategy Overhaul
+
+The test suite will be modernized to be faster, more reliable, and easier to work with.
+
+- **Migration to RSpec**: The entire test suite will be migrated from TestUnit to RSpec to leverage its modern tooling and expressive DSL.
+
+- **Layered Testing**: A three-layered testing strategy will be adopted:
+
+  1. **Unit Tests**: The majority of tests will be fast, isolated unit tests for the `Command` classes, using mock `ExecutionContexts`.
+
+  2. **Integration Tests**: A small number of integration tests will verify that `ExecutionContext` correctly interacts with the system's `git` binary.
+
+  3. **Feature Tests**: A minimal set of high-level tests will ensure the public facade on `Git::Repository` works end-to-end.
+
+- **Reduced Filesystem Dependency**: This new structure will dramatically reduce the suite's reliance on slow and brittle filesystem fixtures.
+
+## 5. Impact on Users: Breaking Changes for v5.0.0
+
+This redesign is a significant undertaking and will be released as version 5.0.0. It includes several breaking changes that users will need to be aware of when upgrading.
+
+- **`Git::Lib` is Removed**: Any code directly referencing `Git::Lib` will break.
+
+- **g.lib Accessor is Removed**: The `.lib` accessor on repository objects will be removed.
+
+- **Internal Methods Relocated**: Methods that were previously accessible via g.lib will now be private implementation details of the new command classes and will not be directly reachable.
+
+Users should only rely on the newly defined public interface.
+

data/redesign/3_architecture_implementation.md

@@ -0,0 +1,138 @@
+# Implementation Plan for Git Gem Redesign (v5.0.0)
+
+This document outlines a step-by-step plan to implement the proposed architectural redesign. The plan is structured to be incremental, ensuring that the gem remains functional and passes its test suite after each major step. This approach minimizes risk and allows for a gradual, controlled migration to the new architecture.
+
+- [Phase 1: Foundation and Scaffolding](#phase-1-foundation-and-scaffolding)
+- [Phase 2: The Strangler Fig Pattern - Migrating Commands](#phase-2-the-strangler-fig-pattern---migrating-commands)
+- [Phase 3: Refactoring the Public Interface](#phase-3-refactoring-the-public-interface)
+- [Phase 4: Final Cleanup and Release Preparation](#phase-4-final-cleanup-and-release-preparation)
+
+## Phase 1: Foundation and Scaffolding
+
+***Goal**: Set up the new file structure and class names without altering existing logic. The gem will be fully functional after this phase.*
+
+1. **Create New Directory Structure**:
+
+   - Create the new directories that will house the refactored components:
+
+     - `lib/git/commands/`
+
+     - `lib/git/repository/` (for the facade modules)
+
+2. **Rename Path Classes**:
+
+   - Perform a project-wide, safe rename of the existing path-related classes. This is a low-risk mechanical change.
+
+     - `Git::WorkingDirectory` -> `Git::WorkingTreePath`
+
+     - `Git::Index` -> `Git::IndexPath`
+
+     - `Git::Repository` -> `Git::RepositoryPath`
+
+   - Run the test suite to ensure everything still works as expected.
+
+3. **Introduce New Core Classes (Empty Shells)**:
+
+   - Create the new `Git::ExecutionContext` class in `lib/git/execution_context.rb`. For now, its implementation can be a simple shell or a thin wrapper around the existing `Git::Lib`.
+
+   - Create the new `Git::Repository` class in `lib/git/repository.rb`. This will initially be an empty class.
+
+4. **Set Up RSpec Environment**:
+
+    - Add rspec dependencies to the `Gemfile` as a development dependency.
+
+    - Configure the test setup to allow both TestUnit and RSpec tests to run concurrently.
+
+## Phase 2: The Strangler Fig Pattern - Migrating Commands
+
+***Goal**: Incrementally move the implementation of each git command from `Git::Lib` to a new `Command` class, strangling the old implementation one piece at a time using a Test-Driven Development workflow.*
+
+- **1. Migrate the First Command (`config`)**:
+
+  - **Write Unit Tests First**: Write comprehensive RSpec unit tests for the *proposed* `Git::Commands::Config` class. These tests will fail initially because the class doesn't exist yet. The tests should be fast and mock the `ExecutionContext`.
+
+  - **Create Command Class**: Implement `Git::Commands::Config` to make the tests pass. This class will contain all the logic for building git config arguments and parsing its output. It will accept an `ExecutionContext` instance in its constructor.
+
+  - **Delegate from `Git::Lib`**: Modify the `config_*` methods within the existing `Git::Lib` class. Instead of containing the implementation, they will now instantiate and call the new `Git::Commands::Config` object.
+
+  - **Verify**: Run the full test suite (both TestUnit and RSpec). The existing tests for `g.config` should still pass, but they will now be executing the new, refactored code.
+
+- **2. Incrementally Migrate Remaining Commands:**
+
+  - Repeat the process from the previous step for all other commands, one by one or in logical groups (e.g., all `diff` related commands, then all `log` commands).
+
+  - For each command (`add`, `commit`, `log`, `diff`, `status`, etc.):
+
+    1. Create the corresponding Git::Commands::* class.
+
+    2. Write isolated RSpec unit tests for the new class.
+
+    3. Change the method in Git::Lib to delegate to the new command object.
+
+    4. Run the full test suite to ensure no regressions have been introduced.
+
+## Phase 3: Refactoring the Public Interface
+
+***Goal**: Switch the public-facing classes to use the new architecture directly, breaking the final ties to the old implementation.*
+
+1. **Refactor Factory Methods**:
+
+   - Modify the factory methods in the top-level `Git` module (`.open`, `.clone`, etc.).
+
+   - These methods will now be responsible for creating an instance of `Git::ExecutionContext` and injecting it into the constructor of a `Git::Repository` object.
+
+    The return value of these factories will now be a `Git::Repository` instance, not a `Git::Base` instance.
+
+2. **Implement the Facade**:
+
+   - Populate the `Git::Repository` class with the simple, one-line facade methods that delegate to the `Command` objects. For example:
+
+        ```ruby
+        def commit(msg)
+          Git::Commands::Commit.new(@execution_context, msg).run
+        end
+        ```
+
+   - Organize these facade methods into modules as planned (`lib/git/repository/branching.rb`, etc.) and include them in the main `Git::Repository` class.
+
+3. **Deprecate and Alias `Git::Base`**:
+
+   - To maintain a degree of backward compatibility through the transition, make `Git::Base` a deprecated constant that points to `Git::Repository`.
+
+        ```ruby
+        Git::Base = ActiveSupport::Deprecation::DeprecatedConstantProxy.new(
+          'Git::Base',
+          'Git::Repository',
+          Git::Deprecation
+        )
+        ```
+
+   - This ensures that any user code checking `is_a?(Git::Base)` will not immediately break.
+
+## Phase 4: Final Cleanup and Release Preparation
+
+***Goal**: Remove all old code, finalize the test suite, and prepare for the v5.0.0 release.*
+
+1. **Remove Old Code**:
+
+   - Delete the `Git::Lib` class entirely.
+
+   - Delete the `Git::Base` class file and remove the deprecation proxy.
+
+   - Remove any other dead code that was part of the old implementation.
+
+2. **Finalize Test Suite**:
+
+   - Convert any remaining, relevant TestUnit tests to RSpec.
+
+   - Remove the `test-unit` dependency from the `Gemfile`.
+
+   - Ensure the RSpec suite has comprehensive coverage for the new architecture.
+
+3. **Update Documentation**:
+
+   - Thoroughly document the new public API (`Git`, `Git::Repository`, etc.).
+
+   - Mark all internal classes (`ExecutionContext`, `Commands`, `*Path`) with `@api private` in the YARD documentation.
+
+   - Update the `README.md` and create a `UPGRADING.md` guide explaining the breaking changes for v5.0.0.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.5
 platform: ruby
 authors:
 - Scott Chacon and others
@@ -274,6 +274,9 @@ files:
 - lib/git/worktree.rb
 - lib/git/worktrees.rb
 - package.json
+- redesign/1_architecture_existing.md
+- redesign/2_architecture_redesign.md
+- redesign/3_architecture_implementation.md
 - release-please-config.json
 homepage: http://github.com/ruby-git/ruby-git
 licenses:
@@ -281,8 +284,8 @@ licenses:
 metadata:
   homepage_uri: http://github.com/ruby-git/ruby-git
   source_code_uri: http://github.com/ruby-git/ruby-git
-  changelog_uri: https://rubydoc.info/gems/git/4.0.2/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/4.0.2
+  changelog_uri: https://rubydoc.info/gems/git/4.0.5/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/4.0.5
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -299,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 2.28.0 or greater
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories
 test_files: []