git 1.17.0 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcca4b91f56e1bf6b99c471f918fbe4b1ed6d56b0058021e345514676e153223
-  data.tar.gz: 9f4386702fca4248c3a7a07400c6ff3e52fa7898f0e16bbcb3b90bf945fde1da
+  metadata.gz: cebf2eab3cc2c8cc605b1e3b9aeafa2f2c82ef0a50be725fc211fdb55a7980c0
+  data.tar.gz: 9df1a5d2f067aa183a65cea1cd21e7260b72213f92c50b60bda26f261b2e7d23
 SHA512:
-  metadata.gz: 4d943759fc15a56baee49734b4628cf1b5651416c13842077a9bfe979df1bdc05afbe114af904b2161ef84be090207f9691a80a704efe2d8a3a14bb4c80df8f6
-  data.tar.gz: 8feccfa435ec2f3d95a52ec0fd3920b5a956b2dc3cbcddfbc63c48052ddf64686ba1ef849f0b96307e573134d0e818c6d5bfaae8f3dad877a6f74a516806754a
+  metadata.gz: 57019fb39b7476d7ee5d97fd1c21f1bffa3b1fbd59413e5bb602794c106f38c2bc528c1a86b98b89bc835976671ea836a1bdf911aa9a281b81b97d221c12b80d
+  data.tar.gz: d2f2927fbdf6b13b66d931183d6effb5fbb651e10c77a393e6b035ccc88e5b6ffd60dbed859fa6c400cd4551df253be89074e20aaa0f40379b609e79bd3553fa

data/CHANGELOG.md

@@ -5,6 +5,22 @@
 
 # Change Log
 
+## v1.17.2 (2023-03-07)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.17.1..v1.17.2)
+
+Changes since v1.17.1:
+
+* f43d6 Fix branch name parsing to handle names that include slashes (#651)
+
+## v1.17.1 (2023-03-06)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.17.0..v1.17.1)
+
+Changes since v1.17.0:
+
+* 774e Revert introduction of ActiveSupport dependency (#649)
+
 ## v1.17.0 (2023-03-05)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.16.0..v1.17.0)

data/README.md

@@ -3,73 +3,47 @@
 # @title README
 -->
 
-# The `git` Gem
+# The Git Gem
 
-[![Gem Version](https://badge.fury.io/rb/git.svg)](https://badge.fury.io/rb/git)
-[![Change Log](https://img.shields.io/badge/change%20log-Latest-green)](https://rubydoc.info/gems/git/file/CHANGELOG.md)
-[![Build Status](https://github.com/ruby-git/ruby-git/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/ruby-git/ruby-git/actions/workflows/continuous_integration.yml)
-[![Code Climate](https://codeclimate.com/github/ruby-git/ruby-git.png)](https://codeclimate.com/github/ruby-git/ruby-git)
-[![Source Code](https://img.shields.io/badge/source-GitHub-green)](https://github.com/ruby-git/ruby-git)
-[![Documentation](https://img.shields.io/badge/documentation-Latest-green)](https://rubydoc.info/gems/git)
-[![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/ruby-git/ruby-git/blob/master/LICENSE)
-
-The git Gem provides an API that can be used to create, read, and manipulate
+The Git Gem provides an API that can be used to create, read, and manipulate
 Git repositories by wrapping system calls to the `git` binary. The API can be
 used for working with Git in complex interactions including branching and
 merging, object inspection and manipulation, history, patch generation and
 more.
 
-## Basic Usage
+## Homepage
 
-Get started by obtaining a repository object by:
+The project source code is at:
 
-* Opening an existing working copy with [Git.open](https://rubydoc.info/gems/git/Git#open-class_method)
-* Initializing a new repository with [Git.init](https://rubydoc.info/gems/git/Git#init-class_method)
-* Cloning a repository with [Git.clone](https://rubydoc.info/gems/git/Git#clone-class_method)
+http://github.com/ruby-git/ruby-git
 
-Methods that can be called on a repository object are documented in [Git::Base](https://rubydoc.info/gems/git/Git/Base)
+## Documentation
 
-## Install
+Detailed documentation can be found at:
 
-You can install the `git` gem with the following command:
+https://rubydoc.info/gems/git/Git.html
 
-```shell
-gem install git
-```
-
-## Deprecation Warnings
+Get started by obtaining a repository object by:
 
-Deprecation warnings are managed with the `Git.deprecation` attribute.
+* opening an existing working copy with [Git.open](https://rubydoc.info/gems/git/Git#open-class_method)
+* initializing a new repository with [Git.init](https://rubydoc.info/gems/git/Git#init-class_method)
+* cloning a repository with [Git.clone](https://rubydoc.info/gems/git/Git#clone-class_method)
 
-Use this object to define deprecations in the source code:
+Methods that can be called on a repository object are documented in [Git::Base](https://rubydoc.info/gems/git/Git/Base)
 
-```ruby
-Git.deprecation.deprecate_methods(Git::Branch, stashes: 'use Git::Base#stash_list instead')
-```
+## Install
 
-The default action when using deprecated items (methods, classes, etc.) is to output
-a **DEPRECATION WARNING** to `$stderr` like the following:
+You can install Ruby/Git like this:
 
-```text
-DEPRECATION WARNING: stashes is deprecated and will be removed from git 2.0.0 (use Git::Base.stash_list instead)
 ```
-
-The action taken when a deprecated item is used is defined by setting the behavior
-on the deprecation object:
-
-```ruby
-# Log all deprecation warnings to $stderr (the default)
-Git.deprecation = :stderr
-
-# Raise an ActiveSupport::DeprecationException
-Git.deprecation = :raise
-
-# Do nothing
-Git.deprecation = :silence
+sudo gem install git
 ```
 
-See [ActiveSupport::Deprecation](https://api.rubyonrails.org/classes/ActiveSupport/Deprecation.html)
-for more details on how to use deprecations.
+## Code Status
+
+* [![Build Status](https://github.com/ruby-git/ruby-git/workflows/CI/badge.svg?branch=master)](https://github.com/ruby-git/ruby-git/actions?query=workflow%3ACI)
+* [![Code Climate](https://codeclimate.com/github/ruby-git/ruby-git.png)](https://codeclimate.com/github/ruby-git/ruby-git)
+* [![Gem Version](https://badge.fury.io/rb/git.svg)](https://badge.fury.io/rb/git)
 
 ## Major Objects
 

data/Rakefile

@@ -18,7 +18,7 @@ task :test do
 end
 default_tasks << :test
 
-unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
+unless RUBY_PLATFORM == 'java'
   #
   # YARD documentation for this project can NOT be built with JRuby.
   # This project uses the redcarpet gem which can not be installed on JRuby.

data/git.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
   s.requirements = ['git 1.6.0.0, or greater']
 
-  s.add_runtime_dependency 'activesupport', '>= 4.0.0'
   s.add_runtime_dependency 'addressable', '~> 2.8'
   s.add_runtime_dependency 'rchardet', '~> 1.8'
 

data/lib/git/branch.rb

@@ -1,11 +1,9 @@
 require 'git/path'
 
 module Git
-
   class Branch < Path
-    
     attr_accessor :full, :remote, :name
-    
+
     def initialize(base, name)
       @full = name
       @base = base
@@ -13,25 +11,25 @@ module Git
       @stashes = nil
       @remote, @name = parse_name(name)
     end
-    
+
     def gcommit
       @gcommit ||= @base.gcommit(@full)
       @gcommit
     end
-    
+
     def stashes
       @stashes ||= Git::Stashes.new(@base)
     end
-    
+
     def checkout
       check_if_create
       @base.checkout(@full)
     end
-    
+
     def archive(file, opts = {})
       @base.lib.archive(@full, file, opts)
     end
-    
+
     # g.branch('new_branch').in_branch do
     #   # create new file
     #   # do other stuff
@@ -47,26 +45,26 @@ module Git
       end
       @base.checkout(old_current)
     end
-    
+
     def create
       check_if_create
     end
-    
+
     def delete
       @base.lib.branch_delete(@name)
     end
-    
+
     def current
       determine_current
     end
-    
+
     def contains?(commit)
       !@base.lib.branch_contains(commit, self.name).empty?
     end
-    
+
     def merge(branch = nil, message = nil)
       if branch
-        in_branch do 
+        in_branch do
           @base.merge(branch, message)
           false
         end
@@ -76,7 +74,7 @@ module Git
         @base.merge(@name)
       end
     end
-    
+
     def update_ref(commit)
       if @remote
         @base.lib.update_ref("refs/remotes/#{@remote.name}/#{@name}", commit)
@@ -84,47 +82,62 @@ module Git
         @base.lib.update_ref("refs/heads/#{@name}", commit)
       end
     end
-    
+
     def to_a
       [@full]
     end
-    
+
     def to_s
       @full
     end
-    
-    private 
 
-      def check_if_create
-        @base.lib.branch_new(@name) rescue nil
-      end
-      
-      def determine_current
-        @base.lib.branch_current == @name
-      end
-    
-      # Given a full branch name return an Array containing the remote and branch names.
-      #
-      # Removes 'remotes' from the beggining of the name (if present).
-      # Takes the second part (splittign by '/') as the remote name.
-      # Takes the rest as the repo name (can also hold one or more '/').
-      #
-      # Example:
-      #   parse_name('master') #=> [nil, 'master']
-      #   parse_name('origin/master') #=> ['origin', 'master']
-      #   parse_name('remotes/origin/master') #=> ['origin', 'master']
-      #   parse_name('origin/master/v2') #=> ['origin', 'master/v2'] 
-      #
-      # param [String] name branch full name.
-      # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names. 
-      def parse_name(name)
-        if name.match(/^(?:remotes\/)?([^\/]+)\/(.+)/)
-          return [Git::Remote.new(@base, $1), $2]
-        end
+    private
 
-        return [nil, name]
-      end
-    
+    def check_if_create
+      @base.lib.branch_new(@name) rescue nil
+    end
+
+    def determine_current
+      @base.lib.branch_current == @name
+    end
+
+    BRANCH_NAME_REGEXP = %r{
+      ^
+        # Optional 'refs/remotes/' at the beggining to specify a remote tracking branch
+        # with a <remote_name>. <remote_name> is nil if not present.
+        (?:
+          (?:(?:refs/)?remotes/)(?<remote_name>[^/]+)/
+        )?
+        (?<branch_name>.*)
+      $
+    }x
+
+    # Given a full branch name return an Array containing the remote and branch names.
+    #
+    # Removes 'remotes' from the beggining of the name (if present).
+    # Takes the second part (splittign by '/') as the remote name.
+    # Takes the rest as the repo name (can also hold one or more '/').
+    #
+    # Example:
+    #   # local branches
+    #   parse_name('master') #=> [nil, 'master']
+    #   parse_name('origin/master') #=> [nil, 'origin/master']
+    #   parse_name('origin/master/v2') #=> [nil, 'origin/master']
+    #
+    #   # remote branches
+    #   parse_name('remotes/origin/master') #=> ['origin', 'master']
+    #   parse_name('remotes/origin/master/v2') #=> ['origin', 'master/v2']
+    #   parse_name('refs/remotes/origin/master') #=> ['origin', 'master']
+    #   parse_name('refs/remotes/origin/master/v2') #=> ['origin', 'master/v2']
+    #
+    # param [String] name branch full name.
+    # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names.
+    def parse_name(name)
+      # Expect this will always match
+      match = name.match(BRANCH_NAME_REGEXP)
+      remote = match[:remote_name] ? Git::Remote.new(@base, match[:remote_name]) : nil
+      branch_name = match[:branch_name]
+      [ remote, branch_name ]
+    end
   end
-  
 end

data/lib/git/version.rb

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

data/lib/git.rb

@@ -1,32 +1,7 @@
-require 'active_support/deprecation'
-
-module Git
-  # An object used to manage deprecations
-  #
-  # A ActiveSupport::Deprecation object used to manage the deprecations scheduled
-  # to be removed in the next major release of the `git`` gem.
-  #
-  # @example Deprecate a method
-  #   Git.deprecation.deprecate_methods(Git::Branch, stashes: 'use Git::Base#stash_list instead')
-  #
-  # @example Set the deprecation behavior
-  #   # Log all deprecation warnings to $stderr (the default)
-  #   Git.deprecation.behavior = :stderr
-  #
-  #   # Raise an ActiveSupport::DeprecationException
-  #   Git.deprecation.behavior = :raise
-  #
-  #   # Do nothing
-  #   Git.deprecation.behavior = :raise
-  #
-  # @see https://api.rubyonrails.org/classes/ActiveSupport/Deprecation.html ActiveSupport::Deprecation
-  #
-  # @return [ActiveSupport::Deprecation]
-  #
-  def self.deprecation
-    @deprecation ||= ActiveSupport::Deprecation.new('2.0.0', 'git')
-  end
-end
+# 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 'git/author'
 require 'git/base'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.2
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement