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

Merge branch 'master' into 214-delete-and-restore-branches

This commit is contained in:
Vokhmin Alexey V 2013-07-13 00:31:52 +04:00
parent 953c327b46 e0f247ac1e
commit c79fbbd2d5
27 changed files with 519 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/assets/stylesheets/design/custom.scss
View File

@ -2036,3 +2036,26 @@ a.button.reject_publish, a.button.create_container {
height: 16px;
padding: 3px 20px 5px 20px;
}
#contents {
.path {
a {
margin-right: 20px;
}
.text {
padding: 5px 10px;
background-color: #dcecfa;
float: left;
height: 14px;
}
.arrow-right {
content: '';
width: 0;
height: 0;
border: 12px solid transparent;
border-left: 12px solid #dcecfa;
float: left;
}
}
}

10
app/controllers/api/v1/base_controller.rb
View File

@ -1,5 +1,6 @@
# -*- encoding : utf-8 -*-
class Api::V1::BaseController < ApplicationController
include PaginateHelper
#respond_to :json
helper_method :member_path
@ -72,15 +73,6 @@ class Api::V1::BaseController < ApplicationController
end
end
def paginate_params
per_page = params[:per_page].to_i
per_page = 20 if per_page < 1
per_page = 100 if per_page >100
page = params[:page].to_i
page = nil if page == 0
{:page => page, :per_page => per_page}
end
def render_json_response(subject, message, status = 200)
id = status != 200 ? nil : subject.id

1
app/controllers/api/v1/pull_requests_controller.rb
View File

@ -55,6 +55,7 @@ class Api::V1::PullRequestsController < Api::V1::BaseController
render_validation_error(@pull, "#{@pull.class.name} has not been created") && return unless @pull.valid?
@pull.save # set pull id
@pull.reload
@pull.check(false) # don't make event transaction
if @pull.already?
@pull.destroy

17
app/controllers/platforms/contents_controller.rb Normal file
View File

@ -0,0 +1,17 @@
class Platforms::ContentsController < Platforms::BaseController
include PaginateHelper
before_filter :authenticate_user!
skip_before_filter :authenticate_user! if APP_CONFIG['anonymous_access']
load_and_authorize_resource :platform
def index
@path = params[:path].to_s
@term = params[:term]
@contents = PlatformContent.find_by_platform(@platform, @path, @term)
.paginate(paginate_params)
end
end

1
app/controllers/projects/pull_requests_controller.rb
View File

@ -45,6 +45,7 @@ class Projects::PullRequestsController < Projects::BaseController
if @pull.valid? # FIXME more clean/clever logics
@pull.save # set pull id
@pull.reload
@pull.check(false) # don't make event transaction
if @pull.already?
@pull.destroy

26
app/helpers/contents_helper.rb Normal file
View File

@ -0,0 +1,26 @@
# -*- encoding : utf-8 -*-
module ContentsHelper
def build_content_paths(platform, path)
paths = ['/']
paths |= path.split('/').select(&:present?)
paths.uniq!
compound_path = ''
paths.map do |p|
compound_path << p << '/' if p != '/'
link_to(platform_content_path(platform, compound_path), {:remote => true}) do
content_tag(:span, p, {:class => 'text'}) +
content_tag(:span, '', {:class => 'arrow-right'})
end
end.join.html_safe
end
def platform_content_path(platform, path, name = nil)
full_path = platform_contents_path(platform)
full_path << '/' << path if path.present?
full_path << ('/' << name) if name.present?
full_path
end
end

13
app/helpers/paginate_helper.rb Normal file
View File

@ -0,0 +1,13 @@
# -*- encoding : utf-8 -*-
module PaginateHelper
def paginate_params
per_page = params[:per_page].to_i
per_page = 20 if per_page < 1
per_page = 100 if per_page >100
page = params[:page].to_i
page = nil if page == 0
{:page => page, :per_page => per_page}
end
end

4
app/helpers/pull_request_helper.rb
View File

