Fix tests and remove app/models/repository.rb

Dmitriy Zaporozhets
1 parent 154e54b4
Showing 6 changed files with 5 additions and 325 deletions Show diff stats
app/models/repository.rb
lib/extracts_path.rb
spec/models/commit_spec.rb
spec/models/project_spec.rb
spec/models/repository_spec.rb
spec/support/stubbed_repository.rb
@@ -1,170 +0,0 @@
-class Repository
-  include Gitlab::Popen
-
-  # Repository directory name with namespace direcotry
-  # Examples:
-  #   gitlab/gitolite
-  #   diaspora
-  #
-  attr_accessor :path_with_namespace
-
-  # Grit repo object
-  attr_accessor :repo
-
-  # Default branch in the repository
-  attr_accessor :root_ref
-
-  def initialize(path_with_namespace, root_ref = 'master')
-    @root_ref = root_ref || "master"
-    @path_with_namespace = path_with_namespace
-
-    # Init grit repo object
-    repo
-  end
-
-  def raw
-    repo
-  end
-
-  def path_to_repo
-    @path_to_repo ||= File.join(Gitlab.config.gitlab_shell.repos_path, "#{path_with_namespace}.git")
-  end
-
-  def repo
-    @repo ||= Grit::Repo.new(path_to_repo)
-  end
-
-  def commit(commit_id = nil)
-    Commit.find_or_first(repo, commit_id, root_ref)
-  end
-
-  def fresh_commits(n = 10)
-    Commit.fresh_commits(repo, n)
-  end
-
-  def commits_with_refs(n = 20)
-    Commit.commits_with_refs(repo, n)
-  end
-
-  def commits_since(date)
-    Commit.commits_since(repo, date)
-  end
-
-  def commits(ref, path = nil, limit = nil, offset = nil)
-    Commit.commits(repo, ref, path, limit, offset)
-  end
-
-  def last_commit_for(ref, path = nil)
-    commits(ref, path, 1).first
-  end
-
-  def commits_between(from, to)
-    Commit.commits_between(repo, from, to)
-  end
-
-  # Returns an Array of branch names
-  # sorted by name ASC
-  def branch_names
-    branches.map(&:name)
-  end
-
-  # Returns an Array of Branches
-  def branches
-    repo.branches.sort_by(&:name)
-  end
-
-  # Returns an Array of tag names
-  def tag_names
-    repo.tags.collect(&:name).sort.reverse
-  end
-
-  # Returns an Array of Tags
-  def tags
-    repo.tags.sort_by(&:name).reverse
-  end
-
-  # Returns an Array of branch and tag names
-  def ref_names
-    [branch_names + tag_names].flatten
-  end
-
-  def heads
-    @heads ||= repo.heads
-  end
-
-  def tree(fcommit, path = nil)
-    fcommit = commit if fcommit == :head
-    tree = fcommit.tree
-    path ? (tree / path) : tree
-  end
-
-  def has_commits?
-    !!commit
-  rescue Grit::NoSuchPathError
-    false
-  end
-
-  def empty?
-    !has_commits?
-  end
-
-  # Discovers the default branch based on the repository's available branches
-  #
-  # - 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)
-  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
-    end
-  end
-
-  # Archive Project to .tar.gz
-  #
-  # Already packed repo archives stored at
-  # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
-  #
-  def archive_repo(ref)
-    ref = ref || self.root_ref
-    commit = self.commit(ref)
-    return nil unless commit
-
-    # Build file path
-    file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
-    storage_path = Rails.root.join("tmp", "repositories")
-    file_path = File.join(storage_path, self.path_with_namespace, file_name)
-
-    # Put files into a directory before archiving
-    prefix = File.basename(self.path_with_namespace) + "/"
-
-    # Create file if not exists
-    unless File.exists?(file_path)
-      FileUtils.mkdir_p File.dirname(file_path)
-      file = self.repo.archive_to_file(ref, prefix,  file_path)
-    end
-
-    file_path
-  end
-
-  # Return repo size in megabytes
-  # Cached in redis
-  def size
-    Rails.cache.fetch(cache_key(:size)) do
-      size = popen('du -s', path_to_repo).first.strip.to_i
-      (size.to_f / 1024).round(2)
-    end
-  end
-
-  def expire_cache
-    Rails.cache.delete(cache_key(:size))
-  end
-
-  def cache_key(type)
-    "#{type}:#{path_with_namespace}"
-  end
-end
@@ -100,8 +100,8 @@ module ExtractsPath
     # It is used "@project.repository.commits(@ref, @path, 1, 0)",
     # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
-    commits = @project.repository.commits(@ref, @path, 1, 0)
-    @commit = CommitDecorator.decorate(commits.first)
+    @commit = @project.repository.commits(@ref, @path, 1, 0).first
+    @commit = CommitDecorator.decorate(@commit)
     @tree = Tree.new(@commit.tree, @ref, @path)
     @tree = TreeDecorator.new(@tree)
@@ -35,51 +35,6 @@ describe Commit do
     end
   end
-  describe "Commit info" do
-    before do
-      @committer = double(
-        email: 'mike@smith.com',
-        name: 'Mike Smith'
-      )
-
-      @author = double(
-        email: 'john@smith.com',
-        name: 'John Smith'
-      )
-
-      @raw_commit = double(
-        id: "bcf03b5de6abcf03b5de6c",
-        author: @author,
-        committer: @committer,
-        committed_date: Date.yesterday,
-        message: 'Refactoring specs'
-      )
-
-      @commit = Commit.new(@raw_commit)
-    end
-
-    it { @commit.short_id.should == "bcf03b5de6a" }
-    it { @commit.safe_message.should == @raw_commit.message }
-    it { @commit.created_at.should == @raw_commit.committed_date }
-    it { @commit.author_email.should == @author.email }
-    it { @commit.author_name.should == @author.name }
-    it { @commit.committer_name.should == @committer.name }
-    it { @commit.committer_email.should == @committer.email }
-    it { @commit.different_committer?.should be_true }
-  end
-
-  describe "Class methods" do
-    subject { Commit }
-
-    it { should respond_to(:find_or_first) }
-    it { should respond_to(:fresh_commits) }
-    it { should respond_to(:commits_with_refs) }
-    it { should respond_to(:commits_since) }
-    it { should respond_to(:commits_between) }
-    it { should respond_to(:commits) }
-    it { should respond_to(:compare) }
-  end
-
   describe "delegation" do
     subject { commit }
@@ -187,7 +187,7 @@ describe Project do
     let(:project) { create(:project) }
     it "should return valid repo" do
-      project.repository.should be_kind_of(Repository)
+      project.repository.should be_kind_of(Gitlab::Git::Repository)
     end
     it "should return nil" do
@@ -1,105 +0,0 @@
-require "spec_helper"
-
-describe Repository do
-  let(:project) { create(:project) }
-  let(:repository) { project.repository }
-
-  describe "Respond to" do
-    subject { repository }
-
-    it { should respond_to(:repo) }
-    it { should respond_to(:tree) }
-    it { should respond_to(:root_ref) }
-    it { should respond_to(:tags) }
-    it { should respond_to(:commit) }
-    it { should respond_to(:commits) }
-    it { should respond_to(:commits_between) }
-    it { should respond_to(:commits_with_refs) }
-    it { should respond_to(:commits_since) }
-    it { should respond_to(:commits_between) }
-  end
-
-
-  describe "#discover_default_branch" do
-    let(:master) { 'master' }
-    let(:stable) { 'stable' }
-
-    it "returns 'master' when master exists" do
-      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
-      repository.discover_default_branch.should == 'master'
-    end
-
-    it "returns non-master when master exists but default branch is set to something else" do
-      repository.root_ref = 'stable'
-      repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
-      repository.discover_default_branch.should == 'stable'
-    end
-
-    it "returns a non-master branch when only one exists" do
-      repository.should_receive(:branch_names).at_least(:once).and_return([stable])
-      repository.discover_default_branch.should == 'stable'
-    end
-
-    it "returns nil when no branch exists" do
-      repository.should_receive(:branch_names).at_least(:once).and_return([])
-      repository.discover_default_branch.should be_nil
-    end
-  end
-
-  describe :commit do
-    it "should return first head commit if without params" do
-      repository.commit.id.should == repository.repo.commits.first.id
-    end
-
-    it "should return valid commit" do
-      repository.commit(ValidCommit::ID).should be_valid_commit
-    end
-
-    it "should return nil" do
-      repository.commit("+123_4532530XYZ").should be_nil
-    end
-  end
-
-  describe :tree do
-    before do
-      @commit = repository.commit(ValidCommit::ID)
-    end
-
-    it "should raise error w/o arguments" do
-      lambda { repository.tree }.should raise_error
-    end
-
-    it "should return root tree for commit" do
-      tree = repository.tree(@commit)
-      tree.contents.size.should == ValidCommit::FILES_COUNT
-      tree.contents.map(&:name).should == ValidCommit::FILES
-    end
-
-    it "should return root tree for commit with correct path" do
-      tree = repository.tree(@commit, ValidCommit::C_FILE_PATH)
-      tree.contents.map(&:name).should == ValidCommit::C_FILES
-    end
-
-    it "should return root tree for commit with incorrect path" do
-      repository.tree(@commit, "invalid_path").should be_nil
-    end
-  end
-
-  describe "fresh commits" do
-    it { repository.fresh_commits(3).count.should == 3 }
-    it { repository.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
-    it { repository.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
-  end
-
-  describe "commits_between" do
-    subject do
-      commits = repository.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
-                                        "8470d70da67355c9c009e4401746b1d5410af2e3")
-      commits.map { |c| c.id }
-    end
-
-    it { should have(3).elements }
-    it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
-    it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
-  end
-end
-require "repository"
+require "gitlab/git/repository"
 require "project"
 require "merge_request"
 require "shell"
@@ -39,7 +39,7 @@ class MergeRequest
   end
 end
-class GitLabTestRepo < Repository
+class GitLabTestRepo < Gitlab::Git::Repository
   def repo
     @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
   end
	@@ -1,170 +0,0 @@	@@ -1,170 +0,0 @@
1	-class Repository
2	- include Gitlab::Popen
3	-
4	- # Repository directory name with namespace direcotry
5	- # Examples:
6	- # gitlab/gitolite
7	- # diaspora
8	- #
9	- attr_accessor :path_with_namespace
10	-
11	- # Grit repo object
12	- attr_accessor :repo
13	-
14	- # Default branch in the repository
15	- attr_accessor :root_ref
16	-
17	- def initialize(path_with_namespace, root_ref = 'master')
18	- @root_ref = root_ref \|\| "master"
19	- @path_with_namespace = path_with_namespace
20	-
21	- # Init grit repo object
22	- repo
23	- end
24	-
25	- def raw
26	- repo
27	- end
28	-
29	- def path_to_repo
30	- @path_to_repo \|\|= File.join(Gitlab.config.gitlab_shell.repos_path, "#{path_with_namespace}.git")
31	- end
32	-
33	- def repo
34	- @repo \|\|= Grit::Repo.new(path_to_repo)
35	- end
36	-
37	- def commit(commit_id = nil)
38	- Commit.find_or_first(repo, commit_id, root_ref)
39	- end
40	-
41	- def fresh_commits(n = 10)
42	- Commit.fresh_commits(repo, n)
43	- end
44	-
45	- def commits_with_refs(n = 20)
46	- Commit.commits_with_refs(repo, n)
47	- end
48	-
49	- def commits_since(date)
50	- Commit.commits_since(repo, date)
51	- end
52	-
53	- def commits(ref, path = nil, limit = nil, offset = nil)
54	- Commit.commits(repo, ref, path, limit, offset)
55	- end
56	-
57	- def last_commit_for(ref, path = nil)
58	- commits(ref, path, 1).first
59	- end
60	-
61	- def commits_between(from, to)
62	- Commit.commits_between(repo, from, to)
63	- end
64	-
65	- # Returns an Array of branch names
66	- # sorted by name ASC
67	- def branch_names
68	- branches.map(&:name)
69	- end
70	-
71	- # Returns an Array of Branches
72	- def branches
73	- repo.branches.sort_by(&:name)
74	- end
75	-
76	- # Returns an Array of tag names
77	- def tag_names
78	- repo.tags.collect(&:name).sort.reverse
79	- end
80	-
81	- # Returns an Array of Tags
82	- def tags
83	- repo.tags.sort_by(&:name).reverse
84	- end
85	-
86	- # Returns an Array of branch and tag names
87	- def ref_names
88	- [branch_names + tag_names].flatten
89	- end
90	-
91	- def heads
92	- @heads \|\|= repo.heads
93	- end
94	-
95	- def tree(fcommit, path = nil)
96	- fcommit = commit if fcommit == :head
97	- tree = fcommit.tree
98	- path ? (tree / path) : tree
99	- end
100	-
101	- def has_commits?
102	- !!commit
103	- rescue Grit::NoSuchPathError
104	- false
105	- end
106	-
107	- def empty?
108	- !has_commits?
109	- end
110	-
111	- # Discovers the default branch based on the repository's available branches
112	- #
113	- # - If no branches are present, returns nil
114	- # - If one branch is present, returns its name
115	- # - If two or more branches are present, returns the one that has a name
116	- # matching root_ref (default_branch or 'master' if default_branch is nil)
117	- def discover_default_branch
118	- if branch_names.length == 0
119	- nil
120	- elsif branch_names.length == 1
121	- branch_names.first
122	- else
123	- branch_names.select { \|v\| v == root_ref }.first
124	- end
125	- end
126	-
127	- # Archive Project to .tar.gz
128	- #
129	- # Already packed repo archives stored at
130	- # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
131	- #
132	- def archive_repo(ref)
133	- ref = ref \|\| self.root_ref
134	- commit = self.commit(ref)
135	- return nil unless commit
136	-
137	- # Build file path
138	- file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
139	- storage_path = Rails.root.join("tmp", "repositories")
140	- file_path = File.join(storage_path, self.path_with_namespace, file_name)
141	-
142	- # Put files into a directory before archiving
143	- prefix = File.basename(self.path_with_namespace) + "/"
144	-
145	- # Create file if not exists
146	- unless File.exists?(file_path)
147	- FileUtils.mkdir_p File.dirname(file_path)
148	- file = self.repo.archive_to_file(ref, prefix, file_path)
149	- end
150	-
151	- file_path
152	- end
153	-
154	- # Return repo size in megabytes
155	- # Cached in redis
156	- def size
157	- Rails.cache.fetch(cache_key(:size)) do
158	- size = popen('du -s', path_to_repo).first.strip.to_i
159	- (size.to_f / 1024).round(2)
160	- end
161	- end
162	-
163	- def expire_cache
164	- Rails.cache.delete(cache_key(:size))
165	- end
166	-
167	- def cache_key(type)
168	- "#{type}:#{path_with_namespace}"
169	- end
170	-end
	@@ -35,51 +35,6 @@ describe Commit do		@@ -35,51 +35,6 @@ describe Commit do
35	end	35	end
36	end	36	end
37		37
38	- describe "Commit info" do
39	- before do
40	- @committer = double(
41	- email: 'mike@smith.com',
42	- name: 'Mike Smith'
43	- )
44	-
45	- @author = double(
46	- email: 'john@smith.com',
47	- name: 'John Smith'
48	- )
49	-
50	- @raw_commit = double(
51	- id: "bcf03b5de6abcf03b5de6c",
52	- author: @author,
53	- committer: @committer,
54	- committed_date: Date.yesterday,
55	- message: 'Refactoring specs'
56	- )
57	-
58	- @commit = Commit.new(@raw_commit)
59	- end
60	-
61	- it { @commit.short_id.should == "bcf03b5de6a" }
62	- it { @commit.safe_message.should == @raw_commit.message }
63	- it { @commit.created_at.should == @raw_commit.committed_date }
64	- it { @commit.author_email.should == @author.email }
65	- it { @commit.author_name.should == @author.name }
66	- it { @commit.committer_name.should == @committer.name }
67	- it { @commit.committer_email.should == @committer.email }
68	- it { @commit.different_committer?.should be_true }
69	- end
70	-
71	- describe "Class methods" do
72	- subject { Commit }
73	-
74	- it { should respond_to(:find_or_first) }
75	- it { should respond_to(:fresh_commits) }
76	- it { should respond_to(:commits_with_refs) }
77	- it { should respond_to(:commits_since) }
78	- it { should respond_to(:commits_between) }
79	- it { should respond_to(:commits) }
80	- it { should respond_to(:compare) }
81	- end
82	-
83	describe "delegation" do	38	describe "delegation" do
84	subject { commit }	39	subject { commit }
85		40
	@@ -187,7 +187,7 @@ describe Project do		@@ -187,7 +187,7 @@ describe Project do
187	let(:project) { create(:project) }	187	let(:project) { create(:project) }
188		188
189	it "should return valid repo" do	189	it "should return valid repo" do
190	- project.repository.should be_kind_of(Repository)	190	+ project.repository.should be_kind_of(Gitlab::Git::Repository)
191	end	191	end
192		192
193	it "should return nil" do	193	it "should return nil" do
	@@ -1,105 +0,0 @@	@@ -1,105 +0,0 @@
1	-require "spec_helper"
2	-
3	-describe Repository do
4	- let(:project) { create(:project) }
5	- let(:repository) { project.repository }
6	-
7	- describe "Respond to" do
8	- subject { repository }
9	-
10	- it { should respond_to(:repo) }
11	- it { should respond_to(:tree) }
12	- it { should respond_to(:root_ref) }
13	- it { should respond_to(:tags) }
14	- it { should respond_to(:commit) }
15	- it { should respond_to(:commits) }
16	- it { should respond_to(:commits_between) }
17	- it { should respond_to(:commits_with_refs) }
18	- it { should respond_to(:commits_since) }
19	- it { should respond_to(:commits_between) }
20	- end
21	-
22	-
23	- describe "#discover_default_branch" do
24	- let(:master) { 'master' }
25	- let(:stable) { 'stable' }
26	-
27	- it "returns 'master' when master exists" do
28	- repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
29	- repository.discover_default_branch.should == 'master'
30	- end
31	-
32	- it "returns non-master when master exists but default branch is set to something else" do
33	- repository.root_ref = 'stable'
34	- repository.should_receive(:branch_names).at_least(:once).and_return([stable, master])
35	- repository.discover_default_branch.should == 'stable'
36	- end
37	-
38	- it "returns a non-master branch when only one exists" do
39	- repository.should_receive(:branch_names).at_least(:once).and_return([stable])
40	- repository.discover_default_branch.should == 'stable'
41	- end
42	-
43	- it "returns nil when no branch exists" do
44	- repository.should_receive(:branch_names).at_least(:once).and_return([])
45	- repository.discover_default_branch.should be_nil
46	- end
47	- end
48	-
49	- describe :commit do
50	- it "should return first head commit if without params" do
51	- repository.commit.id.should == repository.repo.commits.first.id
52	- end
53	-
54	- it "should return valid commit" do
55	- repository.commit(ValidCommit::ID).should be_valid_commit
56	- end
57	-
58	- it "should return nil" do
59	- repository.commit("+123_4532530XYZ").should be_nil
60	- end
61	- end
62	-
63	- describe :tree do
64	- before do
65	- @commit = repository.commit(ValidCommit::ID)
66	- end
67	-
68	- it "should raise error w/o arguments" do
69	- lambda { repository.tree }.should raise_error
70	- end
71	-
72	- it "should return root tree for commit" do
73	- tree = repository.tree(@commit)
74	- tree.contents.size.should == ValidCommit::FILES_COUNT
75	- tree.contents.map(&:name).should == ValidCommit::FILES
76	- end
77	-
78	- it "should return root tree for commit with correct path" do
79	- tree = repository.tree(@commit, ValidCommit::C_FILE_PATH)
80	- tree.contents.map(&:name).should == ValidCommit::C_FILES
81	- end
82	-
83	- it "should return root tree for commit with incorrect path" do
84	- repository.tree(@commit, "invalid_path").should be_nil
85	- end
86	- end
87	-
88	- describe "fresh commits" do
89	- it { repository.fresh_commits(3).count.should == 3 }
90	- it { repository.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
91	- it { repository.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
92	- end
93	-
94	- describe "commits_between" do
95	- subject do
96	- commits = repository.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
97	- "8470d70da67355c9c009e4401746b1d5410af2e3")
98	- commits.map { \|c\| c.id }
99	- end
100	-
101	- it { should have(3).elements }
102	- it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
103	- it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
104	- end
105	-end
1	-require "repository"	1	+require "gitlab/git/repository"
2	require "project"	2	require "project"
3	require "merge_request"	3	require "merge_request"
4	require "shell"	4	require "shell"
	@@ -39,7 +39,7 @@ class MergeRequest		@@ -39,7 +39,7 @@ class MergeRequest
39	end	39	end
40	end	40	end
41		41
42	-class GitLabTestRepo < Repository	42	+class GitLabTestRepo < Gitlab::Git::Repository
43	def repo	43	def repo
44	@repo \|\|= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))	44	@repo \|\|= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
45	end	45	end