git 5.0.0.beta.3 → 5.0.0.beta.4

data/tasks/yard.rake

@@ -16,20 +16,22 @@ unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
   CLEAN << '.yardoc'
   CLEAN << 'doc'
 
-  # yard:audit
+  # yard:lint
 
-  desc 'Run yardstick to show missing YARD doc elements'
-  task :'yard:audit' do
-    sh "yardstick 'lib/**/*.rb'"
-  end
-
-  # yard:coverage
-
-  require 'yardstick/rake/verify'
+  # Lints YARD documentation against the project's standards and enforces the
+  # minimum documentation coverage threshold. Configuration lives in
+  # .yard-lint.yml.
+  #
+  # yard-lint requires Ruby >= 3.3, so the lint task is only defined and only
+  # included in the aggregate `yard` task on Ruby 3.3+.
+  #
+  yard_lint_supported = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3.0')
 
-  Yardstick::Rake::Verify.new(:'yard:coverage') do |verify|
-    verify.threshold = 75
-    verify.require_exact_threshold = false
+  if yard_lint_supported
+    desc 'Lint YARD documentation with yard-lint'
+    task :'yard:lint' do
+      sh 'bundle exec yard-lint lib/'
+    end
   end
 
   # yard:example-test
@@ -42,9 +44,14 @@ unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
 
   # yard
 
-  # Do not include yard:audit in the yard task because there are too many
-  # missing YARD doc elements
-  #
-  desc 'Run YARD documentation tasks (build, coverage, example-test)'
-  task yard: %i[yard:build yard:coverage yard:example-test]
+  yard_tasks = %i[yard:build]
+  yard_tasks << :'yard:lint' if yard_lint_supported
+  yard_tasks << :'yard:example-test'
+
+  yard_steps = ['build']
+  yard_steps << 'lint' if yard_lint_supported
+  yard_steps << 'example-test'
+
+  desc "Run YARD documentation tasks (#{yard_steps.join(', ')})"
+  task yard: yard_tasks
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta.3
+  version: 5.0.0.beta.4
 platform: ruby
 authors:
 - Scott Chacon and others
@@ -107,34 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -233,20 +205,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -316,19 +274,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: yardstick
+  name: yard-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.8'
 description: |
   The git gem provides an API that can be used to
   create, read, and manipulate Git repositories by wrapping system calls to the git
@@ -341,10 +299,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".commitlintrc.yml"
+- ".dockerignore"
 - ".github/copilot-instructions.md"
+- ".github/hooks/bin-setup-on-worktree.json"
+- ".github/hooks/run-bin-setup-once.sh"
 - ".github/issue_template.md"
 - ".github/prompts/iteratively-address-copilot-reviews.prompt.md"
 - ".github/pull_request_template.md"
+- ".github/skills-deprecated/README.md"
+- ".github/skills-deprecated/extract-command-from-lib/SKILL.md"
+- ".github/skills-deprecated/extract-facade-from-base-lib/KEYWORD_ARG_REMEDIATION.md"
+- ".github/skills-deprecated/extract-facade-from-base-lib/SKILL.md"
+- ".github/skills-deprecated/review-backward-compatibility/SKILL.md"
 - ".github/skills/breaking-change-analysis/SKILL.md"
 - ".github/skills/ci-cd-troubleshooting/SKILL.md"
 - ".github/skills/command-implementation/REFERENCE.md"
@@ -353,9 +319,6 @@ files:
 - ".github/skills/command-yard-documentation/SKILL.md"
 - ".github/skills/dependency-management/SKILL.md"
 - ".github/skills/development-workflow/SKILL.md"
-- ".github/skills/extract-command-from-lib/SKILL.md"
-- ".github/skills/extract-facade-from-base-lib/KEYWORD_ARG_REMEDIATION.md"
-- ".github/skills/extract-facade-from-base-lib/SKILL.md"
 - ".github/skills/facade-implementation/REFERENCE.md"
 - ".github/skills/facade-implementation/SKILL.md"
 - ".github/skills/facade-test-conventions/SKILL.md"
@@ -364,17 +327,19 @@ files:
 - ".github/skills/pr-readiness-review/SKILL.md"
 - ".github/skills/project-context/SKILL.md"
 - ".github/skills/pull-request-review/SKILL.md"
+- ".github/skills/rebase/SKILL.md"
 - ".github/skills/refactor-command-to-commandlineresult/SKILL.md"
 - ".github/skills/release-management/SKILL.md"
+- ".github/skills/resolve-feedback/SKILL.md"
 - ".github/skills/review-arguments-dsl/CHECKLIST.md"
 - ".github/skills/review-arguments-dsl/SKILL.md"
-- ".github/skills/review-backward-compatibility/SKILL.md"
 - ".github/skills/review-cross-command-consistency/SKILL.md"
 - ".github/skills/reviewing-skills/SKILL.md"
 - ".github/skills/rspec-unit-testing-standards/SKILL.md"
 - ".github/skills/tdd-refactor-step/SKILL.md"
 - ".github/skills/test-debugging/SKILL.md"
 - ".github/skills/yard-documentation/SKILL.md"
+- ".github/skills/yard-documentation/element-rules.md"
 - ".github/workflows/continuous_integration.yml"
 - ".github/workflows/enforce_conventional_commits.yml"
 - ".github/workflows/experimental_continuous_integration.yml"
@@ -387,6 +352,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".yard-lint.yml"
 - ".yardopts"
 - AI_POLICY.md
 - CHANGELOG.md
@@ -399,10 +365,10 @@ files:
 - README.md
 - Rakefile
 - UPGRADING.md
-- commitlint.test
+- docker/test/Dockerfile
+- docker/test/docker-compose.yml
 - git.gemspec
 - lib/git.rb
-- lib/git/args_builder.rb
 - lib/git/author.rb
 - lib/git/branch.rb
 - lib/git/branch_delete_failure.rb
@@ -414,7 +380,6 @@ files:
 - lib/git/command_line/capturing.rb
 - lib/git/command_line/result.rb
 - lib/git/command_line/streaming.rb
-- lib/git/command_line_result.rb
 - lib/git/commands.rb
 - lib/git/commands/add.rb
 - lib/git/commands/am.rb
@@ -566,7 +531,6 @@ files:
 - lib/git/config.rb
 - lib/git/config_entry_info.rb
 - lib/git/configuring.rb
-- lib/git/deprecation.rb
 - lib/git/detached_head_info.rb
 - lib/git/diff.rb
 - lib/git/diff_file_numstat_info.rb
@@ -634,16 +598,19 @@ files:
 - redesign/2_architecture_redesign.md
 - redesign/3_architecture_implementation.md
 - redesign/Phase 4 - Step A.md
+- redesign/Phase 4 - Step B.md
+- redesign/Phase 4 - Step C.md
 - redesign/beta_release.md
+- redesign/c1a-public-api-scope.tsv
 - redesign/c1c2_audit.md
 - redesign/c1c2_bucket6_lib_orphans.md
 - redesign/config_design.rb
 - redesign/index.md
+- redesign/phase-4-step-b-test-audit.tsv
 - tasks/gem_tasks.rake
 - tasks/npm_tasks.rake
 - tasks/rspec.rake
 - tasks/rubocop.rake
-- tasks/test.rake
 - tasks/test_gem.rake
 - tasks/yard.rake
 homepage: http://github.com/ruby-git/ruby-git
@@ -652,8 +619,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/5.0.0.beta.3/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/5.0.0.beta.3
+  changelog_uri: https://rubydoc.info/gems/git/5.0.0.beta.4/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/5.0.0.beta.4
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:

data/commitlint.test

@@ -1,4 +0,0 @@
-test: update the tests
-
-Wow I really want to edit the PR #1024 but I can't.
-

data/lib/git/args_builder.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-module Git
-  # Takes a hash of user options and a declarative map and produces
-  # an array of command-line arguments. Also validates that only
-  # supported options are provided based on the map.
-  #
-  # @api private
-  class ArgsBuilder
-    # This hash maps an option type to a lambda that knows how to build the
-    # corresponding command-line argument. This is a scalable dispatch table.
-    ARG_BUILDERS = {
-      boolean: ->(config, value) { value ? config[:flag] : [] },
-
-      valued_equals: ->(config, value) { "#{config[:flag]}=#{value}" if value },
-
-      valued_space: ->(config, value) { [config[:flag], value.to_s] if value },
-
-      repeatable_valued_space: lambda do |config, value|
-        Array(value).flat_map { |v| [config[:flag], v.to_s] }
-      end,
-
-      custom: ->(config, value) { config[:builder].call(value) },
-
-      validate_only: ->(_config, _value) { [] } # Does not build any args
-    }.freeze
-
-    # Main entrypoint to validate options and build arguments
-    def self.build(opts, option_map)
-      validate!(opts, option_map)
-      new(opts, option_map).build
-    end
-
-    # Public validation method that can be called independently
-    def self.validate!(opts, option_map)
-      validate_unsupported_keys!(opts, option_map)
-      validate_configured_options!(opts, option_map)
-    end
-
-    def initialize(opts, option_map)
-      @opts = opts
-      @option_map = option_map
-    end
-
-    def build
-      @option_map.flat_map do |config|
-        type = config[:type]
-        next config[:flag] if type == :static
-
-        key = config[:keys].find { |k| @opts.key?(k) }
-        next [] unless key
-
-        build_arg_for_option(config, @opts[key])
-      end.compact
-    end
-
-    private
-
-    def build_arg_for_option(config, value)
-      builder = ARG_BUILDERS[config[:type]]
-      builder&.call(config, value) || []
-    end
-
-    private_class_method def self.validate_unsupported_keys!(opts, option_map)
-      all_valid_keys = option_map.flat_map { |config| config[:keys] }.compact
-      unsupported_keys = opts.keys - all_valid_keys
-
-      return if unsupported_keys.empty?
-
-      raise ArgumentError, "Unsupported options: #{unsupported_keys.map(&:inspect).join(', ')}"
-    end
-
-    private_class_method def self.validate_configured_options!(opts, option_map)
-      option_map.each do |config|
-        next unless config[:keys] # Skip static flags
-
-        check_for_missing_required_option!(opts, config)
-        validate_option_value!(opts, config)
-      end
-    end
-
-    private_class_method def self.check_for_missing_required_option!(opts, config)
-      return unless config[:required]
-
-      key_provided = config[:keys].any? { |k| opts.key?(k) }
-      return if key_provided
-
-      raise ArgumentError, "Missing required option: #{config[:keys].first}"
-    end
-
-    private_class_method def self.validate_option_value!(opts, config)
-      validator = config[:validator]
-      return unless validator
-
-      user_key = config[:keys].find { |k| opts.key?(k) }
-      return unless user_key # Don't validate if the user didn't provide the option
-
-      return if validator.call(opts[user_key])
-
-      raise ArgumentError, "Invalid value for option: #{user_key}"
-    end
-  end
-end

data/lib/git/command_line_result.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require 'git/command_line/result'
-
-module Git
-  # Backward-compatible alias for {Git::CommandLine::Result}
-  CommandLineResult = Git::CommandLine::Result
-end

data/lib/git/deprecation.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/deprecation'
-
-# The Git module provides a Ruby interface to Git version control.
-module Git
-  # @api private
-  Deprecation = ActiveSupport::Deprecation.new('5.0.0', 'Git')
-end

data/tasks/test.rake

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-desc 'Run Unit Tests (TestUnit)'
-task :test do
-  sh 'ruby bin/test'
-
-  # You can run individual test files (or multiple files) from the command
-  # line with:
-  #
-  # $ bin/test test_archive.rb
-  #
-  # $ bin/test test_archive.rb test_object.rb
-end
-
-desc 'Run Test::Unit tests in parallel'
-task 'test:parallel' do
-  # Ensure git global config is set (normally done by bin/test for serial runs).
-  # CI runners may not have a git identity configured.
-  sh 'git config --global user.email "git@example.com"' if `git config --global user.email`.empty?
-  sh 'git config --global user.name "GitExample"' if `git config --global user.name`.empty?
-  sh 'git config --global init.defaultBranch main' if `git config --global init.defaultBranch`.empty?
-
-  sh({ 'PARALLEL_TESTS_EXECUTABLE' => 'ruby -Itests' },
-     "bundle exec parallel_test tests/units/ --suffix 'test_.+\\.rb$'")
-end