git 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ebad290719cdefc27125cf9a2ebb0d3544334c2d49a079220c0714a701ce141
-  data.tar.gz: 293499cbb61ca9b4d374e86d0bd4357ed3f3b1254a46aa57c095cf0816afd7f6
+  metadata.gz: cf601afe6ddef5cc504f0a350bd9595feb76cc95822bd65716d6b5cecf2d324d
+  data.tar.gz: 5f334a391220774ab0fea9c789a87fe3a45d9de55e0745d87f59c0bc9a52e5a9
 SHA512:
-  metadata.gz: 8fc0929f6ff79eea57f5dbd5f05da813bb55f6c44f925ce45f4ad4f3a011c99e3cfa2d00c4a18824e1521ab975fa70057127b143d77e301f0d5d2382cd4d7480
-  data.tar.gz: 5ef0e326223cc983605c8afc002e3fe77808d337a3a3dcfd1b25588adf58b5c697a3451fd8baae777f727a5f2ba3cb92f2c3e811c79bc9f5da836b24ad5a8a6b
+  metadata.gz: 20133b00f0f50ccc00dc1bd4bb88107911ff5f438e127b804270752c43029e2447b15a5212c701a24a49a6f98d7b12359cb3326924ea3dadf631408b316e626e
+  data.tar.gz: 11ca7ae94de18e0b3d4aad99d315c2b973a8e2521ee24a935e5236fdc91eace943074ad388889a09ef4d8e33e2a4b1355d2590fe16fe0a1eda05357e1a315290

data/CHANGELOG.md

@@ -5,6 +5,26 @@
 
 # Change Log
 
+## v2.1.0 (2024-05-31)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.0.1..v2.1.0)
+
+Changes since v2.0.1:
+
+* 93c8210 Add Git::Log#max_count
+* d84097b Update YARDoc for a few a few method
+
+## v2.0.1 (2024-05-21)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.0.0..v2.0.1)
+
+Changes since v2.0.0:
+
+* da435b1 Document and add tests for Git::Status
+* c8a77db Fix Git::Base#status on an empty repo
+* 712fdad Fix Git::Status#untracked when run from worktree subdir
+* 6a59bc8 Remove the Git::Base::Factory module
+
 ## v2.0.0 (2024-05-10)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.0.0.pre4..v2.0.0)

data/README.md

@@ -23,11 +23,8 @@
 
 ## Summary
 
-The [git gem](https://rubygems.org/gems/git) provides an API that can be used to
-create, read, and manipulate Git repositories by wrapping system calls to the `git`
-command line. 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.
+The [git gem](https://rubygems.org/gems/git) provides a Ruby interface to the `git`
+command line.
 
 Get started by obtaining a repository object by:
 
@@ -41,8 +38,7 @@ Methods that can be called on a repository object are documented in [Git::Base](
 
 git 2.0.0 has recently been released. Please give it a try.
 
-
-**If you have problems with the 2.x release, open an issue and use the 1.9.1 version
+**If you have problems with the 2.x release, open an issue and use the 1.x version
 instead.** We will do our best to fix your issues in a timely fashion.
 
 **JRuby on Windows is not yet supported by the 2.x release line. Users running JRuby
@@ -105,16 +101,28 @@ directory, in the index and in the repository.  Similar to running 'git status'
 
 **Git::Remote**- A reference to a remote repository that is tracked by this repository.
 
-**Git::Log** - An Enumerable object that references all the `Git::Object::Commit` objects that encompass your log query, which can be constructed through methods on the `Git::Log object`,
-like:
+**Git::Log** - An Enumerable object that references all the `Git::Object::Commit`
+objects that encompass your log query, which can be constructed through methods on
+the `Git::Log object`, like:
 
- `@git.log(20).object("some_file").since("2 weeks ago").between('v2.6', 'v2.7').each { |commit| [block] }`
+```ruby
+git.log
+  .max_count(:all)
+  .object('README.md')
+  .since('10 years ago')
+  .between('v1.0.7', 'HEAD')
+  .map { |commit| commit.sha }
+```
 
-Pass the `--all` option to `git log` as follows:
+A maximum of 30 commits are returned if `max_count` is not called. To get all commits
+that match the log query, call `max_count(:all)`.
 
- `@git.log.all.each { |commit| [block] }`
+Note that `git.log.all` adds the `--all` option to the underlying `git log` command.
+This asks for the logs of all refs (basically all commits reachable by HEAD,
+branches, and tags). This does not control the maximum number of commits returned. To
+control how many commits are returned, you should call `max_count`.
 
- **Git::Worktrees** - Enumerable object that holds `Git::Worktree objects`.
+**Git::Worktrees** - Enumerable object that holds `Git::Worktree objects`.
 
 ## Errors Raised By This Gem
 

data/lib/git/base.rb

@@ -1,17 +1,16 @@
-require 'git/base/factory'
 require 'logger'
 require 'open3'
 
 module Git
-  # Git::Base is the main public interface for interacting with Git commands.
+  # The main public interface for interacting with Git commands
   #
   # Instead of creating a Git::Base directly, obtain a Git::Base instance by
   # calling one of the follow {Git} class methods: {Git.open}, {Git.init},
   # {Git.clone}, or {Git.bare}.
   #
+  # @api public
+  #
   class Base
-    include Git::Base::Factory
-
     # (see Git.bare)
     def self.bare(git_dir, options = {})
       normalize_paths(options, default_repository: git_dir, bare: true)
@@ -122,6 +121,62 @@ module Git
       @index = options[:index] ? Git::Index.new(options[:index], false) : nil
     end
 
+    # Update the index from the current worktree to prepare the for the next commit
+    #
+    # @example
+    #   lib.add('path/to/file')
+    #   lib.add(['path/to/file1','path/to/file2'])
+    #   lib.add(all: true)
+    #
+    # @param [String, Array<String>] paths a file or files to be added to the repository (relative to the worktree root)
+    # @param [Hash] options
+    #
+    # @option options [Boolean] :all Add, modify, and remove index entries to match the worktree
+    # @option options [Boolean] :force Allow adding otherwise ignored files
+    #
+    def add(paths = '.', **options)
+      self.lib.add(paths, options)
+    end
+
+    # adds a new remote to this repository
+    # url can be a git url or a Git::Base object if it's a local reference
+    #
+    #  @git.add_remote('scotts_git', 'git://repo.or.cz/rubygit.git')
+    #  @git.fetch('scotts_git')
+    #  @git.merge('scotts_git/master')
+    #
+    # Options:
+    #   :fetch => true
+    #   :track => <branch_name>
+    def add_remote(name, url, opts = {})
+      url = url.repo.path if url.is_a?(Git::Base)
+      self.lib.remote_add(name, url, opts)
+      Git::Remote.new(self, name)
+    end
+
+    # Create a new git tag
+    #
+    # @example
+    #   repo.add_tag('tag_name', object_reference)
+    #   repo.add_tag('tag_name', object_reference, {:options => 'here'})
+    #   repo.add_tag('tag_name', {:options => 'here'})
+    #
+    # @param [String] name The name of the tag to add
+    # @param [Hash] options Opstions to pass to `git tag`.
+    #   See [git-tag](https://git-scm.com/docs/git-tag) for more details.
+    # @option options [boolean] :annotate Make an unsigned, annotated tag object
+    # @option options [boolean] :a An alias for the `:annotate` option
+    # @option options [boolean] :d Delete existing tag with the given names.
+    # @option options [boolean] :f Replace an existing tag with the given name (instead of failing)
+    # @option options [String] :message Use the given tag message
+    # @option options [String] :m An alias for the `:message` option
+    # @option options [boolean] :s Make a GPG-signed tag.
+    #
+    def add_tag(name, *options)
+      self.lib.tag(name, *options)
+      self.tag(name)
+    end
+
     # changes current working directory for a block
     # to the git working directory
     #
@@ -254,29 +309,6 @@ module Git
       self.object('HEAD').grep(string, path_limiter, opts)
     end
 
-    # updates the repository index using the working directory content
-    #
-    # @example
-    #   git.add
-    #   git.add('path/to/file')
-    #   git.add(['path/to/file1','path/to/file2'])
-    #   git.add(:all => true)
-    #
-    # options:
-    #   :all => true
-    #
-    # @param [String,Array] paths files paths to be added (optional, default='.')
-    # @param [Hash] options
-    # @option options [boolean] :all
-    #   Update the index not only where the working tree has a file matching
-    #   <pathspec> but also where the index already has an entry.
-    #   See [the --all option to git-add](https://git-scm.com/docs/git-add#Documentation/git-add.txt--A)
-    #   for more details.
-    #
-    def add(paths = '.', **options)
-      self.lib.add(paths, options)
-    end
-
     # removes file(s) from the git repository
     def rm(path = '.', opts = {})
       self.lib.rm(path, opts)
@@ -437,22 +469,6 @@ module Git
       self.lib.remotes.map { |r| Git::Remote.new(self, r) }
     end
 
-    # adds a new remote to this repository
-    # url can be a git url or a Git::Base object if it's a local reference
-    #
-    #  @git.add_remote('scotts_git', 'git://repo.or.cz/rubygit.git')
-    #  @git.fetch('scotts_git')
-    #  @git.merge('scotts_git/master')
-    #
-    # Options:
-    #   :fetch => true
-    #   :track => <branch_name>
-    def add_remote(name, url, opts = {})
-      url = url.repo.path if url.is_a?(Git::Base)
-      self.lib.remote_add(name, url, opts)
-      Git::Remote.new(self, name)
-    end
-
     # sets the url for a remote
     # url can be a git url or a Git::Base object if it's a local reference
     #
@@ -476,7 +492,7 @@ module Git
       self.lib.tags.map { |r| tag(r) }
     end
 
-    # Creates a new git tag (Git::Tag)
+    # Create a new git tag
     #
     # @example
     #   repo.add_tag('tag_name', object_reference)
@@ -632,6 +648,96 @@ module Git
       self.lib.branch_current
     end
 
+    # @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 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
+
     private
 
     # Normalize options before they are sent to Git::Base.new

data/lib/git/lib.rb

@@ -38,14 +38,23 @@ module Git
 
     # Create a new Git::Lib object
     #
-    # @param [Git::Base, Hash] base An object that passes in values for
-    #   @git_work_dir, @git_dir, and @git_index_file
+    # @overload initialize(base, logger)
     #
-    # @param [Logger] logger
+    #   @param base [Hash] the hash containing paths to the Git working copy,
+    #     the Git repository directory, and the Git index file.
     #
-    # @option base [Pathname] :working_directory
-    # @option base [Pathname] :repository
-    # @option base [Pathname] :index
+    #   @option base [Pathname] :working_directory
+    #   @option base [Pathname] :repository
+    #   @option base [Pathname] :index
+    #
+    #   @param [Logger] logger
+    #
+    # @overload initialize(base, logger)
+    #
+    #   @param base [#dir, #repo, #index] an object with methods to get the Git worktree (#dir),
+    #     the Git repository directory (#repo), and the Git index file (#index).
+    #
+    #   @param [Logger] logger
     #
     def initialize(base = nil, logger = nil)
       @git_dir = nil
@@ -600,6 +609,9 @@ module Git
       command_lines('ls-files', '--others', '-i', '--exclude-standard')
     end
 
+    def untracked_files
+      command_lines('ls-files', '--others', '--exclude-standard', chdir: @git_work_dir)
+    end
 
     def config_remote(name)
       hsh = {}
@@ -667,18 +679,20 @@ module Git
       command('config', '--global', name, value)
     end
 
-    # updates the repository index using the working directory content
-    #
-    #    lib.add('path/to/file')
-    #    lib.add(['path/to/file1','path/to/file2'])
-    #    lib.add(:all => true)
+
+    # Update the index from the current worktree to prepare the for the next commit
     #
-    # options:
-    #   :all => true
-    #   :force => true
+    # @example
+    #   lib.add('path/to/file')
+    #   lib.add(['path/to/file1','path/to/file2'])
+    #   lib.add(:all => true)
     #
-    # @param [String,Array] paths files paths to be added to the repository
+    # @param [String, Array<String>] paths files to be added to the repository (relative to the worktree root)
     # @param [Hash] options
+    #
+    # @option options [Boolean] :all Add, modify, and remove index entries to match the worktree
+    # @option options [Boolean] :force Allow adding otherwise ignored files
+    #
     def add(paths='.',options={})
       arr_opts = []
 
@@ -704,6 +718,19 @@ module Git
       command('rm', *arr_opts)
     end
 
+    # Returns true if the repository is empty (meaning it has no commits)
+    #
+    # @return [Boolean]
+    #
+    def empty?
+      command('rev-parse', '--verify', 'HEAD')
+      false
+    rescue Git::FailedError => e
+      raise unless e.result.status.exitstatus == 128 &&
+        e.result.stderr == 'fatal: Needed a single revision'
+      true
+    end
+
     # Takes the commit message with the options and executes the commit command
     #
     # accepts options:

data/lib/git/log.rb

@@ -1,15 +1,76 @@
 module Git
 
-  # object that holds the last X commits on given branch
+  # Return the last n commits that match the specified criteria
+  #
+  # @example The last (default number) of commits
+  #   git = Git.open('.')
+  #   Git::Log.new(git) #=> Enumerable of the last 30 commits
+  #
+  # @example The last n commits
+  #   Git::Log.new(git).max_commits(50) #=> Enumerable of last 50 commits
+  #
+  # @example All commits returned by `git log`
+  #   Git::Log.new(git).max_count(:all) #=> Enumerable of all commits
+  #
+  # @example All commits that match complex criteria
+  #   Git::Log.new(git)
+  #     .max_count(:all)
+  #     .object('README.md')
+  #     .since('10 years ago')
+  #     .between('v1.0.7', 'HEAD')
+  #
+  # @api public
+  #
   class Log
     include Enumerable
 
-    def initialize(base, count = 30)
+    # Create a new Git::Log object
+    #
+    # @example
+    #   git = Git.open('.')
+    #   Git::Log.new(git)
+    #
+    # @param base [Git::Base] the git repository object
+    # @param max_count [Integer, Symbol, nil] the number of commits to return, or
+    #   `:all` or `nil` to return all
+    #
+    #   Passing max_count to {#initialize} is equivalent to calling {#max_count} on the object.
+    #
+    def initialize(base, max_count = 30)
       dirty_log
       @base = base
-      @count = count
+      max_count(max_count)
+    end
+
+    # The maximum number of commits to return
+    #
+    # @example All commits returned by `git log`
+    #   git = Git.open('.')
+    #   Git::Log.new(git).max_count(:all)
+    #
+    # @param num_or_all [Integer, Symbol, nil] the number of commits to return, or
+    #   `:all` or `nil` to return all
+    #
+    # @return [self]
+    #
+    def max_count(num_or_all)
+      dirty_log
+      @max_count = (num_or_all == :all) ? nil : num_or_all
+      self
     end
 
+    # Adds the --all flag to the git log command
+    #
+    # This asks for the logs of all refs (basically all commits reachable by HEAD,
+    # branches, and tags). This does not control the maximum number of commits
+    # returned. To control how many commits are returned, call {#max_count}.
+    #
+    # @example Return the last 50 commits reachable by all refs
+    #   git = Git.open('.')
+    #   Git::Log.new(git).max_count(50).all
+    #
+    # @return [self]
+    #
     def all
       dirty_log
       @all = true
@@ -119,7 +180,7 @@ module Git
       # actually run the 'git log' command
       def run_log
         log = @base.lib.full_log_commits(
-          count: @count, all: @all, object: @object, path_limiter: @path, since: @since,
+          count: @max_count, all: @all, object: @object, path_limiter: @path, since: @since,
           author: @author, grep: @grep, skip: @skip, until: @until, between: @between,
           cherry: @cherry
         )

data/lib/git/status.rb

@@ -1,6 +1,12 @@
 module Git
+  # The status class gets the status of a git repository
   #
-  # A class for git status
+  # This identifies which files have been modified, added, or deleted from the
+  # worktree. Untracked files are also identified.
+  #
+  # The Status object is an Enumerable that contains StatusFile objects.
+  #
+  # @api public
   #
   class Status
     include Enumerable
@@ -31,7 +37,6 @@ module Git
       changed.member?(file)
     end
 
-    #
     # Returns an Enumerable containing files that have been added.
     # File path starts at git base directory
     #
@@ -40,8 +45,8 @@ module Git
       @files.select { |_k, f| f.type == 'A' }
     end
 
-    #
     # Determines whether the given file has been added to the repository
+    #
     # File path starts at git base directory
     #
     # @param file [String] The name of the file.
@@ -126,9 +131,63 @@ module Git
 
     # subclass that does heavy lifting
     class StatusFile
-      attr_accessor :path, :type, :stage, :untracked
-      attr_accessor :mode_index, :mode_repo
-      attr_accessor :sha_index, :sha_repo
+      # @!attribute [r] path
+      #   The path of the file relative to the project root directory
+      #   @return [String]
+      attr_accessor :path
+
+      # @!attribute [r] type
+      #   The type of change
+      #
+      #   * 'M': modified
+      #   * 'A': added
+      #   * 'D': deleted
+      #   * nil: ???
+      #
+      #   @return [String]
+      attr_accessor :type
+
+      # @!attribute [r] mode_index
+      #   The mode of the file in the index
+      #   @return [String]
+      #   @example 100644
+      #
+      attr_accessor :mode_index
+
+      # @!attribute [r] mode_repo
+      #   The mode of the file in the repo
+      #   @return [String]
+      #   @example 100644
+      #
+      attr_accessor :mode_repo
+
+      # @!attribute [r] sha_index
+      #   The sha of the file in the index
+      #   @return [String]
+      #   @example 123456
+      #
+      attr_accessor :sha_index
+
+      # @!attribute [r] sha_repo
+      #   The sha of the file in the repo
+      #   @return [String]
+      #   @example 123456
+      attr_accessor :sha_repo
+
+      # @!attribute [r] untracked
+      #   Whether the file is untracked
+      #   @return [Boolean]
+      attr_accessor :untracked
+
+      # @!attribute [r] stage
+      #   The stage of the file
+      #
+      #   * '0': the unmerged state
+      #   * '1': the common ancestor (or original) version
+      #   * '2': "our version" from the current branch head
+      #   * '3': "their version" from the other branch head
+      #   @return [String]
+      attr_accessor :stage
 
       def initialize(base, hash)
         @base = base
@@ -158,10 +217,19 @@ module Git
     private
 
     def construct_status
+      # Lists all files in the index and the worktree
+      # git ls-files --stage
+      # { file => { path: file, mode_index: '100644', sha_index: 'dd4fc23', stage: '0' } }
       @files = @base.lib.ls_files
 
+      # Lists files in the worktree that are not in the index
+      # Add untracked files to @files
       fetch_untracked
+
+      # Lists files that are different between the index vs. the worktree
       fetch_modified
+
+      # Lists files that are different between the repo HEAD vs. the worktree
       fetch_added
 
       @files.each do |k, file_hash|
@@ -170,28 +238,30 @@ module Git
     end
 
     def fetch_untracked
-      ignore = @base.lib.ignored_files
-
-      root_dir = @base.dir.path
-      Dir.glob('**/*', File::FNM_DOTMATCH, base: root_dir) do |file|
-        next if @files[file] || File.directory?(File.join(root_dir, file)) ||
-                ignore.include?(file) || file =~ %r{^.git\/.+}
-
+      # git ls-files --others --exclude-standard, chdir: @git_work_dir)
+      # { file => { path: file, untracked: true } }
+      @base.lib.untracked_files.each do |file|
         @files[file] = { path: file, untracked: true }
       end
     end
 
     def fetch_modified
-      # find modified in tree
+      # Files changed between the index vs. the worktree
+      # git diff-files
+      # { file => { path: file, type: 'M', mode_index: '100644', mode_repo: '100644', sha_index: '0000000', :sha_repo: '52c6c4e' } }
       @base.lib.diff_files.each do |path, data|
         @files[path] ? @files[path].merge!(data) : @files[path] = data
       end
     end
 
     def fetch_added
-      # find added but not committed - new files
+      unless @base.lib.empty?
+      # Files changed between the repo HEAD vs. the worktree
+      # git diff-index HEAD
+      # { file => { path: file, type: 'M', mode_index: '100644', mode_repo: '100644', sha_index: '0000000', :sha_repo: '52c6c4e' } }
       @base.lib.diff_index('HEAD').each do |path, data|
-        @files[path] ? @files[path].merge!(data) : @files[path] = data
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        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='2.0.0'
+  VERSION='2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-11 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,7 +213,6 @@ 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
@@ -244,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/2.0.0/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/2.0.0
+  changelog_uri: https://rubydoc.info/gems/git/2.1.0/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/2.1.0
 post_install_message:
 rdoc_options: []
 require_paths:

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