jro_apps/redmine Commit - r847:cedca57620e3

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....

Jean-Philippe Lang -

r847:cedca57620e3

parent child

Context file:

r847:cedca57620e3

Collapse all files

app/apis/sys_api.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class SysApi < ActionWebService::API::Base
               api_method :projects,
                          :expects => [],
                          :returns => [[Project]]
               api_method :repository_created,
-                         :expects => [:int, :string],
+                         :expects => [:string, :string],
                          :returns => [:int]
             end

app/controllers/sys_controller.rb +9 -6

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class SysController < ActionController::Base
               wsdl_service_name 'Sys'
               web_service_api SysApi
               web_service_scaffold :invoke
               before_invocation :check_enabled
+              # Returns the projects list, with their repositories
               def projects
                 Project.find(:all, :include => :repository)
               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?
-                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.id
+                repository.id || 0
               end
             protected
               def check_enabled(name, args)
                 Setting.sys_api_enabled?
               end
             end

extra/svn/reposman.rb +77 -21

             #!/usr/bin/ruby
             # == Synopsis
             #
-            # reposman: manages your svn repositories with redMine
+            # reposman: manages your svn repositories with Redmine
             #
             # == Usage
             #
             #     reposman [ -h | --help ] [ -v | --verbose ] [ -V | --version ] [ -q | --quiet ] -s /var/svn -r redmine.host.org
             #     example: reposman --svn-dir=/var/svn --redmine-host=redmine.mydomain.foo
             #              reposman -s /var/svn -r redmine.mydomain.foo
             #
             # == Arguments (mandatory)
             #
             # -s, --svn-dir=DIR
             #    use DIR as base directory for svn repositories
             #
             # -r, --redmine-host=HOST
-            #    assume redMine is hosted on HOST.
+            #    assume Redmine is hosted on HOST.
             #    you can use :
             #    * -r redmine.mydomain.foo        (will add http://)
             #    * -r http://redmine.mydomain.foo
             #    * -r https://mydomain.foo/redmine
             #
             # == 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:
             #    show help and exit
             #
             # -v, --verbose
             #    verbose
             #
             # -V, --version
             #    print version and exit
             #
             # -q, --quiet
             #    no log
             #
             require 'getoptlong'
             require 'rdoc/usage'
             require 'soap/wsdlDriver'
             require 'find'
             require 'etc'
             Version = "1.0"
             opts = GetoptLong.new(
                                   ['--svn-dir',      '-s', GetoptLong::REQUIRED_ARGUMENT],
                                   ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT],
+                                  ['--owner',        '-o', GetoptLong::REQUIRED_ARGUMENT],
+                                  ['--url',          '-u', GetoptLong::REQUIRED_ARGUMENT],
                                   ['--verbose',      '-v', GetoptLong::NO_ARGUMENT],
                                   ['--version',      '-V', GetoptLong::NO_ARGUMENT],
                                   ['--help'   ,      '-h', GetoptLong::NO_ARGUMENT],
                                   ['--quiet'  ,      '-q', GetoptLong::NO_ARGUMENT]
                                   )
             $verbose      = 0
             $quiet        = false
             $redmine_host = ''
             $repos_base   = ''
+            $svn_owner    = 'root'
+            $svn_url      = false
             def log(text,level=0, exit=false)
               return if $quiet or level > $verbose
               puts text
               exit 1 if exit
             end
             begin
               opts.each do |opt, arg|
                 case opt
-                when '--svn-dir';        $repos_base = arg.dup
+                when '--svn-dir';        $repos_base   = 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 '--version';        puts Version; exit
                 when '--help';           RDoc::usage
                 when '--quiet';          $quiet = true
                 end
               end
             rescue
               exit 1
             end
+            $svn_url += "/" if $svn_url and not $svn_url.match(/\/$/)
             if ($redmine_host.empty? or $repos_base.empty?)
               RDoc::usage
             end
             unless File.directory?($repos_base)
               log("directory '#{$repos_base}' doesn't exists", 0, true)
             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!(/\/$/, '')
             wsdl_url = "#{$redmine_host}/sys/service.wsdl";
             begin
               soap = SOAP::WSDLDriverFactory.new(wsdl_url).create_rpc_driver
             rescue => e
               log("Unable to connect to #{wsdl_url} : #{e}", 0, true)
             end
             projects = soap.Projects
             if projects.nil?
               log('no project found, perhaps you forgot to "Enable WS for repository management"', 0, true)
             end
             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
-              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;
               end
-              repos_path = $repos_base + "/" + p.identifier
+              repos_path = $repos_base + "/" + project.identifier
               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
-                  Find.find(repos_path) { |f| File.chmod right, f }
+                  set_owner_and_rights(project, repos_path)
                 rescue Errno::EPERM => e
                   log("\tunable to change mode on #{repos_path} : #{e}\n")
                   next
                 end
                 log("\tmode change on #{repos_path}");
               else
-                p.is_public ? File.umask(0002) : File.umask(0007)
+                project.is_public ? File.umask(0202) : File.umask(0207)
                 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
                   log("\tunable to create #{repos_path} : #{e}\n")
                   next
                 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");
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages