git 1.10.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd58567bba3a5effab0e3d3f565f5b3891dcf056ef4df11c1521037bbe9f489
-  data.tar.gz: a1f8f9968a3927ce99f393805c34b0ca23941c37f27607d296eaecba9dc0f872
+  metadata.gz: '03386fbc4d48647754608adba467800440ec80e5e8aecddac930a3e2565827bd'
+  data.tar.gz: 180866b01d05c40d495638ee8ddf2a1d8ca2e534250575c09c20728a2473855e
 SHA512:
-  metadata.gz: b1231323bde0b63677f46945800dc950a004cd854bee8c1d5a6711c8709c3dd87fb0c187f54c39c94ae07f92674f27a94b23fe3200a1799992f272c0bd84d315
-  data.tar.gz: 8d89a33a9cbee9357f9a4ffb568ec38506749aa81b931f9b2e862af0420c549c1738fde90e48eede6650c3202d31b9463e852eea5b358020b5561e5a60e12ef3
+  metadata.gz: b5115fff1ce7fbbc3a0fb8d22b8f27b6c3acb00e27613e3e8d0a4d760c2b40a0355a3c2e57e3e8d14e91545f985eea51caca44eab4b04b112f00393e64f48216
+  data.tar.gz: 4494ee6206a07e17b2c1bb983c7519689364c1ec15bfa811a3ab4cf380aba9a29c783adfff82917c0379a7911b2a5a51d0661bf928f69d9502a271d8d11a846e

data/.github/workflows/continuous_integration.yml

@@ -5,6 +5,7 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+  workflow_dispatch:
 
 jobs:
   continuous_integration_build:
@@ -28,6 +29,9 @@ jobs:
 
     runs-on: ${{ matrix.operating-system }}
 
+    env:
+      JAVA_OPTS: -Djdk.io.File.enableADS=true
+
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2

data/CHANGELOG.md

@@ -5,6 +5,25 @@
 
 # Change Log
 
+## v1.12.0
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.12.0
+
+## v1.11.0
+
+* 292087e Supress unneeded test output (#570)
+* 19dfe5e Add support for fetch options "--force/-f" and "--prune-tags/-P". (#563)
+* 018d919 Fix bug when grepping lines that contain numbers surrounded by colons (#566)
+* c04d16e remove from maintainer (#567)
+* 291ca09 Address command line injection in Git::Lib#fetch
+* 521b8e7 Release v1.10.2 (#561)
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.11.0
+
+## v1.10.2
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.10.2
+
 ## 1.10.1
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.10.1

data/Gemfile

@@ -1,4 +1,5 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gemspec :name => 'git'
+source 'https://rubygems.org'
 
+gemspec name: 'git'

data/MAINTAINERS.md

@@ -10,5 +10,4 @@ When making changes in this repository, one of the maintainers below must review
 ### Maintainers
 
 * [Per Lundberg](https://github.com/perlun)
-* [Vern Burton](https://github.com/tarcinil)
 * [James Couball](https://github.com/jcouball)

data/README.md

@@ -108,7 +108,7 @@ g.index.writable?
 g.repo
 g.dir
 
-g.log   # returns array of Git::Commit objects
+g.log   # returns a Git::Log object, which is an Enumerator of Git::Commit objects
 g.log.since('2 weeks ago')
 g.log.between('v2.5', 'v2.6')
 g.log.each {|l| puts l.sha }
@@ -204,13 +204,23 @@ g = Git.init
   { :repository => '/opt/git/proj.git',
       :index => '/tmp/index'} )
 
-g = Git.clone(URI, NAME, :path => '/tmp/checkout')
+# Clone from a git url
+git_url = 'https://github.com/ruby-git/ruby-git.git'
+# Clone into the ruby-git directory
+g = Git.clone(git_url)
+
+# Clone into /tmp/clone/ruby-git-clean
+name = 'ruby-git-clean'
+path = '/tmp/clone'
+g = Git.clone(git_url, name, :path => path)
+g.dir #=> /tmp/clone/ruby-git-clean
+
 g.config('user.name', 'Scott Chacon')
 g.config('user.email', 'email@email.com')
 
 # Clone can take an optional logger
 logger = Logger.new
-g = Git.clone(URI, NAME, :log => logger)
+g = Git.clone(git_url, NAME, :log => logger)
 
 g.add                                   # git add -- "."
 g.add(:all=>true)                       # git add --all -- "."
@@ -234,6 +244,9 @@ g.commit('message', gpg_sign: true)
 key_id = '0A46826A'
 g.commit('message', gpg_sign: key_id)
 
+# Skip signing a commit (overriding any global gpgsign setting)
+g.commit('message', no_gpg_sign: true)
+
 g = Git.clone(repo, 'myrepo')
 g.chdir do
 new_file('test-file', 'blahblahblah')
@@ -278,6 +291,7 @@ g.remote(name).merge(branch)
 g.fetch
 g.fetch(g.remotes.first)
 g.fetch('origin', {:ref => 'some/ref/head'} )
+g.fetch(all: true, force: true, depth: 2)
 
 g.pull
 g.pull(Git::Repo, Git::Branch) # fetch and a merge

data/git.gemspec

@@ -26,21 +26,23 @@ 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 'addressable', '~> 2.8'
   s.add_runtime_dependency 'rchardet', '~> 1.8'
 
+  s.add_development_dependency 'bump', '~> 0.10'
   s.add_development_dependency 'minitar', '~> 0.9'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'test-unit', '~> 3.3'
 
   unless RUBY_PLATFORM == 'java'
     s.add_development_dependency 'redcarpet', '~> 3.5'
-    s.add_development_dependency 'yard', '~> 0.9'
+    s.add_development_dependency 'yard', '~> 0.9', '>= 0.9.28'
     s.add_development_dependency 'yardstick', '~> 0.9'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   s.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(tests|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(tests|spec|features|bin)/}) }
   end
 end

data/lib/git/base.rb

@@ -17,10 +17,10 @@ module Git
     end
 
     # (see Git.clone)
-    def self.clone(repository, name, options = {})
-      new_options = Git::Lib.new(nil, options[:log]).clone(repository, name, options)
+    def self.clone(repository_url, directory, options = {})
+      new_options = Git::Lib.new(nil, options[:log]).clone(repository_url, directory, options)
       normalize_paths(new_options, bare: options[:bare] || options[:mirror])
-      self.new(new_options)
+      new(new_options)
     end
 
     # Returns (and initialize if needed) a Git::Config instance
@@ -336,7 +336,11 @@ module Git
 
     # fetches changes from a remote branch - this does not modify the working directory,
     # it just gets the changes from the remote if there are any
-    def fetch(remote = 'origin', opts={})
+    def fetch(remote = 'origin', opts = {})
+      if remote.is_a?(Hash)
+        opts = remote
+        remote = nil
+      end
       self.lib.fetch(remote, opts)
     end
 

data/lib/git/lib.rb

@@ -95,9 +95,9 @@ module Git
     #
     # @return [Hash] the options to pass to {Git::Base.new}
     #
-    def clone(repository, name, opts = {})
+    def clone(repository_url, directory, opts = {})
       @path = opts[:path] || '.'
-      clone_dir = opts[:path] ? File.join(@path, name) : name
+      clone_dir = opts[:path] ? File.join(@path, directory) : directory
 
       arr_opts = []
       arr_opts << '--bare' if opts[:bare]
@@ -106,11 +106,11 @@ module Git
       arr_opts << '--config' << opts[:config] if opts[:config]
       arr_opts << '--origin' << opts[:remote] || opts[:origin] if opts[:remote] || opts[:origin]
       arr_opts << '--recursive' if opts[:recursive]
-      arr_opts << "--mirror" if opts[:mirror]
+      arr_opts << '--mirror' if opts[:mirror]
 
       arr_opts << '--'
 
-      arr_opts << repository
+      arr_opts << repository_url
       arr_opts << clone_dir
 
       command('clone', arr_opts)
@@ -419,7 +419,7 @@ module Git
 
       hsh = {}
       command_lines('grep', grep_opts).each do |line|
-        if m = /(.*)\:(\d+)\:(.*)/.match(line)
+        if m = /(.*?)\:(\d+)\:(.*)/.match(line)
           hsh[m[1]] ||= []
           hsh[m[1]] << [m[2].to_i, m[3]]
         end
@@ -647,7 +647,8 @@ module Git
     #  :date
     #  :no_verify
     #  :allow_empty_message
-    #  :gpg_sign
+    #  :gpg_sign (accepts true or a gpg key ID as a String)
+    #  :no_gpg_sign (conflicts with :gpg_sign)
     #
     # @param [String] message the commit message to be used
     # @param [Hash] opts the commit options to be used
@@ -661,13 +662,18 @@ module Git
       arr_opts << "--date=#{opts[:date]}" if opts[:date].is_a? String
       arr_opts << '--no-verify' if opts[:no_verify]
       arr_opts << '--allow-empty-message' if opts[:allow_empty_message]
-      if opts[:gpg_sign]
+
+      if opts[:gpg_sign] && opts[:no_gpg_sign]
+        raise ArgumentError, 'cannot specify :gpg_sign and :no_gpg_sign'
+      elsif opts[:gpg_sign]
         arr_opts <<
           if opts[:gpg_sign] == true
             '--gpg-sign'
           else
             "--gpg-sign=#{opts[:gpg_sign]}"
           end
+      elsif opts[:no_gpg_sign]
+        arr_opts << '--no-gpg-sign'
       end
 
       command('commit', arr_opts)
@@ -875,14 +881,18 @@ module Git
       command('tag', arr_opts)
     end
 
-
     def fetch(remote, opts)
-      arr_opts = [remote]
-      arr_opts << opts[:ref] if opts[:ref]
+      arr_opts = []
+      arr_opts << '--all' if opts[:all]
       arr_opts << '--tags' if opts[:t] || opts[:tags]
       arr_opts << '--prune' if opts[:p] || opts[:prune]
+      arr_opts << '--prune-tags' if opts[:P] || opts[:'prune-tags']
+      arr_opts << '--force' if opts[:f] || opts[:force]
       arr_opts << '--unshallow' if opts[:unshallow]
       arr_opts << '--depth' << opts[:depth] if opts[:depth]
+      arr_opts << '--' if remote || opts[:ref]
+      arr_opts << remote if remote
+      arr_opts << opts[:ref] if opts[:ref]
 
       command('fetch', arr_opts)
     end

data/lib/git/url.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'addressable/uri'
+
+module Git
+  # Methods for parsing a Git URL
+  #
+  # Any URL that can be passed to `git clone` can be parsed by this class.
+  #
+  # @see https://git-scm.com/docs/git-clone#_git_urls GIT URLs
+  # @see https://github.com/sporkmonger/addressable Addresable::URI
+  #
+  # @api public
+  #
+  class URL
+    # Regexp used to match a Git URL with an alternative SSH syntax
+    # such as `user@host:path`
+    #
+    GIT_ALTERNATIVE_SSH_SYNTAX = %r{
+      ^
+      (?:(?<user>[^@/]+)@)?  # user or nil
+      (?<host>[^:/]+)        # host is required
+      :(?!/)                 # : serparator is required, but must not be followed by /
+      (?<path>.*?)           # path is required
+      $
+    }x.freeze
+
+    # Parse a Git URL and return an Addressable::URI object
+    #
+    # The URI returned can be converted back to a string with 'to_s'. This is
+    # guaranteed to return the same URL string that was parsed.
+    #
+    # @example
+    #   uri = Git::URL.parse('https://github.com/ruby-git/ruby-git.git')
+    #     #=> #<Addressable::URI:0x44c URI:https://github.com/ruby-git/ruby-git.git>
+    #   uri.scheme #=> "https"
+    #   uri.host #=> "github.com"
+    #   uri.path #=> "/ruby-git/ruby-git.git"
+    #
+    #   Git::URL.parse('/Users/James/projects/ruby-git')
+    #     #=> #<Addressable::URI:0x438 URI:/Users/James/projects/ruby-git>
+    #
+    # @param url [String] the Git URL to parse
+    #
+    # @return [Addressable::URI] the parsed URI
+    #
+    def self.parse(url)
+      if !url.start_with?('file:') && (m = GIT_ALTERNATIVE_SSH_SYNTAX.match(url))
+        GitAltURI.new(user: m[:user], host: m[:host], path: m[:path])
+      else
+        Addressable::URI.parse(url)
+      end
+    end
+
+    # The directory `git clone` would use for the repository directory for the given URL
+    #
+    # @example
+    #   Git::URL.clone_to('https://github.com/ruby-git/ruby-git.git') #=> 'ruby-git'
+    #
+    # @param url [String] the Git URL containing the repository directory
+    #
+    # @return [String] the name of the repository directory
+    #
+    def self.clone_to(url, bare: false, mirror: false)
+      uri = parse(url)
+      path_parts = uri.path.split('/')
+      path_parts.pop if path_parts.last == '.git'
+      directory = path_parts.last
+      if bare || mirror
+        directory += '.git' unless directory.end_with?('.git')
+      elsif directory.end_with?('.git')
+        directory = directory[0..-5]
+      end
+      directory
+    end
+  end
+
+  # The URI for git's alternative scp-like syntax
+  #
+  # This class is necessary to ensure that #to_s returns the same string
+  # that was passed to the initializer.
+  #
+  # @api public
+  #
+  class GitAltURI < Addressable::URI
+    # Create a new GitAltURI object
+    #
+    # @example
+    #   uri = Git::GitAltURI.new(user: 'james', host: 'github.com', path: 'james/ruby-git')
+    #   uri.to_s #=> 'james@github.com/james/ruby-git'
+    #
+    # @param user [String, nil] the user from the URL or nil
+    # @param host [String] the host from the URL
+    # @param path [String] the path from the URL
+    #
+    def initialize(user:, host:, path:)
+      super(scheme: 'git-alt', user: user, host: host, path: path)
+    end
+
+    # Convert the URI to a String
+    #
+    # Addressible::URI forces path to be absolute by prepending a '/' to the
+    # path. This method removes the '/' when converting back to a string
+    # since that is what is expected by git. The following is a valid git URL:
+    #
+    #  `james@github.com:ruby-git/ruby-git.git`
+    #
+    # and the following (with the initial '/'' in the path) is NOT a valid git URL:
+    #
+    #  `james@github.com:/ruby-git/ruby-git.git`
+    #
+    # @example
+    #   uri = Git::GitAltURI.new(user: 'james', host: 'github.com', path: 'james/ruby-git')
+    #   uri.path #=> '/james/ruby-git'
+    #   uri.to_s #=> 'james@github.com:james/ruby-git'
+    #
+    # @return [String] the URI as a String
+    #
+    def to_s
+      if user
+        "#{user}@#{host}:#{path[1..-1]}"
+      else
+        "#{host}:#{path[1..-1]}"
+      end
+    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.10.1'
+  VERSION='1.12.0'
 end

data/lib/git.rb

@@ -21,6 +21,7 @@ require 'git/repository'
 require 'git/status'
 require 'git/stash'
 require 'git/stashes'
+require 'git/url'
 require 'git/version'
 require 'git/working_directory'
 require 'git/worktree'
@@ -106,11 +107,23 @@ module Git
   # @see https://git-scm.com/docs/git-clone git clone
   # @see https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a GIT URLs
   #
-  # @param [URI, Pathname] repository The (possibly remote) repository to clone
+  # @param repository_url [URI, Pathname] The (possibly remote) repository url to clone
   #   from. See [GIT URLS](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a)
   #   for more information.
   #
-  # @param [Pathname] name The directory to clone into.
+  # @param directory [Pathname, nil] The directory to clone into
+  #
+  #   If `directory` is a relative directory it is relative to the `path` option if
+  #   given. If `path` is not given, `directory` is relative to the current working
+  #   directory.
+  #
+  #   If `nil`, `directory` will be set to the basename of the last component of
+  #   the path from the `repository_url`. For example, for the URL:
+  #   `https://github.com/org/repo.git`, `directory` will be set to `repo`.
+  #
+  #   If the last component of the path is `.git`, the next-to-last component of
+  #   the path is used. For example, for the URL `/Users/me/foo/.git`, `directory`
+  #   will be set to `foo`.
   #
   # @param [Hash] options The options for this command (see list of valid
   #   options below)
@@ -157,8 +170,10 @@ module Git
   # @return [Git::Base] an object that can execute git commands in the context
   #   of the cloned local working copy or cloned repository.
   #
-  def self.clone(repository, name, options = {})
-    Base.clone(repository, name, options)
+  def self.clone(repository_url, directory = nil, options = {})
+    clone_to_options = options.select { |key, _value| %i[bare mirror].include?(key) }
+    directory ||= Git::URL.clone_to(repository_url, **clone_to_options)
+    Base.clone(repository_url, directory, options)
   end
 
   # Export the current HEAD (or a branch, if <tt>options[:branch]</tt>

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +115,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +125,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.28
 - !ruby/object:Gem::Dependency
   name: yardstick
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +189,7 @@ files:
 - lib/git/stash.rb
 - lib/git/stashes.rb
 - lib/git/status.rb
+- lib/git/url.rb
 - lib/git/version.rb
 - lib/git/working_directory.rb
 - lib/git/worktree.rb