jro_apps/redmine Commit - r2374:8cf3d7a4929e

0

test/functional/sys_controller_test.rb created 644 +55 0

@@ -0,0 +1,55
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'sys_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class SysController; def rescue_action(e) raise e end; end
	23
	24	class SysControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :repositories
	26
	27	def setup
	28	@controller = SysController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	Setting.sys_api_enabled = '1'
	32	end
	33
	34	def test_projects_with_repository_enabled
	35	get :projects
	36	assert_response :success
	37	assert_equal 'application/xml', @response.content_type
	38	with_options :tag => 'projects' do \|test\|
	39	test.assert_tag :children => { :count => Project.active.has_module(:repository).count }
	40	end
	41	end
	42
	43	def test_create_project_repository
	44	assert_nil Project.find(4).repository
	45
	46	post :create_project_repository, :id => 4,
	47	:vendor => 'Subversion',
	48	:repository => { :url => 'file:///create/project/repository/subproject2'}
	49	assert_response :created
	50
	51	r = Project.find(4).repository
	52	assert r.is_a?(Repository::Subversion)
	53	assert_equal 'file:///create/project/repository/subproject2', r.url
	54	end
	55	end

0

app/controllers/sys_controller.rb +27 -23

@@ -1,5 +1,5
1	# ~~redM~~ine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2007 Jean-Philippe Lang	2	# Copyright (C) 2006-2009 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -16,31 +16,35
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	class SysController < ActionController::Base	18	class SysController < ActionController::Base
19	wsdl_service_name 'Sys'	19	before_filter :check_enabled
20	web_service_api SysApi
21	web_service_scaffold :invoke
22		20
23	before_invocation :check_enabled	21	def projects
24		22	p = Project.active.has_module(:repository).find(:all, :include => :repository, :order => 'identifier')
25	# Returns the projects list, with their repositories	23	render :xml => p.to_xml(:include => :repository)
26	def projects_with_repository_enabled
27	Project.has_module(:repository).find(:all, :include => :repository, :order => 'identifier')
28	end	24	end
29		25
30	# Registers a repository for the given project identifier	26	def create_project_repository
31	def repository_created(identifier, vendor, url)	27	project = Project.find(params[:id])
32	project = Project.find_by_identifier(identifier)	28	if project.repository
33	# Do not create the repository if the project has already one	29	render :nothing => true, :status => 409
34	return 0 unless project && project.repository.nil?	30	else
35	logger.~~debug~~ "Repository for #{project.name} was created"	31	logger.info "Repository for #{project.name} was reported to be created by #{request.remote_ip}."
36	repository = Repository.factory(vendor, ~~:project~~ => ~~project~~, ~~:url~~ => ~~url~~)	32	project.repository = Repository.factory(params[:vendor], params[:repository])
37	repository.save	33	if project.repository && project.repository.save
38	repository.id \|\| 0	34	render :xml => project.repository, :status => 201
		35	else
		36	render :nothing => true, :status => 422
		37	end
		38	end
39	end	39	end
40		40
41	protected	41	protected
42		42
43	def check_enabled(~~name~~, ~~args~~)	43	def check_enabled
44	Setting.sys_api_enabled?	44	User.current = nil
		45	unless Setting.sys_api_enabled?
		46	render :nothing => 'Access denied. Repository management WS is disabled.', :status => 403
		47	return false
		48	end
45	end	49	end
46	end	50	end

0

config/routes.rb +5 -4

                 omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
                 omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
               end
-              # Allow downloading Web Service WSDL as a file with an extension
+              map.with_options :controller => 'sys' do |sys|
-              # instead of a file named 'wsdl'
+                sys.connect 'sys/projects.:format', :action => 'projects', :conditions => {:method => :get}
-              map.connect ':controller/service.wsdl', :action => 'wsdl'
+                sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post}
+              end
               # Install the default route as the lowest priority.
               map.connect ':controller/:action/:id'

0

extra/svn/reposman.rb +18 -12

             require 'getoptlong'
             require 'rdoc/usage'
