gitlab-grit 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8611933f8aa9a6d1f66c3037d40ee93001e1d764
-  data.tar.gz: 3f52e9f42157e9a033ed17689eb747641d524c10
+  metadata.gz: 64a8b118ad835c82733051f1f950afa9f107e08b
+  data.tar.gz: b51dcfd5613c248cdb9c2654bb870da5c6a80204
 SHA512:
-  metadata.gz: 3aae41c2e4e0f66f0338222f1849580446b4648b4a5b630b72fa100aea1cd67c6fb72f837c7efa3a5767ef92063260ebb6cb1bdbe8e063a710f4a0aa7a4458bb
-  data.tar.gz: 40cb71314bc6c1e8d7a299f9c3fc4059dd3f924d25de13e602ceac5a91cb18029017e2c16fc0dafc639a1acfff5cfa833eea82889d52c908a48fab60d93545ec
+  metadata.gz: 359e1450304d9f783b54246186c5bd33dc4a44d52212c5b4785d87875336b537e0b802955e945658e279e962b48e9121effec1abf222bf0e31d185607d953409
+  data.tar.gz: bd37bca63d26b93bf2d33d32888db73b9c919b7888deacb6fb0053b835963b5742056f9f02922df313e84046c840e9b9de47a2a9163dba5951bf22d59e7caa2b

data/README.md

@@ -11,6 +11,21 @@
 * [![Coverage Status](https://coveralls.io/repos/gitlabhq/grit/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/grit)
 
 
+## Fork changes
+
+We patched existing grit library to use it inside GitLab
+
+* Added grep method to look for files
+* Fixed commits parsing for signed commits
+* Encoding fixes
+* Cleanup and improve code style
+* Handle filenames with spaces
+* Fixes symlinks omission from diff
+* Added Gemfile
+* and much more small fixes
+
+
+## Grit
 
 Grit gives you object oriented read/write access to Git repositories via Ruby.
 The main goals are stability and performance. To this end, some of the

data/VERSION

@@ -1 +1 @@
-2.6.4
+2.6.5

data/lib/grit/git.rb

@@ -315,13 +315,6 @@ 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.
-      if args[-1].to_s[0] == ?| && pipeline
-        return run(prefix, cmd, '', options, args)
-      end
 
       # more options
       input    = options.delete(:input)
@@ -416,58 +409,6 @@ module Grit
       end
     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?
-
-      base     = options.delete(:base) rescue nil
-      base     = true if base.nil?
-
-      if input = options.delete(:input)
-        block = lambda { |stdin| stdin.write(input) }
-      end
-
-      opt_args = transform_options(options)
-
-      if RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|bccwin/
-        ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|' || Grit.no_quote) ? a : "\"#{e(a)}\"" }
-        gitdir = base ? "--git-dir=\"#{self.git_dir}\"" : ""
-        call = "#{prefix}#{Git.git_binary} #{gitdir} #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{e(postfix)}"
-      else
-        ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|' || Grit.no_quote) ? a : "'#{e(a)}'" }
-        gitdir = base ? "--git-dir='#{self.git_dir}'" : ""
-        call = "#{prefix}#{Git.git_binary} #{gitdir} #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{e(postfix)}"
-      end
-
-      Grit.log(call) if Grit.debug
-      response, err = timeout ? sh(call, &block) : wild_sh(call, &block)
-      Grit.log(response) if Grit.debug
-      Grit.log(err) if Grit.debug
-      response
-    end
-
-    def sh(command, &block)
-      process =
-        Child.new(
-          command,
-          :timeout => Git.git_timeout,
-          :max     => Git.git_max_size
-        )
-      [process.out, process.err]
-    rescue TimeoutExceeded, MaximumOutputExceeded
-      raise GitTimeout, command
-    end
-
-    def wild_sh(command, &block)
-      process = Child.new(command)
-      [process.out, process.err]
-    end
-
     # Transform Ruby style options into git command line options
     #   +options+ is a hash of Ruby style options
     #

data/lib/grit/repo.rb

@@ -1,5 +1,7 @@
 module Grit
   class Repo
+    include POSIX::Spawn
+
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
     BATCH_PARSERS      = {
       'commit' => ::Grit::Commit
@@ -581,63 +583,29 @@ module Grit
       Commit.diff(self, commit)
     end
 
-    # Archive the given treeish
-    #   +treeish+ is the treeish name/id (default 'master')
-    #   +prefix+ is the optional prefix
-    #
-    # Examples
-    #   repo.archive_tar
-    #   # => <String containing tar archive>
-    #
-    #   repo.archive_tar('a87ff14')
-    #   # => <String containing tar archive for commit a87ff14>
-    #
-    #   repo.archive_tar('master', 'myproject/')
-    #   # => <String containing tar archive and prefixed with 'myproject/'>
-    #
-    # Returns String (containing tar archive)
-    def archive_tar(treeish = 'master', prefix = nil)
-      options = {}
-      options[:prefix] = prefix if prefix
-      self.git.archive(options, treeish)
-    end
-
-    # Archive and gzip the given treeish
-    #   +treeish+ is the treeish name/id (default 'master')
-    #   +prefix+ is the optional prefix
-    #
-    # Examples
-    #   repo.archive_tar_gz
-    #   # => <String containing tar.gz archive>
-    #
-    #   repo.archive_tar_gz('a87ff14')
-    #   # => <String containing tar.gz archive for commit a87ff14>
-    #
-    #   repo.archive_tar_gz('master', 'myproject/')
-    #   # => <String containing tar.gz archive and prefixed with 'myproject/'>
-    #
-    # Returns String (containing tar.gz archive)
-    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
-
     # Write an archive directly to a file
     #   +treeish+ is the treeish name/id (default 'master')
     #   +prefix+ is the optional prefix (default nil)
     #   +filename+ is the name of the file (default 'archive.tar.gz')
     #   +format+ is the optional format (default nil)
-    #   +pipe+ is the command to run the output through (default 'gzip')
+    #   +compress_cmd+ is the command to run the output through (default ['gzip'])
     #
     # Returns nothing
-    def archive_to_file(treeish = 'master', prefix = nil, filename = 'archive.tar.gz', format = nil, pipe = "gzip")
-      options = {}
-      options[:prefix] = prefix if prefix
-      options[:format] = format if format
-      options[:pipeline] = true
-      self.git.archive(options, treeish, "| #{pipe} > #{filename}")
+    def archive_to_file(treeish = 'master', prefix = nil, filename = 'archive.tar.gz', format = nil, compress_cmd = %W(gzip))
+      git_archive_cmd = %W(#{Git.git_binary} --git-dir=#{self.git.git_dir} archive)
+      git_archive_cmd << "--prefix=#{prefix}" if prefix
+      git_archive_cmd << "--format=#{format}" if format
+      git_archive_cmd += %W(-- #{treeish})
+
+      open(filename, 'w') do |file|
+        pipe_rd, pipe_wr = IO.pipe
+        git_archive_pid = spawn(*git_archive_cmd, :out => pipe_wr)
+        compress_pid = spawn(*compress_cmd, :in => pipe_rd, :out => file)
+        pipe_rd.close
+        pipe_wr.close
+        Process.waitpid(git_archive_pid)
+        Process.waitpid(compress_pid)
+      end
     end
 
     # Enable git-daemon serving of this repository by writing the
@@ -716,7 +684,7 @@ module Grit
 
     def grep(searchtext, contextlines = 3, branch = 'master')
       context_arg = '-C ' + contextlines.to_s
-      result = git.native(:grep, {pipeline: false}, '-n', '-E', '-i', '-z', '--heading', '--break', context_arg, searchtext, branch).encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
+      result = git.native(:grep, {}, '-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|
@@ -752,6 +720,87 @@ module Grit
       greps
     end
 
+    def final_escape(str)
+      str.gsub('"', '\\"')
+    end
+
+    # Accepts quoted strings and negation (-) operator in search strings
+    def advanced_grep(searchtext, contextlines = 3, branch = 'master')
+
+      # If there's not an even number of quote marks, get rid of them all
+      searchtext = searchtext.gsub('"', '') if searchtext.count('"') % 2 == 1
+
+      # Escape the text, but allow spaces and quote marks (by unescaping them)
+      searchtext = Shellwords.shellescape(searchtext).gsub('\ ',' ').gsub('\\"','"')
+
+      # Shellwords happens to parse search terms really nicely!
+      terms = Shellwords.split(searchtext)
+
+      term_args = []
+      negative_args = []
+
+      # For each search term (either a word or a quoted string), add the relevant term argument to either the term
+      # args array, or the negative args array, used for two separate calls to git grep
+      terms.each do |term|
+        arg_array = term_args
+        if term[0] == '-'
+          arg_array = negative_args
+          term = term[1..-1]
+        end
+        arg_array.push '-e'
+        arg_array.push final_escape(term)
+      end
+
+      context_arg = '-C ' + contextlines.to_s
+      result = git.native(:grep, {pipeline: false}, '-n', '-F', '-i', '-z', '--heading', '--break', '--all-match', context_arg, *term_args, branch).encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
+
+      # Find files that match the negated terms; these will be excluded from the results
+      excluded_files = Array.new
+      unless negative_args.empty?
+        negative = git.native(:grep, {pipeline: false}, '-F', '-i', '--files-with-matches', *negative_args, branch).encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
+        excluded_files = negative.split("\n").map {|text| text.partition(':')[2]}
+      end
+
+      greps = []
+      filematches = result.split("\n\n")
+      filematches.each do |filematch|
+        binary = false
+        file = ''
+        matches = filematch.split("--\n")
+        matches.each_with_index do |match, i|
+          content = []
+          startline = 0
+          lines = match.split("\n")
+          if i == 0
+            text = lines.first
+            lines.slice!(0)
+            file = text[/^Binary file (.+) matches$/]
+            if file
+              puts "BINARY #{file}"
+              binary = true
+            else
+              text.slice! /^#{branch}:/
+              file = text
+            end
+          end
+
+          # Skip this result if the file is to be ignored (due to a negative match)
+          next if excluded_files.include? file || ( excluded_files.include? text[/^Binary file (.+) matches$/, 1].partition(':')[2] )
+
+          lines.each_with_index do |line, j|
+            line.chomp!
+            number, text = line.split("\0", 2)
+            if j == 0
+              startline = number.to_i
+            end
+            content << text
+          end
+          greps << Grit::Grep.new(self, file, startline, content, binary)
+        end
+      end
+      greps
+    end
+
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Repo "#{@path}">}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -10,76 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Grit is a Ruby library for extracting information from a git repository
@@ -91,6 +91,9 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- LICENSE
+- README.md
+- VERSION
 - lib/grit.rb
 - lib/grit/actor.rb
 - lib/grit/blame.rb
@@ -128,31 +131,28 @@ files:
 - lib/grit_ext/tag.rb
 - lib/grit_ext/tree.rb
 - lib/grit_ext/version.rb
-- VERSION
-- README.md
-- LICENSE
 homepage: http://github.com/gitlabhq/grit
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 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.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby Git bindings.