gitlab_git 7.2.24 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 320a203e93a3ce0ad48aa4edec7afa9b72da8b99
-  data.tar.gz: cc651b333e40c5152e3e732bcb3bccbe267b012b
+  metadata.gz: d950876f8ec96a748af722a6415f180df67145e3
+  data.tar.gz: ba58a4d6062538028df751d1f4c1d5ecc753c588
 SHA512:
-  metadata.gz: c3ee43227084d36f9cf9544ccbab03787e3f453341ee4af66bd71bce154fd238804501324ded8ea331a778a511ea8598ad6b047a9f8a270a130a739438fd8336
-  data.tar.gz: 67d85099411399ddad30d001d12704def155f08d716de240b3675e7aff08c5b59ace76bbe28100413a3b2c456c534c24a93ed285ed659bcf606a995bf0148663
+  metadata.gz: e99e08238b47ce5b23a715c7578fe98d2f29cf755e5cff28b688bcf5195447577354d14fd9a895530bde7b5959943906b93429bf331a4c7ad5be4616ea505083
+  data.tar.gz: 0b39c79a5f3f723509a26d81fd7b8370de336a0487caacc3147588eb8c95268843e2e93fe00ef2abad6cb3841666d4a6ef6e9a4c402851ced7ecd36449e5ea9b

data/VERSION

@@ -1 +1 @@
-7.2.24
+8.0.0

data/lib/gitlab_git/blob.rb

@@ -7,6 +7,11 @@ module Gitlab
       include Linguist::BlobHelper
       include EncodingHelper
 
+      # This number needs to be large enough to allow reliable content /
+      # encoding detection (Linguist) and LFS pointer parsing. All other cases
+      # where we need full blob data should use load_all_data!.
+      DATA_FRAGMENT_SIZE = 1024
+
       attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id
 
       class << self
@@ -28,7 +33,7 @@ module Gitlab
                 id: blob.oid,
                 name: blob_entry[:name],
                 size: blob.size,
-                data: blob.content,
+                data: blob.content(DATA_FRAGMENT_SIZE),
                 mode: blob_entry[:filemode].to_s(8),
                 path: path,
                 commit_id: sha,
@@ -43,7 +48,7 @@ module Gitlab
           Blob.new(
             id: blob.oid,
             size: blob.size,
-            data: blob.content,
+            data: blob.content(DATA_FRAGMENT_SIZE),
           )
         end
 
@@ -217,6 +222,14 @@ module Gitlab
         encode! @data
       end
 
+      # Load all blob data (not just the first DATA_FRAGMENT_SIZE bytes) into
+      # memory as a Ruby string.
+      def load_all_data!(repository)
+        return if @data == '' # don't mess with submodule blobs
+
+        @data = repository.lookup(id).content
+      end
+
       def name
         encode! @name
       end

data/lib/gitlab_git/repository.rb

@@ -197,7 +197,7 @@ module Gitlab
 
       # Return repo size in megabytes
       def size
-        size = popen(%W(du -s), path).first.strip.to_i
+        size = popen(%W(du -sk), path).first.strip.to_i
         (size.to_f / 1024).round(2)
       end
 
@@ -211,12 +211,13 @@ module Gitlab
           # Discard submodules
           next if submodule?(entry)
 
-          content = Blob.raw(self, entry[:oid]).data
+          blob = Blob.raw(self, entry[:oid])
 
           # Skip binary files
-          next if content.encoding == Encoding::ASCII_8BIT
+          next if blob.data.encoding == Encoding::ASCII_8BIT
 
-          greps += build_greps(content, query, ref, entry[:path])
+          blob.load_all_data!(self)
+          greps += build_greps(blob.data, query, ref, entry[:path])
         end
 
         greps

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.24
+  version: 8.0.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library