git 1.6.0 → 1.9.1

data/lib/git/log.rb

@@ -18,6 +18,7 @@ module Git
       @skip = nil
       @until = nil
       @between = nil
+      @cherry = nil
     end
 
     def object(objectish)
@@ -67,6 +68,12 @@ module Git
       @between = [sha1, sha2]
       return self
     end
+
+    def cherry
+      dirty_log
+      @cherry = true
+      return self
+    end
     
     def to_s
       self.map { |c| c.to_s }.join("\n")
@@ -119,7 +126,7 @@ module Git
         log = @base.lib.full_log_commits(:count => @count, :object => @object, 
                                     :path_limiter => @path, :since => @since, 
                                     :author => @author, :grep => @grep, :skip => @skip,
-                                    :until => @until, :between => @between)
+                                    :until => @until, :between => @between, :cherry => @cherry)
         @commits = log.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
       end
       

data/lib/git/status.rb

@@ -104,7 +104,7 @@ module Git
     end
 
     def pretty_file(file)
-      <<-FILE.strip_heredoc
+      <<~FILE
         #{file.path}
         \tsha(r) #{file.sha_repo} #{file.mode_repo}
         \tsha(i) #{file.sha_index} #{file.mode_index}

data/lib/git/version.rb

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

data/lib/git/worktree.rb

@@ -0,0 +1,38 @@
+require 'git/path'
+
+module Git
+
+  class Worktree < Path
+
+    attr_accessor :full, :dir, :gcommit
+
+    def initialize(base, dir, gcommit = nil)
+      @full = dir
+      @full += ' ' + gcommit if !gcommit.nil?
+      @base = base
+      @dir = dir
+      @gcommit = gcommit
+    end
+
+    def gcommit
+      @gcommit ||= @base.gcommit(@full)
+      @gcommit
+    end
+
+    def add
+      @base.lib.worktree_add(@dir, @gcommit)
+    end
+
+    def remove
+      @base.lib.worktree_remove(@dir)
+    end
+
+    def to_a
+      [@full]
+    end
+
+    def to_s
+      @full
+    end
+  end
+end

data/lib/git/worktrees.rb

@@ -0,0 +1,47 @@
+module Git
+  # object that holds all the available worktrees
+  class Worktrees
+
+    include Enumerable
+
+    def initialize(base)
+      @worktrees = {}
+
+      @base = base
+
+      # Array contains [dir, git_hash]
+      @base.lib.worktrees_all.each do |w|
+        @worktrees[w[0]] = Git::Worktree.new(@base, w[0], w[1])
+      end
+    end
+
+    # array like methods
+
+    def size
+      @worktrees.size
+    end
+
+    def each(&block)
+      @worktrees.values.each(&block)
+    end
+
+    def [](worktree_name)
+      @worktrees.values.inject(@worktrees) do |worktrees, worktree|
+        worktrees[worktree.full] ||= worktree
+        worktrees
+      end[worktree_name.to_s]
+    end
+
+    def to_s
+      out = ''
+      @worktrees.each do |k, b|
+        out << b.to_s << "\n"
+      end
+      out
+    end
+
+    def prune
+      @base.lib.worktree_prune
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Scott Chacon and others
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rchardet
@@ -25,65 +25,115 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: yardstick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-description: 
+        version: '0.9'
+description: |
+  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.
 email: schacon@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- ".github/stale.yml"
+- ".github/workflows/continuous_integration.yml"
+- ".gitignore"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE
 - MAINTAINERS.md
+- PULL_REQUEST_TEMPLATE.md
 - README.md
+- RELEASING.md
+- Rakefile
+- git.gemspec
 - lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb
@@ -104,20 +154,24 @@ files:
 - lib/git/status.rb
 - lib/git/version.rb
 - lib/git/working_directory.rb
+- lib/git/worktree.rb
+- lib/git/worktrees.rb
 homepage: http://github.com/ruby-git/ruby-git
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
+metadata:
+  homepage_uri: http://github.com/ruby-git/ruby-git
+  source_code_uri: http://github.com/ruby-git/ruby-git
+  changelog_uri: http://rubydoc.info/gems/git/file.CHANGELOG.html
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -125,9 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
-summary: Ruby/Git is a Ruby library that can be used to create, read and manipulate
-  Git repositories by wrapping system calls to the git binary.
+summary: An API to create, read, and manipulate Git repositories
 test_files: []