rjgit 5.6.1.0 → 5.9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11fd7309b1391fba839301750f2c1fe51d0b38abbb72a36088c39f729ad0368f
-  data.tar.gz: e890015d41e4408358b9d000d8d5d94a251a8dfe9a4815f75c22858f607c01b0
+  metadata.gz: 5b28d35d4c9ea97c5a4ea28b0a62b7374daea6a7a0fd906cfbefbcb986ac37aa
+  data.tar.gz: dceb29a1d1e1d20f93a43c71b08ba02d7f23d1f2c8dd92c43a8bf810594dba19
 SHA512:
-  metadata.gz: a8afbaa28cfd0a432c3d0d3ad9aa54e34a9e262bbe924d6554a3b7745abbe3025508015ccd97c8bdadae38a89a87f04ef71eb3c052ba9508129d398dfc9bdec4
-  data.tar.gz: fc84910f12f9c6b5a768e9b06ef7336363fa5f308192d19493c6f2ae2047f3e7032392305795dff9c1225b372ff903838d843f02b4cab6c7aefa47d49fa56ba2
+  metadata.gz: e3ab922915d8f98e59757c853277f96273871c867d3f7eda3e2bec4f3d65fb6ec142fdab92fd9df60df3a7ffb6c010482d98ad2c9ac0b3b511a14cd469a5e2fc
+  data.tar.gz: c1ac638be7e459f8ab20364ec89c75e6da40d9fa81cd184c7c28f3aaa898c8953b2c62f7f63b52294d38f488ee932944ac6dd707ae74474c0e5e1d83bfa639c3

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'mime-types', '~> 2.6.2'
+gem 'mime-types', '~> 3.3.1'
 gem 'rake', '>= 12.3.3'
 
 gem 'coveralls', '~> 0.8.23', require: false

data/README.md

@@ -6,6 +6,7 @@ RJGit
 [![Build Status](https://travis-ci.org/repotag/rjgit.png)](https://travis-ci.org/repotag/rjgit)
 [![Coverage Status](https://coveralls.io/repos/repotag/rjgit/badge.png?branch=master)](https://coveralls.io/r/repotag/rjgit)
 [![Gem Version](https://badge.fury.io/rb/rjgit.png)](http://badge.fury.io/rb/rjgit)
+[![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/repotag/rjgit/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/repotag/rjgit/info)
 
 Summary
 -------

data/lib/actor.rb

@@ -2,6 +2,7 @@ module RJGit
 
   # PersonIdent in JGit
   import 'org.eclipse.jgit.lib.PersonIdent'
+  import 'java.util.TimeZone'
   
   class Actor
 
@@ -17,10 +18,11 @@ module RJGit
       return self.new(name, email)
     end
     
-    def initialize(name, email)
+    def initialize(name, email, time = nil)
       @name = name
       @email = email
-      @person_ident = PersonIdent.new(name, email)
+      @time = time
+      @person_ident = @time ? PersonIdent.new(name, email, time.to_java, TimeZone.getTimeZone(time.zone)) : PersonIdent.new(name, email)
     end
     
     # Create an Actor from a string.
@@ -43,7 +45,8 @@ module RJGit
     # time - The Time the commit was authored or committed.
     #
     # Returns a String.
-    def output(time)
+    def output(time = nil)
+      time = time || self.time
       offset = time.utc_offset / 60
       "%s <%s> %d %+.2d%.2d" % [
         @name,
@@ -52,6 +55,10 @@ module RJGit
         offset / 60,
         offset.abs % 60]
     end
+    
+    def time
+      Time.at(@person_ident.getWhen.getTime/1000)
+    end
 
   end 
 

data/lib/rjgit.rb

@@ -27,12 +27,17 @@ module RJGit
   
   module Porcelain
 
+    import 'java.io.IOException'
     import 'org.eclipse.jgit.lib.Constants'
     import 'org.eclipse.jgit.api.AddCommand'
     import 'org.eclipse.jgit.api.CommitCommand'
     import 'org.eclipse.jgit.api.BlameCommand'
+    import 'org.eclipse.jgit.api.errors.RefNotFoundException'
     import 'org.eclipse.jgit.blame.BlameGenerator'
     import 'org.eclipse.jgit.blame.BlameResult'
+    import 'org.eclipse.jgit.errors.IncorrectObjectTypeException'
+    import 'org.eclipse.jgit.errors.InvalidPatternException'
+    import 'org.eclipse.jgit.errors.MissingObjectException'
     import 'org.eclipse.jgit.treewalk.CanonicalTreeParser'
     import 'org.eclipse.jgit.diff.DiffFormatter'
 
@@ -163,6 +168,58 @@ module RJGit
       RJGit.convert_diff_entries(diff_entries)
     end
 
+    def self.describe(repository, ref, options = {})
+      options = {:always => false, :long => false, :tags => false, :match => []}.merge(options)
+      repo = RJGit.repository_type(repository)
+      git = RubyGit.new(repo).jgit
+      command = git.describe.
+        set_always(options[:always]).
+        set_long(options[:long]).
+        set_tags(options[:tags])
+      begin
+        command = command.set_target(ref)
+      rescue IncorrectObjectTypeException, IOException, MissingObjectException, RefNotFoundException
+        return nil
+      end
+      options[:match].each do |match|
+        begin
+          command = command.set_match(match)
+        rescue InvalidPatternException
+          return nil
+        end
+      end
+      command.call
+    end
+
+    # options:
+    #  * ref
+    #  * path_filter
+    #  * case_insensitive
+    def self.grep(repository, query, options={})
+      case_insensitive = options[:case_insensitive]
+      repo = RJGit.repository_type(repository)
+      walk = RevWalk.new(repo)
+      ls_tree_options = {:recursive => true, :path_filter => options[:path_filter]}
+
+      query = case query
+      when Regexp then query
+      when String then Regexp.new(Regexp.escape(query))
+      else raise "A #{query.class} was passed to #{self}.grep().  Only Regexps and Strings are supported!"
+      end
+
+      query = Regexp.new(query.source, query.options | Regexp::IGNORECASE) if case_insensitive
+
+      ls_tree(repo, nil, options.fetch(:ref, 'HEAD'), ls_tree_options).each_with_object({}) do |item, result|
+        blob = Blob.new(repo, item[:mode], item[:path], walk.lookup_blob(ObjectId.from_string(item[:id])))
+        next if blob.binary?
+
+        rows = blob.data.split("\n")
+        data = rows.grep(query)
+        next if data.empty?
+
+        result[blob.path] = data
+      end
+    end
   end
 
   module Plumbing

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "5.6.1.0"
+  VERSION = "5.9.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 5.6.1.0
+  version: 5.9.0.0
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,14 +12,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.3'
   name: mime-types
   prerelease: false
   type: :runtime
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.3'
 description: JRuby wrapper around the JGit library for manipulating git repositories
   in code.
 email: repotag-dev@googlegroups.com
@@ -49,7 +49,8 @@ files:
 - lib/java/jars/bcpkix-jdk15on-161.jar
 - lib/java/jars/bcprov-jdk15on-161.jar
 - lib/java/jars/jsch-0.1.54.jar
-- lib/java/jars/org.eclipse.jgit-5.6.1.202002131546-r.jar
+- lib/java/jars/org.eclipse.jgit-5.9.0.202009080501-r.jar
+- lib/java/jars/org.eclipse.jgit.ssh.jsch-5.8.0.202006091008-r.jar
 - lib/java/jars/slf4j-api-1.7.2.jar
 - lib/java/jars/slf4j-simple-1.7.12.jar
 - lib/repo.rb