gollum-grit_adapter 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d871bb42c88eabb6c791ce8da27246976c99468
-  data.tar.gz: 8e3c385dc460a6fbbbd57039c7dd1be9b81d1e09
+  metadata.gz: fec3b95003833b68d26ed5e70595be3e4f165eb3
+  data.tar.gz: 8b626ca0f6e8bd9a9c1b837514646e6378f27895
 SHA512:
-  metadata.gz: 0b94c9ed9edaf6df005e2102b272d710f0d93f638602c5644b21023473848cfeeccbd0c534f47c69ca29a9ae7e4e28f75615836a925aa435cf53d4e784a09107
-  data.tar.gz: 76778c49ff74bdb69b75e325b01fe9ed4dd4e33f4abc1e153dd9cb9b1c26bc0fd1b707fd121c741619f47c909e86b0d1dcc1b9c51b142ba3763fe67d571ec369
+  metadata.gz: 735d80249532575b9ebc38452121f6eb6ff1ff23432edcc48a3d4b5a109a5a56aa0b87eb3ed82652997e2ce431c9e360d64fef6821d8c29ee740640ef08689bf
+  data.tar.gz: a554c3322767dc792f4c1907c98cffae892ba2cea9a5fec2d8f50396b1ff583289235f003a0dfd15f0cb036d8f1fd02c0c76608d45716883e7a710a4cdde5508

data/Gemfile

@@ -6,6 +6,5 @@ gem 'rake', '~> 10.0.3'
 gem 'adapter_specs', :git => 'https://github.com/gollum/adapter_specs.git'
 
 group :test do
-  gem "rspec", "2.13.0"
   gem "simplecov"
 end

data/lib/grit_adapter/git_layer_grit.rb

@@ -1,6 +1,7 @@
 # ~*~ encoding: utf-8 ~*~
 
 require 'grit'
+require 'ostruct'
 
 module Gollum
 
@@ -88,6 +89,13 @@ module Gollum
       def to_s
         @commit.id
       end
+
+      def stats
+        @stats ||= begin
+          grit_stats = @commit.stats
+          OpenStruct.new(:additions => grit_stats.additions, :deletions => grit_stats.deletions, :files => grit_stats.files, :id => id, :total => grit_stats.total)
+        end
+      end
       
       def author
         author = @commit.author
@@ -128,8 +136,8 @@ module Gollum
       
       def grep(query, options={})
         ref = options[:ref] ? options[:ref] : "HEAD"
-        args = [{}, '-i', '-c', query, ref, '--']
-        args << '--' << options[:path] if options[:path]
+        args = [{}, '-I', '-i', '-c', query, ref, '--']
+        args << options[:path] if options[:path]
         result = @git.grep(*args).split("\n")
         result.map do |line|
           branch_and_name, _, count = line.rpartition(":")
@@ -165,8 +173,8 @@ module Gollum
         #         {:r => true, :l => true, :z => true}, sha)
       end
       
-      def apply_patch(options={}, head_sha=nil, patch=nil)
-        @git.apply_patch(options, head_sha, patch)
+      def apply_patch(head_sha=nil, patch=nil)
+        @git.apply_patch({}, head_sha, patch)
       end
       
       # @repo.git.cat_file({:p => true}, sha)
@@ -186,6 +194,8 @@ module Gollum
         end
       end
 
+      private
+
       def log(path = nil, ref = nil, options = nil, *args)
         @git.native(:log, options, "--", path)
       end
@@ -309,7 +319,7 @@ module Gollum
       end
       
       def log(commit = 'master', path = nil, options = {})
-        @repo.log(commit, path, options)
+        @repo.log(commit, path, options).map {|grit_commit| Gollum::Git::Commit.new(grit_commit)}
       end
       
       def lstree(sha, options = {})

data/lib/grit_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-      VERSION = '0.0.2'
+      VERSION = '0.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-grit_adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-grit