Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
c745ad819989
Commit
c745ad81
authored
Dec 05, 2011
by
Dmitriy Zaporozhets
Browse files
refcatoring. cleaning after gitosis
parent
8dc6929aff67
Changes
13
Hide whitespace changes
Inline
Side-by-side
app/controllers/application_controller.rb
View file @
c745ad81
...
...
@@ -3,8 +3,8 @@
protect_from_forgery
helper_method
:abilities
,
:can?
rescue_from
Gitlabhq
::
Gitosis
::
AccessDenied
,
Gitlabhq
::
Gitolite
::
AccessDenied
do
|
exception
|
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"gitos
is
_error"
),
:layout
=>
false
rescue_from
Gitlabhq
::
Gitolite
::
AccessDenied
do
|
exception
|
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"git
h
os
t
_error"
),
:layout
=>
false
end
layout
:layout_by_resource
...
...
app/controllers/errors_controller.rb
View file @
c745ad81
class
ErrorsController
<
ApplicationController
def
gitos
is
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"gitos
is
_error"
),
:layout
=>
false
def
git
h
os
t
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"git
h
os
t
_error"
),
:layout
=>
false
end
end
app/controllers/projects_controller.rb
View file @
c745ad81
...
...
@@ -42,8 +42,8 @@
format
.
js
end
end
rescue
Gitlabhq
::
Gitosis
::
AccessDenied
,
Gitlabhq
::
Gitolite
::
AccessDenied
render
:js
=>
"location.href = '
#{
errors_gitos
is
_path
}
'"
and
return
rescue
Gitlabhq
::
Gitolite
::
AccessDenied
render
:js
=>
"location.href = '
#{
errors_git
h
os
t
_path
}
'"
and
return
rescue
StandardError
=>
ex
@project
.
errors
.
add
(
:base
,
"Cant save project. Please try again later"
)
respond_to
do
|
format
|
...
...
app/models/key.rb
View file @
c745ad81
...
...
@@ -11,10 +11,10 @@
:length
=>
{
:within
=>
0
..
5000
}
before_save
:set_identifier
after_save
:update_
gitosis
after_destroy
:
gitosis
_delete_key
after_save
:update_
repository
after_destroy
:
repository
_delete_key
def
set_identifier
self
.
identifier
=
"
#{
user
.
identifier
}
_
#{
Time
.
now
.
to_i
}
"
end
...
...
@@ -16,10 +16,10 @@
def
set_identifier
self
.
identifier
=
"
#{
user
.
identifier
}
_
#{
Time
.
now
.
to_i
}
"
end
def
update_
gitosis
def
update_
repository
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
c
.
update_keys
(
identifier
,
key
)
projects
.
each
do
|
project
|
...
...
@@ -22,9 +22,9 @@
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
c
.
update_keys
(
identifier
,
key
)
projects
.
each
do
|
project
|
c
.
update_project
(
project
.
path
,
project
.
gitosis
_writers
)
c
.
update_project
(
project
.
path
,
project
.
repository
_writers
)
end
end
end
...
...
@@ -27,9 +27,9 @@
end
end
end
def
gitosis
_delete_key
def
repository
_delete_key
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
c
.
delete_key
(
identifier
)
projects
.
each
do
|
project
|
...
...
@@ -32,8 +32,8 @@
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
c
.
delete_key
(
identifier
)
projects
.
each
do
|
project
|
c
.
update_project
(
project
.
path
,
project
.
gitosis
_writers
)
c
.
update_project
(
project
.
path
,
project
.
repository
_writers
)
end
end
end
...
...
app/models/project.rb
View file @
c745ad81
...
...
@@ -40,8 +40,8 @@
validate
:check_limit
validate
:repo_name
after_destroy
:destroy_
gitosis_project
after_save
:update_
gitosis_project
after_destroy
:destroy_
repository
after_save
:update_
repository
attr_protected
:private_flag
,
:owner_id
...
...
@@ -54,8 +54,8 @@
delegate
:repo
,
:url_to_repo
,
:path_to_repo
,
:update_
gitosis_project
,
:destroy_
gitosis_project
,
:update_
repository
,
:destroy_
repository
,
:tags
,
:repo_exists?
,
:commit
,
...
...
@@ -113,7 +113,7 @@
@writers
||=
users_projects
.
includes
(
:user
).
where
(
:write
=>
true
).
map
(
&
:user
)
end
def
gitosis
_writers
def
repository
_writers
keys
=
Key
.
joins
({
:user
=>
:users_projects
}).
where
(
"users_projects.project_id = ? AND users_projects.write = ?"
,
id
,
true
)
keys
.
map
(
&
:identifier
)
end
...
...
@@ -184,8 +184,8 @@
end
def
repo_name
if
path
==
"gitosis-admin"
&&
path
==
"gitolite-admin"
errors
.
add
(
:path
,
" like 'gito
sis
-admin' is not allowed"
)
if
path
==
"gitolite-admin"
errors
.
add
(
:path
,
" like 'gito
lite
-admin' is not allowed"
)
end
end
...
...
app/models/repository.rb
View file @
c745ad81
...
...
@@ -24,14 +24,10 @@
end
def
url_to_repo
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
Gitlabhq
::
GitHost
.
url_to_repo
(
path
)
end
def
path_to_repo
GIT_HOST
[
"base_path"
]
+
path
+
".git"
end
...
...
@@ -32,8 +28,8 @@
end
def
path_to_repo
GIT_HOST
[
"base_path"
]
+
path
+
".git"
end
def
update_
gitosis_project
def
update_
repository
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
...
...
@@ -39,5 +35,5 @@
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
c
.
update_project
(
path
,
project
.
gitosis
_writers
)
c
.
update_project
(
path
,
project
.
repository
_writers
)
end
end
...
...
@@ -41,7 +37,7 @@
end
end
def
destroy_
gitosis_project
def
destroy_
repository
Gitlabhq
::
GitHost
.
system
.
new
.
configure
do
|
c
|
c
.
destroy_project
(
@project
)
end
...
...
app/models/users_project.rb
View file @
c745ad81
...
...
@@ -4,7 +4,7 @@
attr_protected
:project_id
,
:project
after_commit
:update_
gitosis_project
after_commit
:update_
repository
validates_uniqueness_of
:user_id
,
:scope
=>
[
:project_id
]
validates_presence_of
:user_id
...
...
@@ -13,5 +13,5 @@
delegate
:name
,
:email
,
:to
=>
:user
,
:prefix
=>
true
def
update_
gitosis_project
def
update_
repository
Gitosis
.
new
.
configure
do
|
c
|
...
...
@@ -17,5 +17,5 @@
Gitosis
.
new
.
configure
do
|
c
|
c
.
update_project
(
project
.
path
,
project
.
gitosis_writers
)
c
.
update_project
(
project
.
path
,
project
.
repository
)
end
end
...
...
config/routes.rb
View file @
c745ad81
...
...
@@ -14,7 +14,7 @@
root
:to
=>
"users#index"
end
get
"errors/gitos
is
"
get
"errors/git
h
os
t
"
get
"profile/password"
,
:to
=>
"profile#password"
put
"profile/password"
,
:to
=>
"profile#password_update"
put
"profile/reset_private_token"
,
:to
=>
"profile#reset_private_token"
...
...
lib/gitlabhq/git_host.rb
View file @
c745ad81
require
File
.
join
(
Rails
.
root
,
"lib"
,
"gitlabhq"
,
"gitolite"
)
require
File
.
join
(
Rails
.
root
,
"lib"
,
"gitlabhq"
,
"gitosis"
)
module
Gitlabhq
class
GitHost
def
self
.
system
...
...
@@ -3,14 +2,10 @@
module
Gitlabhq
class
GitHost
def
self
.
system
if
GIT_HOST
[
"system"
]
==
"gitosis"
Gitlabhq
::
Gitosis
else
Gitlabhq
::
Gitolite
end
Gitlabhq
::
Gitolite
end
def
self
.
admin_uri
GIT_HOST
[
"admin_uri"
]
end
...
...
@@ -12,7 +7,15 @@
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
lib/gitlabhq/gitosis.rb
deleted
100644 → 0
View file @
8dc6929a
require
'inifile'
require
'timeout'
require
'fileutils'
module
Gitlabhq
class
Gitosis
class
AccessDenied
<
StandardError
;
end
def
pull
# create tmp dir
@local_dir
=
File
.
join
(
Dir
.
tmpdir
,
"gitlabhq-gitosis-
#{
Time
.
now
.
to_i
}
"
)
Dir
.
mkdir
@local_dir
`git clone
#{
GitHost
.
admin_uri
}
#{
@local_dir
}
/gitosis`
end
def
push
Dir
.
chdir
(
File
.
join
(
@local_dir
,
"gitosis"
))
`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-gitosis.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
raise
Gitosis
::
AccessDenied
.
new
(
"gitosis timeout"
)
end
def
destroy_project
(
project
)
`sudo -u git rm -rf
#{
project
.
path_to_repo
}
`
conf
=
IniFile
.
new
(
File
.
join
(
@local_dir
,
'gitosis'
,
'gitosis.conf'
))
conf
.
delete_section
(
"group
#{
project
.
path
}
"
)
conf
.
write
end
#update or create
def
update_keys
(
user
,
key
)
File
.
open
(
File
.
join
(
@local_dir
,
'gitosis/keydir'
,
"
#{
user
}
.pub"
),
'w'
)
{
|
f
|
f
.
write
(
key
.
gsub
(
/\n/
,
''
))
}
end
def
delete_key
(
user
)
File
.
unlink
(
File
.
join
(
@local_dir
,
'gitosis/keydir'
,
"
#{
user
}
.pub"
))
`cd
#{
File
.
join
(
@local_dir
,
'gitosis'
)
}
; git rm keydir/
#{
user
}
.pub`
end
#update or create
def
update_project
(
repo_name
,
name_writers
)
# write config file
conf
=
IniFile
.
new
(
File
.
join
(
@local_dir
,
'gitosis'
,
'gitosis.conf'
))
conf
[
"group
#{
repo_name
}
"
][
'writable'
]
=
repo_name
conf
[
"group
#{
repo_name
}
"
][
'members'
]
=
name_writers
.
join
(
' '
)
conf
.
write
end
end
end
lib/tasks/gitolite_rebuild.rake
0 → 100644
View file @
c745ad81
desc
"Rebuild each project at gitolite config"
task
:gitolite_rebuild
=>
:environment
do
puts
"Starting..."
Project
.
find_each
(
:batch_size
=>
100
)
do
|
project
|
puts
puts
"===
#{
project
.
name
}
"
project
.
update_repository
puts
end
puts
"Done"
end
spec/models/project_spec.rb
View file @
c745ad81
...
...
@@ -18,7 +18,7 @@
describe
"Respond to"
do
it
{
should
respond_to
(
:readers
)
}
it
{
should
respond_to
(
:writers
)
}
it
{
should
respond_to
(
:
gitosis
_writers
)
}
it
{
should
respond_to
(
:
repository
_writers
)
}
it
{
should
respond_to
(
:admins
)
}
it
{
should
respond_to
(
:add_access
)
}
it
{
should
respond_to
(
:reset_access
)
}
...
...
@@ -22,8 +22,8 @@
it
{
should
respond_to
(
:admins
)
}
it
{
should
respond_to
(
:add_access
)
}
it
{
should
respond_to
(
:reset_access
)
}
it
{
should
respond_to
(
:update_
gitosis_project
)
}
it
{
should
respond_to
(
:destroy_
gitosis_project
)
}
it
{
should
respond_to
(
:update_
repository
)
}
it
{
should
respond_to
(
:destroy_
repository
)
}
it
{
should
respond_to
(
:public?
)
}
it
{
should
respond_to
(
:private?
)
}
it
{
should
respond_to
(
:url_to_repo
)
}
...
...
@@ -35,5 +35,5 @@
it
{
should
respond_to
(
:commit
)
}
end
it
"should not allow 'gito
sis
-admin' as repo name"
do
it
"should not allow 'gito
lite
-admin' as repo name"
do
should
allow_value
(
"blah"
).
for
(
:path
)
...
...
@@ -39,5 +39,5 @@
should
allow_value
(
"blah"
).
for
(
:path
)
should_not
allow_value
(
"gito
sis
-admin"
).
for
(
:path
)
should_not
allow_value
(
"gito
lite
-admin"
).
for
(
:path
)
end
it
"should return valid url to repo"
do
...
...
spec/monkeypatch.rb
View file @
c745ad81
# Stubbing Project <-> git
osis
path
# Stubbing Project <-> git
host
path
# create project using Factory only
class
Project
...
...
@@ -2,6 +2,6 @@
# create project using Factory only
class
Project
def
update_
gitosis_project
def
update_
repository
true
end
...
...
@@ -5,7 +5,7 @@
true
end
def
update_
gitosis
def
update_
repository
true
end
...
...
@@ -15,7 +15,7 @@
end
class
Key
def
update_
gitosis
def
update_
repository
true
end
...
...
@@ -19,9 +19,9 @@
true
end
def
gitosis
_delete_key
def
repository
_delete_key
true
end
end
class
UsersProject
...
...
@@ -23,9 +23,9 @@
true
end
end
class
UsersProject
def
update_
gitosis_project
def
update_
repository
true
end
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment