gollum-grit_adapter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c2a20942c96f829cb954507a337cbaac99d8dd8b
-  data.tar.gz: 91387d9abcd383d7012efd67623e5e87ec1da084
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjUyYjVjOGNhYzc4OWRkZTBhZGU4MDRjNjAyOTNlYmMwZTU3NWVlYQ==
+  data.tar.gz: !binary |-
+    NzVjZjU3MTU3M2U4OGNjNzcxODdhNTNjMGYxMzk3NzFjNjg1NGIyMg==
 SHA512:
-  metadata.gz: 32dad58dec2f20e831914edbdbbeb0d5f1ed14eb4726edab34e7b3cc831113968895f3a622308117f6740aa9a49428ccae2319cdd4ef6a883f7b1f3d8d8d6925
-  data.tar.gz: 1cbd9de24f1bb5d673b76077173cd71b0f40bb76082eb21002c8dd281cbaa1ceabfd22841962e6b2f4e46275e68924254b36cbb9a600616d957f06368f22ab98
+  metadata.gz: !binary |-
+    NmRjNjViMjUwYzVlNDM0MmNlNzI2OWQwODNjOGMxYjI1OTg0YzNlMWZkNDgw
+    MjAyZWRiYTE5YjlkYzY1NGUzZjI5MTVmMDQxMWY5ZGMwZGQ4NWFhNjYwZTYy
+    OGU3ODczMDU3YTY2MzY4MWY0MzM1YzU1M2FhNWM0OTRjNTNlODI=
+  data.tar.gz: !binary |-
+    ZjFmZTZjZTFiZjgyYmU1NmZjZGY2YjgwYzljODc0NDgzNTVkYzkyOGNiNDg4
+    YzA0ZDQwODI1MmYxZGVjNjExMDFmMGI2M2U4YWJkNWE4ZTQxMDhhOGE1ZmM0
+    ZGMwNTlmOGQ2M2E2NjdmMDkwZjQzNGUzNzQyZWIwNjJhMzA3OTQ=

data/lib/grit_adapter/git_layer_grit.rb

@@ -137,6 +137,7 @@ module Gollum
       
       def grep(query, options={})
         ref = options[:ref] ? options[:ref] : "HEAD"
+        query = Shellwords.shellescape(query)
         query = Shellwords.split(query).select {|q| !(q =~ /^(-O)|(--open-files-in-pager)/) }
         query = Shellwords.join(query)
         args = [{}, '-I', '-i', '-c', query, ref, '--']
@@ -365,7 +366,15 @@ module Gollum
       
       # if index.current_tree && tree = index.current_tree / (@wiki.page_file_dir || '/')
       def /(file)
-        @tree.send(:/, file) 
+        result = @tree.send(:/, file)
+        case result
+        when Grit::Blob
+          return Gollum::Git::Blob.new(result)
+        when Grit::Tree
+          return Gollum::Git::Tree.new(result)
+        else
+          nil
+        end
       end
       
       def blobs

data/lib/grit_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-grit_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-grit
@@ -17,7 +17,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.1
   type: :runtime
@@ -27,7 +27,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.1
 - !ruby/object:Gem::Dependency
@@ -51,11 +51,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- README.md
+- lib/grit_adapter.rb
 - lib/grit_adapter/git_layer_grit.rb
 - lib/grit_adapter/version.rb
-- lib/grit_adapter.rb
-- README.md
-- Gemfile
 homepage: https://github.com/gollum/grit_adapter
 licenses:
 - MIT
@@ -66,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Adapter for Gollum to use Grit at the backend.