Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix XML RPC responses. Refs #2162

This commit is contained in:
Pavel Chipiga 2011-10-30 21:01:08 +02:00
parent 0c3a044f81
commit f39e51e516
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/rpc_controller.rb
View File

@ -13,7 +13,7 @@ class RpcController < ApplicationController
def platforms def platforms
ActiveSupport::Notifications.instrument("event_log.observer", :message => 'список платформ') ActiveSupport::Notifications.instrument("event_log.observer", :message => 'список платформ')
return Platform.select('id, unixname').where("platform_type = ?", 'main').map(&:attributes) Platform.select('unixname').where("platform_type = ?", 'main').map(&:unixname)
end end
def user_projects def user_projects
@ -24,8 +24,7 @@ class RpcController < ApplicationController
def project_versions id def project_versions id
p = Project.find_by_id(id) p = Project.find_by_id(id)
ActiveSupport::Notifications.instrument("event_log.observer", :object => p, :message => "список версий") ActiveSupport::Notifications.instrument("event_log.observer", :object => p, :message => "список версий")
return nil if p.blank? p.project_versions.collect {|tag| tag.name.gsub(/^\w+\./, "")} rescue 'not found'
p.project_versions.collect {|tag| [tag.name.gsub(/^\w+\./, ""), tag.name]}.select {|pv| pv[1] =~ /^v\./}
end end
def build_status id def build_status id

12
bin/xml-client-demo.rb
View File

@ -2,7 +2,7 @@
require 'rubygems' require 'rubygems'
require 'xmlrpc/client' require 'xmlrpc/client'
require 'awesome_print' require 'pp'
# Please correctly fill following vars # Please correctly fill following vars
@host = 'localhost' @host = 'localhost'
@ -12,26 +12,26 @@ require 'awesome_print'
puts 'PLATFORMS' puts 'PLATFORMS'
client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900) client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900)
ap client.call("platforms") pp client.call("platforms")
puts 'USER PROJECTS' puts 'USER PROJECTS'
client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900) client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900)
ap client.call("user_projects") pp client.call("user_projects")
puts 'PROJECT VERSIONS' puts 'PROJECT VERSIONS'
client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900) client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900)
project_id = 1 # FIXME! project_id = 1 # FIXME!
ap client.call("project_versions", project_id) pp client.call("project_versions", project_id)
puts 'BUILD STATUS' puts 'BUILD STATUS'
client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900) client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900)
build_list_id = 1 # FIXME build_list_id = 1 # FIXME
ap client.call("build_status", build_list_id) pp client.call("build_status", build_list_id)
puts 'BUILD PACKET' puts 'BUILD PACKET'
client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900) client = XMLRPC::Client.new(@host, '/api/xmlrpc', @port, nil, nil, @user, @password, false, 900)
project_id = 1 # FIXME project_id = 1 # FIXME
repo_id = 1 # FIXME repo_id = 1 # FIXME
ap client.call("build_packet", project_id, repo_id) pp client.call("build_packet", project_id, repo_id)
puts 'DONE' puts 'DONE'