gitlab-grit 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290c31e6fb93fe5e1dd3c3f81e4f1a2438f00767
-  data.tar.gz: fda00dfa647aacbc021a1d2800750490a823ff27
+  metadata.gz: af275c881c0a7a0f9b5bd97093b3817ed9208a7b
+  data.tar.gz: a8a61cbffd8d271e4dcb03e5ba096aad81620c77
 SHA512:
-  metadata.gz: 9fa89384e27c8bbbb6eac83b7062f4151be9009f852b4c2434ee2429f24ee21130694355e22662a41c9870602e91700bbccb6ac309da49bd73b66ab427fe8cad
-  data.tar.gz: bf0e2678fbe8c41dcbacd7a581b4e4f84132a58bb503111cf583c54400f2028fe99f2563b18a9fd03447d8bddb84e3ec796a63926eee742d0b6992f5aeee5715
+  metadata.gz: 20070e9bea6fb2278b24b48574f12a6101363feadef525eb80058a57700753f0108b8db66849ca8fbd1b5484581758174595a2138f6a13cb347f53b02d00ce55
+  data.tar.gz: 65ff74cd753406728149809b196ff2fe2e281d4539f7c533d1054e5aa43098b6c3373a80055bee588e3ad918bda2642b9bf3165b7a05818f46a9384c0d106933

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/grit.rb

@@ -50,7 +50,7 @@ require 'grit/merge'
 require 'grit/grep'
 
 module Grit
-  VERSION = '2.6.0'
+  VERSION = File.read("VERSION").strip
 
   class << self
     # Set +debug+ to true to log all git calls and responses

data/lib/grit/git.rb

@@ -315,10 +315,13 @@ module Grit
       env = options.delete(:env) || {}
       raise_errors = options.delete(:raise)
       process_info = options.delete(:process_info)
+      pipeline = options.delete(:pipeline)
 
       # fall back to using a shell when the last argument looks like it wants to
       # start a pipeline for compatibility with previous versions of grit.
-      return run(prefix, cmd, '', options, args) if args[-1].to_s[0] == ?|
+      if args[-1].to_s[0] == ?| && pipeline
+        return run(prefix, cmd, '', options, args)
+      end
 
       # more options
       input    = options.delete(:input)
@@ -414,7 +417,10 @@ module Grit
     end
 
     # DEPRECATED OPEN3-BASED COMMAND EXECUTION
-
+    # Used only for pipeline support.
+    # Ex.
+    #   git log | grep bugfix
+    #
     def run(prefix, cmd, postfix, options, args, &block)
       timeout  = options.delete(:timeout) rescue nil
       timeout  = true if timeout.nil?

data/lib/grit/repo.rb

@@ -1,5 +1,4 @@
 module Grit
-
   class Repo
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
     BATCH_PARSERS      = {
@@ -621,6 +620,7 @@ module Grit
     def archive_tar_gz(treeish = 'master', prefix = nil)
       options = {}
       options[:prefix] = prefix if prefix
+      options[:pipeline] = true
       self.git.archive(options, treeish, "| gzip -n")
     end
 
@@ -636,6 +636,7 @@ module Grit
       options = {}
       options[:prefix] = prefix if prefix
       options[:format] = format if format
+      options[:pipeline] = true
       self.git.archive(options, treeish, "| #{pipe} > #{filename}")
     end
 
@@ -715,7 +716,7 @@ module Grit
 
     def grep(searchtext, contextlines = 3, branch = 'master')
       context_arg = '-C ' + contextlines.to_s
-      result = git.native(:grep, {}, '-n', '-E', '-i', '-z', '--heading', '--break', context_arg, searchtext, branch).encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
+      result = git.native(:grep, {pipeline: false}, '-n', '-E', '-i', '-z', '--heading', '--break', context_arg, searchtext, branch).encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
       greps = []
       filematches = result.split("\n\n")
       filematches.each do |filematch|
@@ -756,5 +757,4 @@ module Grit
       %Q{#<Grit::Repo "#{@path}">}
     end
   end # Repo
-
 end # Grit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes