git 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892ebb66d9ea20f8ab3f3050b53b1b06bbfc25b732367ffc89d8b9abc0f9d960
-  data.tar.gz: a980be3464e4dcac4fed077a8fe72a120641a788f99947bedd7b4a0644255ab0
+  metadata.gz: 86d44aad4d6c430e5e224d27ddfece08f6a5696c068dbe041df3bd740ae94d7a
+  data.tar.gz: d7ac8d85b906620006cb5c1fc9206d6f406115490b88fedc7fb8aebe4a8302c9
 SHA512:
-  metadata.gz: 280443c1f27cfe14b6ac5db700a28111943e76cee25ceef42d0d18fb6fa5cc536c6f5edf66057cc7b5e602c58e97c541f4f3d226306e80c004cdebad2d4448fa
-  data.tar.gz: e0824c1c2874240848147b57906c811e5f74ee3f8cfd7b5d11361cb35abc6ecf86cb33b61cacc3107ee46706c103259579bccfe68dd1eca252d4629d74871ce4
+  metadata.gz: 19d5093d80ee3a4af8c6ceb27185464378a715330de92893cd81ece19a71986e29f7631c389b7204eb2bb4a47b0dcc8ce56f3a90164a6f2a22b696d53c6e8179
+  data.tar.gz: 29895e438fec3de810e1b3f78bf2c177b04081a72fdfad72a3e231ee3737df23e6cbebb58678a81c9883bcbb05b29058bee9c4c6189dcdac21249e8ac5bd0959

data/{CHANGELOG → CHANGELOG.md}

@@ -1,13 +1,23 @@
-== 1.3.0
+# Change Log
+
+## 1.5.0
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.5.0
+
+## 1.4.0
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.4.0
+
+## 1.3.0
 
  * Dropping Ruby 1.8.x support
 
-== 1.2.10
+## 1.2.10
 
  * Adding Git::Diff.name_status
  * Checking and fixing encoding on commands output to prevent encoding errors afterwards
 
-== 1.2.9
+## 1.2.9
 
 * Adding Git.configure (to configure the git env)
 * Adding Git.ls_remote [Git.ls_remote(repo_path_or_url='.')]
@@ -27,13 +37,13 @@
 * Git.fetch - supporting --prune
 * Git.tag - supporting
 
-== 1.2.8
+## 1.2.8
 
 * Keeping the old escape format for windows users
 * revparse: Supporting ref names containing SHA like substrings (40-hex strings)
 * Fix warnings on Ruby 2.1.2
 
-== 1.2.7
+## 1.2.7
 
 * Fixing mesages encoding
 * Fixing -f flag in git push
@@ -45,7 +55,7 @@
 * Git.add_tag options - supporting -a, -m and -s
 * Added Git.delete_tag
 
-== 1.2.6
+## 1.2.6
 
 * Ruby 1.9.X/2.0 fully supported
 * JRuby 1.8/1.9 support
@@ -61,12 +71,12 @@
 * Travis configuration
 * Licence included with the gem
 
-== 1.0.4
+## 1.0.4
 
 * added camping/gitweb.rb frontend
 * added a number of speed-ups
 
-== 1.0.3
+## 1.0.3
 
 * Sped up most of the operations
 * Added some predicate functions (commit?, tree?, etc)
@@ -74,11 +84,11 @@
 * Fixed a bug with using bare repositories
 * Updated a good amount of the documentation
 
-== 1.0.2
+## 1.0.2
 
 * Added methods to the git objects that might be helpful
 
-== 1.0.1
+## 1.0.1
 
 * Initial version
 

data/CONTRIBUTING.md

@@ -0,0 +1,94 @@
+# Contributing to ruby-git
+
+Thank you for your interest in contributing to this project.
+
+These are mostly guidelines, not rules. 
+Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+#### Table Of Contents
+
+[How Can I Contribute?](#how-can-i-contribute)
+  * [Submitting Issues](#submitting-issues)
+  * [Contribution Process](#contribution-process)
+  * [Pull Request Requirements](#pull-request-requirements)
+  * [Code Review Process](#code-review-process)
+  * [Developer Certification of Origin (DCO)](#developer-certification-of-origin-dco)
+
+
+## How Can I Contribute?
+
+### Submitting Issues
+
+We utilize **GitHub Issues** for issue tracking and contributions. You can contribute in two ways:
+
+1. Reporting an issue or making a feature request [here](https://github.com/ruby-git/ruby-git/issues/new).
+2. Adding features or fixing bugs yourself and contributing your code to ruby-git.
+
+### Contribution Process
+
+We have a 3 step process for contributions:
+
+1. Commit changes to a git branch in your fork.  Making sure to sign-off those changes for the [Developer Certificate of Origin](#developer-certification-of-origin-dco).
+2. Create a GitHub Pull Request for your change, following the instructions in the pull request template.
+3. Perform a [Code Review](#code-review-process) with the project maintainers on the pull request.
+
+### Pull Request Requirements
+In order to ensure high quality, we require that all pull requests to this project meet these specifications:
+
+1. Unit Testing: We require all the new code to include unit tests, and any fixes to pass previous units.
+2. Green CI Tests: We are using [Travis CI](https://travis-ci.org/ruby-git/ruby-git) to run unit tests on various ruby versions, we expect them to all pass before a pull request will be merged.
+3. Up-to-date Documentation: New methods as well as updated methods should have [YARD](https://yardoc.org/) documentation added to them
+
+### Code Review Process
+
+Code review takes place in GitHub pull requests. See [this article](https://help.github.com/articles/about-pull-requests/) if you're not familiar with GitHub Pull Requests.
+
+Once you open a pull request, project maintainers will review your code and respond to your pull request with any feedback they might have. 
+
+The process at this point is as follows:
+
+1. One thumbs-up (:+1:) is required from project maintainers. See the master maintainers document for the ruby-git project at <https://github.com/ruby-git/ruby-git/blob/master/MAINTAINERS.md>.
+2. When ready, your pull request will be merged into `master`, we may require you to rebase your PR to the latest `master`.
+
+### Developer Certification of Origin (DCO)
+
+Licensing is very important to open source projects. It helps ensure the software continues to be available under the terms that the author desired.
+
+ruby-git uses [the MIT license](https://github.com/ruby-git/ruby-git/blob/master/LICENSE)
+
+Detail about the LICENSE can be found [here](https://choosealicense.com/licenses/mit/)
+
+To make a good faith effort to ensure these criteria are met, ruby-git requires the Developer Certificate of Origin (DCO) process to be followed.
+
+The DCO is an attestation attached to every contribution made by every developer. 
+
+In the commit message of the contribution, the developer simply adds a Signed-off-by statement and thereby agrees to the DCO, which you can find below or at <http://developercertificate.org/>.
+
+```
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the
+    best of my knowledge, is covered under an appropriate open
+    source license and I have the right under that license to   
+    submit that work with modifications, whether created in whole
+    or in part by me, under the same open source license (unless
+    I am permitted to submit under a different license), as
+    Indicated in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including
+    all personal information I submit with it, including my
+    sign-off) is maintained indefinitely and may be redistributed
+    consistent with this project or the open source license(s)
+    involved.
+```

data/MAINTAINERS.md

@@ -0,0 +1,8 @@
+# Maintainers
+
+When making changes to the system, this file tells you who needs to review your patch - you need at least two maintainers to provide a :+1: on your pull request.
+
+### Maintainers
+
+* [Per Lundberg](https://github.com/perlun)
+* [Vern Burton](https://github.com/tarcinil)

data/README.md

@@ -202,6 +202,7 @@ And here are the operations that will need to write to your git repository.
      g.branch('new_branch').checkout
      g.branch('new_branch').delete
      g.branch('existing_branch').checkout
+     g.branch('master').contains?('existing_branch')
 
      g.checkout('new_branch')
      g.checkout(g.branch('new_branch'))
@@ -226,6 +227,7 @@ And here are the operations that will need to write to your git repository.
 
      g.fetch
      g.fetch(g.remotes.first)
+     g.fetch('origin', {:ref => 'some/ref/head'} )
 
      g.pull
      g.pull(Git::Repo, Git::Branch) # fetch and a merge

data/lib/git/branch.rb

@@ -60,6 +60,10 @@ module Git
       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 

data/lib/git/diff.rb

@@ -127,10 +127,11 @@ module Git
         }
         final = {}
         current_file = nil
-        full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", {
-			:invalid => :replace,
-			:undef => :replace
-		})
+        if @full_diff.encoding.name != "UTF-8"
+          full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", { :invalid => :replace, :undef => :replace })
+        else
+          full_diff_utf8_encoded = @full_diff
+        end
         full_diff_utf8_encoded.split("\n").each do |line|
           if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
             current_file = m[1]

data/lib/git/lib.rb

@@ -318,6 +318,9 @@ module Git
       branches_all.select { |b| b[1] }.first[0] rescue nil
     end
 
+    def branch_contains(commit, branch_name="")
+      command("branch",  [branch_name, "--contains", commit])
+    end
 
     # returns hash
     # [tree-ish] = [[line_no, match], [line_no, match2]]
@@ -445,7 +448,7 @@ module Git
       if @git_dir
         Dir.chdir(@git_dir, &do_get)
       else
-        build_list.call
+        do_get.call
       end
     end
 
@@ -553,6 +556,7 @@ module Git
       arr_opts << '--all' if opts[:add_all] || opts[:all]
       arr_opts << '--allow-empty' if opts[:allow_empty]
       arr_opts << "--author=#{opts[:author]}" if opts[:author]
+      arr_opts << "--date=#{opts[:date]}" if opts[:date].is_a? String
 
       command('commit', arr_opts)
     end
@@ -600,10 +604,12 @@ module Git
       arr = []
       filename = File.join(@git_dir, 'logs/refs/stash')
       if File.exist?(filename)
-        File.open(filename).each_with_index { |line, i|
-          m = line.match(/:(.*)$/)
-          arr << [i, m[1].strip]
-        }
+        File.open(filename) do |f|
+          f.each_with_index do |line, i|
+            m = line.match(/:(.*)$/)
+            arr << [i, m[1].strip]
+          end
+        end
       end
       arr
     end
@@ -727,7 +733,10 @@ module Git
       arr_opts << '-d' if opts[:d] || opts[:delete]
       arr_opts << name
       arr_opts << target if target
-      arr_opts << "-m #{opts[:m] || opts[:message]}" if opts[:m] || opts[:message]
+
+      if opts[:m] || opts[:message]
+        arr_opts << '-m' << (opts[:m] || opts[:message])
+      end
 
       command('tag', arr_opts)
     end
@@ -735,6 +744,7 @@ module Git
 
     def fetch(remote, opts)
       arr_opts = [remote]
+      arr_opts << opts[:ref] if opts[:ref]
       arr_opts << '--tags' if opts[:t] || opts[:tags]
       arr_opts << '--prune' if opts[:p] || opts[:prune]
 
@@ -747,6 +757,7 @@ module Git
 
       arr_opts = []
       arr_opts << '--mirror'  if opts[:mirror]
+      arr_opts << '--delete'  if opts[:delete]
       arr_opts << '--force'  if opts[:force] || opts[:f]
       arr_opts << remote
 

data/lib/git/stashes.rb

@@ -13,6 +13,17 @@ module Git
         @stashes.unshift(Git::Stash.new(@base, message, true))
       end
     end
+
+    #
+    # Returns an multi-dimensional Array of elements that have been stash saved.
+    # Array is based on position and name. See Example
+    #
+    # @example Returns Array of items that have been stashed
+    #     .all - [0, "testing-stash-all"]]
+    # @return [Array]
+    def all
+      @base.lib.stashes_all
+    end
     
     def save(message)
       s = Git::Stash.new(@base, message)

data/lib/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,10 +65,11 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- CHANGELOG
+- CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE
+- MAINTAINERS.md
 - README.md
-- VERSION
 - lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb

data/VERSION

@@ -1,2 +0,0 @@
-1.3.0
-