gollum-grit_adapter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTk5YjhmY2NlZjdmMTBlMGUzNzkwYzVhNmQ0ZTVjN2FlYmEzZDE2Yg==
-  data.tar.gz: !binary |-
-    ZWRkODA3OWMzNTlkZDlkOTFlMWQ4OWE1ODQyY2U5MWZjYzIyMWNlMg==
+SHA1:
+  metadata.gz: c2a20942c96f829cb954507a337cbaac99d8dd8b
+  data.tar.gz: 91387d9abcd383d7012efd67623e5e87ec1da084
 SHA512:
-  metadata.gz: !binary |-
-    MzAwNTBiYmJjZmIxNjI1MTU0OGJkNTU0YjBlMzBlOTUxMWNiZDUzMTIwYzBh
-    NmUyN2NhYmVhYTUzZTEwNWEyZjMzZTZjY2JmMjMzODA1MGFkMzhlM2ZiODQ2
-    MWZhMTAzNGQ1ZDQ2ZTEwYzdkMDc4YjUyMmU1MjllNTUwNjIwNjY=
-  data.tar.gz: !binary |-
-    N2NmMmViZmU5ZjU0YWViNzZkZjBjNDRiZWI3ZWYyNThhMzhjOWZlOGE4Yjc4
-    NWUyMTRkYmQwZTQ4OTcyNGE2ZmU3ZDg2OWViM2UwZDczN2M1OWI4MzMxNTUw
-    NTFkNDRmZjRmMGJhZDY1ZjA0MGQ4NDgxZTE4ZDNjOWQ4ZWU2NWI=
+  metadata.gz: 32dad58dec2f20e831914edbdbbeb0d5f1ed14eb4726edab34e7b3cc831113968895f3a622308117f6740aa9a49428ccae2319cdd4ef6a883f7b1f3d8d8d6925
+  data.tar.gz: 1cbd9de24f1bb5d673b76077173cd71b0f40bb76082eb21002c8dd281cbaa1ceabfd22841962e6b2f4e46275e68924254b36cbb9a600616d957f06368f22ab98

data/lib/grit_adapter/git_layer_grit.rb

@@ -2,6 +2,7 @@
 
 require 'grit'
 require 'ostruct'
+require 'shellwords'
 
 module Gollum
 
@@ -166,14 +167,19 @@ module Gollum
       end
       
       def ls_files(query, options = {})
-        options[:ref] = options[:ref] ? options[:ref] : "HEAD"
+        ref = options[:ref] ? options[:ref] : "HEAD"
+        path = options.delete(:path) || "."
+        options.delete(:ref)
         query = Shellwords.shellescape(query)
-        @git.ls_files({}, "*#{query}*").split("\n")
+        if @git.work_tree && !@git.work_tree.empty? then
+          @git.ls_files({}, ref, ::File.join(path, "*#{query}*")).split("\n")
+        else
+          ls_tree({:full_tree => true, :r => true, :name_only => true}, ref, path).split("\n").select {|line| line.match(/#{Regexp.escape(query)}/i)}
+        end
       end
       
       def ls_tree(options={}, *args, &block)
         @git.native(:ls_tree, options, *args, &block)
-        #         {:r => true, :l => true, :z => true}, sha)
       end
       
       def apply_patch(head_sha=nil, patch=nil)

data/lib/grit_adapter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-grit_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-07 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.4.1
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Adapter for Gollum to use Grit at the backend.