git 1.13.0 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0d52946aa19627fbff62a47b86f694763e957e1f6d87b9a5e14e6cae46ff1d
-  data.tar.gz: f2b9e31a9cfb944da55c25b22b54aacd54d788e77ef2808d7cfba0a466cedb8a
+  metadata.gz: 29b8c6b76f613f41bcddf2786fe9b164ef2168f265f3b8fdccb9f8f4ead52669
+  data.tar.gz: b0f66b11fd1a2eba3640bfa42ff842dcfbd52ab30455026b97ebecad8fd86f0c
 SHA512:
-  metadata.gz: 0a812bbdc6aabf7c63d30f96659edfe4a65a141dce613046d3f7e537f5105a80e48f6ae03cb30c4d806243cfd130b49bbc852f43df493191e26dfec2f03551f2
-  data.tar.gz: b0a634418e93055e3f3c2c5256176515aa990950f4927e2b0ee82055a87543f0695cf13ae4a1f5bd99ab1cec9f8e264153b8aa2ec3f4392c88c5890c17ce7c13
+  metadata.gz: bb85d50e45a905b7e71617da29f6194e478b17aed237237e0dd53066a5182c328d4e992494a3b7d26df47223c0e601733400e62d04b7e9fffdf8993c22cd2fb5
+  data.tar.gz: ee9d9edbd87615caee4cc073acd2df9a047b46d5ba117997f193a98d28374d214e2994018d3bed10c0e4acad7cd913ba39da25ecc2b0fd973863930f19d0f129

data/.github/workflows/continuous_integration.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.7, 3.0]
+        ruby: [2.7, 3.0, 3.1, 3.2]
         operating-system: [ubuntu-latest]
         include:
           - ruby: head
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -5,6 +5,24 @@
 
 # Change Log
 
