rjgit 5.7.0.1 → 5.7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee1618ecf4d5b33793cda5f7f2d4a83af873e48167ae426f144cbb21177beab0
-  data.tar.gz: 95b32d3cbf4b5b85117986d1daa088180390d327b6503b9b042aa1055a00d20a
+  metadata.gz: 62cd118bda14efaa2c83c38eb7cbb3e4792fde99d4cf3962e20c9511470c2115
+  data.tar.gz: 82a455adf1a9dad2aed63019ea98cde3b4c0c446fab52f2e40f3a2df397eb452
 SHA512:
-  metadata.gz: 268fecedf6964680fc7e94c8fa4b3f66333d556976c154a0db0bbbb8121ee9e23bae563c4493bab07ed798d09b7c57d677062d1a5d5561e56f0d4ab56a256eab
-  data.tar.gz: 00bfe427f864a3aa3854c5aac56b94d1067695dbd0bd6e2dcf8f7302ad6545bd6a55c0c656e6f897bd848a921be35545067ef328fcc577aa2010b7ff1c005c1f
+  metadata.gz: 48340d990bfce221b2a277417e8647ce3fe5765e5bc889af7ac9edf1cf503ac6a3d15d992d0335521dc1abe99e32fea1c221297fa44b6270e9ebab1f0bc73f0b
+  data.tar.gz: ca53c513482e6232396f9d03c502d89d08eee2d9ff034adddf6c2083ebf6fc021fc715f0acaeb4a1a4859c3223fe9fffbc32c04d6466f2eb2a9057c3fba80ef2

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.7.0.1"
+  VERSION = "5.7.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 5.7.0.1
+  version: 5.7.0.2
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement