gollum-rugged_adapter 0.1b → 0.2b

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWJjMGU4NGM0ODZkMjZmZGZkNDhhOTI4YTMzYmFmNzdiZDM3ZDEwMQ==
+    YWUyNjcxMGEzMTk5YWRhNDA3YWNmYjA3NzU1NmY5NWRhNDJjMmNjZQ==
   data.tar.gz: !binary |-
-    YTNjYzk3OWE2Njk2MGQ0ODdmNTExZTMxYjlkMmY3NWIyYzkwYjQ2Nw==
+    YjY1MjA3YzEwMTlmY2ZlYmI0ZDQ0MWZlNDkwZjc4ZTg2MzljYjQ3MA==
 SHA512:
   metadata.gz: !binary |-
-    ZjI2Njg5N2EyODAyYzRiMjkzYmExZjNiYWFlZTZiZDQ3Y2VkZmRkOWEyOTNi
-    ZmYyNTMwMjY1MGNiOWE5ZTQ4ZGIzZGQ1MjczYzYzNGJjY2YyMWVjY2M1NDQ5
-    YjU0ODAxNWE5YjIzNzE4MjA1ZjBhNGUwN2FjOWI2ZWVkZTljMjE=
+    ZjEyMjRlMjYzMzRjOGQzN2I4ZDc4MGY5MmRiODk3ZDVhMTk0MTY0M2E2ZDdk
+    NWExOTQyOWViMzk1ZWY4YmZlMTIzODFiZGYzYjA1NjAyOWU5ZTNjYTJiZTk3
+    NGQwYWRmNWIzZjE3Yzg1ZjIzZTY4MGM5YmZhOWI0YjY2MTA2Y2Q=
   data.tar.gz: !binary |-
-    MGRlOThmMWFhMzI0M2EyZDczNzFiMzA4OTA3ZWE1NTRlOWU3YTU2OTNhNGJj
-    NjBiMDczZDQxNmQzZmFhOTE0NDE0MGQyNmZmNWMxM2U0YmYzMmU5NTFmN2M2
-    NGRkOWEwN2I5NjZhYmFlNzQyZWFjYmVmMjdlOGQ2YTQyMWY0MmE=
+    NWFjZjBjYTgyYjA1MDk4MTVjMjc5YmQ3MjIwYjQ1MmE1MzFhMDQzM2M5NTBk
+    NTg4ZTBmYzRkYmU5YTk0ODExMmMzNmZlNmViZTM2MmEyM2I1ODc3ZDc4NzY0
+    YjRkYTU5OTAyNzk3ZTM1MGJjNzg5MWNiZWFkNTVlMGI5M2Y0OTI=

data/README.md

@@ -12,11 +12,15 @@ Adapter for [gollum](https://github.com/gollum/gollum) to use [Rugged](https://g
 
 Install the gem:
 
-`gem install gollum-rugged_adapter`
+```bash
+gem install --pre gollum-rugged_adapter # --pre required for beta-releases
+```
 
 Now run gollum as follows:
 
-`gollum --adapter rugged`
+```bash
+gollum --adapter rugged
+```
 
 ## CONTRIBUTING
 

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -110,7 +110,7 @@ module Gollum
       end
       
       def authored_date
-        @commit.time
+        @commit.author[:time]
       end
       
       def message
@@ -132,13 +132,15 @@ module Gollum
         deletions = 0
         total = 0
         files = []
-        diff = @commit.diff.each_patch do |patch|
-          new_additions = patch.stat[0]
-          new_deletions = patch.stat[1]
+        parent = @commit.parents.first
+        diff = Rugged::Tree.diff(@commit.tree.repo, parent ? parent.tree : nil, @commit.tree)
+        diff = diff.each_patch do |patch|
+          new_additions = patch.stat[1]
+          new_deletions = patch.stat[0]
           additions += new_additions
           deletions += new_deletions
           total += patch.changes
-          files << [patch.delta.new_file[:path], new_deletions, new_additions, patch.changes] # Rugged seems to generate the stat diffs in the other direciton than grit does by default, so switch the order of additions and deletions.
+          files << [patch.delta.new_file[:path].force_encoding("UTF-8"), new_deletions, new_additions, patch.changes] # Rugged seems to generate the stat diffs in the other direciton than grit does by default, so switch the order of additions and deletions.
         end
         OpenStruct.new(:additions => additions, :deletions => deletions, :files => files, :id => id, :total => total)
       end
@@ -543,9 +545,13 @@ module Gollum
         @index ||= Gollum::Git::Index.new(@repo.index, @repo)
       end
 
-      def diff(sha1, sha2, path = nil)
+      def diff(sha1, sha2, *paths)
         opts = path == nil ? {} : {:path => path}
-        @repo.diff(sha1, sha2, opts).patches.map  {|patch| OpenStruct.new(:diff => patch.to_s.split("\n")[2..-1].join("\n"))}.reverse # First remove two superfluous lines. Rugged seems to order the diffs differently than Grit, so reverse.
+        patches = @repo.diff(sha1, sha2, opts).patches
+        if not paths.empty?
+          patches.keep_if { |p| paths.include? p.delta.new_file[:path] }
+        end
+        patches.map  {|patch| OpenStruct.new(:diff => patch.to_s.split("\n")[2..-1].join("\n").force_encoding("UTF-8"))}.reverse # First remove two superfluous lines. Rugged seems to order the diffs differently than Grit, so reverse.
       end
       
       def log(commit = 'refs/heads/master', path = nil, options = {})

data/lib/rugged_adapter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1b
+  version: 0.2b
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged