gitlab_git 7.2.17 → 7.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58b8aec1553a439911be1cd941d2b75d47560de2
-  data.tar.gz: 457518a82b5af18498f8d8d98967f88ad91e2979
+  metadata.gz: 51faf2ed86cc7ec1871ab520a010387027e10934
+  data.tar.gz: 2c0159a83e00d08ba95c79c05b3b270b2a715e8c
 SHA512:
-  metadata.gz: ca462fb56f9c1dcde3629b60373d7803f568bdd22c43a86db8ae85808c7678857fe4a9af9690e6f080f694b54cda033cd41dff06577addc0114d82bab7544ec4
-  data.tar.gz: 6781c2579a1ca4b46423b5160980ff7f00bcf4a12f151a8206ac55bb9d2f7f7e6775cae0a94f1ebd6e89e909b81ddda491cca4969466901d8e810b4f3156391e
+  metadata.gz: 8fc36043056991b48a5cca5d7a7b0521e5a0fcdb7b6c4a2396c5377e5bd6790916f910e6378d578efe905f23ee1678a722c29f94cec767865de21a84367bd381
+  data.tar.gz: a21575ea3bff0c46aec1a5d6857fdc553b9fc45d12c47e37ded06d7046913b5fcc5538f664c89809ca96b374eedaa4ffc82d313fa2d5160f358d6357902c58c3

data/VERSION

@@ -1 +1 @@
-7.2.17
+7.2.18

data/lib/gitlab_git/blob.rb

@@ -1,3 +1,6 @@
+require_relative 'encoding_helper'
+require_relative 'path_helper'
+
 module Gitlab
   module Git
     class Blob
@@ -58,7 +61,7 @@ module Gitlab
         def find_entry_by_path(repository, root_id, path)
           root_tree = repository.lookup(root_id)
           # Strip leading slashes
-          path.slice!(0) if path[0] == "/"
+          path[/^\/*/] = ''
           path_arr = path.split('/')
 
           entry = root_tree.find do |entry|
@@ -91,7 +94,8 @@ module Gitlab
         # options should contain next structure:
         #   file: {
         #     content: 'Lorem ipsum...',
-        #     path: 'documents/story.txt'
+        #     path: 'documents/story.txt',
+        #     update: true
         #   },
         #   author: {
         #     email: 'user@example.com',
@@ -110,6 +114,7 @@ module Gitlab
         #
         def commit(repository, options, action = :add)
           file = options[:file]
+          update = file[:update].nil? ? true : file[:update]
           author = options[:author]
           committer = options[:committer]
           commit = options[:commit]
@@ -121,17 +126,33 @@ module Gitlab
             ref = 'refs/heads/' + ref
           end
 
+          path_name = PathHelper.normalize_path(file[:path])
+          # Abort if any invalid characters remain (e.g. ../foo)
+          raise Repository::InvalidBlobName.new("Invalid path") if path_name.each_filename.to_a.include?('..')
+
+          filename = path_name.to_s
           index = repo.index
 
           unless repo.empty?
-            last_commit = repo.references[ref].target
+            rugged_ref = repo.references[ref]
+            raise Repository::InvalidRef.new("Invalid branch name") unless rugged_ref
+            last_commit = rugged_ref.target
             index.read_tree(last_commit.tree)
             parents = [last_commit]
           end
 
           if action == :remove
-            index.remove(file[:path])
+            index.remove(filename)
           else
+            mode = 0100644
+            file_entry = index.get(filename)
+
+            if file_entry
+              raise Repository::InvalidBlobName.new("Filename already exists; update not allowed") unless update
+              # Preserve the current file mode if one is available
+              mode = file_entry[:mode] if file_entry[:mode]
+            end
+
             content = file[:content]
             detect = CharlockHolmes::EncodingDetector.new.detect(content) if content
 
@@ -142,7 +163,7 @@ module Gitlab
             end
 
             oid = repo.write(content, :blob)
-            index.add(path: file[:path], oid: oid, mode: 0100644)
+            index.add(path: filename, oid: oid, mode: mode)
           end
 
           opts = {}

data/lib/gitlab_git/path_helper.rb

@@ -0,0 +1,16 @@
+module Gitlab
+  module Git
+    class PathHelper
+      class << self
+        def normalize_path(filename)
+          # Strip all leading slashes so that //foo -> foo
+          filename[/^\/*/] = ''
+
+          # Expand relative paths (e.g. foo/../bar)
+          filename = Pathname.new(filename)
+          filename.relative_path_from(Pathname.new(''))
+        end
+      end
+    end
+  end
+end

data/lib/gitlab_git/repository.rb

@@ -1,5 +1,6 @@
 # Gitlab::Git::Repository is a wrapper around native Rugged::Repository object
 require_relative 'encoding_helper'
+require_relative 'path_helper'
 require 'tempfile'
 require "rubygems/package"
 
@@ -12,6 +13,7 @@ module Gitlab
 
       class NoRepository < StandardError; end
       class InvalidBlobName < StandardError; end
+      class InvalidRef < StandardError; end
 
       # Default branch in the repository
       attr_accessor :root_ref
@@ -807,6 +809,53 @@ module Gitlab
         rugged.config['core.autocrlf'] = AUTOCRLF_VALUES.invert[value]
       end
 
+      # Create a new directory with a .gitkeep file. Creates
+      # all required nested directories (i.e. mkdir -p behavior)
+      #
+      # options should contain next structure:
+      #   author: {
+      #     email: 'user@example.com',
+      #     name: 'Test User',
+      #     time: Time.now
+      #   },
+      #   committer: {
+      #     email: 'user@example.com',
+      #     name: 'Test User',
+      #     time: Time.now
+      #   },
+      #   commit: {
+      #     message: 'Wow such commit',
+      #     branch: 'master'
+      #   }
+      def mkdir(path, options = {})
+        # Check if this directory exists; if it does, then don't bother
+        # adding .gitkeep file.
+        ref = options[:commit][:branch]
+        path = PathHelper.normalize_path(path).to_s
+        rugged_ref = rugged.ref(ref)
+
+        raise InvalidRef.new("Invalid ref") if rugged_ref.nil?
+        target_commit = rugged_ref.target
+        raise InvalidRef.new("Invalid target commit") if target_commit.nil?
+
+        entry = tree_entry(target_commit, path)
+        if entry
+          if entry[:type] == :blob
+            raise InvalidBlobName.new("Directory already exists as a file")
+          else
+            raise InvalidBlobName.new("Directory already exists")
+          end
+        end
+
+        options[:file] = {
+          content: '',
+          path: "#{path}/.gitkeep",
+          update: true
+        }
+
+        Blob.commit(self, options)
+      end
+
       private
 
       # Get the content of a blob for a given commit.  If the blob is a commit
@@ -901,11 +950,15 @@ module Gitlab
       # Find the entry for +path+ in the tree for +commit+
       def tree_entry(commit, path)
         pathname = Pathname.new(path)
+        first = true
         tmp_entry = nil
 
         pathname.each_filename do |dir|
-          if tmp_entry.nil?
+          if first
             tmp_entry = commit.tree[dir]
+            first = false
+          elsif tmp_entry.nil?
+            return nil
           else
             tmp_entry = rugged.lookup(tmp_entry[:oid])
             return nil unless tmp_entry.type == :tree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.17
+  version: 7.2.18
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -83,6 +83,7 @@ files:
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
 - lib/gitlab_git/encoding_helper.rb
+- lib/gitlab_git/path_helper.rb
 - lib/gitlab_git/popen.rb
 - lib/gitlab_git/ref.rb
 - lib/gitlab_git/repository.rb