gollum-rjgit_adapter 0.2-java → 0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b884a5592a7e97ea97c2e046a03d6d795c461912
-  data.tar.gz: 85f5a05ec904490252754708cc4f81dcb5603e6c
+  metadata.gz: 2c80a16a8cb97691a2e46f3cafcc97af770d4686
+  data.tar.gz: f0c49e526ddf49198ddc9fc93dc0364a3e4035ff
 SHA512:
-  metadata.gz: 4371b80e118cb5d8d5f52709341ebe274e39436c6f75dd605c11bee719969d2174ffce9667581dc8c57db585cacc1d22d321134e7e6463a87b34af59a290adfb
-  data.tar.gz: b94acb17eaac0adc51fbaddbdabfacea462a042d11e2976970a90796cce433dcec6b30288e677b0d853fddb6384df629be4be55b6a970006839c4d6129671765
+  metadata.gz: 4a3c80b9970631ea65e1f53bac1c609079a389d88f03655b6a9ec123368e9b5a90f64597a1a8c043eda15f993c2b238a570b004027fa9163f3dca06b96fbda45
+  data.tar.gz: 2bdb2bf5d6085dd3c6f0407b1b082eec1b4b8f72a9df4da20426b2afd0c4dcc53d505e43eb79f3cde18bf44a123e48bd845a219e12e6fd543d9d852ed4417ad2

data/README.md

@@ -1,4 +1,7 @@
 gollum-lib_rjgit_adapter
 ========================
+[![Gem Version](https://badge.fury.io/rb/gollum-rjgit_adapter.svg)](http://badge.fury.io/rb/gollum-rjgit_adapter)
 
-Adapter for Gollum to use RJGit at the backend
+Adapter for Gollum to use [RJGit](https://github.com/repotag/rjgit) at the backend. This adapter is the default when your platform is JRuby, so you need only to `gem install gollum` and then use gollum normally.
+
+Note: this adapter is new. Although it passes the full test suite for gollum (and gollum-lib), it might well still contain bugs. Please let us know if you encouter any!

data/lib/rjgit_adapter/git_layer_rjgit.rb

@@ -194,7 +194,11 @@ module Gollum
       
       def apply_patch(sha, patch = nil, options = {})
         return false if patch.nil?
-        @git.apply_patch(patch)
+        begin
+          @git.apply_patch(patch)
+        rescue Java::OrgEclipseJgitApiErrors::PatchApplyException
+          false
+        end
         Tree.new(RJGit::Tree.new(@git.jrepo, nil, nil, RevWalk.new(@git.jrepo).lookup_tree(@git.jrepo.resolve("HEAD^{tree}"))))
       end
       

data/lib/rjgit_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-      VERSION = '0.2'
+      VERSION = '0.3'
     end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rjgit_adapter
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: java
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: rjgit
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-  name: rjgit
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.13.0
-  name: rspec
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.13.0
+  prerelease: false
+  type: :development
 description: Adapter for Gollum to use RJGit at the backend.
 email:
 - repotag-dev@googlegroups.com