git 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4baf98bc2847ece4cb13a4f558b1654facb3c8add9ce58eebb024a139f880742
-  data.tar.gz: 9c1448896ab666dbe25c38484074fc81814a53fdb6b5e8eac599f58ebdde713b
+  metadata.gz: b2e3c138e7f4eb164585e6d90808a0ed85e016f96a016ff52d09a7346ec3618f
+  data.tar.gz: 7b82caa3fb731d28ca57101b8327e76a7a22ce36436dd88e3f71f5e87152d0c5
 SHA512:
-  metadata.gz: a71409e92d3c79d2c41c2dc693eb031dda63e1d50ddbfcc90c3fea04c30c25341d40a086934f4582f3207fba9a20240c1061ad79a007cdcae19969c9a662c341
-  data.tar.gz: 78c864391d9dcc90f238d78cd616e65c7ccc0fddd2ae7d0a206e31f5d5726d4945ceecdb201680c9630bc7123b88696b744ae8a5f0a9094f743ac0473106c4dc
+  metadata.gz: a467e84e7528a0f0cd373e07bf6725faf0c9df95e20f4c6b420e2c38d9b9a5af2919e3691af593ba3c30994bc97691c4fb7fb15fe9941d78172ade843c8bdea3
+  data.tar.gz: 444c1eaa95b8b3c15cbf3ac30856475468c2b1dd59521d59cd481ef936b0cd7665295218129bf5c6c949f5122689b20dc2132aadd3e81811ee82bc029fffd0d5

data/.github/workflows/continuous_integration.yml

@@ -40,3 +40,6 @@ jobs:
 
       - name: Run Build
         run: bundle exec rake default
+
+      - name: Test Gem
+        run: bundle exec rake test:gem

data/CHANGELOG.md

@@ -5,6 +5,10 @@
 
 # Change Log
 
+## 1.9.0
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.9.0
+
 ## 1.8.1
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.8.1

data/CONTRIBUTING.md

@@ -78,12 +78,14 @@ In order to ensure high quality, all pull requests must meet these requirements:
 
 ### Unit tests
   * All changes must be accompanied by new or modified unit tests
-  * The entire test suite must pass when `bundle exec rake test` is run from the
-    project's local working copy
-
-### Continuous Integration
-  * All tests must pass in the project's [Travis CI](https://travis-ci.org/ruby-git/ruby-git)
-    build before the pull request will be merged
+  * The entire test suite must pass when `bundle exec rake default` is run from the
+    project's local working copy.
+
+### Continuous integration
+  * All tests must pass in the project's [GitHub Continuous Integration build](https://github.com/ruby-git/ruby-git/actions?query=workflow%3ACI)
+    before the pull request will be merged.
+  * The [Continuous Integration workflow](https://github.com/ruby-git/ruby-git/blob/master/.github/workflows/continuous_integration.yml)
+    runs both `bundle exec rake default` and `bundle exec rake test:gem` from the project's [Rakefile](https://github.com/ruby-git/ruby-git/blob/master/Rakefile).
 
 ### Documentation
   * New and updated public methods must have [YARD](https://yardoc.org/)

data/README.md

@@ -146,6 +146,7 @@ g.revparse('v2.5:Makefile')
 
 g.branches # returns Git::Branch objects
 g.branches.local
+g.current_branch
 g.branches.remote
 g.branches[:master].gcommit
 g.branches['origin/master'].gcommit

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require 'English'
 
 require "#{File.expand_path(File.dirname(__FILE__))}/lib/git/version"
 
@@ -41,4 +42,15 @@ unless RUBY_PLATFORM == 'java'
   # default_tasks << :yardstick
 end
 
+default_tasks << :build
+
 task default: default_tasks
+
+desc 'Build and install the git gem and run a sanity check'
+task :'test:gem' => :install do
+  output = `ruby -e "require 'git'; g = Git.open('.'); puts g.log.size"`.chomp
+  raise 'Gem test failed' unless $CHILD_STATUS.success?
+  raise 'Expected gem test to return an integer' unless output =~ /^\d+$/
+
+  puts 'Gem Test Succeeded'
+end

data/lib/git/base.rb

@@ -137,13 +137,14 @@ module Git
 
     #g.config('user.name', 'Scott Chacon') # sets value
     #g.config('user.email', 'email@email.com')  # sets value
+    #g.config('user.email', 'email@email.com', file: 'path/to/custom/config)  # sets value in file
     #g.config('user.name')  # returns 'Scott Chacon'
     #g.config # returns whole config hash
-    def config(name = nil, value = nil)
-      if(name && value)
+    def config(name = nil, value = nil, options = {})
+      if name && value
         # set value
-        lib.config_set(name, value)
-      elsif (name)
+        lib.config_set(name, value, options)
+      elsif name
         # return value
         lib.config_get(name)
       else
@@ -387,7 +388,7 @@ module Git
     #  @git.pull('upstream', 'develope')  # pulls from upstream/develop
     #
     def pull(remote='origin', branch='master')
-			self.lib.pull(remote, branch)
+      self.lib.pull(remote, branch)
     end
 
     # returns an array of Git:Remote objects

data/lib/git/lib.rb

@@ -583,8 +583,12 @@ module Git
 
     ## WRITE COMMANDS ##
 
-    def config_set(name, value)
-      command('config', name, value)
+    def config_set(name, value, options = {})
+      if options[:file].to_s.empty?
+        command('config', name, value)
+      else
+        command('config', '--file', options[:file], name, value)
+      end
     end
 
     def global_config_set(name, value)
@@ -642,6 +646,7 @@ module Git
     #  :date
     #  :no_verify
     #  :allow_empty_message
+    #  :gpg_sign
     #
     # @param [String] message the commit message to be used
     # @param [Hash] opts the commit options to be used
@@ -655,6 +660,7 @@ 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]
+      arr_opts << '--gpg-sign' if opts[:gpg_sign] == true || "--gpg-sign=#{opts[:gpg_sign]}" if opts[:gpg_sign]
 
       command('commit', arr_opts)
     end

data/lib/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rchardet
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories