rjgit 5.7.0.0 → 5.9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c44778442b606fcefdcc05154037588f9cdbda66d37bf9885318815b4eb3799
-  data.tar.gz: eab78cd321c6c45249c0768540f3d4ddcd06d6f04bc1dc6c097b86577341c481
+  metadata.gz: 7f03c8f0d9e77ec4568625a3ec9cbfb87a5b6ec4ae7a1c1f540a5cde0599d9be
+  data.tar.gz: 81f752231d8d1714639f0422b9fb08fe3179837ab171f4ddb919d32159fab52b
 SHA512:
-  metadata.gz: facb928fe049b87c9a50f9ae6151a4e0545990373bad18f66a95bf523ce9666b288f29338a98694a0e5f627b6a55ffe58c61dc6fa2b4b7293f293d96c729bf36
-  data.tar.gz: 1fbf4acc0fce8f4a849a91f84d7a9bec7a19b1c8f11b306aea98b7c73970b8eabdcd03734b015dbacd057e747f0a6ca20f1c0a78499102801e791a134c9c56ce
+  metadata.gz: '05482710f19d6205ca490ef7a3c49244ae584c1116a8de447d4eb34d7624d4b92e34fdd7d932752c823a62459b41b94afcb0052702a9e1389615831dd19d8388'
+  data.tar.gz: 74bff6ee3bc9361e1638697203d6cf64048408f2dcb9d2bc108ff0d7a69918a8fdbe3c27e5ed8a81e869267a413f32dc218e8a1b80ee517e0631ff90fcd1c060

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/blob.rb

@@ -36,7 +36,7 @@ module RJGit
     # The binary contents of this blob.
     # Returns String
     def data
-      @data ||= RJGit::Porcelain.cat_file(@jrepo, @jblob) 
+      @data ||= RJGit::Porcelain.cat_file(@jrepo, self)
     end
     
     def is_symlink?

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'
 
@@ -51,10 +56,11 @@ module RJGit
 
     # http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg00558.html
     def self.cat_file(repository, blob)
+      mode = blob.mode if blob.respond_to?(:mode)
       jrepo = RJGit.repository_type(repository)
       jblob = RJGit.blob_type(blob)
       # Try to resolve symlinks; return nil otherwise
-      mode = RJGit.get_file_mode(jrepo, jblob)
+      mode ||= RJGit.get_file_mode(jrepo, jblob)
       if mode == SYMLINK_TYPE
         symlink_source = jrepo.open(jblob.id).get_bytes.to_a.pack('c*').force_encoding('UTF-8')
         blob = Blob.find_blob(jrepo, symlink_source)
@@ -163,6 +169,80 @@ 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
+
+      # We optimize below by first grepping the entire file, and then, if a match is found, then identifying the individual line.
+      # To avoid missing full-line matches during the optimization, we first convert multiline anchors to single-line anchors.
+      query = Regexp.new(query.source.gsub(/\A\\A/, '^').gsub(/\\z\z/, '$'), query.options)
+
+      ref = options.fetch(:ref, 'HEAD')
+      files_to_scan = ls_tree(repo, nil, ref, ls_tree_options)
+
+      files_to_scan.each_with_object({}) do |file, result|
+        id = if file[:mode] == SYMLINK_TYPE
+          symlink_source = repo.open(ObjectId.from_string(file[:id])).get_bytes.to_a.pack('c*').force_encoding('UTF-8')
+          unless symlink_source[File::SEPARATOR]
+            dir = file[:path].split(File::SEPARATOR)
+            dir[-1] = symlink_source
+            symlink_source = File.join(dir)
+          end
+          Blob.find_blob(repo, symlink_source, ref).jblob.id
+        else
+          ObjectId.from_string(file[:id])
+        end
+        bytes = repo.open(id).get_bytes
+
+        next if RawText.is_binary(bytes)
+
+        file_contents = bytes.to_s
+        next unless query.match(file_contents)
+
+        rows = file_contents.split("\n")
+        data = rows.grep(query)
+        next if data.empty?
+
+        result[file[:path]] = data
+      end
+    end
   end
 
   module Plumbing

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "5.7.0.0"
+  VERSION = "5.9.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 5.7.0.0
+  version: 5.9.0.1
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,14 +12,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-11-19 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.7.0.202003110725-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