+## v1.13.2 (2023-02-02)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.1..v1.13.2)
+
+Changes since v1.13.1:
+
+* b6e031d Fix `Git::Lib#commit_data` for GPG-signed commits (#610)
+* b12b820 Fix escaped path decoding (#612)
+
+## v1.13.1 (2023-01-12)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.0...v1.13.1)
+
+* 667b830 Update the GitHub Action step "actions/checkout" from v2 to v3 (#608)
+* 23a0ac4 Fix version parsing (#605)
+* 429f0bb Update release instructions (#606)
+* 68d76b8 Drop ruby 2.3 build and add 3.1 and 3.2 builds (#607)
+
 ## v1.13.0 (2022-12-10)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.12.0...v1.13.0)

data/RELEASING.md

@@ -8,61 +8,63 @@
 Releasing a new version of the `git` gem requires these steps:
 
 - [How to release a new git.gem](#how-to-release-a-new-gitgem)
-  - [Prepare the release](#prepare-the-release)
-  - [Create a GitHub release](#create-a-github-release)
-  - [Build and release the gem](#build-and-release-the-gem)
-
-These instructions use an example where the current release version is `1.5.0`
-and the new release version to be created is `1.6.0.pre1`.
-
-## Prepare the release
-
-From a fork of ruby-git, create a PR containing changes to (1) bump the
-version number, (2) update the CHANGELOG.md, and (3) tag the release.
-
-- Bump the version number in lib/git/version.rb following [Semantic Versioning](https://semver.org)
-  guidelines
-- Add a link in CHANGELOG.md to the release tag which will be created later
-  in this guide
-- Create a new tag using [git-extras](https://github.com/tj/git-extras/blob/master/Commands.md#git-release)
-  `git release` command
-  - For example: `git release v1.6.0.pre1`
-- These should be the only changes in the PR
-- An example of these changes for `v1.6.0.pre1` can be found in [PR #435](https://github.com/ruby-git/ruby-git/pull/435)
-- Get the PR reviewed, approved and merged to master.
-
-## Create a GitHub release
-
-On [the ruby-git releases page](https://github.com/ruby-git/ruby-git/releases),
-select `Draft a new release`
-
-- Select the tag corresponding to the version being released `v1.6.0.pre1`
-- The Target should be `master`
-- For the release description, use the output of [changelog-rs](https://github.com/perlun/changelog-rs)
-  - A Docker image is provided in [Dockerfile.changelog-rs](https://github.com/ruby-git/ruby-git/blob/master/Dockerfile.changelog-rs)
-    so you don't have to install changelog-rs or the Rust tool chain. To build the
-    Docker image, run this command from this project's root directory:
-    - `docker build --file Dockerfile.changelog-rs --tag changelog-rs .`
-  - To run the changelog-rs command using this image, run the following command
-    from this project's root directory (replace the tag names appropriate for the
-    current release):
-    - `docker run --rm --volume "$PWD:/worktree" changelog-rs v1.5.0 v1.6.0.pre1`
-  - Copy the output, omitting the tag header `## v1.6.0.pre1` and paste into
-    the release description
-  - The release description can be edited later if needed
-- Select the appropriate value for `This is a pre-release`
-  - Since `v1.6.0.pre1` is a pre-release, check `This is a pre-release`
-
-## Build and release the gem
-
-Clone [ruby-git/ruby-git](https://github.com/ruby-git/ruby-git) directly (not a
-fork) and ensure your local working copy is on the master branch
-
-- Verify that you are not on a fork with the command `git remote -v`
-- Verify that the version number is correct by running `rake -T` and inspecting
-  the output for the `release[remote]` task
-
-Build the git gem and push it to rubygems.org with the command `rake release`
-
-- Ensure that your `gem sources list` includes `https://rubygems.org` (in my
-  case, I usually have my work’s internal gem repository listed)
+  - [Install Prerequisites](#install-prerequisites)
+  - [Prepare the Release](#prepare-the-release)
+  - [Review and Merge the Release](#review-and-merge-the-release)
+  - [Build and Release the Gem](#build-and-release-the-gem)
+
+These instructions use an example where:
+
+- The default branch is `master`
+- The current release version is `1.5.0`
+- You want to create a new *minor* release, `1.6.0`
+
+## Install Prerequisites
+
+The following tools need to be installed in order to create the release:
+
+- [git](https://git-scm.com) is used to interact with the local and remote repositories
+- [gh](https://cli.github.com) is used to create the release and PR in GitHub
+- [Docker](https://www.docker.com) is used to run the script to create the release notes
+
+On a Mac, these tools can be installed using [brew](https://brew.sh):
+
+```shell
+$ brew install git
+...
+$ brew install gh
+...
+$ brew install --cask docker
+...
+$
+```
+
+## Prepare the Release
+
+Bump the version, create release notes, tag the release and create a GitHub release and PR which can be used to review the release.
+
+Steps:
+
+- Check out the code with `git clone https://github.com/ruby-git/ruby-git ruby-git-v1.6.0 && cd ruby-git-v1.6.0`
+- Install development dependencies using bundle `bundle install`
+- Based upon the nature of the changes, decide on the type of release: `major`, `minor`, or `patch` (in this example we will use `minor`)
+- Run the release script `bundle exec create-github-release minor`
+
+## Review and Merge the Release
+
+Have the release PR approved and merge the changes into the `master` branch.
+
+**IMPORTANT** DO NOT merge to the `master` branch using the GitHub UI. Instead use the instructions below.
+
+Steps:
+
+- Get the release PR reviewed and approved in GitHub
+- Merge the changes with the command `git checkout master && git merge --ff-only v1.6.0 && git push`
+
+## Build and Release the Gem
+
+Build the gem and publish it to [rubygems.org](https://rubygems.org/gems/git)
+
+Steps:
+
+- Build and release the gem using rake `bundle exec rake release`

data/git.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rchardet', '~> 1.8'
 
   s.add_development_dependency 'bump', '~> 0.10'
+  s.add_development_dependency 'create_github_release', '~> 0.2'
   s.add_development_dependency 'minitar', '~> 0.9'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'test-unit', '~> 3.3'

data/lib/git/escaped_path.rb

@@ -42,7 +42,7 @@ module Git
     private
 
     def extract_octal(path, index)
-      [path[index + 1..index + 4].to_i(8), 4]
+      [path[index + 1..index + 3].to_i(8), 4]
     end
 
     def extract_escape(path, index)

data/lib/git/lib.rb

@@ -63,8 +63,6 @@ module Git
         @git_work_dir = base[:working_directory]
       end
       @logger = logger
-
-      Git::Lib.warn_if_old_command(self)
     end
 
     # creates or reinitializes the repository
@@ -223,54 +221,57 @@ module Git
     def commit_data(sha)
       sha = sha.to_s
       cdata = command_lines('cat-file', 'commit', sha)
-      process_commit_data(cdata, sha, 0)
+      process_commit_data(cdata, sha)
     end
 
-    def process_commit_data(data, sha = nil, indent = 4)
+    def process_commit_data(data, sha)
       hsh = {
-        'sha'     => sha,
-        'message' => '',
-        'parent'  => []
+        'sha'    => sha,
+        'parent' => []
       }
 
-      loop do
-        key, *value = data.shift.split
-
-        break if key.nil?
-
+      each_cat_file_header(data) do |key, value|
         if key == 'parent'
-          hsh['parent'] << value.join(' ')
+          hsh['parent'] << value
         else
-          hsh[key] = value.join(' ')
+          hsh[key] = value
         end
       end
 
-      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+      hsh['message'] = data.join("\n") + "\n"
 
       return hsh
     end
 
+    CAT_FILE_HEADER_LINE = /\A(?<key>\w+) (?<value>.*)\z/
+
+    def each_cat_file_header(data)
+      while (match = CAT_FILE_HEADER_LINE.match(data.shift))
+        key = match[:key]
+        value_lines = [match[:value]]
+
+        while data.first.start_with?(' ')
+          value_lines << data.shift.lstrip
+        end
+
+        yield key, value_lines.join("\n")
+      end
+    end
+
     def tag_data(name)
       sha = sha.to_s
       tdata = command_lines('cat-file', 'tag', name)
-      process_tag_data(tdata, name, 0)
+      process_tag_data(tdata, name)
     end
 
-    def process_tag_data(data, name, indent=4)
-      hsh = {
-        'name'    => name,
-        'message' => ''
-      }
-
-      loop do
-        key, *value = data.shift.split
-
-        break if key.nil?
+    def process_tag_data(data, name)
+      hsh = { 'name' => name }
 
-        hsh[key] = value.join(' ')
+      each_cat_file_header(data) do |key, value|
+        hsh[key] = value
       end
 
-      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+      hsh['message'] = data.join("\n") + "\n"
 
       return hsh
     end
@@ -1029,8 +1030,9 @@ module Git
     # returns the current version of git, as an Array of Fixnums.
     def current_command_version
       output = command('version')
-      version = output[/\d+\.\d+(\.\d+)+/]
-      version.split('.').collect {|i| i.to_i}
+      version = output[/\d+(\.\d+)+/]
+      version_parts = version.split('.').collect { |i| i.to_i }
+      version_parts.fill(0, version_parts.length...3)
     end
 
     def required_command_version
@@ -1043,10 +1045,11 @@ module Git
 
     def self.warn_if_old_command(lib)
       return true if @version_checked
+      @version_checked = true
       unless lib.meets_required_version?
         $stderr.puts "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
       end
-      @version_checked = true
+      true
     end
 
     private
@@ -1104,6 +1107,8 @@ module Git
     end
 
     def command(cmd, *opts, &block)
+      Git::Lib.warn_if_old_command(self)
+
       command_opts = { chomp: true, redirect: '' }
       if opts.last.is_a?(Hash)
         command_opts.merge!(opts.pop)

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.13.0'
+  VERSION='1.13.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.2
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: create_github_release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories