git 2.3.3 → 3.1.1

data/lib/git/branches.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Git
-  
+
   # object that holds all the available branches
   class Branches
 
     include Enumerable
-    
+
     def initialize(base)
       @branches = {}
-      
+
       @base = base
-            
+
       @base.lib.branches_all.each do |b|
         @branches[b[0]] = Git::Branch.new(@base, b[0])
       end
@@ -18,21 +20,21 @@ module Git
     def local
       self.select { |b| !b.remote }
     end
-    
+
     def remote
       self.select { |b| b.remote }
     end
-    
+
     # array like methods
 
     def size
       @branches.size
-    end    
-    
+    end
+
     def each(&block)
       @branches.values.each(&block)
     end
-    
+
     # Returns the target branch
     #
     # Example:
@@ -50,14 +52,14 @@ module Git
       @branches.values.inject(@branches) do |branches, branch|
         branches[branch.full] ||= branch
 
-        # This is how Git (version 1.7.9.5) works. 
-        # Lets you ignore the 'remotes' if its at the beginning of the branch full name (even if is not a real remote branch). 
+        # This is how Git (version 1.7.9.5) works.
+        # Lets you ignore the 'remotes' if its at the beginning of the branch full name (even if is not a real remote branch).
         branches[branch.full.sub('remotes/', '')] ||= branch if branch.full =~ /^remotes\/.+/
-        
+
         branches
       end[branch_name.to_s]
     end
-    
+
     def to_s
       out = ''
       @branches.each do |k, b|
@@ -65,7 +67,6 @@ module Git
       end
       out
     end
-    
   end
 
 end

data/lib/git/command_line.rb

@@ -189,13 +189,14 @@ module Git
     #
     # @raise [Git::TimeoutError] if the command times out
     #
-    def run(*args, out:, err:, normalize:, chomp:, merge:, chdir: nil, timeout: nil)
+    def run(*args, out: nil, err: nil, normalize:, chomp:, merge:, chdir: nil, timeout: nil)
       git_cmd = build_git_cmd(args)
-      out ||= StringIO.new
-      err ||= (merge ? out : StringIO.new)
-      status = execute(git_cmd, out, err, chdir: (chdir || :not_set), timeout: timeout)
-
-      process_result(git_cmd, status, out, err, normalize, chomp, timeout)
+      begin
+        result = ProcessExecuter.run(env, *git_cmd, out: out, err: err, merge:, chdir: (chdir || :not_set), timeout: timeout, raise_errors: false)
+      rescue ProcessExecuter::Command::ProcessIOError => e
+        raise Git::ProcessIOError.new(e.message), cause: e.exception.cause
+      end
+      process_result(result, normalize, chomp, timeout)
     end
 
     private
@@ -210,121 +211,12 @@ module Git
       [binary_path, *global_opts, *args].map { |e| e.to_s }
     end
 
-    # Determine the output to return in the `CommandLineResult`
-    #
-    # If the writer can return the output by calling `#string` (such as a StringIO),
-    # then return the result of normalizing the encoding and chomping the output
-    # as requested.
-    #
-    # If the writer does not support `#string`, then return nil. The output is
-    # assumed to be collected by the writer itself such as when the  writer
-    # is a file instead of a StringIO.
-    #
-    # @param writer [#string] the writer to post-process
-    #
-    # @return [String, nil]
-    #
-    # @api private
-    #
-    def post_process(writer, normalize, chomp)
-      if writer.respond_to?(:string)
-        output = writer.string.dup
-        output = output.lines.map { |l| Git::EncodingUtils.normalize_encoding(l) }.join if normalize
-        output.chomp! if chomp
-        output
-      else
-        nil
-      end
-    end
-
-    # Post-process all writers and return an array of the results
-    #
-    # @param writers [Array<#write>] the writers to post-process
-    # @param normalize [Boolean] whether to normalize the output of each writer
-    # @param chomp [Boolean] whether to chomp the output of each writer
-    #
-    # @return [Array<String, nil>] the output of each writer that supports `#string`
-    #
-    # @api private
-    #
-    def post_process_all(writers, normalize, chomp)
-      Array.new.tap do |result|
-        writers.each { |writer| result << post_process(writer, normalize, chomp) }
-      end
-    end
-
-    # Raise an error when there was exception while collecting the subprocess output
-    #
-    # @param git_cmd [Array<String>] the git command that was executed
-    # @param pipe_name [Symbol] the name of the pipe that raised the exception
-    # @param pipe [ProcessExecuter::MonitoredPipe] the pipe that raised the exception
-    #
-    # @raise [Git::ProcessIOError]
-    #
-    # @return [void] this method always raises an error
-    #
-    # @api private
-    #
-    def raise_pipe_error(git_cmd, pipe_name, pipe)
-      raise Git::ProcessIOError.new("Pipe Exception for #{git_cmd}: #{pipe_name}"), cause: pipe.exception
-    end
-
-    # Execute the git command and collect the output
-    #
-    # @param cmd [Array<String>] the git command to execute
-    # @param chdir [String] the directory to run the command in
-    # @param timeout [Numeric, nil] the maximum seconds to wait for the command to complete
-    #
-    #   If timeout is zero of nil, the command will not time out. If the command
-    #   times out, it is killed via a SIGKILL signal and `Git::TimeoutError` is raised.
-    #
-    #   If the command does not respond to SIGKILL, it will hang this method.
-    #
-    # @raise [Git::ProcessIOError] if an exception was raised while collecting subprocess output
-    # @raise [Git::TimeoutError] if the command times out
-    #
-    # @return [ProcessExecuter::Status] the status of the completed subprocess
-    #
-    # @api private
-    #
-    def spawn(cmd, out_writers, err_writers, chdir:, timeout:)
-      out_pipe = ProcessExecuter::MonitoredPipe.new(*out_writers, chunk_size: 10_000)
-      err_pipe = ProcessExecuter::MonitoredPipe.new(*err_writers, chunk_size: 10_000)
-      ProcessExecuter.spawn(env, *cmd, out: out_pipe, err: err_pipe, chdir: chdir, timeout: timeout)
-    ensure
-      out_pipe.close
-      err_pipe.close
-      raise_pipe_error(cmd, :stdout, out_pipe) if out_pipe.exception
-      raise_pipe_error(cmd, :stderr, err_pipe) if err_pipe.exception
-    end
-
-    # The writers that will be used to collect stdout and stderr
-    #
-    # Additional writers could be added here if you wanted to tee output
-    # or send output to the terminal.
-    #
-    # @param out [#write] the object to write stdout to
-    # @param err [#write] the object to write stderr to
-    #
-    # @return [Array<Array<#write>, Array<#write>>] the writers for stdout and stderr
-    #
-    # @api private
-    #
-    def writers(out, err)
-      out_writers = [out]
-      err_writers = [err]
-      [out_writers, err_writers]
-    end
-
     # Process the result of the command and return a Git::CommandLineResult
     #
     # Post process output, log the command and result, and raise an error if the
     # command failed.
     #
-    # @param git_cmd [Array<String>] the git command that was executed
-    # @param status [Process::Status] the status of the completed subprocess
-    # @param out [#write] the object that stdout was written to
-    # @param err [#write] the object that stderr was written to
+    # @param result [ProcessExecuter::Command::Result] the result it is a Process::Status and include command, stdout, and stderr
     # @param normalize [Boolean] whether to normalize the output of each writer
     # @param chomp [Boolean] whether to chomp the output of each writer
     # @param timeout [Numeric, nil] the maximum seconds to wait for the command to complete
@@ -338,40 +230,58 @@ module Git
     #
     # @api private
     #
-    def process_result(git_cmd, status, out, err, normalize, chomp, timeout)
-      out_str, err_str = post_process_all([out, err], normalize, chomp)
-      logger.info { "#{git_cmd} exited with status #{status}" }
-      logger.debug { "stdout:\n#{out_str.inspect}\nstderr:\n#{err_str.inspect}" }
-      Git::CommandLineResult.new(git_cmd, status, out_str, err_str).tap do |result|
-        raise Git::TimeoutError.new(result, timeout) if status.timeout?
-        raise Git::SignaledError.new(result) if status.signaled?
-        raise Git::FailedError.new(result) unless status.success?
+    def process_result(result, normalize, chomp, timeout)
+      command = result.command
+      processed_out, processed_err = post_process_all([result.stdout, result.stderr], normalize, chomp)
+      logger.info { "#{command} exited with status #{result}" }
+      logger.debug { "stdout:\n#{processed_out.inspect}\nstderr:\n#{processed_err.inspect}" }
+      Git::CommandLineResult.new(command, result, processed_out, processed_err).tap do |processed_result|
+        raise Git::TimeoutError.new(processed_result, timeout) if result.timeout?
+        raise Git::SignaledError.new(processed_result) if result.signaled?
+        raise Git::FailedError.new(processed_result) unless result.success?
       end
     end
 
-    # Execute the git command and write the command output to out and err
+    # Post-process command output and return an array of the results
     #
-    # @param git_cmd [Array<String>] the git command to execute
-    # @param out [#write] the object to write stdout to
-    # @param err [#write] the object to write stderr to
-    # @param chdir [String] the directory to run the command in
-    # @param timeout [Numeric, nil] the maximum seconds to wait for the command to complete
+    # @param raw_outputs [Array] the output to post-process
+    # @param normalize [Boolean] whether to normalize the output of each writer
+    # @param chomp [Boolean] whether to chomp the output of each writer
     #
-    #   If timeout is zero of nil, the command will not time out. If the command
-    #   times out, it is killed via a SIGKILL signal and `Git::TimeoutError` is raised.
+    # @return [Array<String, nil>] the processed output of each command output object that supports `#string`
     #
-    #   If the command does not respond to SIGKILL, it will hang this method.
+    # @api private
     #
-    # @raise [Git::ProcessIOError] if an exception was raised while collecting subprocess output
-    # @raise [Git::TimeoutError] if the command times out
+    def post_process_all(raw_outputs, normalize, chomp)
+      Array.new.tap do |result|
+        raw_outputs.each { |raw_output| result << post_process(raw_output, normalize, chomp) }
+      end
+    end
+
+    # Determine the output to return in the `CommandLineResult`
     #
-    # @return [Git::CommandLineResult] the result of the command to return to the caller
+    # If the writer can return the output by calling `#string` (such as a StringIO),
+    # then return the result of normalizing the encoding and chomping the output
+    # as requested.
+    #
+    # If the writer does not support `#string`, then return nil. The output is
+    # assumed to be collected by the writer itself such as when the  writer
+    # is a file instead of a StringIO.
+    #
+    # @param raw_output [#string] the output to post-process
+    # @return [String, nil]
     #
     # @api private
     #
-    def execute(git_cmd, out, err, chdir:, timeout:)
-      out_writers, err_writers = writers(out, err)
-      spawn(git_cmd, out_writers, err_writers, chdir: chdir, timeout: timeout)
+    def post_process(raw_output, normalize, chomp)
+      if raw_output.respond_to?(:string)
+        output = raw_output.string.dup
+        output = output.lines.map { |l| Git::EncodingUtils.normalize_encoding(l) }.join if normalize
+        output.chomp! if chomp
+        output
+      else
+        nil
+      end
     end
   end
 end

data/lib/git/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
 
   class Config

data/lib/git/diff.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
 
   # object that holds the last X commits on given branch

data/lib/git/index.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 module Git
   class Index < Git::Path
-    
   end
 end

data/lib/git/lib.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git/command_line'
 require 'git/errors'
 require 'logger'
@@ -124,7 +126,7 @@ module Git
       arr_opts = []
       arr_opts << '--bare' if opts[:bare]
       arr_opts << '--branch' << opts[:branch] if opts[:branch]
-      arr_opts << '--depth' << opts[:depth].to_i if opts[:depth] && opts[:depth].to_i > 0
+      arr_opts << '--depth' << opts[:depth].to_i if opts[:depth]
       arr_opts << '--filter' << opts[:filter] if opts[:filter]
       Array(opts[:config]).each { |c| arr_opts << '--config' << c }
       arr_opts << '--origin' << opts[:remote] || opts[:origin] if opts[:remote] || opts[:origin]
@@ -292,6 +294,7 @@ module Git
     #   * 'tree' [String] the tree sha
     #   * 'author' [String] the author of the commit and timestamp of when the changes were created
     #   * 'committer' [String] the committer of the commit and timestamp of when the commit was applied
+    #   * 'merges' [Boolean] if truthy, only include merge commits (aka commits with 2 or more parents)
     #
     # @raise [ArgumentError] if the revision range (specified with :between or :object) is a string starting with a hyphen
     #
@@ -303,6 +306,7 @@ module Git
 
       arr_opts << '--pretty=raw'
       arr_opts << "--skip=#{opts[:skip]}" if opts[:skip]
+      arr_opts << '--merges' if opts[:merges]
 
       arr_opts += log_path_options(opts)
 
@@ -331,7 +335,7 @@ module Git
     def rev_parse(revision)
       assert_args_are_not_options('rev', revision)
 
-      command('rev-parse', revision)
+      command('rev-parse', '--revs-only', '--end-of-options', revision, '--')
     end
 
     # For backwards compatibility with the old method name
@@ -570,7 +574,7 @@ module Git
         case key
           when 'commit'
             hsh_array << hsh if hsh
-            hsh = {'sha' => value, 'message' => '', 'parent' => []}
+            hsh = {'sha' => value, 'message' => +'', 'parent' => []}
           when 'parent'
             hsh['parent'] << value
           else
@@ -1545,7 +1549,8 @@ module Git
         'GIT_DIR' => @git_dir,
         'GIT_WORK_TREE' => @git_work_dir,
         'GIT_INDEX_FILE' => @git_index_file,
-        'GIT_SSH' => Git::Base.config.git_ssh
+        'GIT_SSH' => Git::Base.config.git_ssh,
+        'LC_ALL' => 'en_US.UTF-8'
       }
     end
 

data/lib/git/log.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
 
   # Return the last n commits that match the specified criteria
@@ -131,11 +133,16 @@ module Git
       return self
     end
 
+    def merges
+      dirty_log
+      @merges = true
+      return self
+    end
+
     def to_s
       self.map { |c| c.to_s }.join("\n")
     end
 
-
     # forces git log to run
 
     def size
@@ -182,7 +189,7 @@ module Git
         log = @base.lib.full_log_commits(
           count: @max_count, all: @all, object: @object, path_limiter: @path, since: @since,
           author: @author, grep: @grep, skip: @skip, until: @until, between: @between,
-          cherry: @cherry
+          cherry: @cherry, merges: @merges
         )
         @commits = log.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
       end

data/lib/git/object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git/author'
 require 'git/diff'
 require 'git/errors'

data/lib/git/path.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module Git
- 
+
  class Path
-    
+
     attr_accessor :path
-    
+
     def initialize(path, check_path=true)
       path = File.expand_path(path)
-      
+
       if check_path && !File.exist?(path)
         raise ArgumentError, 'path does not exist', [path]
       end
-      
+
       @path = path
     end
-    
+
     def readable?
       File.readable?(@path)
     end
@@ -21,11 +23,10 @@ module Git
     def writable?
       File.writable?(@path)
     end
-    
+
     def to_s
       @path
     end
-    
  end
 
 end

data/lib/git/remote.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   class Remote < Path
 

data/lib/git/repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
 
   class Repository < Path

data/lib/git/stash.rb

@@ -1,27 +1,28 @@
+# frozen_string_literal: true
+
 module Git
   class Stash
-    
+
     def initialize(base, message, existing=false)
       @base = base
       @message = message
       save unless existing
     end
-    
+
     def save
       @saved = @base.lib.stash_save(@message)
     end
-    
+
     def saved?
       @saved
     end
-    
+
     def message
       @message
     end
-    
+
     def to_s
       message
     end
-    
   end
 end

data/lib/git/stashes.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Git
-  
+
   # object that holds all the available stashes
   class Stashes
     include Enumerable
-    
+
     def initialize(base)
       @stashes = []
-      
+
       @base = base
-            
+
       @base.lib.stashes_all.each do |id, message|
         @stashes.unshift(Git::Stash.new(@base, message, true))
       end
@@ -24,16 +26,16 @@ module Git
     def all
       @base.lib.stashes_all
     end
-    
+
     def save(message)
       s = Git::Stash.new(@base, message)
       @stashes.unshift(s) if s.saved?
     end
-    
+
     def apply(index=nil)
       @base.lib.stash_apply(index)
     end
-    
+
     def clear
       @base.lib.stash_clear
       @stashes = []
@@ -42,14 +44,13 @@ module Git
     def size
       @stashes.size
     end
-    
+
     def each(&block)
       @stashes.each(&block)
     end
-    
+
     def [](index)
       @stashes[index.to_i]
     end
-    
   end
 end

data/lib/git/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   # The status class gets the status of a git repository
   #
@@ -100,7 +102,7 @@ module Git
     end
 
     def pretty
-      out = ''
+      out = +''
       each do |file|
         out << pretty_file(file)
       end

data/lib/git/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='2.3.3'
+  VERSION='3.1.1'
 end

data/lib/git/working_directory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   class WorkingDirectory < Git::Path
   end

data/lib/git/worktree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git/path'
 
 module Git

data/lib/git/worktrees.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   # object that holds all the available worktrees
   class Worktrees

data/lib/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/deprecation'
 

data/package.json

@@ -0,0 +1,10 @@
+{
+  "devDependencies": {
+    "@commitlint/cli": "^19.8.0",
+    "@commitlint/config-conventional": "^19.8.0",
+    "husky": "^9.1.7"
+  },
+  "scripts": {
+    "prepare": "husky"
+  }
+}

data/release-please-config.json

@@ -0,0 +1,36 @@
+{
+  "bootstrap-sha": "31374263eafea4e23352494ef4f6bea3ce62c1b5",
+  "packages": {
+    ".": {
+      "release-type": "ruby",
+      "package-name": "git",
+      "changelog-path": "CHANGELOG.md",
+      "version-file": "lib/git/version.rb",
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "draft": false,
+      "prerelease": false,
+      "include-component-in-tag": false,
+      "pull-request-title-pattern": "chore: release v${version}",
+      "changelog-sections": [
+        { "type": "feat",     "section": "Features",      "hidden": false },
+        { "type": "fix",      "section": "Bug Fixes",     "hidden": false },
+        { "type": "build",    "section": "Other Changes", "hidden": false },
+        { "type": "chore",    "section": "Other Changes", "hidden": false },
+        { "type": "ci",       "section": "Other Changes", "hidden": false },
+        { "type": "docs",     "section": "Other Changes", "hidden": false },
+        { "type": "perf",     "section": "Other Changes", "hidden": false },
+        { "type": "refactor", "section": "Other Changes", "hidden": false },
+        { "type": "revert",   "section": "Other Changes", "hidden": false },
+        { "type": "style",    "section": "Other Changes", "hidden": false },
+        { "type": "test",     "section": "Other Changes", "hidden": false }
+      ]
+    }
+  },
+  "plugins": [
+    {
+      "type": "sentence-case"
+    }
+  ],
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}