lib/ refactoring. Module Gitlabhq renamed to Gitlab
This commit is contained in:
parent
8ceb94081a
commit
3272620f72
20 changed files with 87 additions and 85 deletions
20
lib/gitlab/encode.rb
Normal file
20
lib/gitlab/encode.rb
Normal file
|
@ -0,0 +1,20 @@
|
|||
module Gitlab
|
||||
module Encode
|
||||
extend self
|
||||
|
||||
def utf8 message
|
||||
return nil unless message
|
||||
|
||||
hash = CharlockHolmes::EncodingDetector.detect(message) rescue {}
|
||||
if hash[:encoding]
|
||||
CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8')
|
||||
else
|
||||
message
|
||||
end.force_encoding("utf-8")
|
||||
# Prevent app from crash cause of
|
||||
# encoding errors
|
||||
rescue
|
||||
""
|
||||
end
|
||||
end
|
||||
end
|
21
lib/gitlab/git_host.rb
Normal file
21
lib/gitlab/git_host.rb
Normal file
|
@ -0,0 +1,21 @@
|
|||
require File.join(Rails.root, "lib", "gitlab", "gitolite")
|
||||
|
||||
module Gitlab
|
||||
class GitHost
|
||||
def self.system
|
||||
Gitlab::Gitolite
|
||||
end
|
||||
|
||||
def self.admin_uri
|
||||
GIT_HOST["admin_uri"]
|
||||
end
|
||||
|
||||
def self.url_to_repo(path)
|
||||
if !GIT_HOST["port"] or GIT_HOST["port"] == 22
|
||||
"#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{path}.git"
|
||||
else
|
||||
"ssh://#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{GIT_HOST["port"]}/#{path}.git"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
157
lib/gitlab/gitolite.rb
Normal file
157
lib/gitlab/gitolite.rb
Normal file
|
@ -0,0 +1,157 @@
|
|||
require 'gitolite'
|
||||
require 'timeout'
|
||||
require 'fileutils'
|
||||
|
||||
module Gitlab
|
||||
class Gitolite
|
||||
class AccessDenied < StandardError; end
|
||||
|
||||
def self.update_project(path, project)
|
||||
self.new.configure { |git| git.update_project(path, project) }
|
||||
end
|
||||
|
||||
def self.destroy_project(project)
|
||||
self.new.configure { |git| git.destroy_project(project) }
|
||||
end
|
||||
|
||||
def pull
|
||||
# create tmp dir
|
||||
@local_dir = File.join(Dir.tmpdir,"gitlabhq-gitolite-#{Time.now.to_i}")
|
||||
Dir.mkdir @local_dir
|
||||
|
||||
`git clone #{GitHost.admin_uri} #{@local_dir}/gitolite`
|
||||
end
|
||||
|
||||
def push
|
||||
Dir.chdir(File.join(@local_dir, "gitolite"))
|
||||
`git add -A`
|
||||
`git commit -am "Gitlab"`
|
||||
`git push`
|
||||
Dir.chdir(Rails.root)
|
||||
|
||||
FileUtils.rm_rf(@local_dir)
|
||||
end
|
||||
|
||||
def configure
|
||||
status = Timeout::timeout(20) do
|
||||
File.open(File.join(Dir.tmpdir,"gitlabhq-gitolite.lock"), "w+") do |f|
|
||||
begin
|
||||
f.flock(File::LOCK_EX)
|
||||
pull
|
||||
yield(self)
|
||||
push
|
||||
ensure
|
||||
f.flock(File::LOCK_UN)
|
||||
end
|
||||
end
|
||||
end
|
||||
rescue Exception => ex
|
||||
Gitlab::Logger.error(ex.message)
|
||||
raise Gitolite::AccessDenied.new("gitolite timeout")
|
||||
end
|
||||
|
||||
def destroy_project(project)
|
||||
FileUtils.rm_rf(project.path_to_repo)
|
||||
|
||||
ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
|
||||
conf = ga_repo.config
|
||||
conf.rm_repo(project.path)
|
||||
ga_repo.save
|
||||
end
|
||||
|
||||
#update or create
|
||||
def update_keys(user, key)
|
||||
File.open(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"), 'w') {|f| f.write(key.gsub(/\n/,'')) }
|
||||
end
|
||||
|
||||
def delete_key(user)
|
||||
File.unlink(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"))
|
||||
`cd #{File.join(@local_dir,'gitolite')} ; git rm keydir/#{user}.pub`
|
||||
end
|
||||
|
||||
# update or create
|
||||
def update_project(repo_name, project)
|
||||
ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
|
||||
conf = ga_repo.config
|
||||
repo = update_project_config(project, conf)
|
||||
conf.add_repo(repo, true)
|
||||
|
||||
ga_repo.save
|
||||
end
|
||||
|
||||
# Updates many projects and uses project.path as the repo path
|
||||
# An order of magnitude faster than update_project
|
||||
def update_projects(projects)
|
||||
ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
|
||||
conf = ga_repo.config
|
||||
|
||||
projects.each do |project|
|
||||
repo = update_project_config(project, conf)
|
||||
conf.add_repo(repo, true)
|
||||
end
|
||||
|
||||
ga_repo.save
|
||||
end
|
||||
|
||||
def update_project_config(project, conf)
|
||||
repo_name = project.path
|
||||
|
||||
repo = if conf.has_repo?(repo_name)
|
||||
conf.get_repo(repo_name)
|
||||
else
|
||||
::Gitolite::Config::Repo.new(repo_name)
|
||||
end
|
||||
|
||||
name_readers = project.repository_readers
|
||||
name_writers = project.repository_writers
|
||||
name_masters = project.repository_masters
|
||||
|
||||
pr_br = project.protected_branches.map(&:name).join(" ")
|
||||
|
||||
repo.clean_permissions
|
||||
|
||||
# Deny access to protected branches for writers
|
||||
unless name_writers.blank? || pr_br.blank?
|
||||
repo.add_permission("-", pr_br, name_writers)
|
||||
end
|
||||
|
||||
# Add read permissions
|
||||
repo.add_permission("R", "", name_readers) unless name_readers.blank?
|
||||
|
||||
# Add write permissions
|
||||
repo.add_permission("RW+", "", name_writers) unless name_writers.blank?
|
||||
repo.add_permission("RW+", "", name_masters) unless name_masters.blank?
|
||||
|
||||
repo
|
||||
end
|
||||
|
||||
def admin_all_repo
|
||||
ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
|
||||
conf = ga_repo.config
|
||||
owner_name = ""
|
||||
|
||||
# Read gitolite-admin user
|
||||
#
|
||||
begin
|
||||
repo = conf.get_repo("gitolite-admin")
|
||||
owner_name = repo.permissions[0]["RW+"][""][0]
|
||||
raise StandardError if owner_name.blank?
|
||||
rescue => ex
|
||||
puts "Cant determine gitolite-admin owner".red
|
||||
raise StandardError
|
||||
end
|
||||
|
||||
# @ALL repos premission for gitolite owner
|
||||
repo_name = "@all"
|
||||
repo = if conf.has_repo?(repo_name)
|
||||
conf.get_repo(repo_name)
|
||||
else
|
||||
::Gitolite::Config::Repo.new(repo_name)
|
||||
end
|
||||
|
||||
repo.add_permission("RW+", "", owner_name)
|
||||
conf.add_repo(repo, true)
|
||||
ga_repo.save
|
||||
end
|
||||
end
|
||||
end
|
8
lib/gitlab/logger.rb
Normal file
8
lib/gitlab/logger.rb
Normal file
|
@ -0,0 +1,8 @@
|
|||
module Gitlab
|
||||
class Logger
|
||||
def self.error(message)
|
||||
@@logger ||= ::Logger.new(File.join(Rails.root, "log/githost.log"))
|
||||
@@logger.error(message)
|
||||
end
|
||||
end
|
||||
end
|
60
lib/gitlab/merge.rb
Normal file
60
lib/gitlab/merge.rb
Normal file
|
@ -0,0 +1,60 @@
|
|||
module Gitlab
|
||||
class Merge
|
||||
attr_accessor :project, :merge_request, :user
|
||||
|
||||
def initialize(merge_request, user)
|
||||
self.user = user
|
||||
self.merge_request = merge_request
|
||||
self.project = merge_request.project
|
||||
end
|
||||
|
||||
def can_be_merged?
|
||||
result = false
|
||||
process do |repo, output|
|
||||
result = !(output =~ /CONFLICT/)
|
||||
end
|
||||
result
|
||||
end
|
||||
|
||||
def merge
|
||||
process do |repo, output|
|
||||
if output =~ /CONFLICT/
|
||||
false
|
||||
else
|
||||
repo.git.push({}, "origin", merge_request.target_branch)
|
||||
true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def process
|
||||
Grit::Git.with_timeout(30.seconds) do
|
||||
lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
|
||||
|
||||
File.open(lock_file, "w+") do |f|
|
||||
f.flock(File::LOCK_EX)
|
||||
|
||||
unless project.satellite.exists?
|
||||
raise "You should run: rake gitlab:app:enable_automerge"
|
||||
end
|
||||
|
||||
project.satellite.clear
|
||||
|
||||
Dir.chdir(project.satellite.path) do
|
||||
merge_repo = Grit::Repo.new('.')
|
||||
merge_repo.git.sh "git reset --hard"
|
||||
merge_repo.git.sh "git fetch origin"
|
||||
merge_repo.git.sh "git config user.name \"#{user.name}\""
|
||||
merge_repo.git.sh "git config user.email \"#{user.email}\""
|
||||
merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
|
||||
output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
|
||||
yield(merge_repo, output)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
rescue Grit::Git::GitTimeout
|
||||
return false
|
||||
end
|
||||
end
|
||||
end
|
41
lib/gitlab/satellite.rb
Normal file
41
lib/gitlab/satellite.rb
Normal file
|
@ -0,0 +1,41 @@
|
|||
module Gitlab
|
||||
class Satellite
|
||||
|
||||
PARKING_BRANCH = "__parking_branch"
|
||||
|
||||
attr_accessor :project
|
||||
|
||||
def initialize project
|
||||
self.project = project
|
||||
end
|
||||
|
||||
def create
|
||||
`git clone #{project.url_to_repo} #{path}`
|
||||
end
|
||||
|
||||
def path
|
||||
File.join(Rails.root, "tmp", "repo_satellites", project.path)
|
||||
end
|
||||
|
||||
def exists?
|
||||
File.exists? path
|
||||
end
|
||||
|
||||
#will be deleted all branches except PARKING_BRANCH
|
||||
def clear
|
||||
Dir.chdir(path) do
|
||||
heads = Grit::Repo.new(".").heads.map{|head| head.name}
|
||||
if heads.include? PARKING_BRANCH
|
||||
`git checkout #{PARKING_BRANCH}`
|
||||
else
|
||||
`git checkout -b #{PARKING_BRANCH}`
|
||||
end
|
||||
heads.delete(PARKING_BRANCH)
|
||||
heads.each do |head|
|
||||
`git branch -D #{head}`
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue