rjgit 4.0.1.0 → 4.0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a465cfeece5013f22dc111804a3e9bc4dc4fb667
-  data.tar.gz: 8e6d8bcffd10eac722c5c61f5808fd10cf2091a1
+  metadata.gz: 0ca68263a40b689b818e249bd15a957dcb48d587
+  data.tar.gz: cef170d6a7fb2826a599b48268bf7274925427d8
 SHA512:
-  metadata.gz: 0eb0dca93ef3c5e84bc5af9a4b26d25e3b81fccd5731411dc6efaccfdb8604b5d0c2f02306a6915dc8e87d2d48870d81d1d0346863b8bde0e435c7180dd1877b
-  data.tar.gz: 034259f6a049f41353dfdc1bb378de8bb1664661a2160f8c234136112e87217fefb4171b8fa287e5dca1b70977a66691a82435b98c6327b66c65225e7d51959b
+  metadata.gz: 530f3585843ea4ec1db17d5094c8c4da3ba1096f89a76689773a2c0e36efb440b91b031666a9e4d0ddbb814d07195a5b32ede60101b251d66c839b8902e096f7
+  data.tar.gz: 68fe649430f200759180d48a3a7146d89476f428c6bde23f9bff2d22d696986e121c7d21fa97e3f671f5301c920fd2cacbbd0ab6a60af16e3e09f6217689b758

data/README.md

@@ -38,6 +38,10 @@ $ gem install rjgit
 - rspec >= 2.0
 - simplecov
 
+#### Version scheme
+
+RJGit's version number is the version of jgit used, plus our own patch level counter. For instance, RJGit 4.0.1.0 uses jgit 4.0.1, patch level 0.
+
 Usage
 -----
 RJGit wraps most (if not all) of JGit's core functionality; it has classes for all important Git objects, i.e., Repo, Blob, Tree, Commit, and Tag. It allows parsing and manipulation of these objects in an intuitive manner, either simulating ordinary git usage (with a working directory on disk) or on a lower level, through creating new git objects manually (also works with 'bare' repositories, without a working directory).

data/lib/blob.rb

@@ -1,6 +1,7 @@
 module RJGit
   
   import 'org.eclipse.jgit.revwalk.RevBlob'
+  import 'org.eclipse.jgit.diff.RawText'
   
   class Blob 
     
@@ -41,6 +42,14 @@ module RJGit
       @mode == SYMLINK_TYPE
     end
     
+    def binary?
+      RawText.is_binary(self.data.to_java_bytes)
+    end
+    
+    def line_count
+      self.binary? ? 0 : self.data.split("\n").size
+    end
+    
     # The mime type of this file (based on the filename)
     # Returns String
     def mime_type

data/lib/transport.rb

@@ -14,10 +14,6 @@ module RJGit
       @jrepo = RJGit.repository_type(repository)
       @bidirectional = bidirectional
     end
-
-    def init_buffers(client_msg)
-      return ByteArrayInputStream.new(client_msg.to_java_bytes), ByteArrayOutputStream.new
-    end    
   
     def advertise_refs
       out_stream = ByteArrayOutputStream.new
@@ -26,6 +22,24 @@ module RJGit
       @jpack.sendAdvertisedRefs(advertiser)
       return out_stream.to_string
     end
+
+    def process(client_msg)
+      input, output = init_buffers(client_msg)
+      @jpack.set_bi_directional_pipe(@bidirectional)
+      begin
+        @jpack.send(@action, input, output, nil)
+      rescue Java::OrgEclipseJgitErrors::InvalidObjectIdException, Java::OrgEclipseJgitTransport::UploadPackInternalServerErrorException, Java::JavaIo::IOException => e
+        return nil, e
+      end
+      return ByteArrayInputStream.new(output.to_byte_array).to_io, nil
+    end
+
+    private
+
+    def init_buffers(client_msg)
+      return ByteArrayInputStream.new(client_msg.to_java_bytes), ByteArrayOutputStream.new
+    end  
+
   end
 
   class RJGitReceivePack < RJGitPack
@@ -33,45 +47,17 @@ module RJGit
     def initialize(repository, bidirectional = false)
       super
       @jpack = ReceivePack.new(@jrepo)
+      @action = :receive
     end
   
-    def process(client_msg)
-      self.receive(client_msg)
-    end
-  
-    def receive(client_msg)
-      in_stream, out_stream = init_buffers(client_msg)
-      @jpack.set_bi_directional_pipe(@bidirectional)
-      begin
-        @jpack.receive(in_stream, out_stream, nil)
-      rescue Java::OrgEclipseJgitErrors::InvalidObjectIdException, Java::JavaIo::IOException => e
-        return nil, e
-      end
-      return ByteArrayInputStream.new(out_stream.to_byte_array).to_io, nil
   end
-  
-end
 
   class RJGitUploadPack < RJGitPack
   
     def initialize(repository, bidirectional = false)
       super
       @jpack = UploadPack.new(@jrepo)
-    end
-  
-    def process(client_msg)
-      self.upload(client_msg)
-    end
-  
-    def upload(client_msg)
-      in_stream, out_stream = init_buffers(client_msg)
-      @jpack.set_bi_directional_pipe(@bidirectional)
-      begin
-        @jpack.upload(in_stream, out_stream, nil)
-      rescue Java::OrgEclipseJgitErrors::InvalidObjectIdException, Java::OrgEclipseJgitTransport::UploadPackInternalServerErrorException, Java::JavaIo::IOException => e
-        return nil, e
-      end
-      return ByteArrayInputStream.new(out_stream.to_byte_array).to_io, nil
+      @action = :upload
     end
   
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "4.0.1.0"
+  VERSION = "4.0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjgit
 version: !ruby/object:Gem::Version
-  version: 4.0.1.0
+  version: 4.0.3.0
 platform: ruby
 authors:
 - Maarten Engelen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -45,7 +45,7 @@ files:
 - lib/constants.rb
 - lib/git.rb
 - lib/java/jars/jsch-0.1.49.jar
-- lib/java/jars/org.eclipse.jgit-4.0.1.201506240215-r.jar
+- lib/java/jars/org.eclipse.jgit-4.0.3.201509231615-r.jar
 - lib/java/jars/slf4j-api-1.7.2.jar
 - lib/java/jars/slf4j-simple-1.7.12.jar
 - lib/repo.rb