@ -53,8 +53,8 @@ module PullRequestHelper
def ref_selector_options(project, current)
res = []
value = Proc.new {|t| [t.name.truncate(50), t.name]}
res << [I18n.t('layout.git.repositories.branches'), project.repo.branches.map(&value)]
res << [I18n.t('layout.git.repositories.tags'), project.repo.tags.map(&value)]
res << [I18n.t('layout.git.repositories.branches'), project.repo.branches.map(&value).sort]
res << [I18n.t('layout.git.repositories.tags'), project.repo.tags.map(&value).sort]
grouped_options_for_select(res, current)
end

2
app/models/platform.rb
View File

@ -1,7 +1,7 @@
# -*- encoding : utf-8 -*-
class Platform < ActiveRecord::Base
VISIBILITIES = %w(open hidden)
NAME_PATTERN = /[a-zA-Z0-9_\-\.]+/
NAME_PATTERN = /[\w\-\.]+/
belongs_to :parent, :class_name => 'Platform', :foreign_key => 'parent_platform_id'
belongs_to :owner, :polymorphic => true

90
app/models/platform_content.rb Normal file
View File

@ -0,0 +1,90 @@
class PlatformContent
# ------------------
# *** ATTRIBUTES ***
# ------------------
attr_reader :path
# ---------------
# *** METHODS ***
# ---------------
def initialize(platform, path)
@platform, @path = platform, path
end
def build_list
return @build_list if !!@build_list
return nil if path !~ /\/(release|updates)+\/[\w\-\.]+$/
return nil unless repository_name = path.match(/\/[\w]+\/(release|updates)\//)
repository_name = repository_name[0].gsub(/\/(release|updates)\/$/, '').gsub('/', '')
repository = @platform.repositories.where(:name => repository_name).first
return nil unless repository
if @platform.main?
build_for_platform = @platform
else
bfp_name = path.match(/\/#{@platform.name}\/repository\/[\w]+\//)
return nil unless bfp_name
bfp_name = bfp_name[0].gsub(/\/#{@platform.name}\/repository\//, '').gsub('/', '')
build_for_platform = Platform.main.find_by_name bfp_name
return nil unless build_for_platform
end
@build_list = BuildList.for_status(BuildList::BUILD_PUBLISHED)
.for_platform(build_for_platform)
.scoped_to_save_platform(@platform)
.where(:save_to_repository_id => repository)
.where(:build_list_packages => {:fullname => name, :actual => true})
.joins(:packages)
.last
return @build_list
end
def name
@name ||= @path.gsub(/.*#{File::SEPARATOR}/, '')
end
def size
@size ||= File.size(@path)
end
def is_folder?
@is_folder.nil? ? (@is_folder = File.directory?(path)) : @is_folder
end
def download_url
suffix = path.gsub(/^#{@platform.path}/, '')
"#{APP_CONFIG['downloads_url']}/#{@platform.name}#{suffix}"
end
# ---------------------
# *** CLASS METHODS ***
# ---------------------
def self.find_by_platform(platform, path, term)
# Strip out the non-ascii character
term = (term || '').strip.gsub(/[\\\/]+/, '')
.gsub(/[^\w\-\+\.]/, '_')
path = path.split(File::SEPARATOR).map(&:strip).select(&:present?)
.map{ |p|
# Strip out the non-ascii character
p.gsub(/[\\\/]+/, '')
.gsub(/^[\.]+/, '')
.gsub(/[^\w\-\.]/, '_')
}
.join(File::SEPARATOR)
results = Dir.glob(File.join(platform.path, path, "*#{term}*"))
if term
results = results.sort_by(&:length)
else
results = results.sort
end
results.map{ |p| PlatformContent.new(platform, p) }
end
end

2
app/models/project.rb
View File

@ -2,7 +2,7 @@
class Project < ActiveRecord::Base
VISIBILITIES = ['open', 'hidden']
MAX_OWN_PROJECTS = 32000
NAME_REGEXP = /[a-zA-Z0-9_\-\+\.]+/
NAME_REGEXP = /[\w\-\+\.]+/
belongs_to :owner, :polymorphic => true, :counter_cache => :own_projects_count
belongs_to :maintainer, :class_name => "User"

2
app/views/platforms/base/_sidebar.html.haml
View File

@ -10,6 +10,8 @@
= link_to t("layout.platforms.about"), platform_path(@platform)
%li{:class => (contr == :repositories) ? 'active' : ''}
= link_to t("layout.repositories.list_header"), platform_repositories_path(@platform)
%li{:class => (contr == :contents) ? 'active' : ''}
= link_to t('layout.platforms.contents'), platform_contents_path(@platform)
- if can? :show, @platform
%li{:class => (act == :index && contr == :maintainers) ? 'active' : nil}
= link_to t("layout.platforms.maintainers"), platform_maintainers_path(@platform)

34
app/views/platforms/contents/_contents.html.haml Normal file
View File

@ -0,0 +1,34 @@
#contents
= form_for @platform, :url => platform_content_path(@platform, @path), :html => { :class => :form, :remote => true, :method => :get } do |f|
= tracker_search_field(:term, @term.present? ? @term : t('layout.platforms.search_contents'))
= f.submit t('layout.search.header')
%br
.path= build_content_paths(@platform, @path)
.both
%table.tablesorter.project{:cellpadding => "0", :cellspacing => "0"}
%tbody
- if @path.present?
%tr
%td= link_to '../', platform_content_path(@platform, @path, '../'), {:remote => true}
%td
%td
- (@contents.select(&:is_folder?) | @contents).each do |content|
%tr
%td
- options = {:class => 'files-see'}
- if content.is_folder?
- pic = 'folder.png'
- path = platform_content_path(@platform, @path, content.name)
- options[:remote] = true
.pic= image_tag pic || 'code.png'
.name= link_to(content.name, path || content.download_url, options)
%td= link_to t('activerecord.models.build_list'), content.build_list if content.build_list
%td= number_to_human_size(content.size) unless content.is_folder?
.both
= will_paginate @contents, {:remote => true}

14
app/views/platforms/contents/index.html.haml Normal file
View File

@ -0,0 +1,14 @@
- set_meta_tags :title => [title_object(@platform), t('layout.platforms.contents')]
= render 'platforms/base/submenu'
= render 'platforms/base/sidebar'
%h3
= t('layout.platforms.contents_of')
= @platform.name
= render 'contents'
:javascript
$(function(){
$('.pagination a').attr('data-remote', 'true');
});

2
app/views/platforms/contents/index.js.haml Normal file
View File

@ -0,0 +1,2 @@
$('#contents').html("#{escape_javascript(render 'contents')}");
$('.pagination a').attr('data-remote', 'true');

2
app/views/platforms/platforms/edit.html.haml
View File

@ -22,5 +22,5 @@
- if can? :clear, @platform
.hr
.leftside= t("layout.repositories.clear_warning")
.rightside= link_to t("layout.repositories.clear"), clear_platform_path(@platform), :class => 'button', :confirm => t('layout.repositories.clear_confirm'), :method => :post
.rightside= link_to t("layout.repositories.clear"), clear_platform_path(@platform), :class => 'button', :confirm => t('layout.repositories.clear_confirm'), :method => :put
.both

4
app/views/platforms/platforms/show.html.haml
View File

@ -2,7 +2,9 @@
= render 'submenu'
= render 'sidebar'
%h3.fix= "#{t("layout.platforms.about")} #{@platform.name}"
%h3.fix
= t 'layout.platforms.about'
= link_to @platform.name, platform_contents_path(@platform)
%p= @platform.description

3
config/locales/models/platform.en.yml
View File

@ -1,6 +1,9 @@
en:
layout:
platforms:
contents: Contents
contents_of: Contents of
search_contents: Search name of file/folder...
admin_id: Owner
build_all: Build all
list: List

3
config/locales/models/platform.ru.yml
View File

@ -1,6 +1,9 @@
ru:
layout:
platforms:
contents: Содержимое
contents_of: Содержимое
search_contents: Найти имя файла/папки...
admin_id: Владелец
build_all: Собрать все
list: Список

3
config/routes.rb
View File

@ -161,6 +161,9 @@ Rosa::Application.routes.draw do
get :advisories
end
resources :contents, :only => [:index]
match '/contents/*path' => 'contents#index', :format => false
resources :mass_builds, :only => [:create, :new, :index] do
member do
post :cancel

14
lib/modules/observers/activity_feed/issue.rb
View File

@ -5,11 +5,11 @@ module Modules::Observers::ActivityFeed::Issue
included do
after_commit :new_issue_notifications, :on => :create
after_commit :send_assign_notifications, :on => :create
after_commit :send_assign_notifications, :on => :create, :if => Proc.new { |i| i.assignee }
after_commit -> { send_assign_notifications(:update) }, :on => :update
after_commit :send_hooks, :on => :create
after_commit -> { send_hooks(:update) }, :on => :update, :if => :status_changed?
after_commit -> { send_hooks(:update) }, :on => :update, :if => Proc.new { |i| i.previous_changes['status'].present? }
end
private
@ -18,7 +18,7 @@ module Modules::Observers::ActivityFeed::Issue
collect_recipients.each do |recipient|
next if user_id == recipient.id
if recipient.notifier.can_notify && recipient.notifier.new_issue && assignee_id != recipient.id
UserMailer.new_issue_notification(self, recipient).deliver
UserMailer.new_issue_notification(self, recipient).deliver
end
ActivityFeed.create(
:user => recipient,
@ -35,12 +35,11 @@ module Modules::Observers::ActivityFeed::Issue
}
)
end
# dont remove outdated issues link
Comment.create_link_on_issues_from_item(self)
end
def send_assign_notifications(action = :create)
if assignee_id && assignee_id_changed?
if(action == :create && assignee_id) || previous_changes['assignee_id'].present?
if assignee.notifier.issue_assign && assignee.notifier.can_notify
UserMailer.issue_assign_notification(self, assignee).deliver
end
@ -59,11 +58,10 @@ module Modules::Observers::ActivityFeed::Issue
)
end
# dont remove outdated issues link
Comment.create_link_on_issues_from_item(self)
Comment.create_link_on_issues_from_item(self) if previous_changes['title'].present? || previous_changes['body'].present?
end
def send_hooks(action = :create)
project.hooks.each{ |h| h.receive_issues(self, action) }
end
end
end

42
spec/controllers/api/v1/pull_requests_controller.rb
View File

@ -262,6 +262,48 @@ describe Api::V1::PullRequestsController do
end
end
context 'send email messages' do
before(:each) do
@project_reader = FactoryGirl.create :user
@project.relations.create!(:actor_type => 'User', :actor_id => @project_reader.id, :role => 'reader')
@project_admin = FactoryGirl.create :user
@project.relations.create!(:actor_type => 'User', :actor_id => @project_admin.id, :role => 'admin')
@project_writer = FactoryGirl.create :user
@project.relations.create!(:actor_type => 'User', :actor_id => @project_writer.id, :role => 'writer')
http_login(@project_writer)
ActionMailer::Base.deliveries = []
end
it 'should send two email messages to project admins' do
post :create, @create_params
@project.pull_requests.last.issue.send(:new_issue_notifications)
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 2
end
it 'should send two email messages to admins and one to assignee' do
post :create, @create_params.deep_merge(:pull_request => {:assignee_id => @project_reader.id})
@project.pull_requests.last.issue.send(:new_issue_notifications)
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 3
end
it 'should send email message to new assignee' do
put :update, @update_params.deep_merge(:pull_request => {:assignee_id => @project_reader.id})
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 1
end
it 'should not duplicate email message' do
post :create, @create_params.deep_merge(:pull_request => {:assignee_id => @project_admin.id})
@project.pull_requests.last.issue.send(:new_issue_notifications)
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 2 # send only to admins
ActionMailer::Base.deliveries.first.to != ActionMailer::Base.deliveries.last.to
end
end
after(:all) do
User.destroy_all
Platform.destroy_all

98
spec/controllers/platforms/contents_controller_spec.rb Normal file
View File

@ -0,0 +1,98 @@
# -*- encoding : utf-8 -*-
require 'spec_helper'
shared_examples_for 'content platform user without show rights for hidden platform' do
it 'should not be able to perform index action' do
@platform.update_column(:visibility, 'hidden')
get :index, :platform_id => @platform
response.should_not be_success
end
end
shared_examples_for 'content platform user with show rights for hidden platform' do
it 'should be able to perform index action' do
@platform.update_column(:visibility, 'hidden')
get :index, :platform_id => @platform
response.should be_success
end
end
shared_examples_for 'content platform user with show rights' do
it 'should be able to perform index action for main platform' do
get :index, :platform_id => @platform
response.should be_success
end
it 'should be able to perform index action for personal platform' do
get :index, :platform_id => @personal_platform
response.should be_success
end
end
describe Platforms::ContentsController do
before do
stub_symlink_methods
@platform = FactoryGirl.create(:platform)
@personal_platform = FactoryGirl.create(:platform, :platform_type => 'personal')
@user = FactoryGirl.create(:user)
end
context 'for guest' do
it 'should not be able to perform index action for main platform', :anonymous_access => false do
get :index, :platform_id => @platform
response.should_not be_success
end
it 'should not be able to perform index action for personal platform', :anonymous_access => false do
get :index, :platform_id => @personal_platform
response.should_not be_success
end
it_should_behave_like 'content platform user with show rights' if APP_CONFIG['anonymous_access']
it_should_behave_like 'content platform user without show rights for hidden platform'
end
context 'for global admin' do
before do
http_login(FactoryGirl.create(:admin))
end
it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user with show rights for hidden platform'
end
context 'for owner user' do
before do
http_login(@user)
@platform.owner = @user; @platform.save
@platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
end
it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user with show rights for hidden platform'
end
context 'for member of platform' do
before do
http_login(@user)
@platform.add_member(@user)
@personal_platform.add_member(@user)
end
it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user with show rights for hidden platform'
end
context 'for simple user' do
before do
http_login(@user)
end
it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user without show rights for hidden platform'
end
end

36
spec/controllers/projects/pull_requests_controller_spec.rb
View File

@ -272,4 +272,40 @@ describe Projects::PullRequestsController do
it_should_behave_like 'user without pull request update rights'
end
context 'send email messages' do
before(:each) do
@project_reader = FactoryGirl.create :user
@project.relations.create!(:actor_type => 'User', :actor_id => @project_reader.id, :role => 'reader')
@project_admin = FactoryGirl.create :user
@project.relations.create!(:actor_type => 'User', :actor_id => @project_admin.id, :role => 'admin')
@project_writer = FactoryGirl.create :user
@project.relations.create!(:actor_type => 'User', :actor_id => @project_writer.id, :role => 'writer')
set_session_for(@project_writer)
ActionMailer::Base.deliveries = []
end
it 'should send two email messages to project admins' do
post :create, @create_params
@project.pull_requests.last.issue.send(:new_issue_notifications)
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 2
end
it 'should send two email messages to admins and one to assignee' do
post :create, @create_params.deep_merge(:issue => {:assignee_id => @project_reader.id})
@project.pull_requests.last.issue.send(:new_issue_notifications)
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 3
end
it 'should not duplicate email message' do
post :create, @create_params.deep_merge(:issue => {:assignee_id => @project_admin.id})
@project.pull_requests.last.issue.send(:new_issue_notifications)
@project.pull_requests.last.issue.send(:send_assign_notifications)
ActionMailer::Base.deliveries.count.should == 2 # send only to admins
ActionMailer::Base.deliveries.first.to != ActionMailer::Base.deliveries.last.to
end
end
end

25
spec/models/issue_spec.rb
View File

@ -33,6 +33,31 @@ describe Issue do
create_issue(@user)
ActionMailer::Base.deliveries.count.should == 0
end
it 'should create automatic comment from another issue' do
create_issue(@user)
another_issue = FactoryGirl.create(:issue, :project => @project, :title => "[##{@issue.serial_id}]")
Comment.where(:automatic => true, :commentable_type => 'Issue',
:created_from_issue_id => another_issue.id).count.should == 1
end
it 'should create automatic comment after updating another issue body' do
create_issue(@user)
another_issue = FactoryGirl.create(:issue, :project => @project)
another_issue.update_attribute(:title, "[##{@issue.serial_id}]")
another_issue.send(:send_assign_notifications)
Comment.where(:automatic => true, :commentable_type => 'Issue',
:created_from_issue_id => another_issue.id).count.should == 1
end
it 'should send email message to new assignee' do
create_issue(@user)
ActionMailer::Base.deliveries = []
@issue.update_attribute :assignee_id, @user.id
@issue.send(:send_assign_notifications, :update)
ActionMailer::Base.deliveries.count.should == 1
end
end
context 'for member-group' do

71
spec/models/platform_content.rb Normal file
View File

@ -0,0 +1,71 @@
# -*- encoding : utf-8 -*-
require 'spec_helper'
describe PlatformContent do
subject { PlatformContent }
before { stub_symlink_methods }
let!(:platform) { FactoryGirl.create(:platform) }
context '#find_by_platform' do
before do
File.open(File.join(platform.path, 'test001'), "w")
File.open(File.join(platform.path, 'test002'), "w")
end
it 'ensures that finds files' do
# + /repository folder
subject.find_by_platform(platform, '', '').should have(3).items
end
context 'ensures that finds files by name' do
it { subject.find_by_platform(platform, '', 'test').should have(2).items }
it { subject.find_by_platform(platform, '', 'test001').should have(1).item }
it { subject.find_by_platform(platform, 'repository', 'test').should have(:no).items }
end
end
context '#is_folder?' do
it 'ensures that returns true for folder' do
subject.find_by_platform(platform, '', 'repository').first.is_folder?
.should be_true
end
it 'ensures that returns false for file' do
File.open(File.join(platform.path, 'test001'), "w")
subject.find_by_platform(platform, '', 'test').first.is_folder?
.should be_false
end
end
context '#build_list' do
let!(:package) { FactoryGirl.create(:build_list_package, :actual => true) }
let(:platform) { package.build_list.save_to_platform }
let(:repository) { platform.repositories.first }
before do
File.open(File.join(platform.path, 'test001'), "w")
package.build_list.update_column(:status, BuildList::BUILD_PUBLISHED)
path = File.join platform.path, 'repository', 'SRPMS', repository.name, 'release'
FileUtils.mkdir_p path
File.open(File.join(path, package.fullname), "w")
path = File.join path, 'repodata'
FileUtils.mkdir_p path
File.open(File.join(path, package.fullname), "w")
end
context 'ensures that returns nil for simple file' do
it { subject.find_by_platform(platform, '', 'test').first.build_list.should be_nil }
it { subject.find_by_platform(platform, "repository/SRPMS/#{repository.name}/release/repodata", '').first.build_list.should be_nil }
end
it 'ensures that returns build_list for package' do
subject.find_by_platform(platform, "repository/SRPMS/#{repository.name}/release", package.fullname)
.first.build_list.should == package.build_list
end
end
end

1
spec/models/pull_request_spec.rb
View File

@ -15,7 +15,6 @@ def set_data_for_pull
end
describe PullRequest do
context 'for owner user' do
before do
stub_symlink_methods