-            require 'soap/wsdlDriver'
             require 'find'
             require 'etc'
-            Version = "1.1"
+            Version = "1.2"
             SUPPORTED_SCM = %w( Subversion Darcs Mercurial Bazaar Git Filesystem )
             opts = GetoptLong.new(
               log("directory '#{$repos_base}' doesn't exists", :exit => true)
             end
+            begin
+              require 'activeresource'
+            rescue LoadError
+              log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true)
+            end
+            class Project < ActiveResource::Base; end
             log("querying Redmine for projects...", :level => 1);
             $redmine_host.gsub!(/^/, "http://") unless $redmine_host.match("^https?://")
             $redmine_host.gsub!(/\/$/, '')
-            wsdl_url = "#{$redmine_host}/sys/service.wsdl";
+            Project.site = "#{$redmine_host}/sys";
             begin
-              soap = SOAP::WSDLDriverFactory.new(wsdl_url).create_rpc_driver
+              # Get all active projects that have the Repository module enabled
+              projects = Project.find(:all)
             rescue => e
-              log("Unable to connect to #{wsdl_url} : #{e}", :exit => true)
+              log("Unable to connect to #{Project.site}: #{e}", :exit => true)
             end
-            projects = soap.ProjectsWithRepositoryEnabled
             if projects.nil?
               log('no project found, perhaps you forgot to "Enable WS for repository management"', :exit => true)
             end
               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?
+                if $force == false and project.respond_to?(:repository)
                   log("\trepository for project #{project.identifier} already exists in Redmine", :level => 1)
                   next
                 end
                 end
                 if $svn_url
-                  ret = soap.RepositoryCreated project.identifier, $scm, "#{$svn_url}#{project.identifier}"
+                  begin
-                  if ret > 0
+                    project.post(:repository, :vendor => $scm, :repository => {:url => "#{$svn_url}#{project.identifier}"})
                     log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}");
-                  else
+                  rescue => e
-                    log("\trepository #{repos_path} not registered in Redmine. Look in your log to find why.");
+                    log("\trepository #{repos_path} not registered in Redmine: #{e.message}");
                   end
                 end

0

app/apis/sys_api.rb removed 0 -33

1

NO CONTENT: file was removed

0

test/functional/sys_api_test.rb removed 0 -50

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/CHANGELOG removed 0 -265

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/MIT-LICENSE removed 0 -21

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/README removed 0 -364

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/Rakefile removed 0 -172

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/TODO removed 0 -32

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/init.rb removed 0 -7

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/install.rb removed 0 -30

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service.rb removed 0 -66

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/api.rb removed 0 -297

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/base.rb removed 0 -38

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/casting.rb removed 0 -138

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/client.rb removed 0 -3

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/client/base.rb removed 0 -28

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/client/soap_client.rb removed 0 -113

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb removed 0 -58

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/container.rb removed 0 -3

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/container/action_controller_container.rb removed 0 -93

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/container/delegated_container.rb removed 0 -86

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/container/direct_container.rb removed 0 -69

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/dispatcher.rb removed 0 -2

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/abstract.rb removed 0 -207

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb removed 0 -379

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/invocation.rb removed 0 -202

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/protocol.rb removed 0 -4

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/protocol/abstract.rb removed 0 -112

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/protocol/discovery.rb removed 0 -37

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb removed 0 -176

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb removed 0 -235

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb removed 0 -122

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/scaffolding.rb removed 0 -283

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/struct.rb removed 0 -64

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb removed 0 -26

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/support/signature_types.rb removed 0 -226

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb removed 0 -65

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml removed 0 0

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb removed 0 -6

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml removed 0 0

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb removed 0 -29

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml removed 0 0

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb removed 0 -30

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml removed 0 0

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/test_invoke.rb removed 0 -110

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/action_web_service/version.rb removed 0 -9

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/lib/actionwebservice.rb removed 0 -1

1

NO CONTENT: file was removed

0

vendor/plugins/actionwebservice/setup.rb removed 0 -1379

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1379 lines changed) Show them Hide them

	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