gitlab-grit 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e01843f1f907d4f805ebe1a462b2b9ef8d9eaab5
-  data.tar.gz: b9f43ffa1683eaf547231ed43669af157f8164c4
+  metadata.gz: 290c31e6fb93fe5e1dd3c3f81e4f1a2438f00767
+  data.tar.gz: fda00dfa647aacbc021a1d2800750490a823ff27
 SHA512:
-  metadata.gz: b24104f75bfe51628548effd17d98df9f5a0afd5b21b78e46014dfdfaec6429e6af233b8e6eb23c0d94854886a4129cb06b046c1b0995e59575a0ba950e4f8a9
-  data.tar.gz: f2d909494083105615098ff61a57da78b7ff4a041b214286fb5c3d5b0c5a0cb1717d8b71e9fddb7d8909fe7bd70e9a1115fdb71d1e46bb94cbc696eb31247941
+  metadata.gz: 9fa89384e27c8bbbb6eac83b7062f4151be9009f852b4c2434ee2429f24ee21130694355e22662a41c9870602e91700bbccb6ac309da49bd73b66ab427fe8cad
+  data.tar.gz: bf0e2678fbe8c41dcbacd7a581b4e4f84132a58bb503111cf583c54400f2028fe99f2563b18a9fd03447d8bddb84e3ec796a63926eee742d0b6992f5aeee5715

data/README.md

@@ -31,7 +31,7 @@ This documentation is accurate as of Grit 2.3.
 
 ## Requirements
 
-* git (http://git-scm.com) tested with 1.7.2.1
+* git (http://git-scm.com) tested with 1.7.4.6
 
 
 ## Install

data/lib/grit.rb

@@ -50,7 +50,7 @@ require 'grit/merge'
 require 'grit/grep'
 
 module Grit
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 
   class << self
     # Set +debug+ to true to log all git calls and responses

data/lib/grit/commit_stats.rb

@@ -68,7 +68,7 @@ module Grit
 
         files = []
         while lines.first =~ /^([-\d]+)\s+([-\d]+)\s+(.+)/
-          (additions, deletions, filename) = lines.shift.split
+          (additions, deletions, filename) = lines.shift.split(nil, 3)
           additions = additions.to_i
           deletions = deletions.to_i
           total = additions + deletions

data/lib/grit/git-ruby.rb

@@ -116,27 +116,29 @@ module Grit
     def refs(options, prefix)
       refs = []
       already = {}
-      Dir.chdir(@git_dir) do
-        files = Dir.glob(prefix + '/**/*')
-        files.each do |ref|
-          next if !File.file?(ref)
-          id = File.read(ref).chomp
-          name = ref.sub("#{prefix}/", '')
-          if !already[name]
-            refs << "#{name} #{id}"
-            already[name] = true
-          end
+      orig_prefix = prefix
+      prefix = File.join @git_dir, prefix
+
+      files = Dir.glob(prefix + '/**/*')
+      files.each do |ref|
+        next if !File.file?(ref)
+        id = File.read(ref).chomp
+        name = ref.sub("#{prefix}/", '')
+        if !already[name]
+          refs << "#{name} #{id}"
+          already[name] = true
         end
+      end
 
-        if File.file?('packed-refs')
-          File.readlines('packed-refs').each do |line|
-            if m = /^(\w{40}) (.*?)$/.match(line)
-              next if !Regexp.new('^' + prefix).match(m[2])
-              name = m[2].sub("#{prefix}/", '')
-              if !already[name]
-                refs << "#{name} #{m[1]}"
-                already[name] = true
-              end
+      packed = File.join(@git_dir, 'packed-refs')
+      if File.file?(packed)
+        File.readlines(packed).each do |line|
+          if m = /^(\w{40}) (.*?)$/.match(line)
+            next if !Regexp.new('^' + orig_prefix).match(m[2])
+            name = m[2].sub("#{orig_prefix}/", '')
+            if !already[name]
+              refs << "#{name} #{m[1]}"
+              already[name] = true
             end
           end
         end
@@ -149,43 +151,45 @@ module Grit
       refs = []
       already = {}
 
-      Dir.chdir(repo.path) do
-        files = Dir.glob(prefix + '/**/*')
+      orig_prefix = prefix
+      prefix = File.join @git_dir, prefix
 
-        files.each do |ref|
-          next if !File.file?(ref)
+      files = Dir.glob(prefix + '/**/*')
 
-          id = File.read(ref).chomp
-          name = ref.sub("#{prefix}/", '')
+      files.each do |ref|
+        next if !File.file?(ref)
 
-          if !already[name]
-            refs << "#{name} #{id}"
-            already[name] = true
-          end
+        id = File.read(ref).chomp
+        name = ref.sub("#{prefix}/", '')
+
+        if !already[name]
+          refs << "#{name} #{id}"
+          already[name] = true
         end
+      end
 
-        if File.file?('packed-refs')
-          lines = File.readlines('packed-refs')
-          lines.each_with_index do |line, i|
-            if m = /^(\w{40}) (.*?)$/.match(line)
-              next if !Regexp.new('^' + prefix).match(m[2])
-              name = m[2].sub("#{prefix}/", '')
+      packed = File.join(@git_dir, 'packed-refs')
+      if File.file?(packed)
+        lines = File.readlines('packed-refs')
+        lines.each_with_index do |line, i|
+          if m = /^(\w{40}) (.*?)$/.match(line)
+            next if !Regexp.new('^' + orig_prefix).match(m[2])
+            name = m[2].sub("#{orig_prefix}/", '')
 
-              # Annotated tags in packed-refs include a reference
-              # to the commit object on the following line.
-              next_line = lines[i + 1]
+            # Annotated tags in packed-refs include a reference
+            # to the commit object on the following line.
+            next_line = lines[i + 1]
 
-              id =
+            id =
               if next_line && next_line[0] == ?^
                 next_line[1..-1].chomp
               else
                 m[1]
               end
 
-              if !already[name]
-                refs << "#{name} #{id}"
-                already[name] = true
-              end
+            if !already[name]
+              refs << "#{name} #{id}"
+              already[name] = true
             end
           end
         end

data/lib/grit/git.rb

@@ -167,11 +167,7 @@ module Grit
     end
 
     def list_remotes
-      remotes = []
-      Dir.chdir(File.join(self.git_dir, 'refs/remotes')) do
-        remotes = Dir.glob('*')
-      end
-      remotes
+      Dir.glob(File.join(self.git_dir, 'refs/remotes/*'))
     rescue
       []
     end
@@ -319,13 +315,10 @@ 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
+      return run(prefix, cmd, '', options, args) if args[-1].to_s[0] == ?|
 
       # more options
       input    = options.delete(:input)
@@ -421,10 +414,7 @@ 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,4 +1,5 @@
 module Grit
+
   class Repo
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
     BATCH_PARSERS      = {
@@ -620,7 +621,6 @@ 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,7 +636,6 @@ module Grit
       options = {}
       options[:prefix] = prefix if prefix
       options[:format] = format if format
-      options[:pipeline] = true
       self.git.archive(options, treeish, "| #{pipe} > #{filename}")
     end
 
@@ -716,7 +715,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).force_encoding('UTF-8')
+      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|
@@ -757,4 +756,5 @@ module Grit
       %Q{#<Grit::Repo "#{@path}">}
     end
   end # Repo
+
 end # Grit

data/lib/grit/status.rb

@@ -90,34 +90,33 @@ module Grit
       def construct_status
         @files = ls_files
 
-        Dir.chdir(@base.working_dir) do
-          # find untracked in working dir
-          Dir.glob('**/*') do |file|
-            if !@files[file]
-              @files[file] = {:path => file, :untracked => true} if !File.directory?(file)
-            end
+        # find untracked in working dir
+        Dir.glob(File.join(@base.working_dir, '**/*')) do |full_file|
+          file = full_file.gsub "#{@base.working_dir}/", ""
+          if !@files[file]
+            @files[file] = {:path => file, :untracked => true} if !File.directory?(file)
           end
+        end
 
-          # find modified in tree
-         diff_files.each do |path, data|
-            @files[path] ? @files[path].merge!(data) : @files[path] = data
-          end
+        # find modified in tree
+        diff_files.each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
 
-          # find added but not committed - new files
-          diff_index('HEAD').each do |path, data|
-            @files[path] ? @files[path].merge!(data) : @files[path] = data
-          end
+        # find added but not committed - new files
+        diff_index('HEAD').each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
 
-          @files.each do |k, file_hash|
-            @files[k] = StatusFile.new(@base, file_hash)
-          end
+        @files.each do |k, file_hash|
+          @files[k] = StatusFile.new(@base, file_hash)
         end
       end
 
       # compares the index and the working directory
       def diff_files
         hsh = {}
-        @base.git.diff_files.split("\n").each do |line|
+        @base.git.diff_files(chdir: @base.working_dir).split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
           hsh[file] = {:path => file, :mode_file => mode_src.to_s[1, 7], :mode_index => mode_dest,
@@ -129,7 +128,7 @@ module Grit
       # compares the index and the repository
       def diff_index(treeish)
         hsh = {}
-        @base.git.diff_index({}, treeish).split("\n").each do |line|
+        @base.git.diff_index({chdir: @base.working_dir}, treeish).split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
           hsh[file] = {:path => file, :mode_repo => mode_src.to_s[1, 7], :mode_index => mode_dest,
@@ -140,7 +139,7 @@ module Grit
 
       def ls_files
         hsh = {}
-        lines = @base.git.ls_files({:stage => true})
+        lines = @base.git.ls_files({chdir: @base.working_dir, :stage => true})
         lines.split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode, sha, stage) = info.split
@@ -150,4 +149,4 @@ module Grit
       end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Tom Preston-Werner