git 1.19.1 → 2.1.1

data/lib/git.rb

@@ -1,19 +1,21 @@
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'active_support'
+require 'active_support/deprecation'
+
+module Git
+  Deprecation = ActiveSupport::Deprecation.new('3.0', 'Git')
+end
 
 require 'git/author'
 require 'git/base'
 require 'git/branch'
 require 'git/branches'
 require 'git/command_line_result'
+require 'git/command_line'
 require 'git/config'
 require 'git/diff'
 require 'git/encoding_utils'
+require 'git/errors'
 require 'git/escaped_path'
-require 'git/failed_error'
-require 'git/git_execute_error'
 require 'git/index'
 require 'git/lib'
 require 'git/log'
@@ -21,7 +23,6 @@ require 'git/object'
 require 'git/path'
 require 'git/remote'
 require 'git/repository'
-require 'git/signaled_error'
 require 'git/status'
 require 'git/stash'
 require 'git/stashes'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -25,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: rchardet
+  name: process_executer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: rchardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
+        version: '1.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: create_github_release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -181,18 +195,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/stale.yml"
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".github/workflows/continuous_integration.yml"
+- ".github/workflows/experimental_continuous_integration.yml"
 - ".gitignore"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dockerfile.changelog-rs
 - Gemfile
-- ISSUE_TEMPLATE.md
 - LICENSE
 - MAINTAINERS.md
-- PULL_REQUEST_TEMPLATE.md
 - README.md
 - RELEASING.md
 - Rakefile
@@ -200,16 +213,15 @@ files:
 - lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb
-- lib/git/base/factory.rb
 - lib/git/branch.rb
 - lib/git/branches.rb
+- lib/git/command_line.rb
 - lib/git/command_line_result.rb
 - lib/git/config.rb
 - lib/git/diff.rb
 - lib/git/encoding_utils.rb
+- lib/git/errors.rb
 - lib/git/escaped_path.rb
-- lib/git/failed_error.rb
-- lib/git/git_execute_error.rb
 - lib/git/index.rb
 - lib/git/lib.rb
 - lib/git/log.rb
@@ -217,7 +229,6 @@ files:
 - lib/git/path.rb
 - lib/git/remote.rb
 - lib/git/repository.rb
-- lib/git/signaled_error.rb
 - lib/git/stash.rb
 - lib/git/stashes.rb
 - lib/git/status.rb
@@ -232,8 +243,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/1.19.1/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/1.19.1
+  changelog_uri: https://rubydoc.info/gems/git/2.1.1/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/2.1.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -242,15 +253,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- git 1.6.0.0, or greater
-rubygems_version: 3.5.3
+- git 2.28.0 or greater
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories

data/.github/stale.yml

@@ -1,25 +0,0 @@
-# Probot: Stale
-# https://github.com/probot/stale
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-
-# Number of days of inactivity before a stale issue is closed
-# Set to false to disable. If disabled, issues still need to be closed
-# manually, but will remain marked as stale.
-daysUntilClose: false
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-
-# Label to use when marking an issue as stale
-staleLabel: stale
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  A friendly reminder that this issue had no activity for 60 days.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

data/Dockerfile.changelog-rs

@@ -1,12 +0,0 @@
-FROM rust
-
-# Build the docker image (from this project's root directory):
-# docker build --file Dockerfile.changelog-rs --tag changelog-rs .
-#
-# Use this image to output a changelog (from this project's root directory):
-# docker run --rm --volume "$PWD:/worktree" changelog-rs v1.9.1 v1.10.0
-
-RUN cargo install changelog-rs
-WORKDIR /worktree
-
-ENTRYPOINT ["/usr/local/cargo/bin/changelog-rs", "/worktree"]

data/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +0,0 @@
-### Your checklist for this pull request
-🚨Please review the [guidelines for contributing](https://github.com/ruby-git/ruby-git/blob/master/CONTRIBUTING.md) to this repository.
-
-- [ ] Ensure all commits include DCO sign-off.
-- [ ] Ensure that your contributions pass unit testing.
-- [ ] Ensure that your contributions contain documentation if applicable.
-
-### Description
-Please describe your pull request.

data/lib/git/base/factory.rb

@@ -1,99 +0,0 @@
-module Git
-
-  class Base
-
-    module Factory
-      # @return [Git::Branch] an object for branch_name
-      def branch(branch_name = self.current_branch)
-        Git::Branch.new(self, branch_name)
-      end
-
-      # @return [Git::Branches] a collection of all the branches in the repository.
-      #   Each branch is represented as a {Git::Branch}.
-      def branches
-        Git::Branches.new(self)
-      end
-
-      # returns a Git::Worktree object for dir, commitish
-      def worktree(dir, commitish = nil)
-        Git::Worktree.new(self, dir, commitish)
-      end
-
-      # returns a Git::worktrees object of all the Git::Worktrees
-      # objects for this repo
-      def worktrees
-        Git::Worktrees.new(self)
-      end
-
-      # @return [Git::Object::Commit] a commit object
-      def commit_tree(tree = nil, opts = {})
-        Git::Object::Commit.new(self, self.lib.commit_tree(tree, opts))
-      end
-
-      # @return [Git::Diff] a Git::Diff object
-      def diff(objectish = 'HEAD', obj2 = nil)
-        Git::Diff.new(self, objectish, obj2)
-      end
-
-      # @return [Git::Object] a Git object
-      def gblob(objectish)
-        Git::Object.new(self, objectish, 'blob')
-      end
-
-      # @return [Git::Object] a Git object
-      def gcommit(objectish)
-        Git::Object.new(self, objectish, 'commit')
-      end
-
-      # @return [Git::Object] a Git object
-      def gtree(objectish)
-        Git::Object.new(self, objectish, 'tree')
-      end
-
-      # @return [Git::Log] a log with the specified number of commits
-      def log(count = 30)
-        Git::Log.new(self, count)
-      end
-
-      # returns a Git::Object of the appropriate type
-      # you can also call @git.gtree('tree'), but that's
-      # just for readability.  If you call @git.gtree('HEAD') it will
-      # still return a Git::Object::Commit object.
-      #
-      # object calls a factory method that will run a rev-parse
-      # on the objectish and determine the type of the object and return
-      # an appropriate object for that type
-      #
-      # @return [Git::Object] an instance of the appropriate type of Git::Object
-      def object(objectish)
-        Git::Object.new(self, objectish)
-      end
-
-      # @return [Git::Remote] a remote of the specified name
-      def remote(remote_name = 'origin')
-        Git::Remote.new(self, remote_name)
-      end
-
-      # @return [Git::Status] a status object
-      def status
-        Git::Status.new(self)
-      end
-
-      # @return [Git::Object::Tag] a tag object
-      def tag(tag_name)
-        Git::Object.new(self, tag_name, 'tag', true)
-      end
-
-      # Find as good common ancestors as possible for a merge
-      # example: g.merge_base('master', 'some_branch', 'some_sha', octopus: true)
-      #
-      # @return [Array<Git::Object::Commit>] a collection of common ancestors
-      def merge_base(*args)
-        shas = self.lib.merge_base(*args)
-        shas.map { |sha| gcommit(sha) }
-      end
-    end
-
-  end
-
-end

data/lib/git/failed_error.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'git/git_execute_error'
-
-module Git
-  # This error is raised when a git command fails
-  #
-  # The git command executed, status, stdout, and stderr are available from this
-  # object. The #message includes the git command, the status of the process, and
-  # the stderr of the process.
-  #
-  # @api public
-  #
-  class FailedError < Git::GitExecuteError
-    # Create a FailedError object
-    #
-    # Since this gem redirects stderr to stdout, the stdout of the process is used.
-    #
-    # @example
-    #   `exit 1` # set $? appropriately for this example
-    #   result = Git::CommandLineResult.new(%w[git status], $?, 'stdout', 'stderr')
-    #   error = Git::FailedError.new(result)
-    #   error.message #=>
-    #     "[\"git\", \"status\"]\nstatus: pid 89784 exit 1\noutput: \"stdout\""
-    #
-    # @param result [Git::CommandLineResult] the result of the git command including
-    #   the git command, status, stdout, and stderr
-    #
-    def initialize(result)
-      super("#{result.git_cmd}\nstatus: #{result.status}\noutput: #{result.stdout.inspect}")
-      @result = result
-    end
-
-    # @attribute [r] result
-    #
-    # The result of the git command including the git command and its status and output
-    #
-    # @example
-    #   `exit 1` # set $? appropriately for this example
-    #   result = Git::CommandLineResult.new(%w[git status], $?, 'stdout', 'stderr')
-    #   error = Git::FailedError.new(result)
-    #   error.result #=>
-    #     #<Git::CommandLineResult:0x00000001046bd488
-    #       @git_cmd=["git", "status"],
-    #       @status=#<Process::Status: pid 89784 exit 1>,
-    #       @stderr="stderr",
-    #       @stdout="stdout">
-    #
-    # @return [Git::CommandLineResult]
-    #
-    attr_reader :result
-  end
-end

data/lib/git/git_execute_error.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Git
-  # This error is raised when a git command fails
-  #
-  class GitExecuteError < StandardError; end
-end

data/lib/git/signaled_error.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require 'git/git_execute_error'
-
-module Git
-  # This error is raised when a git command exits because of an uncaught signal
-  #
-  # The git command executed, status, stdout, and stderr are available from this
-  # object. The #message includes the git command, the status of the process, and
-  # the stderr of the process.
-  #
-  # @api public
-  #
-  class SignaledError < Git::GitExecuteError
-    # Create a SignaledError object
-    #
-    # @example
-    #   `kill -9 $$` # set $? appropriately for this example
-    #   result = Git::CommandLineResult.new(%w[git status], $?, '', "killed")
-    #   error = Git::SignaledError.new(result)
-    #   error.message #=>
-    #     "[\"git\", \"status\"]\nstatus: pid 88811 SIGKILL (signal 9)\nstderr: \"killed\""
-    #
-    # @param result [Git::CommandLineResult] the result of the git command including the git command, status, stdout, and stderr
-    #
-    def initialize(result)
-      super("#{result.git_cmd}\nstatus: #{result.status}\nstderr: #{result.stderr.inspect}")
-      @result = result
-    end
-
-    # @attribute [r] result
-    #
-    # The result of the git command including the git command, status, and output
-    #
-    # @example
-    #   `kill -9 $$` # set $? appropriately for this example
-    #   result = Git::CommandLineResult.new(%w[git status], $?, '', "killed")
-    #   error = Git::SignaledError.new(result)
-    #   error.result #=>
-    #     #<Git::CommandLineResult:0x000000010470f6e8
-    #       @git_cmd=["git", "status"],
-    #       @status=#<Process::Status: pid 88811 SIGKILL (signal 9)>,
-    #       @stderr="killed",
-    #       @stdout="">
-    #
-    # @return [Git::CommandLineResult]
-    #
-    attr_reader :result
-  end
-end