Skip to content

O
OHR Support
Commit cedca576 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

SVN integration: reposman.rb can now register created repositories in Redmine,… 

SVN integration: reposman.rb can now register created repositories in Redmine, so that the administrator doesn't have to enter the repository url in Redmine once it's created.
To do so, use the --url option when running reposman (see reposman help).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@860 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 0d605006
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 28 deletions
app/apis/sys_api.rb
View file @ cedca576
...@@ -20,6 +20,6 @@ class SysApi < ActionWebService::API::Base ...@@ -20,6 +20,6 @@ class SysApi < ActionWebService::API::Base
:expects => [], :expects => [],
:returns => [[Project]] :returns => [[Project]]
api_method :repository_created, api_method :repository_created,
:expects => [:int, :string], :expects => [:string, :string],
:returns => [:int] :returns => [:int]
end end
app/controllers/sys_controller.rb
View file @ cedca576
...@@ -22,18 +22,21 @@ class SysController < ActionController::Base ...@@ -22,18 +22,21 @@ class SysController < ActionController::Base
before_invocation :check_enabled before_invocation :check_enabled
# Returns the projects list, with their repositories
def projects def projects
Project.find(:all, :include => :repository) Project.find(:all, :include => :repository)
end end
def repository_created(project_id, url) # Registers a repository for the given project identifier
project = Project.find_by_id(project_id) # (Subversion specific)
def repository_created(identifier, url)
project = Project.find_by_identifier(identifier)
# Do not create the repository if the project has already one
return 0 unless project && project.repository.nil? return 0 unless project && project.repository.nil?
logger.debug "Repository for #{project.name} created" logger.debug "Repository for #{project.name} was created"
repository = Repository.new(:project => project, :url => url) repository = Repository.factory('Subversion', :project => project, :url => url)
repository.root_url = url
repository.save repository.save
repository.id repository.id || 0
end end
protected protected
......
extra/svn/reposman.rb
View file @ cedca576
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# == Synopsis # == Synopsis
# #
# reposman: manages your svn repositories with redMine # reposman: manages your svn repositories with Redmine
# #
# == Usage # == Usage
# #
...@@ -16,14 +16,28 @@ ...@@ -16,14 +16,28 @@
# use DIR as base directory for svn repositories # use DIR as base directory for svn repositories
# #
# -r, --redmine-host=HOST # -r, --redmine-host=HOST
# assume redMine is hosted on HOST. # assume Redmine is hosted on HOST.
# you can use : # you can use :
# * -r redmine.mydomain.foo (will add http://) # * -r redmine.mydomain.foo (will add http://)
# * -r http://redmine.mydomain.foo # * -r http://redmine.mydomain.foo
# * -r https://mydomain.foo/redmine # * -r https://mydomain.foo/redmine
# #
# == Options # == Options
# #
# -o, --owner=OWNER
# owner of the repository. using the rails login allow user to browse
# the repository in Redmine even for private project
#
# -u, --url=URL
# the base url Redmine will use to access your repositories. This
# will be used to register the repository in Redmine so that user
# doesn't need to do anything. reposman will add the identifier to this url :
#
# -u https://my.svn.server/my/reposity/root # if the repository can be access by http
# -u file:///var/svn/ # if the repository is local
# if this option isn't set, reposman won't register the repository
#
#
# -h, --help: # -h, --help:
# show help and exit # show help and exit
# #
...@@ -48,6 +62,8 @@ Version = "1.0" ...@@ -48,6 +62,8 @@ Version = "1.0"
opts = GetoptLong.new( opts = GetoptLong.new(
['--svn-dir', '-s', GetoptLong::REQUIRED_ARGUMENT], ['--svn-dir', '-s', GetoptLong::REQUIRED_ARGUMENT],
['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT], ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT],
['--owner', '-o', GetoptLong::REQUIRED_ARGUMENT],
['--url', '-u', GetoptLong::REQUIRED_ARGUMENT],
['--verbose', '-v', GetoptLong::NO_ARGUMENT], ['--verbose', '-v', GetoptLong::NO_ARGUMENT],
['--version', '-V', GetoptLong::NO_ARGUMENT], ['--version', '-V', GetoptLong::NO_ARGUMENT],
['--help' , '-h', GetoptLong::NO_ARGUMENT], ['--help' , '-h', GetoptLong::NO_ARGUMENT],
...@@ -58,6 +74,8 @@ $verbose = 0 ...@@ -58,6 +74,8 @@ $verbose = 0
$quiet = false $quiet = false
$redmine_host = '' $redmine_host = ''
$repos_base = '' $repos_base = ''
$svn_owner = 'root'
$svn_url = false
def log(text,level=0, exit=false) def log(text,level=0, exit=false)
return if $quiet or level > $verbose return if $quiet or level > $verbose
...@@ -68,8 +86,10 @@ end ...@@ -68,8 +86,10 @@ end
begin begin
opts.each do |opt, arg| opts.each do |opt, arg|
case opt case opt
when '--svn-dir'; $repos_base = arg.dup when '--svn-dir'; $repos_base = arg.dup
when '--redmine-host'; $redmine_host = arg.dup when '--redmine-host'; $redmine_host = arg.dup
when '--owner'; $svn_owner = arg.dup
when '--url'; $svn_url = arg.dup
when '--verbose'; $verbose += 1 when '--verbose'; $verbose += 1
when '--version'; puts Version; exit when '--version'; puts Version; exit
when '--help'; RDoc::usage when '--help'; RDoc::usage
...@@ -80,6 +100,8 @@ rescue ...@@ -80,6 +100,8 @@ rescue
exit 1 exit 1
end end
$svn_url += "/" if $svn_url and not $svn_url.match(/\/$/)
if ($redmine_host.empty? or $repos_base.empty?) if ($redmine_host.empty? or $repos_base.empty?)
RDoc::usage RDoc::usage
end end
...@@ -88,7 +110,7 @@ unless File.directory?($repos_base) ...@@ -88,7 +110,7 @@ unless File.directory?($repos_base)
log("directory '#{$repos_base}' doesn't exists", 0, true) log("directory '#{$repos_base}' doesn't exists", 0, true)
end end
log("querying redMine for projects...", 1); log("querying Redmine for projects...", 1);
$redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://") $redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://")
$redmine_host.gsub!(/\/$/, '') $redmine_host.gsub!(/\/$/, '')
...@@ -109,28 +131,53 @@ end ...@@ -109,28 +131,53 @@ end
log("retrieved #{projects.size} projects", 1) log("retrieved #{projects.size} projects", 1)
projects.each do |p| def set_owner_and_rights(project, repos_path, &block)
log("treating project #{p.name}", 1) if RUBY_PLATFORM =~ /mswin/
yield if block_given?
else
uid, gid = Etc.getpwnam($svn_owner).uid, Etc.getgrnam(project.identifier).gid
right = project.is_public ? 0575 : 0570
yield if block_given?
Find.find(repos_path) do |f|
File.chmod right, f
File.chown uid, gid, f
end
end
end
def other_read_right?(file)
(File.stat(file).mode & 0007).zero? ? false : true
end
def owner_name(file)
RUBY_PLATFORM =~ /mswin/ ?
$svn_owner :
Etc.getpwuid( File.stat(file).uid ).name
end
if p.identifier.empty? projects.each do |project|
log("\tno identifier for project #{p.name}") log("treating project #{project.name}", 1)
if project.identifier.empty?
log("\tno identifier for project #{project.name}")
next next
elsif not p.identifier.match(/^[a-z0-9\-]+$/) elsif not project.identifier.match(/^[a-z0-9\-]+$/)
log("\tinvalid identifier for project #{p.name} : #{p.identifier}"); log("\tinvalid identifier for project #{project.name} : #{project.identifier}");
next; next;
end end
repos_path = $repos_base + "/" + p.identifier repos_path = $repos_base + "/" + project.identifier
if File.directory?(repos_path) if File.directory?(repos_path)
other_read = (File.stat(repos_path).mode & 0007).zero? ? false : true # we must verify that repository has the good owner and the good
next if p.is_public == other_read # rights before leaving
other_read = other_read_right?(repos_path)
right = p.is_public ? 0775 : 0770 owner = owner_name(repos_path)
next if project.is_public == other_read and owner == $svn_owner
begin begin
Find.find(repos_path) { |f| File.chmod right, f } set_owner_and_rights(project, repos_path)
rescue Errno::EPERM => e rescue Errno::EPERM => e
log("\tunable to change mode on #{repos_path} : #{e}\n") log("\tunable to change mode on #{repos_path} : #{e}\n")
next next
...@@ -139,17 +186,26 @@ projects.each do |p| ...@@ -139,17 +186,26 @@ projects.each do |p|
log("\tmode change on #{repos_path}"); log("\tmode change on #{repos_path}");
else else
p.is_public ? File.umask(0002) : File.umask(0007) project.is_public ? File.umask(0202) : File.umask(0207)
begin begin
uid, gid = Etc.getpwnam("root").uid, Etc.getgrnam(p.identifier).gid set_owner_and_rights(project, repos_path) do
raise "svnadmin create #{repos_path} failed" unless system("svnadmin", "create", repos_path) raise "svnadmin create #{repos_path} failed" unless system("svnadmin", "create", repos_path)
Find.find(repos_path) { |f| File.chown uid, gid, f } end
rescue => e rescue => e
log("\tunable to create #{repos_path} : #{e}\n") log("\tunable to create #{repos_path} : #{e}\n")
next next
end end
if $svn_url
ret = soap.RepositoryCreated project.identifier, "#{$svn_url}#{project.identifier}"
if ret > 0
log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}");
else
log("\trepository #{repos_path} not registered in Redmine. Look in your log to find why.");
end
end
log("\trepository #{repos_path} created"); log("\trepository #{repos_path} created");
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment