* reposman can now use an external command with "-c" to create repository of other...

* WS used by reposman only return projects with repository module enable (so reposman no longer create repository if module is disable)
* it doesn't create repository if repository definition already exists in redmine database (unless -f is used)

git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1793 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/apis/sys_api.rb b/app/apis/sys_api.rb
index f52f9e7ef58c0dd0c0e4397401a2cc133d0c94d4..65c81647e3379e583f4c843606a14b64c0eb098a 100644 (file)
--- a/app/apis/sys_api.rb
+++ b/app/apis/sys_api.rb
@@ -15,10 +15,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+class AWSProjectWithRepository < ActionWebService::Struct
+  member :id,              :int
+  member :identifier,      :string
+  member :name,            :string
+  member :is_public,       :bool
+  member :repository,      Repository
+end
+
 class SysApi < ActionWebService::API::Base
-  api_method :projects,
+  api_method :projects_with_repository_enabled,
              :expects => [],
-             :returns => [[Project]]
+             :returns => [[AWSProjectWithRepository]]
   api_method :repository_created,
              :expects => [:string, :string],
              :returns => [:int]

diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb
index 6065c28339ff8c79daeadf7e2994cffa97c7869e..3d1984e307dfb98f25ab2b1aa9e032e04ed5e41f 100644 (file)
--- a/app/controllers/sys_controller.rb
+++ b/app/controllers/sys_controller.rb
@@ -23,8 +23,8 @@ class SysController < ActionController::Base
   before_invocation :check_enabled
   
   # Returns the projects list, with their repositories
-  def projects
-    Project.find(:all, :include => :repository)
+  def projects_with_repository_enabled
+    Project.repository_enabled(:all, :include => :repository)
   end
 
   # Registers a repository for the given project identifier

diff --git a/app/models/project.rb b/app/models/project.rb
index adc70c644984df8009a73ca01ece416f03ee5932..55dc8121be895586eb7893b467c8cd4cfb85ef34 100644 (file)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -62,6 +62,8 @@ class Project < ActiveRecord::Base
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
   
   before_destroy :delete_all_members
+
+  named_scope :repository_enabled, { :include => :enabled_modules, :conditions => ['enabled_modules.name=?', 'repository'] }
   
   def identifier=(identifier)
     super unless identifier_frozen?

diff --git a/extra/svn/reposman.rb b/extra/svn/reposman.rb
index 0b476cdc46b6291fc0b3d255f4b39a52d225b864..89215d047b8423898d78cd4f50949b22fa209fac 100755 (executable)
--- a/extra/svn/reposman.rb
+++ b/extra/svn/reposman.rb
@@ -37,6 +37,13 @@
 #    -u file:///var/svn/                       # if the repository is local
 #    if this option isn't set, reposman won't register the repository
 #
+# -c, --command=COMMAND
+#    the default is to create an subversion repository. You can use this command
+#    to create another kind of repository
+#
+# -f, --force
+#    force repository creation even if a repository is already declared in redmine.
+#
 # -t, --test
 #    only show what should be done
 #
@@ -66,7 +73,9 @@ opts = GetoptLong.new(
                       ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT],
                       ['--owner',        '-o', GetoptLong::REQUIRED_ARGUMENT],
                       ['--url',          '-u', GetoptLong::REQUIRED_ARGUMENT],
+                      ['--command' ,     '-c', GetoptLong::REQUIRED_ARGUMENT],
                       ['--test',         '-t', GetoptLong::NO_ARGUMENT],
+                      ['--force',        '-f', GetoptLong::NO_ARGUMENT],
                       ['--verbose',      '-v', GetoptLong::NO_ARGUMENT],
                       ['--version',      '-V', GetoptLong::NO_ARGUMENT],
                       ['--help'   ,      '-h', GetoptLong::NO_ARGUMENT],
@@ -81,6 +90,8 @@ $svn_owner    = 'root'
 $use_groupid  = true
 $svn_url      = false
 $test         = false
+$command      = "svnadmin create"
+$force        = false
 
 def log(text,level=0, exit=false)
   return if $quiet or level > $verbose
@@ -95,8 +106,10 @@ begin
     when '--redmine-host';   $redmine_host = arg.dup
     when '--owner';          $svn_owner    = arg.dup; $use_groupid = false;
     when '--url';            $svn_url      = arg.dup
+    when '--command';        $command =      arg.dup
     when '--verbose';        $verbose += 1
     when '--test';           $test = true
+    when '--force';          $force = true
     when '--version';        puts Version; exit
     when '--help';           RDoc::usage
     when '--quiet';          $quiet = true
@@ -133,7 +146,7 @@ rescue => e
   log("Unable to connect to #{wsdl_url} : #{e}", 0, true)
 end
 
-projects = soap.Projects
+projects = soap.ProjectsWithRepositoryEnabled
 
 if projects.nil?
   log('no project found, perhaps you forgot to "Enable WS for repository management"', 0, true)
@@ -201,6 +214,13 @@ projects.each do |project|
     log("\tmode change on #{repos_path}");
 
   else
+    # if repository is already declared in redmine, we don't create
+    # unless user use -f with reposman
+    if $force == false and not project.repository.nil?
+      log("\trepository for project #{project.identifier} already exists in Redmine", 1)
+      next
+    end
+
     project.is_public ? File.umask(0002) : File.umask(0007)
 
     if $test
@@ -211,7 +231,8 @@ projects.each do |project|
 
     begin
       set_owner_and_rights(project, repos_path) do
-        raise "svnadmin create #{repos_path} failed" unless system("svnadmin", "create", repos_path)
+        command = "#{$command} #{repos_path}"
+        raise "#{command} failed" unless system( command  )
       end
     rescue => e
       log("\tunable to create #{repos_path} : #{e}\n")