gitlab_git 2.3.1 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b908eba48287d7309ed2ac395c3210d57708a86
-  data.tar.gz: 7106a23af68133322ee9a965188c43196bcecad4
+  metadata.gz: c207576fe702ed6a64b24f956856968287325866
+  data.tar.gz: 0fc3ac8c449422b760cdac189d84b56691fda26c
 SHA512:
-  metadata.gz: 4e31474d89d6bcac44800cea27d1ce363b035a65aaa6076ce6804fd41b5d7c0fe076c169ee5838318fff68673690e649f40009220120b9ab9733d59f6feb762c
-  data.tar.gz: 794d8dc3f1223e4950748c15e1b18a03f1ef3b21eb7fdcf3abe6420717a066aa81795bcd89cc920dba90f48ae3bd6792d01700dbc07117044d1c680e2493fa3a
+  metadata.gz: 8f37199e9248a6681bb127f65dff32026bc2a39bfee7c50eda5a566ec8a94620803a4f184f2e5df882bfa28ff97231b2a8f8837c02ae6afc4821765e0b8e9094
+  data.tar.gz: 01909f36d53f1986d1972009d1f7a45ff3907c4eb3d2184e9ffc705d8ca141db444e699099530e4e081ffc246ca79cf2eb66762843005274653c833dce9772ff

data/lib/gitlab_git/blob.rb

@@ -3,42 +3,36 @@ module Gitlab
     class Blob
       include Linguist::BlobHelper
 
-      attr_accessor :raw_blob
-
-      def initialize(repository, sha, ref, path)
-        @repository, @sha, @ref = repository, sha, ref
-
-        @commit = @repository.commit(sha)
-        @raw_blob = @repository.tree(@commit, path)
-      end
-
-      def data
-        if raw_blob and raw_blob.respond_to?('data')
-          raw_blob.data
-        else
-          nil
+      attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id
+
+      class << self
+        def find(repository, sha, path)
+          commit = Commit.find(repository, sha)
+          grit_blob = commit.tree / path
+
+          if grit_blob.kind_of?(Grit::Blob)
+            Blob.new(
+              id: grit_blob.id,
+              name: grit_blob.name,
+              size: grit_blob.size,
+              data: grit_blob.data,
+              mode: grit_blob.mode,
+              path: path,
+              commit_id: sha,
+            )
+          end
         end
       end
 
-      def name
-        raw_blob.name
-      end
-
-      def exists?
-        raw_blob
+      def initialize(options)
+        %w(id name path size data mode commit_id).each do |key|
+          self.send("#{key}=", options[key.to_sym])
+        end
       end
 
       def empty?
         !data || data == ''
       end
-
-      def mode
-        raw_blob.mode
-      end
-
-      def size
-        raw_blob.size
-      end
     end
   end
 end

data/lib/gitlab_git/git_stats.rb

@@ -13,7 +13,7 @@ module Gitlab
         log = nil
         Grit::Git.with_timeout(30) do
           # Limit log to 6k commits to avoid timeout for huge projects
-          args = [ref, '-6000', '--format=%aN%x0a%aE%x0a%cd', '--date=short', '--shortstat', '--no-merges', '--diff-filter=ACDM']
+          args = ['-6000', '--format=%aN%x0a%aE%x0a%cd', '--date=short', '--shortstat', '--no-merges', '--diff-filter=ACDM']
           log = repo.git.run(nil, 'log', nil, {}, args)
         end
 

data/lib/gitlab_git/repository.rb

@@ -8,44 +8,29 @@ module Gitlab
 
       class NoRepository < StandardError; end
 
-      class << self
-        attr_accessor :repos_path
-      end
-
-      # Repository directory name with namespace direcotry
-      # Examples:
-      #   gitlab/gitolite
-      #   diaspora
-      #
-      attr_accessor :path_with_namespace
-
       # Default branch in the repository
       attr_accessor :root_ref
 
-      # Grit repo object
-      attr_reader :raw
-
-      # compatibility
-      alias_method :repo, :raw
+      # Full path to repo
+      attr_reader :path
 
-      def initialize(path_with_namespace, root_ref)
-        @path_with_namespace = path_with_namespace
-        @root_ref = root_ref || raw.head.name
+      # Directory name of repo
+      attr_reader :name
 
-        # Init grit repo object
-        raw
-      end
+      # Grit repo object
+      attr_reader :grit
 
-      def path_to_repo
-        @path_to_repo ||= File.join(repos_path, "#{path_with_namespace}.git")
-      end
+      # Alias to old method for compatibility
+      alias_method :raw, :grit
 
-      def repos_path
-        self.class.repos_path
+      def initialize(path)
+        @path = path
+        @name = path.split("/").last
+        @root_ref = discover_default_branch
       end
 
-      def raw
-        @raw ||= Grit::Repo.new(path_to_repo)
+      def grit
+        @grit ||= Grit::Repo.new(path)
       rescue Grit::NoSuchPathError
         raise NoRepository.new('no repository for such path')
       end
@@ -58,7 +43,7 @@ module Gitlab
 
       # Returns an Array of Branches
       def branches
-        raw.branches.sort_by(&:name)
+        grit.branches.sort_by(&:name)
       end
 
       # Returns an Array of tag names
@@ -68,7 +53,7 @@ module Gitlab
 
       # Returns an Array of Tags
       def tags
-        raw.tags.sort_by(&:name).reverse
+        grit.tags.sort_by(&:name).reverse
       end
 
       # Returns an Array of branch and tag names
@@ -77,13 +62,7 @@ module Gitlab
       end
 
       def heads
-        @heads ||= raw.heads.sort_by(&:name)
-      end
-
-      def tree(fcommit, path = nil)
-        fcommit = commit if fcommit == :head
-        tree = fcommit.tree
-        path ? (tree / path) : tree
+        @heads ||= grit.heads.sort_by(&:name)
       end
 
       def has_commits?
@@ -100,15 +79,18 @@ module Gitlab
       #
       # - If no branches are present, returns nil
       # - If one branch is present, returns its name
-      # - If two or more branches are present, returns the one that has a name
-      #   matching root_ref (default_branch or 'master' if default_branch is nil)
+      # - If two or more branches are present, returns current HEAD or master or first branch
       def discover_default_branch
         if branch_names.length == 0
           nil
         elsif branch_names.length == 1
           branch_names.first
-        else
-          branch_names.select { |v| v == root_ref }.first
+        elsif grit.head
+          grit.head.name
+        elsif branch_names.include?("master")
+          "master"
+        elsif
+          branch_names.first
         end
       end
 
@@ -123,16 +105,16 @@ module Gitlab
         return nil unless commit
 
         # Build file path
-        file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
-        file_path = File.join(storage_path, self.path_with_namespace, file_name)
+        file_name = self.name.gsub("\.git", "") + "-" + commit.id.to_s + ".tar.gz"
+        file_path = File.join(storage_path, self.name, file_name)
 
         # Put files into a directory before archiving
-        prefix = File.basename(self.path_with_namespace) + "/"
+        prefix = File.basename(self.name) + "/"
 
         # Create file if not exists
         unless File.exists?(file_path)
           FileUtils.mkdir_p File.dirname(file_path)
-          file = self.raw.archive_to_file(ref, prefix,  file_path)
+          file = self.grit.archive_to_file(ref, prefix,  file_path)
         end
 
         file_path
@@ -140,7 +122,7 @@ module Gitlab
 
       # Return repo size in megabytes
       def size
-        size = popen('du -s', path_to_repo).first.strip.to_i
+        size = popen('du -s', path).first.strip.to_i
         (size.to_f / 1024).round(2)
       end
 
@@ -149,7 +131,7 @@ module Gitlab
           ref = root_ref
         end
 
-        greps = raw.grep(query, 3, ref)
+        greps = grit.grep(query, 3, ref)
 
         greps.map do |grep|
           Gitlab::Git::BlobSnippet.new(ref, grep.content, grep.startline, grep.filename)
@@ -177,7 +159,7 @@ module Gitlab
 
         options = default_options.merge(options)
 
-        raw.log(
+        grit.log(
           options[:ref] || root_ref,
           options[:path],
           max_count: options[:limit].to_i,
@@ -189,15 +171,15 @@ module Gitlab
       # Delegate commits_between to Grit method
       #
       def commits_between(from, to)
-        raw.commits_between(from, to)
+        grit.commits_between(from, to)
       end
 
       def merge_base_commit(from, to)
-        raw.git.native(:merge_base, {}, [to, from]).strip
+        grit.git.native(:merge_base, {}, [to, from]).strip
       end
 
       def diff(from, to)
-        raw.diff(from, to)
+        grit.diff(from, to)
       end
 
       # Returns commits collection
@@ -253,9 +235,9 @@ module Gitlab
           actual_options[:all] = true
         end
 
-        output = raw.git.native(:rev_list, actual_options, *args)
+        output = grit.git.native(:rev_list, actual_options, *args)
 
-        Grit::Commit.list_from_string(raw, output).map do |commit|
+        Grit::Commit.list_from_string(grit, output).map do |commit|
           Gitlab::Git::Commit.decorate(commit)
         end
       rescue Grit::GitRuby::Repository::NoSuchShaFound
@@ -268,7 +250,7 @@ module Gitlab
       #   repo.branch_names_contains('master')
       #
       def branch_names_contains(commit)
-        output = raw.git.native(:branch, {contains: true}, commit)
+        output = grit.git.native(:branch, {contains: true}, commit)
         # The output is expected as follow
         #   fix-aaa
         #   fix-bbb
@@ -276,17 +258,17 @@ module Gitlab
         output.scan(/[^* \n]+/)
       end
 
-      # Get refs hash which key is SHA1 and value is ref object(Grit::Head or Grit::Remote or Grit::Tag)
+      # Get refs hash which key is SHA1
+      # and value is ref object(Grit::Head or Grit::Remote or Grit::Tag)
       def refs_hash
         # Initialize only when first call
         if @refs_hash.nil?
           @refs_hash = Hash.new { |h, k| h[k] = [] }
 
-          @raw.refs.each do |r|
+          grit.refs.each do |r|
             @refs_hash[r.commit.id] << r
           end
         end
-
         @refs_hash
       end
     end

data/lib/gitlab_git/tree.rb

@@ -1,54 +1,52 @@
 module Gitlab
   module Git
     class Tree
-      attr_accessor :repository, :sha, :path, :ref, :raw_tree, :id
+      attr_accessor :id, :name, :path, :type, :mode, :commit_id
 
-      def initialize(repository, sha, ref = nil, path = nil)
-        @repository, @sha, @ref, @path = repository, sha, ref, path
+      class << self
+        def where(repository, sha, path = '/')
+          commit = Commit.find(repository, sha)
+          grit_tree = commit.tree / path
 
-        @path = nil if !@path || @path == ''
+          if grit_tree && grit_tree.respond_to?(:contents)
+            grit_tree.contents.map do |entry|
+              type = entry.class.to_s.split("::").last.downcase.to_sym
 
-        # Load tree from repository
-        @commit = Gitlab::Git::Commit.find(@repository, @sha)
-        @raw_tree = @repository.tree(@commit, @path)
+              Tree.new(
+                id: entry.id,
+                name: entry.name,
+                type: type,
+                mode: entry.mode,
+                path: path == '/' ? entry.name : File.join(path, entry.name),
+                commit_id: sha,
+              )
+            end
+          else
+            []
+          end
+        end
       end
 
-      def exists?
-        raw_tree
+      def initialize(options)
+        %w(id name path type mode commit_id).each do |key|
+          self.send("#{key}=", options[key.to_sym])
+        end
       end
 
-      def empty?
-        trees.empty? && blobs.empty?
+      def dir?
+        type == :tree
       end
 
-      def trees
-        entries.select { |t| t.is_a?(Grit::Tree) }
+      def file?
+        type == :blob
       end
 
-      def blobs
-        entries.select { |t| t.is_a?(Grit::Blob) }
+      def submodule?
+        type == :submodule
       end
 
-      def submodules
-        entries.select { |t| t.is_a?(Grit::Submodule) }
-      end
-
-      def is_blob?
-        raw_tree.is_a?(Grit::Blob)
-      end
-
-      def up_dir?
-        path && path != ''
-      end
-
-      def readme
-        @readme ||= blobs.find { |c| c.name =~ /^readme/i }
-      end
-
-      protected
-
-      def entries
-        raw_tree.contents
+      def readme?
+        name =~ /^readme/i
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -86,9 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3