gollum-rugged_adapter 0.99 → 0.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b5e759dc0448a68c2ef5b03a5da78f81ca2af18e5faa82280b2f707a83e7d4
-  data.tar.gz: bcc46ceaab4b1bf5b5dd1d5e05ce9856a9cd6ee63219eaf85dbff7f90c87f9d4
+  metadata.gz: 62f2f0d6560dcb5d317b61df375d139cb190b16c9af3ba3c1f54b03fa3cfc141
+  data.tar.gz: a7670168ff8073d746be2595ce29cb8adf6f5b41c732e0c0c1c884542a8504ee
 SHA512:
-  metadata.gz: 0abff79a7bdb6ea9ea54a7d6483cb7a8e2daf34d0d28f44a2a7702efe12a2d6bdaed8e59fd3969bd7aa57b5b62b281880f998c2d740cd91dc2f0ab5a9ae370c7
-  data.tar.gz: 0b2e7ac0435588fc46a2f4777e5295a26caa370f24a1ec5a0083c5470c4668c3a64596d27112c645c39d4949acabf3cbd45e610405e93c048d5b3438b1cfa69b
+  metadata.gz: 6ffdbf17ec358fc35cb5b54e7566826c507d4405ba657e009bb77391997d1a58dc650360232f565889a6f470215bd112198a4d6357ffa1e03b37b253415bb961
+  data.tar.gz: e7b85277ae334912092be5296dd0da660a7ba02ad1f4ad92a5f22c9f5c9fa5859a164d5af0573ba96f56a065cd13fd6c20e0ba99e7bf2cd77dd83ad80f0aed43

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -16,6 +16,7 @@ module Gollum
 
     DEFAULT_MIME_TYPE = "text/plain"
     class NoSuchShaFound < StandardError; end
+    class PathApplyError < StandardError; end
 
     class Actor
 
@@ -196,7 +197,7 @@ module Gollum
         diff = @repo.diff(sha2, sha1, {:paths => [path]}).first.diff
         begin
           result = @repo.apply(diff, {:location => :index, :path => path})
-        rescue RuntimeError
+        rescue RuntimeError, Rugged::PathError
           return false
         end
         begin
@@ -493,9 +494,13 @@ module Gollum
       def read_tree(id)
         id = Gollum::Git::Git.new(@rugged_repo).ref_to_sha(id)
         return nil if id.nil?
-        current_tree = @rugged_repo.lookup(id)
-        current_tree = current_tree.tree unless current_tree.is_a?(Rugged::Tree)
-        @index.read_tree(current_tree)
+        begin
+          current_tree = @rugged_repo.lookup(id)
+          current_tree = current_tree.tree unless current_tree.is_a?(Rugged::Tree)
+          @index.read_tree(current_tree)
+        rescue
+          raise Gollum::Git::NoSuchShaFound
+        end
         @current_tree = Gollum::Git::Tree.new(current_tree)
       end
 
@@ -579,7 +584,11 @@ module Gollum
       end
 
       def commit(id)
-        git.commit_from_ref(id)
+        begin
+          git.commit_from_ref(id)
+        rescue
+          raise Gollum::Git::NoSuchShaFound
+        end
       end
 
       def commits(start = 'refs/heads/master', max_count = 10, skip = 0)

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-    VERSION = '0.99'
+    VERSION = '0.99.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: '0.99'
+  version: 0.99.1
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto