gitlab_git 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab5aa6578bdca193435e2b0c7341a0c050b2d8b
-  data.tar.gz: b9d0126b99b6da231b0c45d7e0ef65962d8f6db5
+  metadata.gz: e4a8a135eb5358dd1b869c7838ef929d86de4293
+  data.tar.gz: 1f64c7ab0f98fcc4e5b0e93bb959d3b56d4cae08
 SHA512:
-  metadata.gz: a568b6db546a15940023289f7a01c704dedfffb76616cc51cccec0a9c65bac06e96da48e3677d53a75eafaeaf18d649248932ffb014c1af48b5c37dbee9e87a0
-  data.tar.gz: 90191aa864c638784c91b4b20475d629df00d7911e471c1a5c1858baea637327501f701966790f97d5cc20511aabf76eca6b5fa8f3046689247e015ce873e0b5
+  metadata.gz: 2a1e73582ca20fa80bdb6d1c7b337864f9cdf412b751b4bc3f32f3982f0afc6e8f021f909b44fa6224f53a88d050d96086216036c5b66404f5f64c1ad226e48c
+  data.tar.gz: 36a067ae07f4700f32a55216c51bd071f4047ddc95b7612222381e62dc1c05426c39e5a684bf89c0454542c2fb448aa9f8ccdd3cd5662a3880057c2820facbaa

data/VERSION

@@ -1 +1 @@
-7.0.1
+7.1.0

data/lib/gitlab_git/blame.rb

@@ -1,12 +1,13 @@
 module Gitlab
   module Git
     class Blame
+      attr_accessor :blob
 
       def initialize(repository, sha, path)
         @repo = repository.rugged
-        @blame = Rugged::Blame.new(@repo, path, { :newest_commit => sha })
-        @blob = @repo.blob_at(sha, path)
-        @lines = @blob.content.split("\n")
+        @blame = Rugged::Blame.new(@repo, path, { newest_commit: sha })
+        @blob = Blob.find(repository, sha, path)
+        @lines = @blob.data.split("\n")
       end
 
       def each

data/lib/gitlab_git/commit.rb

@@ -2,6 +2,8 @@
 module Gitlab
   module Git
     class Commit
+      include EncodingHelper
+
       attr_accessor :raw_commit, :head, :refs
 
       SERIALIZE_KEYS = [
@@ -248,6 +250,26 @@ module Gitlab
         end
       end
 
+      def message
+        encode! @message
+      end
+
+      def author_name
+        encode! @author_name
+      end
+
+      def author_email
+        encode! @author_email
+      end
+
+      def committer_name
+        encode! @committer_name
+      end
+
+      def committer_email
+        encode! @committer_email
+      end
+
       private
 
       def init_from_hash(hash)

data/lib/gitlab_git/diff.rb

@@ -231,4 +231,3 @@ module Gitlab
     end
   end
 end
-

data/lib/gitlab_git/encoding_helper.rb

@@ -27,7 +27,7 @@ module EncodingHelper
   private
 
   def clean(message)
-    message.encode("UTF-16BE", :undef => :replace, :invalid => :replace, :replace => "")
+    message.encode("UTF-16BE", undef: :replace, invalid: :replace, replace: "")
            .encode("UTF-8")
            .gsub("\0".encode("UTF-8"), "")
   end

data/lib/gitlab_git/popen.rb

@@ -4,12 +4,12 @@ module Gitlab
   module Git
     module Popen
       def popen(cmd, path)
-      unless cmd.is_a?(Array)
-        raise "System commands must be given as an array of strings"
-      end
+        unless cmd.is_a?(Array)
+          raise "System commands must be given as an array of strings"
+        end
 
         vars = { "PWD" => path }
-        options = { :chdir => path }
+        options = { chdir: path }
 
         @cmd_output = ""
         @cmd_status = 0

data/lib/gitlab_git/ref.rb

@@ -1,6 +1,8 @@
 module Gitlab
   module Git
     class Ref
+      include EncodingHelper
+      
       # Branch or tag name
       # without "refs/tags|heads" prefix
       attr_reader :name
@@ -19,6 +21,7 @@ module Gitlab
       end
 
       def initialize(name, target)
+        encode! name
         @name = name.gsub(/\Arefs\/(tags|heads)\//, '')
         @target = if target.respond_to?(:oid)
                     target.oid

data/lib/gitlab_git/repository.rb

@@ -202,7 +202,11 @@ module Gitlab
           # Discard submodules
           next if submodule?(entry)
 
-          content = rugged.lookup(entry[:oid]).content
+          content = Blob.raw(self, entry[:oid]).data
+
+          # Skip binary files
+          next if content.encoding == Encoding::ASCII_8BIT
+
           greps += build_greps(content, query, ref, entry[:path])
         end
 
@@ -899,7 +903,7 @@ module Gitlab
 
           # Get the compression process ready to accept data from the read end
           # of the pipe
-          compress_pid = spawn(*compress_cmd, :in => pipe_rd, :out => file)
+          compress_pid = spawn(*compress_cmd, in: pipe_rd, out: file)
           # Set the lowest priority for the compressing process
           popen(nice_process(compress_pid), path)
           # The read end belongs to the compression process now; we should
@@ -908,7 +912,7 @@ module Gitlab
 
           # Start 'git archive' and tell it to write into the write end of the
           # pipe.
-          git_archive_pid = spawn(*git_archive_cmd, :out => pipe_wr)
+          git_archive_pid = spawn(*git_archive_cmd, out: pipe_wr)
           # The write end belongs to 'git archive' now; close it.
           pipe_wr.close
 

data/lib/gitlab_git/tag.rb

@@ -1,12 +1,14 @@
 module Gitlab
   module Git
     class Tag < Ref
-      attr_reader :message
-
       def initialize(name, target, message = nil)
         super(name, target)
         @message = message
       end
+
+      def message
+        encode! @message
+      end
     end
   end
 end

data/lib/gitlab_git/tree.rb

@@ -1,6 +1,8 @@
 module Gitlab
   module Git
     class Tree
+      include EncodingHelper
+
       attr_accessor :id, :root_id, :name, :path, :type,
         :mode, :commit_id, :submodule_url
 
@@ -74,6 +76,10 @@ module Gitlab
         end
       end
 
+      def name
+        encode! @name
+      end
+
       def dir?
         type == :tree
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist