').html_safe render :action => :new else + BuildList.where(:id => build_lists.map(&:id)).update_all(:group_id => build_lists[0].id) if build_lists.size > 1 flash[:notice] = notices.join('
').html_safe redirect_to project_build_lists_path(@project) end @@ -79,75 +94,6 @@ class Projects::BuildListsController < Projects::BaseController @item_groups = @build_list.items.group_by_level end - def update - if params[:publish].present? and can?(:publish, @build_list) - publish - elsif params[:reject_publish].present? and can?(:reject_publish, @build_list) - reject_publish - else - # King Arthur, we are under attack! - redirect_to :forbidden and return - end - end - - def create_container - if @build_list.publish_container - redirect_to :back, :notice => t('layout.build_lists.create_container_success') - else - redirect_to :back, :notice => t('layout.build_lists.create_container_fail') - end - end - - def cancel - if @build_list.cancel - redirect_to :back, :notice => t('layout.build_lists.will_be_canceled') - else - redirect_to :back, :notice => t('layout.build_lists.cancel_fail') - end - end - - def log - render :json => { - :log => @build_list.log(params[:load_lines]), - :building => @build_list.build_started? - } - end - - def autocomplete_to_extra_repos_and_builds - results, save_to_platform = [], Platform.find(params[:platform_id]) - bl = BuildList.where(:id => params[:term]).published_container.accessible_by(current_ability, :read) - if save_to_platform.main? - bl = bl.where(:save_to_platform_id => save_to_platform.id) - else - platforms = Platform.includes(:repositories).search(params[:term]). - accessible_by(current_ability, :read).search_order.limit(5) - platforms.each{ |p| p.repositories.each{ |r| results << {:id => r.id, :label => "#{p.name}/#{r.name}", :value => "#{p.name}/#{r.name}"} } } - end - bl = bl.first - results << {:id => "#{bl.id}-build-list", :value => bl.id, :label => "#{bl.id} (#{bl.project.name} - #{bl.arch.name})"} if bl - render json: results.to_json - end - - def update_extra_repos_and_builds - results, save_to_repository = [], Repository.find(params[:build_list][:save_to_repository_id]) - extra_repos = params[:build_list][:extra_repositories] || [] - extra_bls = params[:build_list][:extra_build_lists] || [] - (params[:extra_repo].gsub!(/-build-list$/, '') ? extra_bls : extra_repos) << params[:extra_repo] - build_lists = BuildList.where(:id => extra_bls).published_container.accessible_by(current_ability, :read) - if save_to_repository.platform.main? - build_lists = build_lists.where(:save_to_platform_id => save_to_repository.platform_id) - else - results.concat Repository.where(:id => extra_repos).accessible_by(current_ability, :read) - end - render :partial => 'extra', :collection => results.concat(build_lists) - end - - protected - - def find_build_list - @build_list = BuildList.find(params[:id]) - end - def publish @build_list.update_type = params[:build_list][:update_type] if params[:build_list][:update_type].present? @@ -169,22 +115,74 @@ class Projects::BuildListsController < Projects::BaseController redirect_to :back, :notice => t('layout.build_lists.publish_fail') and return end end - end @build_list.publisher = current_user - if @build_list.save && @build_list.can_publish? && @build_list.now_publish - redirect_to :back, :notice => t('layout.build_lists.publish_success') - else - redirect_to :back, :notice => t('layout.build_lists.publish_fail') - end + message = @build_list.publish ? 'success' : 'fail' + redirect_to :back, :notice => t("layout.build_lists.publish_#{message}") + end + + def publish_into_testing + @build_list.publisher = current_user + message = @build_list.publish_into_testing ? 'success' : 'fail' + redirect_to :back, :notice => t("layout.build_lists.publish_#{message}") end def reject_publish - if @build_list.reject_publish - redirect_to :back, :notice => t('layout.build_lists.reject_publish_success') - else - redirect_to :back, :notice => t('layout.build_lists.reject_publish_fail') - end + @build_list.publisher = current_user + message = @build_list.reject_publish ? 'success' : 'fail' + redirect_to :back, :notice => t("layout.build_lists.reject_publish_#{message}") + end + + def create_container + message = @build_list.publish_container ? 'success' : 'fail' + redirect_to :back, :notice => t("layout.build_lists.create_container_#{message}") + end + + def cancel + message = @build_list.cancel ? 'will_be_canceled' : 'cancel_fail' + redirect_to :back, :notice => t("layout.build_lists.#{message}") + end + + def log + render :json => { + :log => @build_list.log(params[:load_lines]), + :building => @build_list.build_started? + } + end + + def list + @build_lists = @project.build_lists + sort_col = params[:ol_0] || 7 + sort_dir = params[:sSortDir_0] == 'asc' ? 'asc' : 'desc' + order = "build_lists.updated_at #{sort_dir}" + + @build_lists = @build_lists.paginate(:page => (params[:iDisplayStart].to_i/params[:iDisplayLength].to_i).to_i + 1, :per_page => params[:iDisplayLength]) + @total_build_lists = @build_lists.count + @build_lists = @build_lists.where(:user_id => current_user) if params[:owner_filter] == 'true' + @build_lists = @build_lists.where(:status => [BuildList::BUILD_ERROR, BuildList::FAILED_PUBLISH, BuildList::REJECTED_PUBLISH]) if params[:status_filter] == 'true' + @build_lists = @build_lists.order(order) + + render :partial => 'build_lists_ajax', :layout => false + end + + + protected + + def find_build_list + @build_list = BuildList.find(params[:id]) + end + + def create_from_build_list + return if params[:build_list_id].blank? + build_list = BuildList.find(params[:build_list_id]) + + params[:build_list] ||= {} + keys = [:save_to_repository_id, :auto_publish, :include_repos, :extra_params, + :project_version, :update_type, :auto_create_container, + :extra_repositories, :extra_build_lists, :build_for_platform_id] + keys.each { |key| params[:build_list][key] = build_list.send(key) } + params[:arches] = [build_list.arch_id.to_s] + [:owner_filter, :status_filter].each { |t| params[t] = 'true' if %w(true undefined).exclude? params[t] } end end diff --git a/app/controllers/projects/collaborators_controller.rb b/app/controllers/projects/collaborators_controller.rb index d86e83e26..15fffe511 100644 --- a/app/controllers/projects/collaborators_controller.rb +++ b/app/controllers/projects/collaborators_controller.rb @@ -13,12 +13,6 @@ class Projects::CollaboratorsController < Projects::BaseController respond_with @collaborators end - def show - end - - def new - end - def find users = User.not_member_of(@project) groups = Group.not_member_of(@project) @@ -32,9 +26,6 @@ class Projects::CollaboratorsController < Projects::BaseController end end - def edit - end - def create @collaborator = Collaborator.new(params[:collaborator]) @collaborator.project = @project diff --git a/app/controllers/projects/comments_controller.rb b/app/controllers/projects/comments_controller.rb index cf019ace9..4a79b86d5 100644 --- a/app/controllers/projects/comments_controller.rb +++ b/app/controllers/projects/comments_controller.rb @@ -52,7 +52,7 @@ class Projects::CommentsController < Projects::BaseController end def find_or_build_comment - @comment = params[:id].present? && Comment.find(params[:id]) || + @comment = params[:id].present? && Comment.where(:automatic => false).find(params[:id]) || current_user.comments.build(params[:comment]) {|c| c.commentable = @commentable; c.project = @project} end end diff --git a/app/controllers/projects/git/base_controller.rb b/app/controllers/projects/git/base_controller.rb index eb843043b..b93b3c0ad 100644 --- a/app/controllers/projects/git/base_controller.rb +++ b/app/controllers/projects/git/base_controller.rb @@ -1,8 +1,8 @@ class Projects::Git::BaseController < Projects::BaseController before_filter :authenticate_user! skip_before_filter :authenticate_user!, :only => [:show, :index, :blame, :raw, :archive, :diff, :tags, :branches] if APP_CONFIG['anonymous_access'] - load_and_authorize_resource :project + load_and_authorize_resource :project before_filter :set_treeish_and_path before_filter :set_branch_and_tree diff --git a/app/controllers/projects/git/blobs_controller.rb b/app/controllers/projects/git/blobs_controller.rb index 6c930eb42..1d7ec3fcd 100644 --- a/app/controllers/projects/git/blobs_controller.rb +++ b/app/controllers/projects/git/blobs_controller.rb @@ -32,6 +32,7 @@ class Projects::Git::BlobsController < Projects::Git::BaseController def set_blob @blob = @tree / @path or raise Grit::NoSuchPathError + redirect_to tree_path(@project, :treeish => @treeish, :path => @path) if @blob.is_a? Grit::Tree @commit = @project.repo.log(@treeish, @path, :max_count => 1).first end end diff --git a/app/controllers/projects/git/trees_controller.rb b/app/controllers/projects/git/trees_controller.rb index a6df09571..7f570f3a0 100644 --- a/app/controllers/projects/git/trees_controller.rb +++ b/app/controllers/projects/git/trees_controller.rb @@ -1,12 +1,18 @@ class Projects::Git::TreesController < Projects::Git::BaseController before_filter lambda{redirect_to @project if params[:treeish] == @project.default_branch and params[:path].blank?}, :only => :show skip_before_filter :set_branch_and_tree, :set_treeish_and_path, :only => :archive + before_filter lambda { raise Grit::NoSuchPathError if params[:treeish] != @branch.try(:name) }, :only => [:branch, :destroy] + + skip_authorize_resource :project, :only => [:destroy, :restore_branch, :create] + before_filter lambda { authorize!(:write, @project) }, :only => [:destroy, :restore_branch, :create] def show - render('empty') and return if @project.is_empty? - @tree = @tree / @path if @path.present? - @commit = @branch.present? ? @branch.commit() : @project.repo.log(@treeish, @path, :max_count => 1).first - raise Grit::NoSuchPathError unless @commit + unless request.xhr? + render('empty') and return if @project.is_empty? + @tree = @tree / @path if @path.present? + @commit = @branch.present? ? @branch.commit() : @project.repo.log(@treeish, @path, :max_count => 1).first + raise Grit::NoSuchPathError unless @commit + end end def archive @@ -27,14 +33,42 @@ class Projects::Git::TreesController < Projects::Git::BaseController end def tags - @tags = @project.repo.tags.select{ |t| t.commit }.sort_by(&:name).reverse - render 'refs' + if request.xhr? + @refs = @project.repo.tags.select{ |t| t.commit }.sort_by(&:name).reverse + render :refs_list + else + respond_to do |format| + format.json { render :nothing => true, :status => 422 } + format.html + end + end + end + + def restore_branch + status = @project.create_branch(@treeish, params[:sha], current_user) ? 200 : 422 + render :nothing => true, :status => status + end + + def create + status = @project.create_branch(params[:new_ref], params[:from_ref], current_user) ? 200 : 422 + render :nothing => true, :status => status + end + + def destroy + status = @branch && @project.delete_branch(@branch, current_user) ? 200 : 422 + render :nothing => true, :status => status end def branches - raise Grit::NoSuchPathError if params[:treeish] != @branch.try(:name) # get wrong branch name to nonempty project - @branches = @project.repo.branches.sort_by(&:name).select{ |b| b.name != @branch.name }.unshift(@branch).compact if @branch - render 'refs' + if request.xhr? + @refs = @project.repo.branches.sort_by(&:name) + render :refs_list + else + respond_to do |format| + format.json { render :nothing => true, :status => 422 } + format.html + end + end end end diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb new file mode 100644 index 000000000..f1e12555e --- /dev/null +++ b/app/controllers/projects/hooks_controller.rb @@ -0,0 +1,46 @@ +# -*- encoding : utf-8 -*- +class Projects::HooksController < Projects::BaseController + before_filter :authenticate_user! + load_and_authorize_resource :project + load_and_authorize_resource :hook, :through => :project + + + def index + authorize! :edit, @project + @name = params[:name] + @hooks = @project.hooks.for_name(@name).order('name asc, created_at desc') + render(:show) if @name.present? + end + + def new + end + + def edit + end + + def create + if @hook.save + redirect_to project_hooks_path(@project, :name => @hook.name), :notice => t('flash.hook.created') + else + flash[:error] = t('flash.hook.save_error') + flash[:warning] = @hook.errors.full_messages.join('. ') + render :new + end + end + + def update + if @hook.update_attributes(params[:hook]) + redirect_to project_hooks_path(@project, :name => @hook.name), :notice => t('flash.hook.updated') + else + flash[:error] = t('flash.hook.save_error') + flash[:warning] = @hook.errors.full_messages.join('. ') + render :edit + end + end + + def destroy + @hook.destroy + redirect_to project_hooks_path(@project, :name => @hook.name) + end + +end diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index c9681f1e3..873a914fc 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -12,7 +12,7 @@ class Projects::IssuesController < Projects::BaseController def index(status = 200) @labels = params[:labels] || [] @issues = @project.issues.without_pull_requests - @issues = @issues.where(:assignee_id => current_user.id) if @is_assigned_to_me = params[:filter] == 'to_me' + @issues = @issues.where(:assignee_id => current_user.id) if @is_assigned_to_me = params[:filter] == 'assigned' @issues = @issues.joins(:labels).where(:labels => {:name => @labels}) unless @labels == [] # Using mb_chars for correct transform to lowercase ('Русский Текст'.downcase => "Русский Текст") @issues = @issues.search(params[:search_issue]) if params[:search_issue] !~ /#{t('layout.issues.search')}/ @@ -37,9 +37,12 @@ class Projects::IssuesController < Projects::BaseController end def create - @assignee_uname = params[:assignee_uname] @issue.user_id = current_user.id + unless can?(:write, @project) + @issue.assignee_id = nil + @issue.labelings = [] + end if @issue.save @issue.subscribe_creator(current_user.id) flash[:notice] = I18n.t("flash.issue.saved") @@ -55,6 +58,12 @@ class Projects::IssuesController < Projects::BaseController end def update + unless can?(:write, @project) + params.delete :update_labels + [:assignee_id, :labelings, :labelings_attributes].each do |k| + params[:issue].delete k + end if params[:issue] + end @issue.labelings.destroy_all if params[:update_labels] if params[:issue] && status = params[:issue][:status] @issue.set_close(current_user) if status == 'closed' diff --git a/app/controllers/projects/projects_controller.rb b/app/controllers/projects/projects_controller.rb index f8c509109..9d74586b1 100644 --- a/app/controllers/projects/projects_controller.rb +++ b/app/controllers/projects/projects_controller.rb @@ -2,6 +2,7 @@ class Projects::ProjectsController < Projects::BaseController include ProjectsHelper before_filter :authenticate_user! load_and_authorize_resource :id_param => :project_name # to force member actions load + before_filter :who_owns, :only => [:new, :create, :mass_import, :run_mass_import] def index @projects = Project.accessible_by(current_ability, :membered) @@ -23,7 +24,27 @@ class Projects::ProjectsController < Projects::BaseController def new @project = Project.new - @who_owns = :me + end + + def mass_import + @project = Project.new(:mass_import => true) + end + + def run_mass_import + @project = Project.new params[:project] + @project.owner = choose_owner + authorize! :write, @project.owner if @project.owner.class == Group + authorize! :add_project, Repository.find(params[:project][:add_to_repository_id]) + @project.valid? + @project.errors.messages.slice! :url + if @project.errors.messages.blank? # We need only url validation + @project.init_mass_import + flash[:notice] = t('flash.project.mass_import_added_to_queue') + redirect_to projects_path + else + flash[:warning] = @project.errors.full_messages.join('. ') + render :mass_import + end end def edit @@ -32,8 +53,7 @@ class Projects::ProjectsController < Projects::BaseController def create @project = Project.new params[:project] @project.owner = choose_owner - @who_owns = (@project.owner_type == 'User' ? :me : :group) - authorize! :update, @project.owner if @project.owner.class == Group + authorize! :write, @project.owner if @project.owner.class == Group if @project.save flash[:notice] = t('flash.project.saved') @@ -66,16 +86,21 @@ class Projects::ProjectsController < Projects::BaseController def fork owner = (Group.find params[:group] if params[:group].present?) || current_user - authorize! :update, owner if owner.class == Group - if forked = @project.fork(owner) and forked.valid? + authorize! :write, owner if owner.class == Group + if forked = @project.fork(owner, params[:fork_name]) and forked.valid? redirect_to forked, :notice => t("flash.project.forked") else flash[:warning] = t("flash.project.fork_error") - flash[:error] = forked.errors.full_messages + flash[:error] = forked.errors.full_messages.join("\n") redirect_to @project end end + def possible_forks + render :partial => 'projects/git/base/forks', :layout => false, + :locals => { :owner => current_user, :name => (params[:name].presence || @project.name) } + end + def sections if request.post? if @project.update_attributes(params[:project]) @@ -114,6 +139,10 @@ class Projects::ProjectsController < Projects::BaseController protected + def who_owns + @who_owns = (@project.try(:owner_type) == 'User' ? :me : :group) + end + def prepare_list(projects, groups, owners) res = {} @@ -128,7 +157,7 @@ class Projects::ProjectsController < Projects::BaseController projects = projects.by_owners(groups, owners) end - projects = projects.search(params[:sSearch]).search_order if params[:sSearch].present? + projects = projects.search(params[:sSearch]) res[:filtered_count] = projects.count diff --git a/app/controllers/projects/pull_requests_controller.rb b/app/controllers/projects/pull_requests_controller.rb index 47a9714de..bc470aa6a 100644 --- a/app/controllers/projects/pull_requests_controller.rb +++ b/app/controllers/projects/pull_requests_controller.rb @@ -37,13 +37,14 @@ class Projects::PullRequestsController < Projects::BaseController authorize! :read, to_project @pull = to_project.pull_requests.new pull_params - @pull.issue.assignee_id = (params[:issue] || {})[:assignee_id] + @pull.issue.assignee_id = (params[:issue] || {})[:assignee_id] if can?(:write, to_project) @pull.issue.user, @pull.issue.project, @pull.from_project = current_user, to_project, @project @pull.from_project_owner_uname = @pull.from_project.owner.uname @pull.from_project_name = @pull.from_project.name 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 @@ -65,28 +66,32 @@ class Projects::PullRequestsController < Projects::BaseController end end + def merge + status = @pull.merge!(current_user) ? 200 : 422 + render :nothing => true, :status => status + end + def update + status = 422 if (action = params[:pull_request_action]) && %w(close reopen).include?(params[:pull_request_action]) if @pull.send("can_#{action}?") @pull.set_user_and_time current_user @pull.send(action) @pull.check if @pull.open? + status = 200 end end - redirect_to project_pull_request_path(@pull.to_project, @pull) - end - - def merge - @pull.check - unless @pull.merge!(current_user) - flash.now[:error] = t('flash.pull_request.save_error') - flash.now[:warning] = @pull.errors.full_messages.join('. ') - end - redirect_to project_pull_request_path(@pull.to_project, @pull) + render :nothing => true, :status => status end def show - load_diff_commits_data + unless request.xhr? + if @pull.nil? + redirect_to project_issue_path(@project, @issue) + else + load_diff_commits_data + end + end end def index(status = 200) @@ -114,9 +119,12 @@ class Projects::PullRequestsController < Projects::BaseController end def autocomplete_to_project - items = Project.accessible_by(current_ability, :membered) | @project.ancestors - term = Regexp.new(Regexp.escape params[:term].downcase) - items.select! {|e| term.match(e.name_with_owner.downcase) && e.repo.branches.count > 0} + items = [] + term = params[:term].to_s.strip.downcase + [Project.accessible_by(current_ability, :membered), @project.ancestors].each do |p| + items.concat p.by_owner_and_name(term) + end + items = items.uniq{|i| i.id}.select{|e| e.repo.branches.count > 0} render :json => json_for_autocomplete_base(items) end @@ -128,7 +136,7 @@ class Projects::PullRequestsController < Projects::BaseController def json_for_autocomplete_base items items.collect do |project| - hash = {"id" => project.id.to_s, "label" => project.name_with_owner, "value" => project.name_with_owner} + hash = {:id => project.id.to_s, :label => project.name_with_owner, :value => project.name_with_owner} hash[:get_refs_url] = project_refs_list_path(project) hash end diff --git a/app/controllers/projects/wiki_controller.rb b/app/controllers/projects/wiki_controller.rb index b53b7aa28..5af88e8bd 100644 --- a/app/controllers/projects/wiki_controller.rb +++ b/app/controllers/projects/wiki_controller.rb @@ -244,7 +244,7 @@ class Projects::WikiController < Projects::BaseController when 'revert' then "Reverted page #{@name.to_s}" when 'revert_wiki' then "Reverted wiki" end - msg += " (#{params['format']})" if params['format'] + msg << " (#{params['format']})" if params['format'] end msg = 'Unhandled action' if !msg || msg.empty? { :message => msg } diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 55665e78d..85a80aa15 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -1,29 +1,63 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController - def open_id - # raise env['omniauth.auth'].inspect - generic + + def facebook + oauthorize 'Facebook' + end + + def google_oauth2 + oauthorize 'google_oauth2' + end + + def github + oauthorize 'GitHub' end def passthru render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false end + + private - protected - - def generic - authentication = Authentication.find_or_initialize_by_provider_and_uid(env['omniauth.auth']['provider'], env['omniauth.auth']['uid']) + def oauthorize(kind) + provider = kind.downcase + @user = find_for_ouath(env["omniauth.auth"], current_user) + if @user && @user.persisted? + flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => action_name.classify + sign_in_and_redirect @user, :event => :authentication + else + session["devise.#{provider}_data"] = env["omniauth.auth"] + redirect_to new_user_registration_url + end + end + + def find_for_ouath(auth, resource=nil) + provider, uid = auth['provider'], auth['uid'] + authentication = Authentication.find_or_initialize_by_provider_and_uid(provider, uid) if authentication.new_record? if user_signed_in? # New authentication method for current_user authentication.user = current_user - authentication.save else # Register new user from session - session["devise.omniauth_data"] = env["omniauth.auth"].except('extra') - flash[:notice] = I18n.t "devise.omniauth_callbacks.register" - redirect_to new_user_registration_url + case provider + when 'facebook' + name = auth['extra']['raw_info']['name'] + when 'google_oauth2', 'github' + name = auth['info']['nickname'] || auth['info']['name'] + else + raise 'Provider #{provider} not handled' + end + user = User.find_or_initialize_by_email(auth['info']['email']) + if user.new_record? + user.name = name + user.uname = name.gsub(/\s/, '').underscore + user.password = Devise.friendly_token[0,20] + user.confirmed_at = Time.zone.now + user.save + end + authentication.user = user end - else - flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => action_name.classify - sign_in_and_redirect authentication.user, :event => :authentication + authentication.save end + return authentication.user end + end diff --git a/app/controllers/users/profile_controller.rb b/app/controllers/users/profile_controller.rb index f17dcc0fa..e632e52b5 100644 --- a/app/controllers/users/profile_controller.rb +++ b/app/controllers/users/profile_controller.rb @@ -2,8 +2,24 @@ class Users::ProfileController < Users::BaseController skip_before_filter :authenticate_user!, :only => :show if APP_CONFIG['anonymous_access'] def show - @projects = @user.projects.by_visibilities(['open']). - search(params[:search]).search_order. - paginate(:page => params[:page], :per_page => 25) + @path, page = user_path, params[:page].to_i + @projects = @user.own_projects.search(params[:search]).recent + if request.xhr? + if params[:visibility] != 'hidden' + @projects = @projects.opened + @hidden = true + else + @projects = @projects.by_visibilities('hidden').accessible_by(current_ability, :read) + end + render :partial => 'shared/profile_projects', :layout => nil, :locals => {:projects => paginate_projects(page)} + else + @projects = paginate_projects(page) + end + end + + protected + + def paginate_projects(page) + @projects.paginate(:page => (page>0 ? page : nil), :per_page => 24) end end diff --git a/app/controllers/users/register_requests_controller.rb b/app/controllers/users/register_requests_controller.rb index 2112c3893..ee79d8940 100644 --- a/app/controllers/users/register_requests_controller.rb +++ b/app/controllers/users/register_requests_controller.rb @@ -3,7 +3,11 @@ class Users::RegisterRequestsController < ApplicationController layout 'invite' def new - render :invite + if APP_CONFIG['preregistration'] + render :invite + else + redirect_to new_user_registration_path + end end def create diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb new file mode 100644 index 000000000..a081a2a59 --- /dev/null +++ b/app/controllers/users/registrations_controller.rb @@ -0,0 +1,11 @@ +class Users::RegistrationsController < Devise::RegistrationsController + # POST /resource + def create + # Try stop bots + if params[:recaptcha_response_field].present? + respond_with(resource, :location => after_inactive_sign_up_path_for(resource)) + return + end + super + end +end \ No newline at end of file diff --git a/app/controllers/users/settings_controller.rb b/app/controllers/users/settings_controller.rb index 8c6fe18d1..70b3293e8 100644 --- a/app/controllers/users/settings_controller.rb +++ b/app/controllers/users/settings_controller.rb @@ -20,6 +20,12 @@ class Users::SettingsController < Users::BaseController end end + def reset_auth_token + @user.reset_authentication_token! + flash[:notice] = t("flash.user.reset_auth_token") + redirect_to profile_settings_path + end + def private if request.put? if @user.update_with_password(params[:user]) diff --git a/app/controllers/users/users_controller.rb b/app/controllers/users/users_controller.rb index b1961731c..e4eca24a6 100644 --- a/app/controllers/users/users_controller.rb +++ b/app/controllers/users/users_controller.rb @@ -1,5 +1,5 @@ class Users::UsersController < Users::BaseController - skip_before_filter :authenticate_user! + skip_before_filter :authenticate_user!, :only => [:allowed, :check, :discover] before_filter :find_user_by_key, :only => [:allowed, :discover] def allowed diff --git a/app/helpers/activity_feeds_helper.rb b/app/helpers/activity_feeds_helper.rb index b8a979c3b..060645432 100644 --- a/app/helpers/activity_feeds_helper.rb +++ b/app/helpers/activity_feeds_helper.rb @@ -10,7 +10,7 @@ module ActivityFeedsHelper feed_title = feed_title.gsub(/\s{2,}/, ' ').strip end - def user_link user, user_name - user.persisted? ? link_to(user_name, user_path(user)) : user_name + def user_link(user, user_name, full_url = false) + user.persisted? ? link_to(user_name, full_url ? user_url(user) : user_path(user)) : user_name end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cdb8090fa..ee29e7545 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,18 +37,20 @@ module ApplicationHelper end end - def markdown(text) - unless @redcarpet - html_options = {filter_html: true, hard_wrap: true, with_toc_data: true} - options = {no_intraemphasis: true, tables: true, fenced_code_blocks: true, autolink: true, strikethrough: true, lax_html_blocks: true} - @redcarpet = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(html_options), options) - end - @redcarpet.render(text).html_safe - end - def local_alert(text, type = 'error') html = "
#{text}"
html << link_to('×', '#', :class => 'close close-alert', 'data-dismiss' => 'alert')
html << '
" } + 1.upto(n){ |i| res << "#{i}
" } res.html_safe end @@ -56,12 +76,12 @@ module GitHelper if params[:treeish].present? && !project.repo.branches_and_tags.map(&:name).include?(params[:treeish]) res << [I18n.t('layout.git.repositories.commits'), [params[:treeish].truncate(20)]] end - linking = Proc.new {|t| [t.name.truncate(20), url_for(p.merge :treeish => t.name).split('?', 2).first]} - res << [I18n.t('layout.git.repositories.branches'), project.repo.branches.map(&linking)] + linking = Proc.new {|name| [name.truncate(20), url_for(p.merge :treeish => name).split('?', 2).first]} + res << [I18n.t('layout.git.repositories.branches'), project.repo.branches.map(&:name).sort.map(&linking)] if tag_enabled - res << [I18n.t('layout.git.repositories.tags'), project.repo.tags.map(&linking)] + res << [I18n.t('layout.git.repositories.tags'), project.repo.tags.map(&:name).sort.map(&linking)] else - res << [I18n.t('layout.git.repositories.tags'), project.repo.tags.map {|t| [t.name.truncate(20), {:disabled => true}]}] + res << [I18n.t('layout.git.repositories.tags'), project.repo.tags.map(&:name).sort.map {|name| [name.truncate(20), {:disabled => true}]}] end grouped_options_for_select(res, current) end diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb new file mode 100644 index 000000000..6a9ad45e9 --- /dev/null +++ b/app/helpers/gitlab_markdown_helper.rb @@ -0,0 +1,62 @@ +# This module is based on +# https://github.com/gitlabhq/gitlabhq/blob/7665b1de7eed4addd7b94786c84e6674710e6377/app/helpers/gitlab_markdown_helper.rb +module GitlabMarkdownHelper + include Modules::Models::Markdown + + # Use this in places where you would normally use link_to(gfm(...), ...). + # + # It solves a problem occurring with nested links (i.e. + # "outer text gfm ref more outer text"). This will not be + # interpreted as intended. Browsers will parse something like + # "outer text gfm ref more outer text" (notice the last part is + # not linked any more). link_to_gfm corrects that. It wraps all parts to + # explicitly produce the correct linking behavior (i.e. + # "outer text gfm ref more outer text"). + def link_to_gfm(body, url, html_options = {}) + return "" if body.blank? + + escaped_body = if body =~ /^\
").html_safe if @content - @content = simple_format(@content, {}, :sanitize => true).html_safe if @content - end + @content = simple_format(@content, {}, :sanitize => true).html_safe if @content + end end diff --git a/app/views/admin/flash_notifies/_form.html.haml b/app/views/admin/flash_notifies/_form.html.haml index c609dd20b..e7de4d9de 100644 --- a/app/views/admin/flash_notifies/_form.html.haml +++ b/app/views/admin/flash_notifies/_form.html.haml @@ -15,7 +15,7 @@ .both .button_block - = submit_tag t("layout.save") + = submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} %span.text_button_padding= t("layout.or") = link_to t("layout.cancel"), admin_flash_notifies_path, :class => "button" diff --git a/app/views/admin/users/_users_ajax.json.jbuilder b/app/views/admin/users/_users_ajax.json.jbuilder index 052003e36..363e968da 100644 --- a/app/views/admin/users/_users_ajax.json.jbuilder +++ b/app/views/admin/users/_users_ajax.json.jbuilder @@ -1,6 +1,5 @@ users = @users.map do |user| link_block = [ - (link_to t('layout.show'), user if can?(:read, user) && !@system_list), (link_to t('layout.edit'), edit_admin_user_path(user) if can?(:edit, user) && !@system_list), (link_to t('layout.users.reset_token'), reset_auth_token_admin_user_path(user), :method => :put, :confirm => t('layout.users.confirm_reset_token') if can?(:edit, user) && @system_list), (link_to t('layout.delete'), admin_user_path(user), :method => :delete, :confirm => t('layout.users.confirm_delete') if can? :destroy, user) @@ -9,8 +8,9 @@ users = @users.map do |user| if !@system_list [ user.name, - user.uname, + (can?(:read, user) ? link_to(user.uname, user) : user.uname), user.email, + user.created_at.to_date, content_tag(:span, user.role, :style => user.access_locked? ? 'background: #FEDEDE' : ''), link_block ] diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 2ccbc25d6..632b16c10 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -2,7 +2,7 @@ -if @filter == 'system' - columns = [{:type => 'html'}, {:type => nil, :sortable => false, :searchable => false, :class => 'buttons'}] -else - - columns = [{:type => 'html'}, {:type => 'html'}, {:type => 'html'}, {:type => 'html', :sortable => false, :searchable => false}, {:type => nil, :sortable => false, :searchable => false, :class => 'buttons'}] + - columns = [{:type => 'html'}, {:type => 'html'}, {:type => 'html'}, {:type => 'html'}, {:type => 'html', :sortable => false, :searchable => false}, {:type => nil, :sortable => false, :searchable => false, :class => 'buttons'}] = raw datatable(columns, {:sort_by => "[0, 'asc']", :processing => t("layout.processing"), :search_label => t("layout.search.header"), :pagination_labels => {:previous => t("datatables.previous_label"), :next => t("datatables.next_label")}, :empty_label => t("datatables.empty_label"), @@ -23,6 +23,7 @@ %th.th1= t("activerecord.attributes.user.name") %th.th2= t("activerecord.attributes.user.uname") %th.th3= t("activerecord.attributes.user.email") + %th.th1= t("activerecord.attributes.user.created_at") %th.th4= t("activerecord.attributes.user.role") %th.last %tbody diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml index faa8fca22..d49a54e6a 100644 --- a/app/views/admin/users/new.html.haml +++ b/app/views/admin/users/new.html.haml @@ -9,7 +9,7 @@ .rightlist= f.text_field :uname .leftlist \ - .rightlist= submit_tag t("layout.save"), :data => {:"disable-with" => t("layout.saving")} + .rightlist= submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} .both -else = render "users/base/form", :f => f diff --git a/app/views/advisories/_list.html.haml b/app/views/advisories/_list.html.haml index 5f3ea4f52..a5b24b6b0 100644 --- a/app/views/advisories/_list.html.haml +++ b/app/views/advisories/_list.html.haml @@ -8,8 +8,8 @@ -# TODO: change filter to Backbone.js %th{:colspan => 3, :rowspan => 1} = form_tag advisories_path, :method => :get do |f| - = text_field_tag('q', params[:q], :placeholder => t("layout.advisories.search_by_id"), :class => params[:q].present? ? 'black' : 'gray') - %input{:type => 'submit', :value => t("layout.search.header")} + = text_field_tag('q', params[:q], :placeholder => t('layout.advisories.search_by_id'), :class => params[:q].present? ? 'black' : 'gray', :style => 'width:600px;') + = submit_tag t('layout.search.header'), :data => {'disable-with' => t('layout.processing')} =# link_to t('layout.back'), advisories_path, :class => 'button' = button_to t('layout.clear'), {:action => :index} , :method => :get diff --git a/app/views/api/v1/advisories/_advisory.json.jbuilder b/app/views/api/v1/advisories/_advisory.json.jbuilder index 5205ddc29..882db3411 100644 --- a/app/views/api/v1/advisories/_advisory.json.jbuilder +++ b/app/views/api/v1/advisories/_advisory.json.jbuilder @@ -1,12 +1,12 @@ json.id advisory.advisory_id json.(advisory, :description) -json.platforms advisory.platforms do |json_platform, platform| - json_platform.(platform, :id, :released) - json_platform.url api_v1_platform_path(platform.id, :format => :json) +json.platforms advisory.platforms do |platform| + json.(platform, :id, :released) + json.url api_v1_platform_path(platform.id, :format => :json) end -json.projects advisory.projects do |json_project, project| - json_project.(project, :id, :name) - json_project.fullname project.name_with_owner - json_project.url api_v1_project_path(project.id, :format => :json) +json.projects advisory.projects do |project| + json.(project, :id, :name) + json.fullname project.name_with_owner + json.url api_v1_project_path(project.id, :format => :json) end json.url api_v1_advisory_path(advisory.advisory_id, :format => :json) \ No newline at end of file diff --git a/app/views/api/v1/advisories/index.json.jbuilder b/app/views/api/v1/advisories/index.json.jbuilder index c0248c828..d2af972c9 100644 --- a/app/views/api/v1/advisories/index.json.jbuilder +++ b/app/views/api/v1/advisories/index.json.jbuilder @@ -1,4 +1,4 @@ -json.advisories @advisories do |json, advisory| - json.partial! 'advisory', :advisory => advisory, :json => json +json.advisories @advisories do |advisory| + json.partial! 'advisory', :advisory => advisory end json.url api_v1_advisories_path(:format => :json) \ No newline at end of file diff --git a/app/views/api/v1/advisories/show.json.jbuilder b/app/views/api/v1/advisories/show.json.jbuilder index 740d12afe..c1ec4dfa5 100644 --- a/app/views/api/v1/advisories/show.json.jbuilder +++ b/app/views/api/v1/advisories/show.json.jbuilder @@ -1,26 +1,24 @@ -json.advisory do |json| - json.partial! 'advisory', :advisory => @advisory, :json => json +json.advisory do + json.partial! 'advisory', :advisory => @advisory json.created_at @advisory.created_at.to_i json.updated_at @advisory.updated_at.to_i json.(@advisory, :update_type) json.references @advisory.references.split('\n') - json.build_lists @advisory.build_lists do |json_build_list, build_list| - json_build_list.(build_list, :id) - json_build_list.url api_v1_build_list_path(build_list.id, :format => :json) + json.build_lists @advisory.build_lists do |build_list| + json.(build_list, :id) + json.url api_v1_build_list_path(build_list.id, :format => :json) end - json.affected_in @packages_info do |json_platform, package_info| - json.partial! 'api/v1/platforms/platform', - :platform => package_info[0], :json => json_platform + json.affected_in @packages_info do |package_info| + json.partial! 'api/v1/platforms/platform', :platform => package_info[0] - json_platform.projects package_info[1] do |json_project, info| - json.partial! 'api/v1/projects/project', - :project => info[0], :json => json_project + json.projects package_info[1] do |info| + json.partial! 'api/v1/projects/project', :project => info[0] packages = info[1] - json_project.srpm packages[:srpm] - json_project.rpm packages[:rpm] + json.srpm packages[:srpm] + json.rpm packages[:rpm] end end diff --git a/app/views/api/v1/arches/index.json.jbuilder b/app/views/api/v1/arches/index.json.jbuilder index b51119646..a36416566 100644 --- a/app/views/api/v1/arches/index.json.jbuilder +++ b/app/views/api/v1/arches/index.json.jbuilder @@ -1,3 +1,3 @@ -json.architectures @arches do |json, arch| +json.architectures @arches do |arch| json.(arch, :id, :name) end \ No newline at end of file diff --git a/app/views/api/v1/build_lists/_repositories.json.jbuilder b/app/views/api/v1/build_lists/_repositories.json.jbuilder index 037b19276..e776bd258 100644 --- a/app/views/api/v1/build_lists/_repositories.json.jbuilder +++ b/app/views/api/v1/build_lists/_repositories.json.jbuilder @@ -1,9 +1,5 @@ -json.partial! 'api/v1/repositories/repository', - :repository => repository, - :json => json +json.partial! 'api/v1/repositories/repository', :repository => repository -json.platform do |json_str_platform| - json.partial! 'api/v1/platforms/platform', - :platform => repository.platform, - :json => json +json.platform do + json.partial! 'api/v1/platforms/platform', :platform => repository.platform end \ No newline at end of file diff --git a/app/views/api/v1/build_lists/index.json.jbuilder b/app/views/api/v1/build_lists/index.json.jbuilder index fb29bc472..ae5ddeb41 100644 --- a/app/views/api/v1/build_lists/index.json.jbuilder +++ b/app/views/api/v1/build_lists/index.json.jbuilder @@ -1,4 +1,4 @@ -json.build_lists @build_lists do |json, build_list| +json.build_lists @build_lists do |build_list| json.(build_list, :id, :status) json.url api_v1_build_list_path(build_list, :format => :json) end diff --git a/app/views/api/v1/build_lists/show.json.jbuilder b/app/views/api/v1/build_lists/show.json.jbuilder index a108c7f76..41eef4778 100644 --- a/app/views/api/v1/build_lists/show.json.jbuilder +++ b/app/views/api/v1/build_lists/show.json.jbuilder @@ -1,92 +1,85 @@ -json.build_list do |json| +json.build_list do json.(@build_list, :id, :container_status, :status, :duration) json.(@build_list, :update_type, :priority, :new_core) - json.(@build_list, :advisory, :mass_build, :use_save_to_repository) + json.(@build_list, :advisory, :mass_build) json.(@build_list, :auto_publish, :package_version, :commit_hash, :last_published_commit_hash, :auto_create_container) json.build_log_url log_build_list_path(@build_list) if @build_list.container_published? - json.container_path container_url(false) + json.container_path container_url else json.container_path '' end - json.arch do |json_arch| - json_arch.(@build_list.arch, :id, :name) + json.arch do + json.(@build_list.arch, :id, :name) end json.created_at @build_list.created_at.to_i json.updated_at @build_list.updated_at.to_i - json.project do |json_project| - json.partial! 'api/v1/projects/project', - :project => @build_list.project, :json => json_project + json.project do + json.partial! 'api/v1/projects/project', :project => @build_list.project end - json.save_to_repository do |json_save_to_repository| + json.save_to_repository do json.partial! 'api/v1/repositories/repository', - :repository => @build_list.save_to_repository, - :json => json_save_to_repository + :repository => @build_list.save_to_repository - json_save_to_repository.platform do |json_str_platform| + json.platform do json.partial! 'api/v1/platforms/platform', - :platform => @build_list.save_to_repository.platform, - :json => json_str_platform + :platform => @build_list.save_to_repository.platform end end - json.build_for_platform do |json_build_for_platform| + json.build_for_platform do json.partial! 'api/v1/platforms/platform', - :platform => @build_list.build_for_platform, - :json => json_build_for_platform + :platform => @build_list.build_for_platform end - json.user do |json_user| - json.partial! 'api/v1/shared/member', :member => @build_list.user, :tag => json_user + json.user do + json.partial! 'api/v1/shared/member', :member => @build_list.user end - json.publisher do |json_publisher| - json.partial! 'api/v1/shared/member', :member => @build_list.publisher, :tag => json_publisher + json.publisher do + json.partial! 'api/v1/shared/member', :member => @build_list.publisher end if @build_list.publisher inc_repos = Repository.includes(:platform).where(:id => @build_list.include_repos) - json.include_repos inc_repos do |json_include_repos, repo| - json.partial! 'repositories', - :repository => repo, - :json => json_include_repos + json.include_repos inc_repos do |repo| + json.partial! 'repositories', :repository => repo end extra_repos = Repository.includes(:platform).where(:id => @build_list.extra_repositories) - json.extra_repos extra_repos do |json_extra_repos, repo| - json.partial! 'repositories', - :repository => repo, - :json => json_extra_repos + json.extra_repositories extra_repos do |repo| + json.partial! 'repositories', :repository => repo end extra_build_lists = BuildList.where(:id => @build_list.extra_build_lists) - json.extra_build_lists extra_build_lists do |json_extra_build_lists, bl| - json_extra_build_lists.(bl, :id, :status) - json_extra_build_lists.container_path container_url(false, bl) - json_extra_build_lists.url api_v1_build_list_path(bl, :format => :json) + json.extra_build_lists extra_build_lists do |bl| + json.(bl, :id, :status) + json.container_path container_url(bl) + json.url api_v1_build_list_path(bl, :format => :json) end + json.extra_params @build_list.extra_params - json.advisory do |json_advisory| - json_advisory.name @build_list.advisory.advisory_id - json_advisory.(@build_list.advisory, :description) + json.advisory do + json.name @build_list.advisory.advisory_id + json.(@build_list.advisory, :description) end if @build_list.advisory - json.mass_build do |json_mass_build| - json_mass_build.(@build_list.mass_build, :id, :name) + json.mass_build do + json.(@build_list.mass_build, :id, :name) end if @build_list.mass_build - json.logs (@build_list.results || []) do |json_logs, result| - json_logs.file_name result['file_name'] - json_logs.size result['size'] - json_logs.url "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{result['sha1']}" + json.logs (@build_list.results || []) do |result| + json.file_name result['file_name'] + json.size result['size'] + json.url "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{result['sha1']}" end if @build_list.new_core? - json.packages @build_list.packages do |json_packages, package| - json_packages.partial! 'api/v1/maintainers/package', :package => package, :json => json_packages + json.packages @build_list.packages do |package| + json.partial! 'api/v1/maintainers/package', :package => package end json.url api_v1_build_list_path(@build_list, :format => :json) diff --git a/app/views/api/v1/groups/index.json.jbuilder b/app/views/api/v1/groups/index.json.jbuilder index fec845836..ed313a4e4 100644 --- a/app/views/api/v1/groups/index.json.jbuilder +++ b/app/views/api/v1/groups/index.json.jbuilder @@ -1,4 +1,4 @@ -json.groups @groups do |json, group| +json.groups @groups do |group| json.(group, :id, :uname, :own_projects_count, :description) json.created_at group.created_at.to_i json.updated_at group.updated_at.to_i diff --git a/app/views/api/v1/groups/members.json.jbuilder b/app/views/api/v1/groups/members.json.jbuilder index eb4ec3391..48e0ba8c4 100644 --- a/app/views/api/v1/groups/members.json.jbuilder +++ b/app/views/api/v1/groups/members.json.jbuilder @@ -1,4 +1,4 @@ -json.group do |json| +json.group do json.(@group, :id) json.partial! 'api/v1/shared/members' end diff --git a/app/views/api/v1/groups/show.json.jbuilder b/app/views/api/v1/groups/show.json.jbuilder index ebe02b9ec..ff4a982e2 100644 --- a/app/views/api/v1/groups/show.json.jbuilder +++ b/app/views/api/v1/groups/show.json.jbuilder @@ -1,4 +1,4 @@ -json.group do |json| +json.group do json.(@group, :id, :uname, :own_projects_count, :description) json.created_at @group.created_at.to_i json.updated_at @group.updated_at.to_i diff --git a/app/views/api/v1/issues/_issue.json.jbuilder b/app/views/api/v1/issues/_issue.json.jbuilder new file mode 100644 index 000000000..2c128fb11 --- /dev/null +++ b/app/views/api/v1/issues/_issue.json.jbuilder @@ -0,0 +1,11 @@ +json.number issue.serial_id +json.(issue, :title, :status) +json.labels issue.labels do |label| + json.partial! 'label', :label => label +end +json.assignee do + json.partial! 'api/v1/shared/member', :member => issue.assignee +end if issue.assignee + +json.url api_v1_project_issue_path(issue.project.id, issue.serial_id, :format => :json) + diff --git a/app/views/api/v1/issues/_label.json.jbuilder b/app/views/api/v1/issues/_label.json.jbuilder new file mode 100644 index 000000000..fdee26e0d --- /dev/null +++ b/app/views/api/v1/issues/_label.json.jbuilder @@ -0,0 +1 @@ +json.(label, :name, :color) diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder new file mode 100644 index 000000000..9b43cc7be --- /dev/null +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -0,0 +1,11 @@ +json.issues @issues do |issue| + json.partial! 'issue', :issue => issue + json.issue issue.body + json.partial! 'api/v1/shared/owner', :owner => issue.user + json.closed_at issue.closed_at.to_i + json.closed_by do + json.partial! 'api/v1/shared/member', :member => issue.closer + end if issue.closer + json.created_at issue.created_at.to_i + json.updated_at issue.updated_at.to_i +end diff --git a/app/views/api/v1/issues/show.json.jbuilder b/app/views/api/v1/issues/show.json.jbuilder new file mode 100644 index 000000000..f9f7e8648 --- /dev/null +++ b/app/views/api/v1/issues/show.json.jbuilder @@ -0,0 +1,11 @@ +json.issue do + json.partial! 'issue', :issue => @issue + json.issue @issue.body + json.partial! 'api/v1/shared/owner', :owner => @issue.user + json.closed_at @issue.closed_at.to_i + json.closed_by do + json.partial! 'api/v1/shared/member', :member => @issue.closer + end if @issue.closer + json.created_at @issue.created_at.to_i + json.updated_at @issue.updated_at.to_i +end diff --git a/app/views/api/v1/maintainers/_package.json.jbuilder b/app/views/api/v1/maintainers/_package.json.jbuilder index c4f92edc3..9940da2ce 100644 --- a/app/views/api/v1/maintainers/_package.json.jbuilder +++ b/app/views/api/v1/maintainers/_package.json.jbuilder @@ -1,4 +1,4 @@ -json.(package, :id, :name, :version, :release) +json.(package, :id, :name, :version, :release, :epoch) json.type package.package_type json.updated_at package.updated_at.to_i json.url (package.sha1 ? "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{package.sha1}" : '' ) \ No newline at end of file diff --git a/app/views/api/v1/maintainers/index.json.jbuilder b/app/views/api/v1/maintainers/index.json.jbuilder index 3113b84af..e771a2d7a 100644 --- a/app/views/api/v1/maintainers/index.json.jbuilder +++ b/app/views/api/v1/maintainers/index.json.jbuilder @@ -1,15 +1,15 @@ -json.maintainers @maintainers do |json, maintainer| - json.project do |json_project| - json_project.partial! 'api/v1/projects/project', :project => maintainer.project, :json => json +json.maintainers @maintainers do |maintainer| + json.project do + json.partial! 'api/v1/projects/project', :project => maintainer.project end - json.package do |json_package| - json_package.partial! 'package', :package => maintainer, :json => json + json.package do + json.partial! 'package', :package => maintainer end - json.maintainer do |json_maintainer| + json.maintainer do if user = maintainer.try(:assignee) - json_maintainer.partial! 'maintainer', :maintainer => user, :json => json + json.partial! 'maintainer', :maintainer => user end end end diff --git a/app/views/api/v1/platforms/index.json.jbuilder b/app/views/api/v1/platforms/index.json.jbuilder index 7e5e5d71d..71fdd4976 100644 --- a/app/views/api/v1/platforms/index.json.jbuilder +++ b/app/views/api/v1/platforms/index.json.jbuilder @@ -1,10 +1,10 @@ -json.platforms @platforms do |json, platform| - json.partial! 'platform', :platform => platform, :json => json +json.platforms @platforms do |platform| + json.partial! 'platform', :platform => platform json.(platform, :platform_type, :visibility) json.partial! 'api/v1/shared/owner', :owner => platform.owner - json.repositories platform.repositories do |json_repos, repo| - json_repos.(repo, :id, :name) - json_repos.url api_v1_repository_path(repo.id, :format => :json) + json.repositories platform.repositories do |repo| + json.(repo, :id, :name) + json.url api_v1_repository_path(repo.id, :format => :json) end end diff --git a/app/views/api/v1/platforms/members.json.jbuilder b/app/views/api/v1/platforms/members.json.jbuilder index 7cfc6e9a1..ec4eca437 100644 --- a/app/views/api/v1/platforms/members.json.jbuilder +++ b/app/views/api/v1/platforms/members.json.jbuilder @@ -1,5 +1,5 @@ -json.platform do |json| - json.partial! 'platform', :platform => @platform, :json => json +json.platform do + json.partial! 'platform', :platform => @platform json.partial! 'api/v1/shared/members' end json.url members_api_v1_platform_path(@platform.id, :format => :json) \ No newline at end of file diff --git a/app/views/api/v1/platforms/show.json.jbuilder b/app/views/api/v1/platforms/show.json.jbuilder index a9fd620bc..b7dbb49a7 100644 --- a/app/views/api/v1/platforms/show.json.jbuilder +++ b/app/views/api/v1/platforms/show.json.jbuilder @@ -1,14 +1,14 @@ -json.platform do |json| - json.partial! 'platform', :platform => @platform, :json => json +json.platform do + json.partial! 'platform', :platform => @platform json.(@platform, :description, :parent_platform_id, :released, :visibility, :platform_type, :distrib_type) json.created_at @platform.created_at.to_i json.updated_at @platform.updated_at.to_i json.partial! 'api/v1/shared/owner', :owner => @platform.owner - json.repositories @platform.repositories do |json_repos, repo| - json_repos.(repo, :id, :name) - json_repos.url api_v1_repository_path(repo.id, :format => :json) + json.repositories @platform.repositories do |repo| + json.(repo, :id, :name) + json.url api_v1_repository_path(repo.id, :format => :json) end - json.products @platform.products do |json_products, product| - json.partial! 'api/v1/products/product', :product => product, :json => json_products + json.products @platform.products do |product| + json.partial! 'api/v1/products/product', :product => product end end diff --git a/app/views/api/v1/products/show.json.jbuilder b/app/views/api/v1/products/show.json.jbuilder index 1f8f3d91b..f74a1a0a8 100644 --- a/app/views/api/v1/products/show.json.jbuilder +++ b/app/views/api/v1/products/show.json.jbuilder @@ -1,11 +1,11 @@ -json.product do |json| - json.partial! 'product', :product => @product, :json => json - json.platform do |json_platform| - json.partial! 'api/v1/platforms/platform', :platform => @product.platform, :json => json_platform +json.product do + json.partial! 'product', :product => @product + json.platform do + json.partial! 'api/v1/platforms/platform', :platform => @product.platform end if @product.project.present? - json.project do |json_project| - json.partial! 'api/v1/projects/project', :project => @product.project, :json => json_project + json.project do + json.partial! 'api/v1/projects/project', :project => @product.project end end json.created_at @product.created_at.to_i diff --git a/app/views/api/v1/projects/get_id.json.jbuilder b/app/views/api/v1/projects/get_id.json.jbuilder index bc4ab3598..6dd156f60 100644 --- a/app/views/api/v1/projects/get_id.json.jbuilder +++ b/app/views/api/v1/projects/get_id.json.jbuilder @@ -1,5 +1,5 @@ -json.project do |json| - json.partial! 'project', :project => @project, :json => json +json.project do + json.partial! 'project', :project => @project json.(@project, :visibility) json.partial! 'api/v1/shared/owner', :owner => @project.owner end diff --git a/app/views/api/v1/projects/index.json.jbuilder b/app/views/api/v1/projects/index.json.jbuilder index 82c44c2ff..b6d4296c8 100644 --- a/app/views/api/v1/projects/index.json.jbuilder +++ b/app/views/api/v1/projects/index.json.jbuilder @@ -1,6 +1,6 @@ -json.projects @projects do |json, project| - json.partial! 'project', :project => project, :json => json - json.(project, :visibility, :description, :ancestry, :has_issues, :has_wiki, :default_branch, :is_package, :average_build_time, :publish_i686_into_x86_64) +json.projects @projects do |project| + json.partial! 'project', :project => project + json.(project, :visibility, :description, :ancestry, :has_issues, :has_wiki, :default_branch, :is_package, :publish_i686_into_x86_64) json.created_at project.created_at.to_i json.updated_at project.updated_at.to_i json.partial! 'api/v1/shared/owner', :owner => project.owner diff --git a/app/views/api/v1/projects/members.json.jbuilder b/app/views/api/v1/projects/members.json.jbuilder index 258b81ca7..d237705f9 100644 --- a/app/views/api/v1/projects/members.json.jbuilder +++ b/app/views/api/v1/projects/members.json.jbuilder @@ -1,5 +1,5 @@ -json.project do |json| - json.partial! 'project', :project => @project, :json => json +json.project do + json.partial! 'project', :project => @project json.partial! 'api/v1/shared/members' end json.url members_api_v1_project_path(@project.id, :format => :json) \ No newline at end of file diff --git a/app/views/api/v1/projects/refs_list.json.jbuilder b/app/views/api/v1/projects/refs_list.json.jbuilder index 7b913f98b..b41dacba7 100644 --- a/app/views/api/v1/projects/refs_list.json.jbuilder +++ b/app/views/api/v1/projects/refs_list.json.jbuilder @@ -1,8 +1,8 @@ -json.refs_list (@project.repo.branches + @project.repo.tags) do |json_grit, grit| - json_grit.ref grit.name - json_grit.object do |json_object| - json_object.type (grit.class.name =~ /Tag/ ? 'tag' : 'commit') - json_object.sha grit.commit.id +json.refs_list @refs do |grit| + json.ref grit.name + json.object do + json.type (grit.class.name =~ /Tag/ ? 'tag' : 'commit') + json.sha grit.commit.id end end json.url refs_list_api_v1_project_path(@project.id, :format => :json) \ No newline at end of file diff --git a/app/views/api/v1/projects/show.json.jbuilder b/app/views/api/v1/projects/show.json.jbuilder index ff64048bb..b820cf415 100644 --- a/app/views/api/v1/projects/show.json.jbuilder +++ b/app/views/api/v1/projects/show.json.jbuilder @@ -1,18 +1,23 @@ -json.project do |json| - json.partial! 'project', :project => @project, :json => json - json.(@project, :visibility, :description, :ancestry, :has_issues, :has_wiki, :default_branch, :is_package, :average_build_time, :publish_i686_into_x86_64) +json.project do + json.partial! 'project', :project => @project + json.(@project, :visibility, :description, :ancestry, :has_issues, :has_wiki, :default_branch, :is_package, :publish_i686_into_x86_64) json.created_at @project.created_at.to_i json.updated_at @project.updated_at.to_i json.partial! 'api/v1/shared/owner', :owner => @project.owner - json.maintainer do |json_maintainer| - json.partial! 'api/v1/shared/member', :member => @project.maintainer, :tag => json_maintainer + json.maintainer do + json.partial! 'api/v1/shared/member', :member => @project.maintainer end - json.repositories @project.repositories do |json_repos, repo| - json_repos.(repo, :id, :name) - json_repos.url api_v1_repository_path(repo.name, :format => :json) - json_repos.platform do |json_platform| - json_platform.(repo.platform, :id, :name) - json_platform.url api_v1_platform_path(repo.platform, :format => :json) + + json.project_statistics @project.project_statistics do |statistic| + json.(statistic, :average_build_time, :build_count, :arch_id) + end + + json.repositories @project.repositories do |repo| + json.(repo, :id, :name) + json.url api_v1_repository_path(repo.name, :format => :json) + json.platform do + json.(repo.platform, :id, :name) + json.url api_v1_platform_path(repo.platform, :format => :json) end end end \ No newline at end of file diff --git a/app/views/api/v1/pull_requests/_pull.json.jbuilder b/app/views/api/v1/pull_requests/_pull.json.jbuilder new file mode 100644 index 000000000..fbe7fb555 --- /dev/null +++ b/app/views/api/v1/pull_requests/_pull.json.jbuilder @@ -0,0 +1,24 @@ +json.number pull.serial_id +json.(pull, :title, :status) +json.to_ref do + json.ref pull.to_ref + json.sha pull.to_commit.try(:id) + json.project do + json.partial! 'api/v1/projects/project', :project => pull.to_project + end +end +json.from_ref do + json.ref pull.from_ref + json.sha pull.from_commit.try(:id) + json.project do + json.partial! 'api/v1/projects/project', :project => pull.from_project + end +end +json.partial! 'api/v1/shared/owner', :owner => pull.user +json.assignee do + json.partial! 'api/v1/shared/member', :member => pull.issue.assignee +end if pull.issue.assignee +json.mergeable pull.can_merging? +json.merged_at pull.issue.closed_at.to_i if pull.merged? + +json.url api_v1_project_pull_request_path(pull.to_project.id, pull.id, :format => :json) diff --git a/app/views/api/v1/pull_requests/commits.json.jbuilder b/app/views/api/v1/pull_requests/commits.json.jbuilder new file mode 100644 index 000000000..6ce77453d --- /dev/null +++ b/app/views/api/v1/pull_requests/commits.json.jbuilder @@ -0,0 +1,25 @@ +json.commits @commits do |commit| + json.sha commit.id + json.https_url commit_path(@project, commit.id) + json.author do + json.name commit.author.name + json.email commit.author.email + json.date commit.authored_date.to_i + end + json.committer do + json.name commit.committer.name + json.email commit.committer.email + json.date commit.committed_date.to_i + end + json.message commit.message + json.tree do + json.sha commit.id + json.https_url commit_path(@project, commit.id) + end + json.parents commit.parents do |parent| + json.sha parent.id + json.https_url commit_path(@project, parent.id) + end +end + +json.url commits_api_v1_project_pull_request_path(:format => :json) diff --git a/app/views/api/v1/pull_requests/files.json.jbuilder b/app/views/api/v1/pull_requests/files.json.jbuilder new file mode 100644 index 000000000..cc7fcbeee --- /dev/null +++ b/app/views/api/v1/pull_requests/files.json.jbuilder @@ -0,0 +1,24 @@ +json.files @stats do |stat| + fstat, diff = stat + commit_id = diff.deleted_file ? @pull.to_commit.id : @pull.from_commit.id + json.sha commit_id + json.filename diff.b_path + status = case + when diff.new_file + 'added' + when diff.deleted_file + 'deleted' + when diff.renamed_file + 'renamed' + else + 'modified' + end + json.status status + json.additions fstat.additions + json.deletions fstat.deletions + json.changes fstat.additions + fstat.deletions + json.blob_https_url blob_path(@project, commit_id, diff.b_path) + json.raw_https_url raw_path(@project, commit_id, diff.b_path) +end + +json.url files_api_v1_project_pull_request_path(:format => :json) diff --git a/app/views/api/v1/pull_requests/index.json.jbuilder b/app/views/api/v1/pull_requests/index.json.jbuilder new file mode 100644 index 000000000..df3fb3381 --- /dev/null +++ b/app/views/api/v1/pull_requests/index.json.jbuilder @@ -0,0 +1,5 @@ +json.pull_requests @pulls do |pull| + json.partial! 'pull', :pull => pull +end + +json.url @pulls_url diff --git a/app/views/api/v1/pull_requests/show.json.jbuilder b/app/views/api/v1/pull_requests/show.json.jbuilder new file mode 100644 index 000000000..c388af95e --- /dev/null +++ b/app/views/api/v1/pull_requests/show.json.jbuilder @@ -0,0 +1,17 @@ +json.pull_request do + json.partial! 'pull', :pull => @pull + json.body @pull.body + json.closed_at @pull.issue.closed_at.to_i if @pull.merged? || @pull.closed? + + if @pull.issue.closer + json.closed_by do + json.(@pull.issue.closer, :id, :name, :uname) + end + json.merged_by do + json.(@pull.issue.closer, :id, :name, :uname) + end if @pull.merged? + end + + json.created_at @pull.issue.created_at.to_i + json.updated_at @pull.issue.updated_at.to_i +end diff --git a/app/views/api/v1/repositories/key_pair.json.jbuilder b/app/views/api/v1/repositories/key_pair.json.jbuilder index a096c4f12..ea474b812 100644 --- a/app/views/api/v1/repositories/key_pair.json.jbuilder +++ b/app/views/api/v1/repositories/key_pair.json.jbuilder @@ -1,11 +1,11 @@ -json.repository do |json| - json.partial! 'repository', :repository => @repository, :json => json - json.key_pair do |json_key_pair| +json.repository do + json.partial! 'repository', :repository => @repository + json.key_pair do if @repository.key_pair - json_key_pair.(@repository.key_pair, :public, :secret) + json.(@repository.key_pair, :public, :secret) else - json_key_pair.public '' - json_key_pair.secret '' + json.public '' + json.secret '' end end end \ No newline at end of file diff --git a/app/views/api/v1/repositories/projects.json.jbuilder b/app/views/api/v1/repositories/projects.json.jbuilder index f911d6645..cafc750f3 100644 --- a/app/views/api/v1/repositories/projects.json.jbuilder +++ b/app/views/api/v1/repositories/projects.json.jbuilder @@ -1,8 +1,7 @@ -json.repository do |json| - json.partial! 'repository', :repository => @repository, :json => json - json.projects @projects do |json_project, project| - json.partial! 'api/v1/projects/project', - :project => project, :json => json_project +json.repository do + json.partial! 'repository', :repository => @repository + json.projects @projects do |project| + json.partial! 'api/v1/projects/project', :project => project end end json.url projects_api_v1_repository_path(@repository.id, :format => :json) \ No newline at end of file diff --git a/app/views/api/v1/repositories/show.json.jbuilder b/app/views/api/v1/repositories/show.json.jbuilder index fc6d54f77..7dd9ec1f3 100644 --- a/app/views/api/v1/repositories/show.json.jbuilder +++ b/app/views/api/v1/repositories/show.json.jbuilder @@ -1,10 +1,10 @@ -json.repository do |json| - json.partial! 'repository', :repository => @repository, :json => json +json.repository do + json.partial! 'repository', :repository => @repository json.(@repository, :description, :publish_without_qa) json.created_at @repository.created_at.to_i json.updated_at @repository.updated_at.to_i - json.platform do |json_platform| - json_platform.(@repository.platform, :id, :name) - json_platform.url api_v1_platform_path(@repository.platform, :format => :json) + json.platform do + json.(@repository.platform, :id, :name) + json.url api_v1_platform_path(@repository.platform, :format => :json) end end \ No newline at end of file diff --git a/app/views/api/v1/search/_groups.json.jbuilder b/app/views/api/v1/search/_groups.json.jbuilder index 56026b009..a0e8f8ff5 100644 --- a/app/views/api/v1/search/_groups.json.jbuilder +++ b/app/views/api/v1/search/_groups.json.jbuilder @@ -1,3 +1,3 @@ json.groups results do |group| - json.partial! 'member', :member => group, :json => json + json.partial! 'member', :member => group end \ No newline at end of file diff --git a/app/views/api/v1/search/_platforms.json.jbuilder b/app/views/api/v1/search/_platforms.json.jbuilder index 4aa9aff17..5d708234e 100644 --- a/app/views/api/v1/search/_platforms.json.jbuilder +++ b/app/views/api/v1/search/_platforms.json.jbuilder @@ -1,3 +1,3 @@ json.platforms results do |platform| - json.partial! 'api/v1/platforms/platform', :platform => platform, :json => json + json.partial! 'api/v1/platforms/platform', :platform => platform end \ No newline at end of file diff --git a/app/views/api/v1/search/_projects.json.jbuilder b/app/views/api/v1/search/_projects.json.jbuilder index 79cfaa435..37935c367 100644 --- a/app/views/api/v1/search/_projects.json.jbuilder +++ b/app/views/api/v1/search/_projects.json.jbuilder @@ -1,3 +1,3 @@ json.projects results do |project| - json.partial! 'api/v1/projects/project', :project => project, :json => json + json.partial! 'api/v1/projects/project', :project => project end \ No newline at end of file diff --git a/app/views/api/v1/search/_users.json.jbuilder b/app/views/api/v1/search/_users.json.jbuilder index 0d23c054d..714a1e4ed 100644 --- a/app/views/api/v1/search/_users.json.jbuilder +++ b/app/views/api/v1/search/_users.json.jbuilder @@ -1,3 +1,3 @@ json.users results do |user| - json.partial! 'member', :member => user, :json => json + json.partial! 'member', :member => user end \ No newline at end of file diff --git a/app/views/api/v1/search/index.json.jbuilder b/app/views/api/v1/search/index.json.jbuilder index 4c861bba7..f6afacba6 100644 --- a/app/views/api/v1/search/index.json.jbuilder +++ b/app/views/api/v1/search/index.json.jbuilder @@ -1,6 +1,6 @@ -json.results do |json| +json.results do @results.each do |tag, results| - json.partial! tag.dup, :results => results, :json => json + json.partial! tag.dup, :results => results end end json.url api_v1_search_index_path(:format => :json) \ No newline at end of file diff --git a/app/views/api/v1/shared/_member.json.jbuilder b/app/views/api/v1/shared/_member.json.jbuilder index 25d2d1cf5..69d85ec5a 100644 --- a/app/views/api/v1/shared/_member.json.jbuilder +++ b/app/views/api/v1/shared/_member.json.jbuilder @@ -1,3 +1,3 @@ -tag.(member, :id, :name) -tag.type member.class.name -tag.url member_path(member) \ No newline at end of file +json.(member, :id, :name, :uname) +json.type member.class.name +json.url member_path(member) diff --git a/app/views/api/v1/shared/_members.json.jbuilder b/app/views/api/v1/shared/_members.json.jbuilder index 00c8b9a93..a930a9db1 100644 --- a/app/views/api/v1/shared/_members.json.jbuilder +++ b/app/views/api/v1/shared/_members.json.jbuilder @@ -1,3 +1,3 @@ -json.members @members do |json_members, member| - json.partial! 'api/v1/shared/member', :member => member, :tag => json_members +json.members @members do |member| + json.partial! 'api/v1/shared/member', :member => member end \ No newline at end of file diff --git a/app/views/api/v1/shared/_owner.json.jbuilder b/app/views/api/v1/shared/_owner.json.jbuilder index e6983d550..9b34683b5 100644 --- a/app/views/api/v1/shared/_owner.json.jbuilder +++ b/app/views/api/v1/shared/_owner.json.jbuilder @@ -1,3 +1,3 @@ -json.owner do |json_owner| - json.partial! 'api/v1/shared/member', :member => owner, :tag => json_owner +json.owner do + json.partial! 'api/v1/shared/member', :member => owner end \ No newline at end of file diff --git a/app/views/api/v1/users/notifiers.json.jbuilder b/app/views/api/v1/users/notifiers.json.jbuilder index 273ebbacc..a1968e864 100644 --- a/app/views/api/v1/users/notifiers.json.jbuilder +++ b/app/views/api/v1/users/notifiers.json.jbuilder @@ -1,7 +1,8 @@ -json.user do |json| +json.user do json.(@user, :id) - json.notifiers do |json_notifiers| - json_notifiers.(@user.notifier, :can_notify, :new_comment, :new_comment_reply, :new_issue, :issue_assign, :new_comment_commit_owner, :new_comment_commit_repo_owner, :new_comment_commit_commentor, :new_build, :new_associated_build) + json.notifiers do + json.(@user.notifier, :can_notify, :new_comment, :new_comment_reply, :new_issue, :issue_assign, :new_comment_commit_owner, :new_comment_commit_repo_owner, :new_comment_commit_commentor, :new_build, :new_associated_build, + :update_code) end end diff --git a/app/views/api/v1/users/show.json.jbuilder b/app/views/api/v1/users/show.json.jbuilder index 15e4ed892..086afbb6b 100644 --- a/app/views/api/v1/users/show.json.jbuilder +++ b/app/views/api/v1/users/show.json.jbuilder @@ -1,4 +1,4 @@ -json.user do |json| +json.user do json.(@user, :id, :name, :email, :uname,:language, :own_projects_count, :professional_experience, :site, :company, :location, :build_priority) json.created_at @user.created_at.to_i json.updated_at @user.updated_at.to_i diff --git a/app/views/contacts/new.html.haml b/app/views/contacts/new.html.haml index adcac6264..4a62c5780 100644 --- a/app/views/contacts/new.html.haml +++ b/app/views/contacts/new.html.haml @@ -34,7 +34,7 @@ :class => @form.errors.messages[:message].present? ? 'error' : '' .form-actions - = f.submit t("layout.contact.send_request"), :class => 'button' + = f.submit t('layout.contact.send_request'), :class => 'button', :data => {'disable-with' => t('layout.processing')} %section.last %div diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml deleted file mode 100644 index ce7f42306..000000000 --- a/app/views/devise/registrations/edit.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -%h3.fix.bpadding10= @user.uname - -= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form" }) do |f| - = render "users/form", :f => f - -.notify - %p= t('layout.users.public_data_edit_warning') - -:javascript - $('article .right').addClass('middlepadding'); - -- content_for :sidebar, render('users/sidebar') diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 5fb9371d6..4dd7b02d0 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -7,6 +7,7 @@ %article = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form" }) do |f| = hidden_field_tag :invitation_token, @invitation_token + = f.password_field :password, :name => 'password', :style => 'display: none;' .left.first=t('activerecord.attributes.user.uname') .right.first = f.text_field :uname, :id => 'login', :class => "registartion-input #{uname_error ? 'registartion-input-error' : ''}" @@ -17,7 +18,11 @@ .both .left=t('activerecord.attributes.user.email') .right - = f.text_field :email, :id => 'email', :readonly => 'readonly', :class => "registartion-input #{email_error ? 'registartion-input-error' : ''}" + - klass = "registartion-input #{email_error ? 'registartion-input-error' : ''}" + - if APP_CONFIG['preregistration'] + = f.text_field :email, :id => 'email', :readonly => 'readonly', :class => klass + - else + = f.text_field :email, :id => 'email', :class => 'registartion-input', :class => klass .both .left=t('activerecord.attributes.user.password') .right @@ -30,6 +35,9 @@ .in =f.submit t("layout.devise.shared_links.sign_up"), :class => 'button', :id => 'btnLogin' .both + = hidden_field_tag :recaptcha_challenge_field + = hidden_field_tag :recaptcha_response_field, 'manual_challenge' + = render 'devise/shared/providers' =showDeviseHintError(:login, uname_error) =showDeviseHintError(:name, name_error) diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 55c16f02d..1598f8dcf 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -27,8 +27,7 @@ .text=t('devise.sessions.remember_me') .in=f.submit t('layout.devise.shared_links.sign_in'), :class => 'button', :id => 'btnLogin' %div{:style => "clear: both;"} - .hr - .both + = render 'devise/shared/providers' .forgot .password %p= link_to t("layout.devise.shared_links.forgot_password"), new_password_path(resource_name) diff --git a/app/views/devise/shared/_providers.haml b/app/views/devise/shared/_providers.haml new file mode 100644 index 000000000..d173f01d0 --- /dev/null +++ b/app/views/devise/shared/_providers.haml @@ -0,0 +1,11 @@ +- if devise_mapping.omniauthable? + .hr + .other + .left + %p= t('layout.sessions.sign_up_with') + .right + - resource_class.omniauth_providers.each do |provider| + = link_to omniauth_authorize_path(resource_name, provider) do + - provider = provider.to_s.gsub(/_oauth2/,'') + = image_tag("#{provider}.png", :alt => provider, :class => provider) + .both \ No newline at end of file diff --git a/app/views/groups/members/index.html.haml b/app/views/groups/members/index.html.haml index 2ce755b65..dc65e3463 100644 --- a/app/views/groups/members/index.html.haml +++ b/app/views/groups/members/index.html.haml @@ -30,7 +30,7 @@ .lineForm= select_tag 'role', options_for_collaborators_roles_select .both %br - = submit_tag t("layout.add"), :class => 'button' + = submit_tag t('layout.add'), :class => 'button', :data => {'disable-with' => t('layout.processing')} .hr.bottom .both diff --git a/app/views/groups/profile/_form.html.haml b/app/views/groups/profile/_form.html.haml index 4ac4eaf82..db6b6a95f 100644 --- a/app/views/groups/profile/_form.html.haml +++ b/app/views/groups/profile/_form.html.haml @@ -12,5 +12,5 @@ %br .leftlist \ -.rightlist= submit_tag t("layout.save") +.rightlist= submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} .both diff --git a/app/views/groups/profile/show.html.haml b/app/views/groups/profile/show.html.haml index 890b9c2c9..a4e7e436f 100644 --- a/app/views/groups/profile/show.html.haml +++ b/app/views/groups/profile/show.html.haml @@ -1,4 +1,8 @@ -set_meta_tags :title => title_object(@group) -- edit_link = can?(:edit, @group) ? link_to(t("layout.edit"), edit_group_path(@group), :class => 'button') : nil -= render 'shared/profile', :uname => @group.name, :group => @group, :search_path => group_path, :projects => @projects, :edit_link => edit_link +- edit_url = can?(:edit, @group) ? edit_group_path(@group) : nil += render 'shared/profile', :uname => @group.name, + :group => @group, + :search_path => group_path, + :projects => @projects, + :edit_url => edit_url diff --git a/app/views/activity_feeds/_feed_tabs.html.haml b/app/views/home/_feed_tabs.html.haml similarity index 87% rename from app/views/activity_feeds/_feed_tabs.html.haml rename to app/views/home/_feed_tabs.html.haml index e8b731174..2531a11d4 100644 --- a/app/views/activity_feeds/_feed_tabs.html.haml +++ b/app/views/home/_feed_tabs.html.haml @@ -1,4 +1,4 @@ -.sub-menu +.sub-menu.activity-tabs %nav %ul - (collection = t 'feed_menu').each do |base, title| diff --git a/app/views/activity_feeds/_list.html.haml b/app/views/home/_list.html.haml similarity index 100% rename from app/views/activity_feeds/_list.html.haml rename to app/views/home/_list.html.haml diff --git a/app/views/activity_feeds/_sidebar.html.haml b/app/views/home/_sidebar.html.haml similarity index 100% rename from app/views/activity_feeds/_sidebar.html.haml rename to app/views/home/_sidebar.html.haml diff --git a/app/views/home/_top_menu.html.haml b/app/views/home/_top_menu.html.haml new file mode 100644 index 000000000..43bae255c --- /dev/null +++ b/app/views/home/_top_menu.html.haml @@ -0,0 +1,7 @@ +- content_for :feed_tabs do + .sub-menu + %nav + %ul + %li= link_to t('activity_menu.activity_feed'), root_path, :class => action_name == 'activity' ? 'active' : '' + %li= link_to t('activity_menu.tracker'), issues_path, :class => action_name == 'issues' ? 'active' : '' + %li= link_to t('activity_menu.pull_requests'), pull_requests_path, :class => action_name == 'pull_requests' ? 'active' : '' \ No newline at end of file diff --git a/app/views/activity_feeds/index.atom.builder b/app/views/home/activity.atom.builder similarity index 100% rename from app/views/activity_feeds/index.atom.builder rename to app/views/home/activity.atom.builder diff --git a/app/views/activity_feeds/index.html.haml b/app/views/home/activity.html.haml similarity index 87% rename from app/views/activity_feeds/index.html.haml rename to app/views/home/activity.html.haml index a8bdf4758..ed75e4efe 100644 --- a/app/views/activity_feeds/index.html.haml +++ b/app/views/home/activity.html.haml @@ -2,7 +2,8 @@ %h3.fix = t("layout.activity_feed.header") = link_to image_tag("rss.ico", :width => '15px', :height => '15px', :class => 'atom_icon'), atom_activity_feeds_path(:format => 'atom', :token => current_user.authentication_token) + =render 'feed_tabs' =render 'list' - content_for :sidebar, render('sidebar') -- content_for :feed_tabs, render('feed_tabs') +- render 'top_menu' diff --git a/app/views/home/issues.html.haml b/app/views/home/issues.html.haml new file mode 100644 index 000000000..91e729667 --- /dev/null +++ b/app/views/home/issues.html.haml @@ -0,0 +1,12 @@ +-set_meta_tags :title => t("home.#{action_name}.title") +-render 'top_menu' +-content_for :sidebar do + =form_tag send("#{action_name}_path"), :id => 'filter_issues', :method => :get do + .bordered + %table + -%w[all assigned created].each do |filter| + %tr + %td.width18=radio_button_tag :myradio, filter, filter == @filter, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'} + %td.width135=t("layout.#{action_name}.#{filter}") + %td.width30.right=instance_variable_get("@#{filter}_issues").not_closed_or_merged.count +=render 'projects/issues/issues_table', :issues => @issues diff --git a/app/views/activity_feeds/partials/_build_list_notification.haml b/app/views/home/partials/_build_list_notification.haml similarity index 81% rename from app/views/activity_feeds/partials/_build_list_notification.haml rename to app/views/home/partials/_build_list_notification.haml index 9f1594004..1dcc17961 100644 --- a/app/views/activity_feeds/partials/_build_list_notification.haml +++ b/app/views/home/partials/_build_list_notification.haml @@ -3,7 +3,7 @@ .image= link_to(image_tag(avatar_url(user, :small), :alt => 'avatar'), user_path(user)) if user.persisted? .text %span - = raw t('notifications.bodies.build_task', :task_num => task_num, :task_link => build_list_path(build_list_id)) + = raw t('notifications.bodies.build_task', :id => build_list_id, :task_link => build_list_path(build_list_id)) = raw t('notifications.bodies.project', :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) - message, error = case status - when BuildList::BUILD_PENDING @@ -15,5 +15,5 @@ - else ['failed', t("layout.build_lists.statuses.#{BuildList::HUMAN_STATUSES[status]}")] = raw t("notifications.bodies.build_status.#{message}", :error => error) .both - %span.date= updated_at + = datetime_moment updated_at, :tag => :span, :class => 'date' .both diff --git a/app/views/activity_feeds/partials/_git_delete_branch_notification.haml b/app/views/home/partials/_git_delete_branch_notification.haml similarity index 88% rename from app/views/activity_feeds/partials/_git_delete_branch_notification.haml rename to app/views/home/partials/_git_delete_branch_notification.haml index 3fe7cc451..c207d9df8 100644 --- a/app/views/activity_feeds/partials/_git_delete_branch_notification.haml +++ b/app/views/home/partials/_git_delete_branch_notification.haml @@ -7,5 +7,5 @@ = t('notifications.bodies.delete_branch', :branch_name => branch_name, :user_link => _user_link).html_safe = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both diff --git a/app/views/activity_feeds/partials/_git_new_push_notification.haml b/app/views/home/partials/_git_new_push_notification.haml similarity index 77% rename from app/views/activity_feeds/partials/_git_new_push_notification.haml rename to app/views/home/partials/_git_new_push_notification.haml index 9f1fb007f..f9553f91f 100644 --- a/app/views/activity_feeds/partials/_git_new_push_notification.haml +++ b/app/views/home/partials/_git_new_push_notification.haml @@ -7,7 +7,7 @@ = raw t("notifications.bodies.#{change_type}_branch", {:branch_name => branch_name, :user_link => _user_link}) = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both %span.subject - last_commits.each do |commit| @@ -15,6 +15,6 @@ = commit[1] %br - if defined? other_commits - -pluralize = t('layout.commits.pluralize').map {|base, title| title.to_s} %br - =link_to t('notifications.bodies.more_commits', :count => other_commits_count, :commits => Russian.p(other_commits_count, *pluralize)), diff_path(project_owner, project_name, :diff => other_commits) + =link_to t('notifications.bodies.more_commits', :count => other_commits_count, :commits => commits_pluralize(other_commits_count)), + diff_path(project_owner, project_name, :diff => other_commits) diff --git a/app/views/activity_feeds/partials/_issue_assign_notification.haml b/app/views/home/partials/_issue_assign_notification.haml similarity index 81% rename from app/views/activity_feeds/partials/_issue_assign_notification.haml rename to app/views/home/partials/_issue_assign_notification.haml index cf9df13d1..4c58df39b 100644 --- a/app/views/activity_feeds/partials/_issue_assign_notification.haml +++ b/app/views/home/partials/_issue_assign_notification.haml @@ -4,5 +4,5 @@ = raw t("notifications.bodies.issue_assign_notification", { :issue_link => link_to(issue_title, project_issue_path(project_owner, project_name, issue_serial_id))}) = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both diff --git a/app/views/activity_feeds/partials/_new_comment_commit_notification.haml b/app/views/home/partials/_new_comment_commit_notification.haml similarity index 90% rename from app/views/activity_feeds/partials/_new_comment_commit_notification.haml rename to app/views/home/partials/_new_comment_commit_notification.haml index 09f23f4d9..e5401ee74 100644 --- a/app/views/activity_feeds/partials/_new_comment_commit_notification.haml +++ b/app/views/home/partials/_new_comment_commit_notification.haml @@ -7,6 +7,6 @@ = raw t("notifications.bodies.new_comment_notification.commit_content", {:commit_link => link_to(commit_message, commit_path(project_owner, project_name, commit_id) + "#comment#{comment_id}")}) = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both %span.subject= comment_body diff --git a/app/views/activity_feeds/partials/_new_comment_notification.haml b/app/views/home/partials/_new_comment_notification.haml similarity index 90% rename from app/views/activity_feeds/partials/_new_comment_notification.haml rename to app/views/home/partials/_new_comment_notification.haml index ef4b4fa53..7a3cbcb01 100644 --- a/app/views/activity_feeds/partials/_new_comment_notification.haml +++ b/app/views/home/partials/_new_comment_notification.haml @@ -7,6 +7,6 @@ = raw t("notifications.bodies.new_comment_notification.content", {:issue_link => link_to(issue_title, project_issue_path(project_owner, project_name, issue_serial_id) + "#comment#{comment_id}")}) = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both %span.subject= comment_body diff --git a/app/views/activity_feeds/partials/_new_issue_notification.haml b/app/views/home/partials/_new_issue_notification.haml similarity index 88% rename from app/views/activity_feeds/partials/_new_issue_notification.haml rename to app/views/home/partials/_new_issue_notification.haml index 76eb29e16..5b3fdb5c9 100644 --- a/app/views/activity_feeds/partials/_new_issue_notification.haml +++ b/app/views/home/partials/_new_issue_notification.haml @@ -6,6 +6,6 @@ = raw t("notifications.bodies.new_issue_notification", { :user_link => user_link(user, user_name), :issue_link => project_issue_path(project_owner, project_name, issue_serial_id)}) = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both %span.subject= issue_title diff --git a/app/views/activity_feeds/partials/_new_user_notification.haml b/app/views/home/partials/_new_user_notification.haml similarity index 86% rename from app/views/activity_feeds/partials/_new_user_notification.haml rename to app/views/home/partials/_new_user_notification.haml index aaa894d5d..870fa68f9 100644 --- a/app/views/activity_feeds/partials/_new_user_notification.haml +++ b/app/views/home/partials/_new_user_notification.haml @@ -5,7 +5,7 @@ %span.name = link_to activity_feed.user.uname, user_path(activity_feed.user.uname) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both .both %span.subject #{ t("notifications.bodies.new_user_notification.title", :user_name => user_name) } diff --git a/app/views/activity_feeds/partials/_wiki_new_commit_notification.haml b/app/views/home/partials/_wiki_new_commit_notification.haml similarity index 88% rename from app/views/activity_feeds/partials/_wiki_new_commit_notification.haml rename to app/views/home/partials/_wiki_new_commit_notification.haml index e431ce73e..4659792d0 100644 --- a/app/views/activity_feeds/partials/_wiki_new_commit_notification.haml +++ b/app/views/home/partials/_wiki_new_commit_notification.haml @@ -6,5 +6,5 @@ = raw t("notifications.bodies.wiki_new_commit_notification", {:user_link => user_link(user, user_name), :history_link => link_to("wiki", history_project_wiki_index_path(project_owner, project_name))}) = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_path(project_owner, project_name)) ) .both - %span.date= activity_feed.created_at + = datetime_moment activity_feed.created_at, :tag => :span, :class => 'date' .both diff --git a/app/views/layouts/_noscript.html.haml b/app/views/layouts/_noscript.html.haml new file mode 100644 index 000000000..76768e245 --- /dev/null +++ b/app/views/layouts/_noscript.html.haml @@ -0,0 +1,2 @@ +%noscript + %div{:style => 'font-size: 12px; color: red; font-weight: bold;'}= t 'layout.noscript_message' \ No newline at end of file diff --git a/app/views/layouts/_notifies.html.haml b/app/views/layouts/_notifies.html.haml index 82ca70300..1c1f9c98f 100644 --- a/app/views/layouts/_notifies.html.haml +++ b/app/views/layouts/_notifies.html.haml @@ -2,9 +2,8 @@ .flash_notify - if (flash_notify = FlashNotify.published.first) && flash_notify.should_show?(cookies[:flash_notify_hash]) .alert{:class => "alert-#{flash_notify.status}"} - = flash_notify.body I18n.locale + = flash_notify.body(I18n.locale).html_safe %a.close#close-alert{:'data-dismiss'=>"alert", :href=>"#"} × :javascript var FLASH_HASH_ID = "#{flash_notify.hash_id}"; - var FLASH_EXPIRES_AT = "#{Date.today + 1.year}"; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9f62ca9a2..7143d44d4 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -6,13 +6,14 @@ = stylesheet_link_tag "application" /[if lt IE 9] = javascript_include_tag 'https://html5shiv.googlecode.com/svn/trunk/html5.js' - = javascript_include_tag "application" + = javascript_include_tag 'application' + = javascript_include_tag 'moment/ru.js' if I18n.locale == :ru = csrf_meta_tag = display_meta_tags :site => APP_CONFIG['project_name'], :reverse => true, :separator => '-' - if user_signed_in? = auto_discovery_link_tag :atom, atom_activity_feeds_path(:format => 'atom', :token => current_user.authentication_token), :title => t("layout.atom_link_tag_title", :nickname => current_user.uname, :app_name => APP_CONFIG['project_name']) - %body + %body{'ng-app' => 'RosaABF', 'ng-controller' => 'RosaABFController', 'ng-init' => "init('#{I18n.locale}', #{!!current_user.try(:sound_notifications)})"} .wrap{:class => content_for?(:sidebar) ? 'columns' : ''} %header .left @@ -38,6 +39,7 @@ .a= link_to t('layout.logout'), destroy_user_session_path, :method => :delete - else .user + .profile= link_to t("layout.devise.shared_links.sign_up"), new_register_request_path .profile= link_to t("layout.devise.shared_links.sign_in"), new_user_session_path .right .both @@ -46,6 +48,7 @@ - if content_for?(:feed_tabs) = yield :feed_tabs .both + = render 'layouts/noscript' = render "layouts/flashes" = render "layouts/notifies" %article diff --git a/app/views/layouts/invite.html.haml b/app/views/layouts/invite.html.haml index 9a9d732b0..a0834a466 100644 --- a/app/views/layouts/invite.html.haml +++ b/app/views/layouts/invite.html.haml @@ -19,4 +19,4 @@ .both / Footer %footer= render "layouts/menu/bottom" - = render 'layouts/counters' unless current_user.try(:admin?) \ No newline at end of file + = render 'layouts/counters' if !current_user.try(:admin?) && Rails.env.production? diff --git a/app/views/layouts/sessions.html.haml b/app/views/layouts/sessions.html.haml index dec6eecf5..1a1a8b0b8 100644 --- a/app/views/layouts/sessions.html.haml +++ b/app/views/layouts/sessions.html.haml @@ -13,8 +13,8 @@ = display_meta_tags :site => APP_CONFIG['project_name'], :reverse => true, :separator => '-' %body - -# render "layouts/flashes" + = render 'layouts/noscript' = yield - = render 'layouts/counters' unless current_user.try(:admin?) + = render 'layouts/counters' if !current_user.try(:admin?) && Rails.env.production? %footer= render "layouts/menu/bottom" diff --git a/app/views/layouts/tour.html.haml b/app/views/layouts/tour.html.haml index 5d70da39d..631f0175f 100644 --- a/app/views/layouts/tour.html.haml +++ b/app/views/layouts/tour.html.haml @@ -42,13 +42,15 @@ .tour =image_tag "tour-top#{I18n.locale == :en ? '-eng' : ''}.png", :alt => 'ABF' .both + = render 'layouts/noscript' + = render 'layouts/flashes' %article = yield .both -# No idea why here was this div... -#.tour-gap %footer= render "layouts/menu/bottom" - = render 'layouts/counters' unless current_user.try(:admin?) + = render 'layouts/counters' if !current_user.try(:admin?) && Rails.env.production? :javascript $(document).ready(function() { $().piroBox_ext({ diff --git a/app/views/pages/root.html.haml b/app/views/pages/root.html.haml deleted file mode 100644 index 0817ea065..000000000 --- a/app/views/pages/root.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.root - = form_tag search_index_path, :method => 'get' do - = text_field_tag 'query', params[:query], :placeholder => t("layout.search.header"), :class => 'exsearch' - = submit_tag t("layout.search.header") diff --git a/app/views/pages/tos.html.haml b/app/views/pages/tos.html.haml index f554d66e4..bebfa9852 100644 --- a/app/views/pages/tos.html.haml +++ b/app/views/pages/tos.html.haml @@ -40,12 +40,8 @@ You must be a human. Accounts registered by “bots” or other automated methods are not permitted. %li - You must provide your legal full name, a valid email address, and any other - information requested in order to complete the signup process. - %li - Your login may only be used by one person - a single login shared by multiple - people is not permitted. You may create separate logins for as many - people as your plan allows. + To register in ABF, you should provide your legal full name and a valid email address. + It is also possible to register using Google, Facebook or Github account. %li You are responsible for maintaining the security of your account and password. ROSA cannot and will not be liable for any loss or damage from your @@ -66,14 +62,13 @@ %ol %li - To cancel your account, we need a email request sent from the same address - as the. A email request to cancel your account is necessary. + To cancel your account, we need an email request sent from the same address as + the one you are registered with. An email request to cancel your account is necessary. %li - All of your Content will be immediately deleted from the Service upon - cancellation. This information cannot be recovered once your account is cancelled. - %li - If you cancel the Service before the end of your current paid up month, your - cancellation will take effect immediately and you will not be charged again. + All the content from your personal platform repositories will be immediately deleted + from the Service upon cancellation. This information cannot be recovered once your + account is canceled. Any content committed by you to repositories of other platforms + will remain in place until owners of that platforms cancel their accounts. %li ROSA, in its sole discretion, has the right to suspend or terminate your account and refuse any and all current or future use of the Service, or any other ROSA diff --git a/app/views/platforms/base/_sidebar.html.haml b/app/views/platforms/base/_sidebar.html.haml index b5a857be5..827837b02 100644 --- a/app/views/platforms/base/_sidebar.html.haml +++ b/app/views/platforms/base/_sidebar.html.haml @@ -10,11 +10,12 @@ = 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) - - if can? :show, @platform - %li{:class => (contr == :mass_builds && [:index, :create].include?(act)) ? 'active' : ''} + %li{:class => (contr == :mass_builds) ? 'active' : ''} = link_to t("layout.platforms.mass_build"), platform_mass_builds_path(@platform) - if can? :read, @platform.products.build %li{:class => (contr == :products) ? 'active' : ''} @@ -31,6 +32,8 @@ - if can? :edit, @platform %li{:class => (act == :index && contr == :key_pairs) ? 'active' : ''} = link_to t("layout.key_pairs.header"), platform_key_pairs_path(@platform) + %li{:class => (contr == :tokens) ? 'active' : ''} + = link_to t('layout.tokens.header'), platform_tokens_path(@platform) -#- if current_user.owner_of? @platform or current_user.admin? %li{:class => (act == :index && contr == :private_users) ? 'active' : ''} = link_to t("layout.platforms.private_users"), platform_private_users_path(@platform) diff --git a/app/views/platforms/contents/_contents.html.haml b/app/views/platforms/contents/_contents.html.haml new file mode 100644 index 000000000..a94551c71 --- /dev/null +++ b/app/views/platforms/contents/_contents.html.haml @@ -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'), :data => {'disable-with' => t('layout.processing')} + %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} \ No newline at end of file diff --git a/app/views/platforms/contents/index.html.haml b/app/views/platforms/contents/index.html.haml new file mode 100644 index 000000000..84898f087 --- /dev/null +++ b/app/views/platforms/contents/index.html.haml @@ -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'); + }); \ No newline at end of file diff --git a/app/views/platforms/contents/index.js.haml b/app/views/platforms/contents/index.js.haml new file mode 100644 index 000000000..2612b957a --- /dev/null +++ b/app/views/platforms/contents/index.js.haml @@ -0,0 +1,2 @@ +$('#contents').html("#{escape_javascript(render 'contents')}"); +$('.pagination a').attr('data-remote', 'true'); \ No newline at end of file diff --git a/app/views/platforms/key_pairs/_new.html.haml b/app/views/platforms/key_pairs/_new.html.haml index b740fe218..c41dbb1d7 100644 --- a/app/views/platforms/key_pairs/_new.html.haml +++ b/app/views/platforms/key_pairs/_new.html.haml @@ -1,5 +1,3 @@ -= render 'platforms/base/sidebar' - %h3= t("layout.key_pairs.header") = form_for :key_pair, :url => platform_key_pairs_path(@platform), :method => :post, :html => { :class => :form } do |f| @@ -14,4 +12,4 @@ .both .button_block - = submit_tag t("layout.save") + = submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} diff --git a/app/views/platforms/key_pairs/index.html.haml b/app/views/platforms/key_pairs/index.html.haml index b04743a34..1d1959d5e 100644 --- a/app/views/platforms/key_pairs/index.html.haml +++ b/app/views/platforms/key_pairs/index.html.haml @@ -1,2 +1,6 @@ +- set_meta_tags :title => [title_object(@platform), t('layout.key_pairs.header')] += render 'platforms/base/submenu' += render 'platforms/base/sidebar' + = render 'new' if can? :edit, @platform = render 'list' diff --git a/app/views/platforms/maintainers/_list.html.haml b/app/views/platforms/maintainers/_list.html.haml index 6effeb766..153e5f88b 100644 --- a/app/views/platforms/maintainers/_list.html.haml +++ b/app/views/platforms/maintainers/_list.html.haml @@ -12,6 +12,7 @@ = form_tag platform_maintainers_path(@platform), :method => :get do |f| = text_field_tag('q', params[:q], :placeholder => t("layout.maintainers.search_by_package"), :class => params[:q].present? ? 'black' : 'gray') %input{:type => 'submit', :value => t("layout.search.header")} + = submit_tag t('layout.search.header'), :data => {'disable-with' => t('layout.processing')} = button_to t('layout.clear'), {:action => :index} , :method => :get %tbody diff --git a/app/views/platforms/mass_builds/_form.html.haml b/app/views/platforms/mass_builds/_form.html.haml deleted file mode 100644 index 88748ed12..000000000 --- a/app/views/platforms/mass_builds/_form.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -= form_for :build, :url => platform_mass_builds_path(@platform), :html => { :class => 'form mass_build', :method => :post } do |f| - %section.left - =render 'repos_or_list_choice' - %br - = f.submit t("layout.projects.build_button") - %section.right - %h3= t("activerecord.attributes.build_list.arch") - - Arch.recent.each do |arch| - .lefter - = check_box_tag "arches[]", arch.id, (params[:arches]||[]).include?(arch.id.to_s), :id => "arches_#{arch.id}" - = label_tag "arches_#{arch.id}", arch.name - .both - %h3= t("activerecord.attributes.build_list.preferences") - .both.bottom_20 - = check_box_tag :auto_publish, true, @auto_publish_selected, :id => 'auto_publish' - = label_tag :auto_publish, t('activerecord.attributes.build_list.auto_publish') -.both \ No newline at end of file diff --git a/app/views/platforms/mass_builds/_repos_or_list_choice.html.haml b/app/views/platforms/mass_builds/_repos_or_list_choice.html.haml deleted file mode 100644 index 96512af3d..000000000 --- a/app/views/platforms/mass_builds/_repos_or_list_choice.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%h3=t("layout.mass_builds.repositories") --@platform.repositories.each do |rep| - .both - =check_box_tag "repositories[]", rep.id, (params[:repositories]||[]).include?(rep.id.to_s), :id => "repositories_#{rep.id}", :href => "#{projects_list_platform_repository_path(@platform, rep)}?text=true" - =label_tag "repositories_#{rep.id}", rep.name -%h3=t("layout.mass_builds.projects_list") -=text_area_tag :projects_list, nil - diff --git a/app/views/platforms/mass_builds/index.html.haml b/app/views/platforms/mass_builds/index.html.haml index d965430c2..03f756f50 100644 --- a/app/views/platforms/mass_builds/index.html.haml +++ b/app/views/platforms/mass_builds/index.html.haml @@ -1,7 +1,7 @@ = render 'platforms/base/submenu' = render 'platforms/base/sidebar' -= render 'form' if can? :edit, @platform += link_to t('layout.mass_builds.new'), new_platform_mass_build_path(@platform), :class => 'button' if can? :create, @platform.mass_builds.build %table.tablesorter.unbordered{:cellpadding => "0", :cellspacing => "0"} %thead @@ -46,15 +46,10 @@ -if mass_build.projects_list.present? = link_to_list @platform, mass_build, 'projects_list' .both - = t('activerecord.attributes.mass_build.arch_names') + ": " - = mass_build.arch_names - .both = t('activerecord.attributes.mass_build.user') + ": " = link_to mass_build.user.fullname, mass_build.user - .both - = t('activerecord.attributes.mass_build.auto_publish') + ": " - = mass_build.auto_publish - .both - = t('activerecord.attributes.mass_build.created_at') + ": " - = mass_build.created_at + - [:arch_names, :auto_publish, :increase_release_tag, :created_at].each do |field| + .both + = t("activerecord.attributes.mass_build.#{field}") + ": " + = mass_build.send field = will_paginate @mass_builds diff --git a/app/views/platforms/mass_builds/new.html.haml b/app/views/platforms/mass_builds/new.html.haml new file mode 100644 index 000000000..d7c1eaea0 --- /dev/null +++ b/app/views/platforms/mass_builds/new.html.haml @@ -0,0 +1,47 @@ +- set_meta_tags :title => [title_object(@platform), t('layout.mass_builds.new')] + += render 'platforms/base/submenu' += render 'platforms/base/sidebar' + += form_for [@platform, @mass_build], :html => { :class => 'form mass_build', :method => :post } do |f| + %section.left + %h3=t('layout.mass_builds.repositories') + - @platform.repositories.each do |rep| + .both + = check_box_tag "repositories[]", rep.id, (params[:repositories]||[]).include?(rep.id.to_s), :id => "repositories_#{rep.id}", :href => "#{projects_list_platform_repository_path(@platform, rep)}?text=true" + = label_tag "repositories_#{rep.id}", rep.name + %h3=t('layout.mass_builds.projects_list') + = f.text_area :projects_list + %br + = f.submit t('layout.projects.build_button'), :data => {'disable-with' => t('layout.processing')} + %section.right + %h3= t("activerecord.attributes.build_list.arch") + - Arch.recent.each do |arch| + .lefter + = check_box_tag "arches[]", arch.id, (params[:arches]||[]).include?(arch.id.to_s), :id => "arches_#{arch.id}" + = label_tag "arches_#{arch.id}", arch.name + .both + - if @platform.personal? + %h3= t('activerecord.attributes.build_list.build_for_platform') + = f.collection_select :build_for_platform_id, Platform.main, :id, :name + .both + = hidden_field_tag :autocomplete_extra_repos_path, + "#{autocomplete_extra_repositories_autocompletes_path}?#{{:platform_id => @mass_build.save_to_platform.try(:id)}.to_param}" + = render 'shared/autocomplete_form', + :field => :extra_repositories, + :field_class => Repository, + :placeholder => 'uxteam_personal', + :subject => @mass_build, + :autocomplete_path => autocomplete_extra_repositories_autocompletes_path + = render 'shared/autocomplete_form', + :field => :extra_build_lists, + :field_class => BuildList, + :placeholder => '1000000', + :subject => @mass_build, + :autocomplete_path => autocomplete_extra_build_list_autocompletes_path + %h3= t("activerecord.attributes.build_list.preferences") + - [:auto_publish, :increase_release_tag].each do |field| + .both + = f.check_box field + = f.label field +.both diff --git a/app/views/platforms/platforms/_form.html.haml b/app/views/platforms/platforms/_form.html.haml index 4508e03b6..9d7400dcd 100644 --- a/app/views/platforms/platforms/_form.html.haml +++ b/app/views/platforms/platforms/_form.html.haml @@ -26,10 +26,26 @@ = hidden_field_tag 'admin_id', @admin_id, :id => 'admin_id_field' .both + %h3= t('layout.platform_arch_settings.extra_settings') + + %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} + %thead + %tr + %th.lpadding16= t("activerecord.models.arch") + %th.lpadding16= t("activerecord.attributes.platform_arch_setting.default") + %th.lpadding16= t("activerecord.attributes.platform_arch_setting.time_living") + %tbody + - platform_arch_settings(@platform).each do |setting| + %tr{:class => cycle("odd", "even")} + = f.fields_for :platform_arch_settings, setting do |s_form| + %td + = setting.arch.name + = s_form.hidden_field :arch_id + %td.center= s_form.check_box :default, :class => 'check_box' + %td.right= s_form.text_field :time_living, :value => setting.time_living / 60, :class => 'text_field', :size => 10 + .both + .button_block - = submit_tag t("layout.save") - -#%input.button{:type => "submit", :class => "button"} - -#= image_tag("choose.png", :alt => t("layout.save")) - -#= t("layout.clone") + = f.submit t('layout.save'), :data => {'disable-with' => t('layout.saving')} %span.text_button_padding= t("layout.or") = link_to t("layout.cancel"), @platform.new_record? ? root_path : platform_path(@platform), :class => "button" diff --git a/app/views/platforms/platforms/clone.html.haml b/app/views/platforms/platforms/clone.html.haml index e72f71a65..b4f65eee6 100644 --- a/app/views/platforms/platforms/clone.html.haml +++ b/app/views/platforms/platforms/clone.html.haml @@ -12,6 +12,6 @@ .both .button_block - = submit_tag t("layout.clone") + = submit_tag t('layout.clone'), :data => {'disable-with' => t('layout.processing')} %span.text_button_padding= t("layout.or") = link_to t("layout.cancel"), platform_path(@platform), :class => "button" \ No newline at end of file diff --git a/app/views/platforms/platforms/edit.html.haml b/app/views/platforms/platforms/edit.html.haml index 18442734e..9d8323e44 100644 --- a/app/views/platforms/platforms/edit.html.haml +++ b/app/views/platforms/platforms/edit.html.haml @@ -5,6 +5,35 @@ = form_for @platform, :url => platform_path(@platform), :html => { :class => :form } do |f| = render "form", :f => f +- if can? :change_visibility, @platform + .hr + .leftside= t('activerecord.attributes.platform.visibility') + .rightside= link_to t("layout.platforms.change_visibility_from_#{@platform.visibility}"), + change_visibility_platform_path(@platform), + :method => :post, + :confirm => t("layout.platforms.confirm_change_visibility"), + :class => 'button' + .both + +- if can? :regenerate_metadata, @platform + .hr + %h3= t('layout.platforms.metadata') + .leftlist= t('activerecord.attributes.regeneration_status.status') + .rightlist= t("layout.regeneration_statuses.statuses.#{@platform.human_status}") + .both + .leftlist= t('activerecord.attributes.regeneration_status.last_regenerated_at') + .rightlist= @platform.last_regenerated_at + .both + .leftlist= t('activerecord.attributes.regeneration_status.last_regenerated_status') + .rightlist= t("layout.regeneration_statuses.last_regenerated_statuses.#{@platform.human_regeneration_status}") + .both + .leftlist= t('activerecord.attributes.regeneration_status.last_regenerated_log_sha1') + .rightlist= link_to_file_store('regeneration.log', @platform.last_regenerated_log_sha1) + .both + .leftside + .rightside= link_to t('layout.regeneration_statuses.regenerate_metadata'), regenerate_metadata_platform_path(@platform), :method => :put, :confirm => t('layout.confirm'), :class => 'button' + .both + - if can? :destroy, @platform .hr .leftside= t("layout.platforms.delete_warning") @@ -12,5 +41,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 diff --git a/app/views/platforms/platforms/show.html.haml b/app/views/platforms/platforms/show.html.haml index 0461c86d6..14aa01776 100644 --- a/app/views/platforms/platforms/show.html.haml +++ b/app/views/platforms/platforms/show.html.haml @@ -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 diff --git a/app/views/platforms/product_build_lists/_filter.html.haml b/app/views/platforms/product_build_lists/_filter.html.haml index fa2824e48..5104d3208 100644 --- a/app/views/platforms/product_build_lists/_filter.html.haml +++ b/app/views/platforms/product_build_lists/_filter.html.haml @@ -1,5 +1,5 @@ - content_for :sidebar do - = render 'projects/build_lists/server_status', :queues => [:iso] + = render 'server_status' = form_tag product_build_lists_path, :method => :get, :html => {:class => :form} do .block @@ -11,4 +11,4 @@ = text_field_tag :product_id, params[:product_id] %br %br - = submit_tag t("layout.search.header") \ No newline at end of file + = submit_tag t('layout.search.header'), :data => {'disable-with' => t('layout.processing')} \ No newline at end of file diff --git a/app/views/platforms/product_build_lists/_product_build_list.html.haml b/app/views/platforms/product_build_lists/_product_build_list.html.haml index 3b1765fc1..dd5bd8107 100644 --- a/app/views/platforms/product_build_lists/_product_build_list.html.haml +++ b/app/views/platforms/product_build_lists/_product_build_list.html.haml @@ -10,4 +10,4 @@ %td= link_to(nil, pbl.container_path) unless pbl.project %td= link_to pbl.product.name, platform_product_path(platform, product) %td= link_to image_tag('x.png'), platform_product_product_build_list_path(platform, product, pbl), :method => :delete, :confirm => t("layout.confirm") if can?(:destroy, pbl) && pbl.can_destroy? && !pbl.project - %td= l(pbl.updated_at, :format => :long) \ No newline at end of file + = datetime_moment pbl.updated_at, :tag => :td \ No newline at end of file diff --git a/app/views/platforms/product_build_lists/_results.html.haml b/app/views/platforms/product_build_lists/_results.html.haml deleted file mode 100644 index 6e458cce5..000000000 --- a/app/views/platforms/product_build_lists/_results.html.haml +++ /dev/null @@ -1,21 +0,0 @@ -%h3= subject.class.human_attribute_name(subject.is_a?(BuildList) ? 'logs' : 'results') -- unless subject.results.present? - %h4.nomargin= t('layout.no_') -- else - %table.tablesorter.width565{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th= t("activerecord.attributes.product_build_list/results.file_name") - %th= t("activerecord.attributes.product_build_list/results.sha1") - %th= t("activerecord.attributes.product_build_list/results.size") - %tbody - - subject.results.each do |item| - %tr - - sha1 = item['sha1'] - - filename = item['file_name'] - - url = "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{sha1}" - - url << '.log?show=true' if filename =~ /.*\.(log|txt)$/ - %td= link_to filename, url - %td= sha1 - %td= item['size'] -.both \ No newline at end of file diff --git a/app/views/platforms/product_build_lists/_server_status.html.haml b/app/views/platforms/product_build_lists/_server_status.html.haml new file mode 100644 index 000000000..e5c345d4c --- /dev/null +++ b/app/views/platforms/product_build_lists/_server_status.html.haml @@ -0,0 +1,19 @@ +.bordered.nopadding + %h3.medium= t('layout.build_lists.build_server_status.header') + + .table + .lefter= t("layout.build_lists.build_server_status.iso_workers") + .both + .table + .lefter= t("layout.build_lists.build_server_status.amount") + .righter= @build_server_status[:iso][:workers] + .both + - [:tasks, :build_tasks].each do |metric| + .table + .lefter= t("layout.build_lists.build_server_status.#{metric}") + .righter= @build_server_status[:iso][metric] + .both + %br + + + diff --git a/app/views/platforms/product_build_lists/new.html.haml b/app/views/platforms/product_build_lists/new.html.haml index 24743689f..4a9f130bf 100644 --- a/app/views/platforms/product_build_lists/new.html.haml +++ b/app/views/platforms/product_build_lists/new.html.haml @@ -14,7 +14,7 @@ = render 'platforms/products/def_fields', :f => f - = f.submit t("layout.projects.build_button") + = f.submit t('layout.projects.build_button'), :data => {'disable-with' => t('layout.processing')} %br %div diff --git a/app/views/platforms/product_build_lists/show.html.haml b/app/views/platforms/product_build_lists/show.html.haml index c27756272..563b43317 100644 --- a/app/views/platforms/product_build_lists/show.html.haml +++ b/app/views/platforms/product_build_lists/show.html.haml @@ -7,44 +7,49 @@ %h3= t("layout.product_build_lists.main_data") .both +%div{'ng-controller' => 'ProductBuildListController'} + = render 'show_field', :key => :id, :value => pbl.id + = hidden_field_tag :product_build_list_id, pbl.id + = render 'show_field', :key => :status, :value => '{{pbl.human_status}}' + - if pbl.user + = render 'show_field', :key => :user, :value => link_to(pbl.user.try(:fullname), pbl.user) -= render 'show_field', :key => :id, :value => pbl.id -= render 'show_field', :key => :status, :value => pbl.human_status -- if pbl.user - = render 'show_field', :key => :user, :value => link_to(pbl.user.try(:fullname), pbl.user) + = render 'show_field', :key => :product, :value => link_to(pbl.product.name, platform_product_path(platform, product)) -= render 'show_field', :key => :product, :value => link_to(pbl.product.name, platform_product_path(platform, product)) + = render 'show_field', :key => :project, :value => link_to(pbl.project.name_with_owner, project_path(pbl.project)) -= render 'show_field', :key => :project, :value => link_to(pbl.project.name_with_owner, project_path(pbl.project)) + = render 'show_field', :key => :project_version, :value => product_build_list_version_link(pbl, true) -= render 'show_field', :key => :project_version, :value => product_build_list_version_link(pbl, true) + - [:main_script, :params].each do |el| + = render 'show_field', :key => el, :value => pbl.send(el) -- [:main_script, :params].each do |el| - = render 'show_field', :key => el, :value => pbl.send(el) + = render 'show_field', :key => :time_living, :value => (pbl.time_living / 60) -= render 'show_field', :key => :time_living, :value => (pbl.time_living / 60) + = render 'show_field', :key => :autostarted, :value => t("layout.#{pbl.autostarted}_") -= render 'show_field', :key => :autostarted, :value => t("layout.#{pbl.autostarted}_") + = render 'show_field', :key => :notified_at, :value => '{{pbl.notified_at}}' -= render 'show_field', :key => :notified_at, :value => l(pbl.updated_at, :format => :long) - -- if pbl.can_cancel? && can?(:cancel, pbl) - = link_to t("layout.build_lists.cancel"), cancel_platform_product_product_build_list_path(pbl.product.platform, pbl.product, pbl), - :method => :put, :confirm => t("layout.confirm"), :class => 'button' - .both - %br - -- if pbl.build_completed? && can?(:update, pbl) - = form_for pbl, :url => platform_product_product_build_list_path(pbl.product.platform, pbl.product, pbl) do |f| - .leftlist= f.label :not_delete - .rightlist - = f.select :not_delete, [false, true].collect{|status| [t("layout.#{status}_"), status]}, {:selected => pbl.not_delete} - .both - %br - = submit_tag t('layout.update') + - if can?(:cancel, pbl) + = link_to t("layout.build_lists.cancel"), + cancel_platform_product_product_build_list_path(pbl.product.platform, pbl.product, pbl), + :method => :put, :confirm => t("layout.confirm"), :class => 'button', + 'ng-show' => 'pbl.can_cancel' .both -- unless pbl.not_delete - .flash_notify + %br + + - if can?(:update, pbl) + = form_for pbl, + :url => platform_product_product_build_list_path(pbl.product.platform,pbl.product, pbl), + :html => {'ng-show' => "pbl.status == #{ProductBuildList::BUILD_COMPLETED}"} do |f| + + .leftlist= f.label :not_delete + .rightlist + = f.select :not_delete, [false, true].collect{|status| [t("layout.#{status}_"), status]}, {:selected => pbl.not_delete} + .both + %br + = submit_tag t('layout.update'), :data => {'disable-with' => t('layout.processing')} + .both + .flash_notify{'ng-hide' => 'pbl.not_delete'} .alert.alert-error - days = pbl.autostarted? ? ProductBuildList::LIVE_TIME : ProductBuildList::MAX_LIVE_TIME - days = (pbl.created_at.to_date - days.ago.to_date).to_i @@ -54,10 +59,10 @@ = t('layout.product_build_lists.will_be_removed_today') .both -- if pbl.build_started? || pbl.build_canceling? - = render 'shared/log', { :build_started => true, :get_log_path => log_platform_product_product_build_list_path(pbl.product.platform, pbl.product, pbl) } + %div{'ng-show' => "pbl.status == #{ProductBuildList::BUILD_STARTED}"} + = render 'shared/log', { :build_started => true, :get_log_path => log_platform_product_product_build_list_path(pbl.product.platform, pbl.product, pbl) } -= render 'results', :subject => pbl + = render 'shared/build_results', :subject => pbl :javascript $(function(){ diff --git a/app/views/platforms/product_build_lists/show.json.jbuilder b/app/views/platforms/product_build_lists/show.json.jbuilder new file mode 100644 index 000000000..543fb0dce --- /dev/null +++ b/app/views/platforms/product_build_lists/show.json.jbuilder @@ -0,0 +1,14 @@ +json.product_build_list do + json.(@product_build_list, :id, :status, :human_status, :not_delete) + json.notified_at l(@product_build_list.updated_at, :format => :long) + + json.can_cancel @product_build_list.can_cancel? + + json.results @product_build_list.results do |result| + json.file_name result['file_name'] + json.sha1 result['sha1'] + json.size result['size'] + json.url file_store_results_url(result['sha1'], result['file_name']) + end if @product_build_list.results.present? + +end diff --git a/app/views/platforms/products/_form.html.haml b/app/views/platforms/products/_form.html.haml index 0095616ad..919fd0538 100644 --- a/app/views/platforms/products/_form.html.haml +++ b/app/views/platforms/products/_form.html.haml @@ -21,7 +21,7 @@ .both .button_block - = submit_tag t("layout.save") + = submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} %span.text_button_padding= t("layout.or") = link_to t("layout.cancel"), @product.new_record? ? platform_path(@platform) : platform_product_path(@platform, @product), :class => "button" diff --git a/app/views/platforms/repositories/_form.html.haml b/app/views/platforms/repositories/_form.html.haml index e8e3a1b91..0e430665c 100644 --- a/app/views/platforms/repositories/_form.html.haml +++ b/app/views/platforms/repositories/_form.html.haml @@ -10,15 +10,8 @@ .both .hr -- if ['edit', 'update'].include?(controller.action_name) && can?(:regenerate_metadata, @repository) - .leftside= t('layout.repositories.regenerate_metadata') - .rightside - = link_to t('layout.repositories.regenerate_metadata').split.first, regenerate_metadata_platform_repository_path(@platform, @repository), - :method => :put, :confirm => t('layout.confirm'), :class => :button -.hr{:style => 'padding-bottom:20px;'} -.both .button_block - = submit_tag t("layout.save") + = submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} %span.text_button_padding= t("layout.or") = link_to t("layout.cancel"), @repository.new_record? ? platform_repositories_path(@platform) : platform_repository_path(@platform, @repository), :class => "button" diff --git a/app/views/platforms/repositories/edit.html.haml b/app/views/platforms/repositories/edit.html.haml index 5a9f1b232..7e6698996 100644 --- a/app/views/platforms/repositories/edit.html.haml +++ b/app/views/platforms/repositories/edit.html.haml @@ -8,9 +8,57 @@ = render "form", :f => f %br -= render "shared/members_table", - :remove_members_path => remove_members_platform_repository_path(@platform, @repository), - :remove_member_path => remove_member_platform_repository_path(@platform, @repository), - :add_member_path => add_member_platform_repository_path(@platform, @repository), - :members => @members, - :editable_object => @repository +- if can?(:update, @repository) + .hr + %h3= t('layout.repositories.extra_actions') + + = form_for @repository, :url => regenerate_metadata_platform_repository_path(@platform, @repository), :html => { :class => :form, :method => :put } do |f| + .leftlist= t('layout.repositories.regenerate_metadata') + .rightlist + = select_tag :build_for_platform_id, options_from_collection_for_select(Platform.main, :id, :name) if @platform.personal? + = f.submit t('layout.repositories.regenerate_metadata'), :confirm => t('layout.confirm') + .both + + - if @repository.repository_statuses.present? + %table#myTable.tablesorter.platform-repos{:cellspacing => "0", :cellpadding => "0"} + %thead + %tr + %th= t('activerecord.attributes.regeneration_status.status') + %th= t('activerecord.attributes.regeneration_status.last_regenerated_status') + %th= t('activerecord.attributes.regeneration_status.last_regenerated_log_sha1') + %th= t('activerecord.attributes.regeneration_status.last_regenerated_at') + - unless @platform.main? + %th= t('activerecord.models.platform') + %tbody + - @repository.repository_statuses.sort_by{ |s| s.platform.name }.each do |status| + %tr{:class => cycle('odd', 'even')} + %td= t("layout.regeneration_statuses.statuses.#{status.human_status}") + %td= t("layout.regeneration_statuses.last_regenerated_statuses.#{status.human_regeneration_status}") + %td= link_to_file_store('regeneration.log', status.last_regenerated_log_sha1) + %td= status.last_regenerated_at + - unless @platform.main? + %td= status.platform.name + .both + + - if @platform.main? + - if @repository.sync_lock_file_exists? + - label = t('layout.repositories.remove_sync_lock_file') + - path = sync_lock_file_platform_repository_path(@platform, @repository, :remove => true) + - else + - label = t('layout.repositories.add_sync_lock_file') + - path = sync_lock_file_platform_repository_path(@platform, @repository) + = form_for @repository, :url => path, :html => { :class => :form, :method => :put } do |f| + .leftlist= t('layout.repositories.sync_lock_file_info') + .rightlist= f.submit label, :confirm => t('layout.confirm') + .both + .hr + + + +- if @platform.main? + = render "shared/members_table", + :remove_members_path => remove_members_platform_repository_path(@platform, @repository), + :remove_member_path => remove_member_platform_repository_path(@platform, @repository), + :add_member_path => add_member_platform_repository_path(@platform, @repository), + :members => @members, + :editable_object => @repository diff --git a/app/views/platforms/repositories/projects_list.html.haml b/app/views/platforms/repositories/projects_list.html.haml index 26de0610c..e744a5d90 100644 --- a/app/views/platforms/repositories/projects_list.html.haml +++ b/app/views/platforms/repositories/projects_list.html.haml @@ -1,6 +1,14 @@ = render 'submenu' = render 'sidebar' -%h3= raw "#{t("layout.repositories.add_project_to")}: #{link_to @repository.name, platform_repository_path(@platform, @repository)}" +%h3= raw "#{t("layout.repositories.add_projects_to")}: #{link_to @repository.name, platform_repository_path(@platform, @repository)}" + += form_for :repository, :url => add_project_platform_repository_path(@platform, @repository), :method => :put, :html => { :class => :form } do |f| + .leftlist= f.label :projects_list + .rightlist= f.text_area :projects_list + .both + .hr + .button_block + = submit_tag t('layout.add'), :data => {'disable-with' => t('layout.saving')} = render 'proj_list', :object => @projects diff --git a/app/views/platforms/repositories/remove_project.html.haml b/app/views/platforms/repositories/remove_project.html.haml new file mode 100644 index 000000000..1fc5b0ed1 --- /dev/null +++ b/app/views/platforms/repositories/remove_project.html.haml @@ -0,0 +1,12 @@ += render 'submenu' += render 'sidebar' + +%h3= raw "#{t("layout.repositories.remove_projects_from")}: #{link_to @repository.name, platform_repository_path(@platform, @repository)}" + += form_for :repository, :url => remove_project_platform_repository_path(@platform, @repository), :method => :delete, :html => { :class => :form } do |f| + .leftlist= f.label :projects_list + .rightlist= f.text_area :projects_list + .both + .hr + .button_block + = submit_tag t('layout.delete'), :data => {'disable-with' => t('layout.saving')} diff --git a/app/views/platforms/repositories/show.html.haml b/app/views/platforms/repositories/show.html.haml index 5bc491bfe..ddfba3750 100644 --- a/app/views/platforms/repositories/show.html.haml +++ b/app/views/platforms/repositories/show.html.haml @@ -16,5 +16,7 @@ %h3.fix= t("layout.projects.list_header") - if can? :add_project, @repository = link_to t("layout.projects.add"), add_project_platform_repository_path(@platform, @repository), :class => 'button' +- if can? :remove_project, @repository + = link_to t("layout.repositories.mass_delete"), remove_project_platform_repository_path(@platform, @repository), :class => 'button' = render 'proj_list' diff --git a/app/views/platforms/tokens/index.html.haml b/app/views/platforms/tokens/index.html.haml new file mode 100644 index 000000000..efbe92cfd --- /dev/null +++ b/app/views/platforms/tokens/index.html.haml @@ -0,0 +1,21 @@ +-set_meta_tags :title => [title_object(@platform), t('layout.tokens.header')] += render 'submenu' += render 'sidebar' += link_to t('layout.tokens.new'), new_platform_token_path(@platform), :class => 'button' + +%table#myTable.tablesorter.tokens{:cellspacing => "0", :cellpadding => "0"} + %thead + %tr + %th= t('activerecord.attributes.token.description') + %th.th2= t('activerecord.attributes.token.creator') + %th= t('activerecord.attributes.token.status') + %th + %tbody + - @tokens.each do |token| + %tr{:class => cycle('odd', 'even')} + %td= truncate token.description, :length => 50 + %td= link_to token.creator.try(:fullname), token.creator + %td= t("layout.tokens.statuses.#{token.status}") + %td= link_to t('layout.show'), platform_token_path(@platform, token) + += will_paginate @tokens diff --git a/app/views/platforms/tokens/new.html.haml b/app/views/platforms/tokens/new.html.haml new file mode 100644 index 000000000..c4d22153c --- /dev/null +++ b/app/views/platforms/tokens/new.html.haml @@ -0,0 +1,16 @@ +-set_meta_tags :title => [title_object(@platform), t('layout.tokens.new')] += render 'submenu' += render 'sidebar' + +%h3= t('layout.tokens.new') + += form_for @token, :url => platform_tokens_path(@platform), :method => :post, :html => { :class => :form } do |f| + .leftlist= f.label :description + .rightlist= f.text_area :description + + .both + .hr + .button_block + = submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} + %span.text_button_padding= t('layout.or') + = link_to t('layout.cancel'), platform_tokens_path(@platform), :class => 'button' diff --git a/app/views/platforms/tokens/show.html.haml b/app/views/platforms/tokens/show.html.haml new file mode 100644 index 000000000..59084b6c5 --- /dev/null +++ b/app/views/platforms/tokens/show.html.haml @@ -0,0 +1,41 @@ +-set_meta_tags :title => [title_object(@platform), t('layout.tokens.header')] += render 'submenu' += render 'sidebar' + +%h3.fix= "#{t('layout.tokens.about')} #{@platform.name}" + +%p= @token.description + +%table.tablesorter.unbordered + %tr + %td + %b= "#{t('activerecord.attributes.token.creator')}:" + %td= link_to @token.creator.try(:name), @token.creator + %tr + %td + %b= "#{t('activerecord.attributes.token.created_at')}:" + %td= @token.created_at + - if @token.updater + %tr + %td + %b= "#{t('activerecord.attributes.token.updater')}:" + %td= link_to @token.updater.try(:name), @token.updater if @token.updater + %tr + %td + %b= "#{t('activerecord.attributes.token.updated_at')}:" + %td= @token.updated_at + %tr + %td + %b= "#{t('activerecord.attributes.token.status')}:" + %td= t("layout.tokens.statuses.#{@token.status}") + %tr + %td + %b= "#{t('activerecord.attributes.token.authentication_token')}:" + %td= @token.authentication_token + +- if @token.active? + .buttons_block + = link_to t('layout.tokens.withdraw'), + withdraw_platform_token_path(@platform, @token), + :method => :post, :class => 'button', + :confirm => t('layout.tokens.withdraw_confirm') diff --git a/app/views/projects/base/_repo_block.html.haml b/app/views/projects/base/_repo_block.html.haml index 5f873fdf5..e641613dc 100644 --- a/app/views/projects/base/_repo_block.html.haml +++ b/app/views/projects/base/_repo_block.html.haml @@ -1,7 +1,7 @@ - act = action_name.to_sym; contr = controller_name.to_sym; treeish = project.default_head(params[:treeish]); branch = @branch.try(:name) || project.default_head -http_url = git_repo_url(project.name_with_owner) -ssh_url = git_ssh_repo_url(project.name_with_owner) -#description-top +#description-top{'ng-controller' => 'ProjectRepoBlockController', 'ng-init' => "init(#{project.repo.branches.count})"} -if @commit %ul.nav.zip %li#menu-archive.dropdown @@ -42,7 +42,7 @@ %li{:class => ('selected' if act == :index && contr == :commits )} = link_to t('project_menu.commits'), commits_path(project, treeish) %li{:class => ('selected' if act == :branches && contr == :trees )} - = link_to t('project_menu.branches', :count => project.repo.branches.count), branches_path(project, branch) + = link_to t('project_menu.branches', :count => '{{singleton.project.branches_count}}'), branch_path(project, branch) %li.tags{:class => ('selected' if act == :tags && contr == :trees )} = link_to t('project_menu.tags', :count => project.repo.tags.count), tags_path(project) .both diff --git a/app/views/projects/base/_sidebar.html.haml b/app/views/projects/base/_sidebar.html.haml index 1468d6b79..4b5429d7d 100644 --- a/app/views/projects/base/_sidebar.html.haml +++ b/app/views/projects/base/_sidebar.html.haml @@ -10,6 +10,8 @@ = link_to t("layout.projects.edit"), edit_project_path(@project) %li{:class => (act == :sections && contr == :projects) ? 'active' : ''} = link_to t("layout.projects.sections"), sections_project_path(@project) + %li{:class => (contr == :hooks) ? 'active' : ''} + = link_to t("layout.projects.hooks"), project_hooks_path(@project) - if can? :manage_collaborators, @project %li{:class => (act == :index && contr == :collaborators) ? 'active' : ''} = link_to t("layout.projects.edit_collaborators"), project_collaborators_path(@project) diff --git a/app/views/projects/build_lists/_build_list.html.haml b/app/views/projects/build_lists/_build_list.html.haml deleted file mode 100644 index 4452174c3..000000000 --- a/app/views/projects/build_lists/_build_list.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -%tr{:id => "row#{build_list_counter}", :class => "#{build_list_status_color(build_list.status)}"} - %td= link_to (build_list.bs_id.present? ? build_list.bs_id : t("layout.build_lists.bs_id_not_set")), build_list - %td - = build_list.human_status - %br - - if BuildList::HUMAN_STATUSES[build_list.status].in? [:build_pending, :build_started, :build_publish] - %time.js-relative-date{:datetime => build_list.updated_at.strftime("%FT%T%:z"), :title => build_list.updated_at.strftime("%F %T")} - = build_list.updated_at.strftime "%F %T" - - if build_list.build_started? && ((build_list.project.average_build_time || 0) > 0) - \/ - %time - = build_list.project.formatted_average_build_time - - if build_list.project.present? - %td= link_to build_list.project.name_with_owner, build_list.project - %td= build_list_version_link(build_list) - - else - %td.centered{:colspan => 2}= t("layout.projects.unexisted_project") - %td= get_version_release build_list - -build_for=" (#{build_list.build_for_platform.name})" if build_list.build_for_platform && build_list.save_to_platform.personal? - %td= link_to "#{build_list.save_to_platform.name}/#{build_list.save_to_repository.name}#{build_for}", [build_list.save_to_platform, build_list.save_to_repository] - %td= build_list.arch.try(:name) || t("layout.arches.unexisted_arch") - %td= link_to build_list.user.try(:fullname), build_list.user - %td= build_list.updated_at.strftime('%d/%m/%Y') diff --git a/app/views/projects/build_lists/_build_lists_ajax.json.jbuilder b/app/views/projects/build_lists/_build_lists_ajax.json.jbuilder new file mode 100644 index 000000000..e56af59b0 --- /dev/null +++ b/app/views/projects/build_lists/_build_lists_ajax.json.jbuilder @@ -0,0 +1,21 @@ +build_lists = @build_lists.map do |build_list| + build_for = " (#{build_list.build_for_platform.name})" if build_list.build_for_platform && build_list.save_to_platform.personal? + [ + [link_to(build_list.id, build_list), + link_to(t('layout.clone'), new_project_build_list_path(@project, :build_list_id => build_list.id), + :id => 'clone_build_list') + ].join('
').html_safe, + build_list.human_status, + build_list_version_link(build_list), + get_version_release(build_list), + link_to("#{build_list.save_to_platform.name}/#{build_list.save_to_repository.name}#{build_for}", [build_list.save_to_platform, build_list.save_to_repository]), + build_list.arch.try(:name) || t('layout.arches.unexisted_arch'), + link_to(build_list.user.try(:fullname), build_list.user), + datetime_moment(build_list.updated_at).html_safe + ] +end + +json.sEcho params[:sEcho].to_i || -1 +json.iTotalRecords @total_build_lists +json.iTotalDisplayRecords @build_lists.count +json.aaData build_lists diff --git a/app/views/projects/build_lists/_extra.html.haml b/app/views/projects/build_lists/_extra.html.haml deleted file mode 100644 index 93afd9372..000000000 --- a/app/views/projects/build_lists/_extra.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -%tr - - if extra.is_a?(BuildList) - %td= link_to "#{extra.id} (#{extra.project.name} - #{extra.arch.name})", extra - - else - %td= link_to "#{extra.platform.name}/#{extra.name}", [extra.platform, extra] - %td.actions - - field = extra.is_a?(BuildList) ? 'extra_build_lists' : 'extra_repositories' - = hidden_field_tag "build_list[#{field}][]", extra.id - %span.delete \ No newline at end of file diff --git a/app/views/projects/build_lists/_filter.html.haml b/app/views/projects/build_lists/_filter.html.haml index 97de8cb5a..b0fad9ee4 100644 --- a/app/views/projects/build_lists/_filter.html.haml +++ b/app/views/projects/build_lists/_filter.html.haml @@ -1,10 +1,11 @@ -html_options = {:class => 'sel80 medium input_cleanse', :tabindex => 2} .top.box .filter - = form_for :filter, :url => @action_url, :html => { :method => :post, :class => :form, :id => 'monitoring_filter' } do |f| + = form_for :filter, :html => {:class => :form, :id => 'monitoring_filter', 'ng-submit' => 'refresh(true)'}, :authenticity_token => false do |f| .column = render 'server_status' - = hidden_field_tag :servertime, Time.now.utc.to_i + = hidden_field_tag :owner_name, @project.try(:owner).try(:uname) + = hidden_field_tag :project_name, @project.try(:name) .reloader = label_tag :autoreload do = check_box_tag :autoreload, true, true @@ -13,50 +14,51 @@ - if current_user .bordered.nopadding %h3.medium= t("layout.build_lists.ownership.header") - =f.hidden_field :ownership + =f.hidden_field :ownership, :value => '{{params.filter.ownership}}' .btn-group - ['owned', (@project ? nil : 'related'), 'everything'].compact.each do |ownership| - -options = {:class => @filter.ownership == ownership ? 'active' : '', :value => ownership, :style => (@project ? 'width:50%;' : '')} + -options = {'ng-class' =>"{active: params.filter.ownership == '#{ownership}'}",:value => ownership, :style => (@project ? 'width:50%;' : '')} %button.btn.ownership{options}= t "layout.build_lists.ownership.#{ownership}" %h3.medium= t 'number_rows' - =hidden_field_tag :per_page, @per_page + =hidden_field_tag :per_page, '{{params.per_page}}' + =hidden_field_tag :page, '{{params.page}}' .btn-group -BuildList::Filter::PER_PAGE.each do |num| - %button.btn.per_page{:value => num, :class => @per_page == num ? 'active' : ''}=num + %button.btn.per_page{:value => num, 'ng-class' => "{active: params.per_page == #{num}}"}=num %h3.medium= t 'activerecord.attributes.build_list.status' .lineForm.aside - = f.select :status, BuildList::STATUSES.collect{|status| [BuildList.human_status(status), status]}, {:include_blank => true, :selected => @filter.status}, - html_options.merge(:id => 'status') + = f.select :status, BuildList::STATUSES.collect{|status| [BuildList.human_status(status), status]}, {:include_blank => true}, + html_options.merge(:id => 'status', 'ng-model' => 'params.filter.status') .both %br/ .column %h3.medium= t 'activerecord.models.platform' .lineForm.aside - = f.select :platform_id, Platform.main.collect{|pl| [pl.name, pl.id]}, {:include_blank => true, :selected => @filter.platform_id}, html_options.merge(:id => 'platform') + = f.select :platform_id, availables_main_platforms.collect{|pl| [pl.name, pl.id]}, {:include_blank => true}, html_options.merge(:id => 'platform', 'ng-model' => 'params.filter.platform_id') %h3.medium= t 'activerecord.attributes.build_list.arch' .lineForm.aside - = f.select :arch_id, Arch.recent.collect{|arch| [arch.name, arch.id]}, {:include_blank => true, :selected => @filter.arch_id}, html_options.merge(:id => 'architecture') + = f.select :arch_id, Arch.recent.collect{|arch| [arch.name, arch.id]}, {:include_blank => true}, html_options.merge(:id => 'architecture', 'ng-model' => 'params.filter.arch_id') %h3.medium= t 'activerecord.models.mass_build' .lineForm.aside - = f.select :mass_build_id, options_from_collection_for_select( MassBuild.all, :id, :name, @filter.mass_build_id ), {:include_blank => true, :selected => @filter.mass_build_id}, - html_options.merge(:id => 'mass_build') + = f.select :mass_build_id, mass_build_options, {:include_blank => true}, + html_options.merge(:id => 'mass_build', 'ng-model' => 'params.filter.mass_build_id') .column -[:updated_at_start, :updated_at_end].each do |attr| -class_name, message = attr == :updated_at_start ? %w[floatleft _on] : %w[floatright until] %div{:class => class_name} %h3.medium= t message - -date = @filter.send(attr) ? @filter.send(attr).strftime('%d/%m/%Y') : nil - =f.text_field attr, :readonly => "readonly", :size => 10, :class => 'mediumheight min input_cleanse', :value => date + =f.text_field attr, :readonly => "readonly", :size => 10, :class => 'mediumheight min input_cleanse', :value => "{{params.filter.#{attr}}}" =link_to image_tag('x.png', :alt => 'x', :class => 'semi'), "#filter_#{attr}", :id => 'updated_at_clear' .both - -%w[project_name bs_id].each do |filter| + -%w[project_name id].each do |filter| %h3.medium= t "layout.build_lists.#{filter}_search" - %input.mediumheight.input_cleanse{:id => "filter_#{filter}", :name => "filter[#{filter}]", :size => "30", :type => "text", :value => @filter.send(filter)} + %input.mediumheight.input_cleanse{:id => "filter_#{filter}", :name => "filter[#{filter}]", :size => "30", :type => "text", :value => "{{params.filter.#{filter}}}"} %br/ %br/ .butgrp - = f.submit t('layout.search.header') + = f.submit t('layout.search.header'), 'ng-hide' => 'isRequest' + = f.submit t('layout.processing'), :disabled => true, 'ng-show' => 'isRequest' = f.submit t('reset'), :id => 'filter_clear' -if @project and can?(:create, @project.build_lists.build) %input{:id => 'filter_new_build', :type => 'button', :onclick => "location.href='#{new_project_build_list_path(@project)}'", :value => t('layout.build_lists.new_header')} diff --git a/app/views/projects/build_lists/_include_repos.html.haml b/app/views/projects/build_lists/_include_repos.html.haml index 504b73cee..a2ce04b12 100644 --- a/app/views/projects/build_lists/_include_repos.html.haml +++ b/app/views/projects/build_lists/_include_repos.html.haml @@ -1,4 +1,9 @@ -- platform.repositories.each do |repo| +- Repository.custom_sort(platform.repositories).each do |repo| .both - = check_box_tag "build_list[include_repos][]", repo.id, repo.name == 'main' || @project.repositories.map(&:id).include?(repo.id), :id => "include_repos_#{repo.id}", :rep_name => repo.name + - if params[:build_list].try(:[], :include_repos).present? + - checked = (params[:build_list].try(:[], :include_repos).map(&:to_s) || []).include?(repo.id.to_s) + - else checked = false + = check_box_tag 'build_list[include_repos][]', repo.id, checked, + :disabled => ((params[:build_list].try(:[], :build_for_platform_id).to_i != platform.id) && @build_list.build_for_platform.try(:main?)), + :id => "include_repos_#{repo.id}", :rep_name => repo.name = label_tag "include_repos_#{repo.id}", repo.name diff --git a/app/views/projects/build_lists/_last_build_lists.html.haml b/app/views/projects/build_lists/_last_build_lists.html.haml new file mode 100644 index 000000000..256b034a5 --- /dev/null +++ b/app/views/projects/build_lists/_last_build_lists.html.haml @@ -0,0 +1,38 @@ +.all + %h3= t 'layout.build_lists.last_build_lists' + %h4= t 'layout.relations.filters' + .both + = check_box_tag :owner_filter_build_lists, true, (params[:owner_filter] || 'true') == 'true' + = label_tag t('layout.build_lists.only_my_build_lists') + .both + = check_box_tag :status_filter_build_lists, true, (params[:status_filter] || 'true') == 'true' + = label_tag t('layout.build_lists.failed_build_lists') + + - columns, default_column = [], {:type => 'html', :sortable => false, :searchable => false} + - 8.times { columns << default_column } + = raw datatable(columns, {:sort_by => "[7, 'asc']", :processing => t('layout.processing'), :search => 'false', + :pagination_labels => {:previous => t('datatables.previous_label'), :next => t('datatables.next_label')}, + :empty_label => t('datatables.empty_label'), + :info_label => t('datatables.info_label'), + :info_empty_label => t('datatables.info_empty_label'), + :filtered_label => t('datatables.filtered_label'), + :table_dom_id => 'datatable', + :auto_width => 'false', + :ajax_source => "#{url_for :controller => 'projects/build_lists', :action => :list}", + :additional_data => {:owner_filter => "' + $('#owner_filter_build_lists:checked').val() + '", + :status_filter => "' + $('#status_filter_build_lists:checked').val() + '"} }) + + %table#datatable.tablesorter.list-users{:cellspacing => 0, :cellpadding => 0} + %thead + %tr + %th.th1= t('activerecord.attributes.build_list.id') + %th.th2= t('activerecord.attributes.build_list.status') + %th.th2= t('diff') + %th.th2= t('activerecord.attributes.build_list.project_version') + %th.th2= t('activerecord.attributes.build_list.save_to_repository') + %th.th1= t('activerecord.attributes.build_list.arch_short') + %th.th2= t('activerecord.attributes.build_list.user') + %th.th1= t('activerecord.attributes.build_list.updated_at') + %tbody + %br + diff --git a/app/views/projects/build_lists/_new_form.html.haml b/app/views/projects/build_lists/_new_form.html.haml new file mode 100644 index 000000000..bd8d47fe9 --- /dev/null +++ b/app/views/projects/build_lists/_new_form.html.haml @@ -0,0 +1,62 @@ += form_for [@project, @build_list], :html => { :class => :form, :method => :post } do |f| + %section.left + %h3= t("activerecord.attributes.build_list.build_for_platform") + .all_platforms + - availables_main_platforms.each do |pl| + .both + %div{:id => "build_for_pl_#{pl.id}", :class => 'build_for_pl'}= pl.name + .offset25= render 'include_repos', :platform => pl + %section.right + %h3= t('activerecord.attributes.build_list.save_to_repository') + - selected = params[:build_list].try(:[], :save_to_repository_id) ? {:selected => params[:build_list][:save_to_repository_id]} : {} + .lineForm= f.select :save_to_repository_id, save_to_repositories(project), selected + %h3= t("activerecord.attributes.build_list.project_version") + .lineForm= f.select :project_version, versions_for_group_select(project), :selected => params[:build_list].try(:[], :project_version) || project.default_branch + %h3= t("activerecord.attributes.build_list.arch") + - Arch.recent.each do |arch| + .both + - checked = (params[:arches]||[]).include?(arch.id.to_s) || (params[:arches].blank? && controller.action_name == 'new' && Arch::DEFAULT.include?(arch.name)) + = check_box_tag "arches[]", arch.id, checked, :id => "arches_#{arch.id}" + = label_tag "arches_#{arch.id}", arch.name + %h3= t('activerecord.attributes.build_list.update_type') + - selected = params[:build_list].try(:[], :update_type) ? {:selected => params[:build_list][:update_type]} : {} + .lineForm= f.select :update_type, BuildList::UPDATE_TYPES, selected + + = render 'shared/autocomplete_form', + :field => :extra_repositories, + :field_class => Repository, + :placeholder => 'uxteam_personal', + :subject => @build_list, + :autocomplete_path => autocomplete_extra_repositories_autocompletes_path, + :default_values => project.repositories.select{ |r| r.platform.personal? } + = render 'shared/autocomplete_form', + :field => :extra_build_lists, + :field_class => BuildList, + :placeholder => '1000000', + :subject => build_list, + :autocomplete_path => autocomplete_extra_build_list_autocompletes_path + + %h3= t('activerecord.attributes.build_list.extra_params.label') + - BuildList::EXTRA_PARAMS.each do |field| + - text = params[:build_list].try(:[], :extra_params).try(:[], field) + = text_field_tag "build_list[extra_params][#{field}]", text, :placeholder => t("activerecord.attributes.build_list.extra_params.#{field}"), :class => 'full-size' + .both + + %h3= t("activerecord.attributes.build_list.preferences") + - [:auto_publish, :auto_create_container, :include_testing_subrepository].each do |kind| + .both + - checked, field = params[:build_list].try(:[], kind), "build_list[#{kind}]" + = hidden_field_tag field, false, :id => nil + = check_box_tag field, true, checked + = f.label kind + .both + - selected = params[:build_list].try(:[], :external_nodes) ? {:selected => params[:build_list][:external_nodes]} : {} + = f.select :external_nodes, external_nodes, selected.merge(:include_blank => true) + = f.label :external_nodes + .both + + %br + = hidden_field_tag :from_build_list_id, params[:build_list_id] if params[:build_list_id].present? + = f.submit t('layout.projects.build_button'), :data => {'disable-with' => t('layout.processing')} +.both + diff --git a/app/views/projects/build_lists/_platform_build_list.html.haml b/app/views/projects/build_lists/_platform_build_list.html.haml index 66e2c76a7..d21b445f7 100644 --- a/app/views/projects/build_lists/_platform_build_list.html.haml +++ b/app/views/projects/build_lists/_platform_build_list.html.haml @@ -1,5 +1,5 @@ %tr{:id => "row#{platform_build_list_counter}"} - %td= link_to (platform_build_list.bs_id.present? ? platform_build_list.bs_id : t("layout.build_lists.bs_id_not_set")), platform_build_list + %td= link_to platform_build_list.id, platform_build_list %td= platform_build_list.human_status %td= link_to platform_build_list.project.name, platform_build_list.project %td= platform_build_list.updated_at diff --git a/app/views/projects/build_lists/_recreate_build_list.html.haml b/app/views/projects/build_lists/_recreate_build_list.html.haml new file mode 100644 index 000000000..d6ce8ff0c --- /dev/null +++ b/app/views/projects/build_lists/_recreate_build_list.html.haml @@ -0,0 +1,5 @@ += form_for [build_list.project, build_list.project.build_lists.new], :html => { :class => :form, :method => :post } do |f| + = hidden_field_tag :build_list_id, build_list.id + = f.hidden_field :project_id + = f.submit t('layout.build_lists.recreate_build_list'), :data => {'disable-with' => t('layout.processing')} +.both \ No newline at end of file diff --git a/app/views/projects/build_lists/_server_status.html.haml b/app/views/projects/build_lists/_server_status.html.haml index 8a86a33e6..e1d56b0ab 100644 --- a/app/views/projects/build_lists/_server_status.html.haml +++ b/app/views/projects/build_lists/_server_status.html.haml @@ -1,13 +1,43 @@ -- queues ||= [:rpm, :publish] .bordered.nopadding %h3.medium= t('layout.build_lists.build_server_status.header') - - queues.each do |queue| + + .table + .lefter= t("layout.build_lists.build_server_status.rpm_workers") + .both + .table + .lefter= t("layout.build_lists.build_server_status.amount") + .both + .table + .lefter= t("layout.build_lists.build_server_status.abf") + .righter {{server_status.rpm.workers}} + .both + .table + .lefter= t("layout.build_lists.build_server_status.custom") + .righter {{server_status.rpm.other_workers}} + .both + .table + .lefter= t("layout.build_lists.build_server_status.tasks") + .both + - [['custom', :default_tasks], ['mass_build_tasks', :low_tasks], ['build_tasks', :build_tasks]].each do |label, metric| .table - .lefter= t("layout.build_lists.build_server_status.#{queue}_workers") + .lefter= t("layout.build_lists.build_server_status.#{label}") + .righter= "{{server_status.rpm.#{metric}}}" .both - - [:count, :tasks, :build_tasks].each do |metric| - .table - .lefter= t("layout.build_lists.build_server_status.#{metric}") - .righter= @build_server_status[queue][metric] - .both - %br + %br + + .table + .lefter= t("layout.build_lists.build_server_status.publish_workers") + .both + .table + .lefter= t("layout.build_lists.build_server_status.amount") + .righter= "{{server_status.publish.workers}}" + .both + - [:tasks, :build_tasks].each do |metric| + .table + .lefter= t("layout.build_lists.build_server_status.#{metric}") + .righter= "{{server_status.publish.#{metric}}}" + .both + %br + + + diff --git a/app/views/projects/build_lists/index.html.haml b/app/views/projects/build_lists/index.html.haml index 72d1f8154..e24b6b7ea 100644 --- a/app/views/projects/build_lists/index.html.haml +++ b/app/views/projects/build_lists/index.html.haml @@ -1,73 +1,73 @@ -set_meta_tags :title => t('.title') -= render 'filter' +%div{'ng-controller' => 'BuildListsController'} -%table.tablesorter{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th.lpadding16= t("activerecord.attributes.build_list.bs_id") - %th.lpadding16= t("activerecord.attributes.build_list.status") - %th.lpadding16= t("activerecord.attributes.build_list.project") - %th.lpadding16= t("diff") - %th.lpadding16= t("activerecord.attributes.build_list.project_version") - %th.lpadding16= t("activerecord.attributes.build_list.save_to_repository") - %th.lpadding6= t("activerecord.attributes.build_list.arch_short") - %th.lpadding16= t("activerecord.attributes.build_list.user") - %th.lpadding6= t("activerecord.attributes.build_list.updated_at") - %tbody= render :partial => 'projects/build_lists/build_list', :collection => @build_lists -.both + = render 'filter' -:javascript - $(function(){ - // from jQuery.timeago - var parseIso8601 = function(iso8601) { - var s = $.trim(iso8601); - s = s.replace(/\.\d+/,""); // remove milliseconds - s = s.replace(/-/,"/").replace(/-/,"/"); - s = s.replace(/T/," ").replace(/Z/," UTC"); - s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 - return new Date(s); - } - var strTimeBetween = function(dt, dt1) { + %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} + %thead + %tr + %th.lpadding16= t("activerecord.attributes.build_list.id") + %th.lpadding16= t("activerecord.attributes.build_list.status") + %th.lpadding16= t("activerecord.attributes.build_list.project") + %th.lpadding16= t("diff") + %th.lpadding16= t("activerecord.attributes.build_list.project_version") + %th.lpadding16= t("activerecord.attributes.build_list.save_to_repository") + %th.lpadding6= t("activerecord.attributes.build_list.arch_short") + %th.lpadding16= t("activerecord.attributes.build_list.user") + %th.lpadding6= t("activerecord.attributes.build_list.updated_at") + %tbody + %tr{'ng-repeat' => 'bl in build_lists', :class => '{{bl.status_color}}', :id => 'build-list-{{bl.id}}', 'ng-class' => "{'group-start': !bl.relatedHidden, 'group-end': bl.lastRelated}", 'ng-show' => 'bl.show'} - var formatNumber = function(num) { - return (num < 10) ? "0%d".replace("%d", num) : num - } + / id + %td.build-list-statuses + %a.expand{'ng-show' => 'bl.hasRelated'} + %span.icon-chevron-down{'ng-show' => 'bl.relatedHidden', 'ng-click' => 'showRelated(bl)'} + %span.icon-chevron-up{'ng-hide' => 'bl.relatedHidden', 'ng-click' => 'hideRelated(bl)'} + %a{'ng-href' => '{{bl.url}}' } {{bl.id}} + %div{'ng-show' => 'bl.hasRelated'} + .status{'ng-repeat' => 'related in bl.related', :class => '{{related.status_color}}'} - var seconds = Math.abs(dt1 - dt) / 1000; - var minutes = seconds / 60; - var hours = minutes / 60; - minutes = Math.round(minutes % 60); - hours = Math.floor(hours); + / status + %td + {{bl.human_status | i18n}} + %br + %time{'ng-show' => 'bl.duration'} + {{bl.duration}} + %time{'ng-show' => 'bl.average_build_time'} + \/{{bl.average_build_time}} - return "%d:%d".replace("%d", formatNumber(hours)) - .replace("%d", formatNumber(minutes)); - } - // TODO Very, very ugly method. - var now = $('#servertime').val() * 1000; - $("time.js-relative-date").each(function() { - var time = parseIso8601($(this).attr('datetime')).getTime(); - $(this).text(strTimeBetween(time, now)); - }); + / project + %td.centered{'ng-hide' => 'bl.project', :colspan => 2} + = t('layout.projects.unexisted_project') + %td{'ng-show' => 'bl.project'} + %a{'ng-href' => '{{bl.project.url}}' } {{bl.project.name_with_owner}} - var t = null; + / diff + %td + %a{'ng-href' => '{{bl.version_link_url}}', 'ng-show' => 'bl.project'} + {{bl.version_link_text}} - var reloadChange = function() { - if ($(this).is(':checked')) { - //reload page every 1 minute - t = setTimeout(function() { - window.location.reload(); - }, 60000); - } else { - clearTimeout(t); - } - } + / project_version + %td {{bl.version_release}} - $('#autoreload').on('change', reloadChange) - .trigger('change'); + / save_to_repository + %td + %a{'ng-href' => '{{bl.save_to_repository_url}}' } {{bl.save_to_repository_name}} - }); + / arch_short + %td{'ng-show' => 'bl.arch'} {{bl.arch.name}} + %td{'ng-hide' => 'bl.arch'}= t('layout.arches.unexisted_arch') -= will_paginate @bls + / user + %td + %a{'ng-href' => '{{bl.user.url}}' } {{bl.user.fullname}} + + / updated_at + %td{'am-time-ago' => 'bl.updated_at', :title => '{{bl.updated_at_utc}}'} + + .both + + = render 'shared/angularjs_will_paginate' = render @project ? 'projects/base/submenu' : 'projects/build_lists/submenu' diff --git a/app/views/projects/build_lists/index.json.jbuilder b/app/views/projects/build_lists/index.json.jbuilder new file mode 100644 index 000000000..42d3d4fe9 --- /dev/null +++ b/app/views/projects/build_lists/index.json.jbuilder @@ -0,0 +1,44 @@ +now = Time.now.utc +users, projects, platforms, repositories = [], [], [], [] +json.build_lists @build_lists do |build_list| + json.(build_list, :id, :status, :project_id, :project_version, :save_to_platform_id, :save_to_repository_id, :user_id, :project_id, :build_for_platform_id, :arch_id, :group_id) + json.commit_hash build_list.commit_hash.first(5) + json.last_published_commit_hash build_list.last_published_commit_hash.first(5) if build_list.last_published_commit_hash + + if BuildList::HUMAN_STATUSES[build_list.status].in? [:build_pending, :build_started, :build_publish] + json.duration Time.diff(now, build_list.updated_at, '%h:%m')[:diff] + json.average_build_time build_list.formatted_average_build_time if build_list.build_started? && (build_list.average_build_time > 0) + end + + json.version_release get_version_release(build_list) + json.updated_at build_list.updated_at + json.updated_at_utc build_list.updated_at.strftime('%Y-%m-%d %H:%M:%S UTC') + users |= [build_list.user] + projects |= [build_list.project] + platforms |= [build_list.build_for_platform, build_list.save_to_platform] + repositories |= [build_list.save_to_repository] +end + +json.dictionary do + json.users users.compact do |user| + json.(user, :id, :uname, :fullname) + end + json.projects projects.compact do |project| + json.(project, :id, :name) + json.owner project.name_with_owner.gsub(/\/.*/, '') + end + json.platforms platforms.compact do |platform| + json.(platform, :id, :name) + json.personal platform.personal? + end + json.repositories repositories.compact do |repository| + json.(repository, :id, :name) + end + json.arches Arch.all do |arch| + json.(arch, :id, :name) + end +end + +json.server_status @build_server_status +json.filter @filter.try(:options) +json.pages angularjs_will_paginate(@bls) diff --git a/app/views/projects/build_lists/new.html.haml b/app/views/projects/build_lists/new.html.haml index 94b5aa3c3..974f0e091 100644 --- a/app/views/projects/build_lists/new.html.haml +++ b/app/views/projects/build_lists/new.html.haml @@ -1,61 +1,5 @@ -set_meta_tags :title => [title_object(@project), t('layout.build_lists.new_header')] -= form_for [@project, @build_list], :html => { :class => :form, :method => :post } do |f| - %section.left - %h3= t("activerecord.attributes.build_list.build_for_platform") - .all_platforms - - Platform.main.each do |pl| - - if pl.repository_ids.size > 0 - .both - =# check_box_tag "build_for_platforms[]", pl.id, (params[:build_for_platforms]||[]).include?(pl.id.to_s), :class => 'build_bpl_ids', :id => "bpls_#{pl.id}" - =# label_tag "bpls_#{pl.id}", pl.name - %div{:id => "build_for_pl_#{pl.id}", :class => 'build_for_pl'}= pl.name - .offset25= render 'include_repos', :platform => pl - %section.right - %h3= t("activerecord.attributes.build_list.save_to_repository") - .lineForm= f.select :save_to_repository_id, @project.repositories.collect{|r| ["#{r.platform.name}/#{r.name}", r.id, {:publish_without_qa => r.publish_without_qa? ? 1 : 0, :platform_id => r.platform.id}]} - %h3= t("activerecord.attributes.build_list.project_version") - .lineForm= f.select :project_version, versions_for_group_select(@project), :selected => params[:build_list].try(:fetch, :project_version) || @project.default_branch - %h3= t("activerecord.attributes.build_list.arch") - - Arch.recent.each do |arch| - .both - = check_box_tag "arches[]", arch.id, (params[:arches]||[]).include?(arch.id.to_s) || controller.action_name == 'new', :id => "arches_#{arch.id}" - = label_tag "arches_#{arch.id}", arch.name - %h3= t("activerecord.attributes.build_list.update_type") - .lineForm= f.select :update_type, BuildList::UPDATE_TYPES - - #extra-repos-and-build-lists - %h3= t("activerecord.attributes.build_list.extra_repos") - %span.icon-question-sign - %div#extra-repos-and-build-lists-dialog{:title => t("activerecord.attributes.build_list.extra_repos")} - %b= t('helpers.extra_repos_and_build_lists.header') - %br - %br - %b= t('helpers.extra_repos_and_build_lists.build_lists.header') - - (1..4).each do |index| - %p= t("helpers.extra_repos_and_build_lists.build_lists.message#{index}").html_safe - %br - %b= t('helpers.extra_repos_and_build_lists.repos.header') - %p= t('helpers.extra_repos_and_build_lists.repos.message1') - %br - %b= t('helpers.extra_repos_and_build_lists.repos.header2') - %p= t('helpers.extra_repos_and_build_lists.repos.message2') - %p= t('helpers.extra_repos_and_build_lists.repos.message3').html_safe - - = autocomplete_field_tag 'extra_repos', nil, autocomplete_to_extra_repos_and_builds_build_lists_path, :id_element => '#extra_repo_field' - = hidden_field_tag 'extra_repo', nil, :id => 'extra_repo_field' - = submit_tag t("layout.add"), :class => 'button', :id => 'add' - - %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} - %tbody - = render :partial => 'extra', :collection => Repository.where(id: @build_list.extra_repositories) - = render :partial => 'extra', :collection => BuildList.where(id: @build_list.extra_build_lists) - - %h3= t("activerecord.attributes.build_list.preferences") - - [:auto_publish, :auto_create_container, :use_save_to_repository].each do |kind| - .both - = f.check_box kind - = f.label kind - %br - = f.submit t("layout.projects.build_button") - -= render 'projects/base/submenu' \ No newline at end of file +#new_form= render 'new_form', :project => @project, :build_list => @build_list +%br += render 'last_build_lists', :project => @project += render 'projects/base/submenu' diff --git a/app/views/projects/build_lists/show.html.haml b/app/views/projects/build_lists/show.html.haml index 94f8bcdcb..5cbc139ab 100644 --- a/app/views/projects/build_lists/show.html.haml +++ b/app/views/projects/build_lists/show.html.haml @@ -1,219 +1,247 @@ -set_meta_tags :title => [title_object(@build_list.project), t('activerecord.models.build_list')] -.notify.blue - %div{:class => build_list_status_color(@build_list.status)} - %p= @build_list.human_status - %p= @build_list.updated_at - .both -= form_for @build_list do |f| - %h3= t("layout.build_lists.main_data") - .leftlist= t("activerecord.attributes.build_list.container_path") - .rightlist - - if @build_list.build_published? - = raw "%s %s" % [t("layout.build_lists.container_published"), - link_to("#{@build_list.save_to_platform.name}/#{@build_list.save_to_repository.name}", - [@build_list.save_to_platform, @build_list.save_to_repository])] - - if @build_list.container_published? - = link_to container_url, container_url - - elsif @build_list.container_publish? +.build-list{'ng-controller' => 'BuildListController'} + .notify.blue + %div{:class => '{{build_list.status_color}}'} + %p {{build_list.human_status | i18n}} + %p{'am-time-ago' => 'build_list.updated_at', :title => '{{build_list.updated_at_utc}}'} + .both + =form_for @build_list, :url => publish_build_list_path(@build_list), :html => { :class => :form } do |f| + %h3= t("layout.build_lists.main_data") + .leftlist= t("activerecord.attributes.build_list.container_path") + .rightlist{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISHED}"} + - url = container_url + = link_to url, url + .rightlist{'ng-show' => "build_list.container_status == #{BuildList::BUILD_PUBLISH}"} = t("layout.build_lists.creating") - .both + .both - .leftlist= t("activerecord.attributes.build_list.bs_id") - .rightlist= @build_list.bs_id.present? ? @build_list.bs_id : t("layout.build_lists.bs_id_not_set") - .both - .leftlist= t("activerecord.attributes.build_list.user") - .rightlist - = link_to @build_list.user.try(:fullname), @build_list.user - .both - .leftlist= t("activerecord.attributes.build_list.publisher") - .rightlist - = link_to @build_list.publisher.try(:fullname), @build_list.publisher if @build_list.publisher - .both - .leftlist= t("activerecord.attributes.build_list.build_for_platform") - .rightlist - - bfp = @build_list.build_for_platform - - if bfp.present? - = link_to(bfp.name, bfp) - - else - = t("layout.build_lists.platform_deleted") - .both - .leftlist= t("activerecord.attributes.build_list.save_to_repository") - .rightlist - = link_to "#{@build_list.save_to_platform.name}/#{@build_list.save_to_repository.name}", [@build_list.save_to_platform, @build_list.save_to_repository] - .both - .leftlist= t("activerecord.attributes.build_list.use_save_to_repository") - .rightlist= t("layout.#{@build_list.use_save_to_repository?}_") - .both - .leftlist= t("activerecord.attributes.build_list.include_repos") - .rightlist= (@build_list.include_repos||[]).map{|r| Repository.find(r).name}.join(', ') - .both - .leftlist= t("activerecord.attributes.build_list.update_type") - .rightlist - - if can?(:publish, @build_list) - = f.select :update_type, options_for_select(build_list_classified_update_types, @build_list.update_type) - - else - = @build_list.update_type - .both - .leftlist= t("activerecord.attributes.build_list.auto_publish") - .rightlist= t("layout.#{@build_list.auto_publish}_") - .both - .leftlist= t("activerecord.attributes.build_list.auto_create_container") - .rightlist= t("layout.#{@build_list.auto_create_container?}_") - .both - .leftlist= t("diff") - .rightlist= build_list_version_link(@build_list, true) - .both - .leftlist= t("activerecord.attributes.build_list.arch") - .rightlist= @build_list.arch.name - .both - .leftlist= t("activerecord.attributes.build_list.updated_at") - .rightlist= @build_list.updated_at - .both - .leftlist= t("activerecord.attributes.build_list.is_circle") - .rightlist= t("layout.#{@build_list.is_circle?}_") - .both - .leftlist= t("activerecord.attributes.build_list.new_core") - .rightlist= t("layout.#{@build_list.new_core?}_") - .both - - - if @build_list.extra_build_lists.present? || @build_list.extra_repositories.present? - .leftlist= t("activerecord.attributes.build_list.extra_repos") + .leftlist= t("activerecord.attributes.build_list.id") .rightlist - - Repository.where(:id => @build_list.extra_repositories).each do |repo| - %p= link_to "#{repo.platform.name}/#{repo.name}", [repo.platform, repo] - - BuildList.where(:id => @build_list.extra_build_lists).each do |bl| - %p= link_to "#{bl.id} (#{bl.project.name} - #{bl.arch.name})", bl + = @build_list.id + = hidden_field_tag :build_list_id, @build_list.id .both - - - if @build_list.mass_build_id.present? - .leftlist= t("activerecord.attributes.mass_build_id") - .rightlist= link_to @build_list.mass_build.name, platform_mass_builds_path(@build_list.save_to_platform) - .both - - - - if @build_list.advisory.present? - .leftlist= t("layout.build_lists.attached_advisory") - .rightlist= link_to @build_list.advisory.advisory_id, advisory_path(@build_list.advisory) - .both - - if !@build_list.in_work? && @build_list.started_at - %br - .leftlist - .rightlist= @build_list.human_duration - .both - - if @build_list.in_work? - %br - .leftlist + .leftlist= t("activerecord.attributes.build_list.user") .rightlist - = "#{@build_list.human_current_duration} / #{@build_list.project.human_average_build_time}" + = link_to @build_list.user.try(:fullname), @build_list.user .both - - - if @build_list.can_cancel? && can?(:cancel, @build_list) - = link_to t("layout.build_lists.cancel"), cancel_build_list_path(@build_list), - :method => :put, :confirm => t("layout.confirm"), :class => 'button' - - - if @build_list.save_to_platform.released && @build_list.advisory.nil? && can?(:publish, @build_list) - #advisory_block - .leftlist= label_tag :attach_advisory, t("layout.build_lists.attached_advisory") + .leftlist= t("activerecord.attributes.build_list.publisher") + .rightlist{'ng-show' => 'build_list.publisher'} + %a{'ng-href' => '{{build_list.publisher.path}}' } {{build_list.publisher.fullname}} + .both + .leftlist= t("activerecord.attributes.build_list.build_for_platform") + .rightlist + - if bfp = @build_list.build_for_platform + = link_to(bfp.name, bfp) + - else + = t("layout.build_lists.platform_deleted") + .both + .leftlist= t("activerecord.attributes.build_list.save_to_repository") + .rightlist + = link_to "#{@build_list.save_to_platform.name}/#{@build_list.save_to_repository.name}", [@build_list.save_to_platform, @build_list.save_to_repository] + .both + .leftlist= t("activerecord.attributes.build_list.include_testing_subrepository") + .rightlist= t("layout.#{@build_list.include_testing_subrepository?}_") + .both + .leftlist= t("activerecord.attributes.build_list.include_repos") + .rightlist= (@build_list.include_repos||[]).map{|r| Repository.where(:id => r).first.try(:name)}.join(', ') + .both + .leftlist= t("activerecord.attributes.build_list.update_type") + .rightlist + = f.select :update_type, options_for_select(build_list_classified_update_types, + @build_list.update_type), {}, 'ng-model' => 'build_list.update_type', + 'ng-change' => 'updateTypeChanged()', 'ng-show' => 'build_list.can_publish' + %div{'ng-hide' => 'build_list.can_publish'}= @build_list.update_type + .both + .leftlist= t("activerecord.attributes.build_list.auto_publish") + .rightlist= t("layout.#{@build_list.auto_publish}_") + .both + .leftlist= t("activerecord.attributes.build_list.auto_create_container") + .rightlist= t("layout.#{@build_list.auto_create_container?}_") + .both + .leftlist= t("activerecord.attributes.build_list.project_version") + .rightlist= link_to @build_list.project_version, tree_path(@build_list.project, @build_list.project_version) + .both + .leftlist= t("diff") + .rightlist= build_list_version_link(@build_list, true) + .both + .leftlist= t("activerecord.attributes.build_list.arch") + .rightlist= @build_list.arch.name + .both + .leftlist= t("activerecord.attributes.build_list.updated_at") + .rightlist {{build_list.updated_at_utc}} + .both + - if @build_list.external_nodes.present? + .leftlist= t("activerecord.attributes.build_list.external_nodes") + .rightlist= I18n.t("layout.build_lists.external_nodes.#{@build_list.external_nodes}") + .both + .leftlist= t("activerecord.attributes.build_list.builder") + .rightlist{'ng-show' => 'build_list.builder'} + %a{'ng-href' => '{{build_list.builder.path}}' } {{build_list.builder.fullname}} + .both + .leftlist= t("activerecord.attributes.build_list.is_circle") + .rightlist= t("layout.#{@build_list.is_circle?}_") + .both + .leftlist= t("activerecord.attributes.build_list.new_core") + .rightlist= t("layout.#{@build_list.new_core?}_") + .both + - if @build_list.extra_build_lists.present? || @build_list.extra_repositories.present? + .leftlist= t("activerecord.attributes.build_list.extra_repositories") .rightlist - = select_tag :attach_advisory, advisories_select_options(@advisories) - %p.hint_text= t("layout.advisories.publication_info", :update_types => BuildList::RELEASE_UPDATE_TYPES.join(', ')) + - Repository.where(:id => @build_list.extra_repositories).each do |repo| + %p= link_to "#{repo.platform.name}/#{repo.name}", [repo.platform, repo] + - BuildList.where(:id => @build_list.extra_build_lists).each do |bl| + %p= link_to "#{bl.id} (#{bl.project.name} - #{bl.arch.name})", bl .both - #advisory_search_block - %h3= t("layout.advisories.search_by_id") - .leftlist= label_tag :advisory_search, t("layout.advisories.search_hint") + - if @build_list.extra_params.present? + .leftlist + %h4.nomargin= t('activerecord.attributes.build_list.extra_params.label') + .rightlist + .both + - @build_list.extra_params.each do |k, v| + .leftlist= t("activerecord.attributes.build_list.extra_params.#{k}") + .rightlist= v + .both + + + - if @build_list.mass_build_id.present? + .leftlist= t("activerecord.attributes.mass_build_id") + .rightlist= link_to @build_list.mass_build.name, platform_mass_builds_path(@build_list.save_to_platform) + .both + + %div{'ng-show' => 'build_list.advisory'} + .leftlist= t("layout.build_lists.attached_advisory") + .rightlist + %a{'ng-href' => '{{build_list.advisory.path}}' } + {{build_list.advisory.advisory_id}} + .both + + %div{'ng-show' => 'build_list.human_duration'} + %br + .leftlist + .rightlist {{build_list.human_duration }} + .both + + - if @build_list.save_to_platform.released + #advisory_block{'ng-show' => 'build_list.can_publish && !build_list.advisory'} + .leftlist= label_tag :attach_advisory, t("layout.build_lists.attached_advisory") .rightlist - %input#advisory_search{:type => 'text'} - %p.hint_text= t("layout.advisories.advisory_id_info", :advisory_format => advisory_id_for_hint) - .both - - %w(advisory_not_found server_error continue_input).each do |el| - .info{:class => el} - %p= t("layout.advisories.banners.#{el}") - - #new_advisory_form - = f.fields_for @build_list.build_advisory do |f| - = render :partial => 'advisories/form', :locals => {:f => f} - - #advisory_preview - %h3= t("activerecord.models.advisory") << ' ' - - .leftlist= t("activerecord.attributes.advisory.description") - .rightlist.descr + = select_tag :attach_advisory, advisories_select_options(@advisories), 'ng-model' => 'attach_advisory', 'ng-change' => 'attachAdvisoryChanged()' + %p.hint_text= t("layout.advisories.publication_info", :update_types => BuildList::RELEASE_UPDATE_TYPES.join(', ')) .both - .leftlist= t("activerecord.attributes.advisory.references") - .rightlist.refs - .both - :javascript - $(function() { - var r = new Rosa.Routers.BuildListsAdvisoriesRouter(); - }); + #advisory_search_block{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'} + %h3= t("layout.advisories.search_by_id") + .leftlist= label_tag :advisory_search, t("layout.advisories.search_hint") + .rightlist + %input#advisory_search{:type => 'text', 'ng-model' => 'term', 'ng-keyup' => 'search()'} + %p.hint_text= t("layout.advisories.advisory_id_info", :advisory_format => advisory_id_for_hint) + .both + - I18n.t('layout.advisories.banners').keys.each do |key| + .info{:class => key, 'ng-show' => "search_status == '#{key}'"} + %p= t("layout.advisories.banners.#{key}") - - if @build_list.build_started? - = render 'shared/log', { :build_started => true, :get_log_path => log_build_list_path(@build_list) } + #new_advisory_form{'ng-show' => 'attach_advisory == "new"'} + = f.fields_for @build_list.build_advisory do |f| + = render :partial => 'advisories/form', :locals => {:f => f} - - unless @build_list.extra_build_lists_published? - .flash_notify - .alert.alert-error= t('layout.build_lists.publish_with_extra_fail') - .both + #advisory_preview{'ng-show' => 'attach_advisory != "no" && attach_advisory != "new"'} + %h3= t('activerecord.models.advisory') << ' {{advisory.advisory_id}}' - - if can?(:publish, @build_list) - - if @build_list.build_published? - = submit_tag t("layout.publish_again"), :confirm => t("layout.publish_again_warning"), :name => 'publish' - - elsif can_publish_in_future?(@build_list) && @build_list.extra_build_lists_published? - - confirm = @build_list.tests_failed? ? t('layout.build_lists.tests_failed') : t('layout.confirm') - = submit_tag t("layout.publish"), :confirm => confirm, :name => 'publish' - - if @build_list.can_reject_publish? && can?(:reject_publish, @build_list) - = submit_tag t("layout.reject_publish"), :confirm => t("layout.confirm"), :name => 'reject_publish' - - if @build_list.can_create_container? && can?(:create_container, @build_list) - = link_to t("layout.build_lists.create_container"), create_container_build_list_path(@build_list), - :method => :put, :confirm => t("layout.confirm"), :class => 'button' + .leftlist= t('activerecord.attributes.advisory.description') + .rightlist.descr {{advisory.description}} + .both -.hr -%h3= t("layout.build_lists.items_header") -- if @item_groups.blank? - %h4.nomargin= t("layout.build_lists.no_items_data") -- @item_groups.each_with_index do |group, level| - - group.each do |item| - %h4.nomargin= "#{item.name} ##{level}" + .leftlist= t('activerecord.attributes.advisory.references') + .rightlist.refs {{advisory.references}} + .both + + %div{'ng-hide' => 'build_list.extra_build_lists_published'} + .flash_notify + .alert.alert-error= t('layout.build_lists.publish_with_extra_fail') + .both + + - if can?(:cancel, @build_list) + = link_to t("layout.build_lists.cancel"), cancel_build_list_path(@build_list), + :method => :put, :confirm => t("layout.confirm"), :class => 'button', + 'ng-show' => 'build_list.can_cancel' + = submit_tag t('layout.publish_again'), + :confirm => t("layout.publish_again_warning"), + :name => 'publish', + 'ng-show' => "build_list.can_publish && build_list.status == #{BuildList::BUILD_PUBLISHED}" + = submit_tag t("layout.publish"), + :confirm => t('layout.build_lists.tests_failed'), :name => 'publish', + 'ng-show' => "build_list.can_publish && build_list.can_publish_in_future && build_list.extra_build_lists_published && build_list.status == #{BuildList::TESTS_FAILED}" + = submit_tag t("layout.publish"), + :confirm => t('layout.confirm'), :name => 'publish', + 'ng-show' => "build_list.can_publish && build_list.can_publish_in_future && build_list.extra_build_lists_published && build_list.status != #{BuildList::TESTS_FAILED} && build_list.status != #{BuildList::BUILD_PUBLISHED}" + = link_to t('layout.publish_into_testing'), publish_into_testing_build_list_path(@build_list), + :method => :put, :confirm => t("layout.confirm"), + :class => 'button', + 'ng-show' => 'build_list.can_publish_into_testing' + - if can?(:reject_publish, @build_list) + = link_to t('layout.reject_publish'), reject_publish_build_list_path(@build_list), + :method => :put, :confirm => t("layout.confirm"), + :class => 'button', + 'ng-show' => 'build_list.can_reject_publish' + - if can?(:create_container, @build_list) + = link_to t("layout.build_lists.create_container"), + create_container_build_list_path(@build_list), + :method => :put, :confirm => t("layout.confirm"), + :class => 'button', + 'ng-show' => 'build_list.can_create_container' + - if can? :create, @build_list + = link_to t('layout.build_lists.recreate_build_list'), new_project_build_list_path(@build_list.project, :build_list_id => @build_list.id), :class => 'button' + + %div{'ng-show' => "build_list.status == #{BuildList::BUILD_STARTED}"} + = render 'shared/log', { :build_started => true, :get_log_path => log_build_list_path(@build_list) } + + .hr + %h3= t("layout.build_lists.items_header") + %h4.nomargin{'ng-hide' => 'build_list.item_groups'} + = t("layout.build_lists.no_items_data") + %div{'ng-repeat' => 'group in build_list.item_groups'} + %div{'ng-repeat' => 'item in group'} + %h4.nomargin {{item.name + ' #' + item.level}} + %table.tablesorter.width565{:cellpadding => "0", :cellspacing => "0"} + %thead + %tr + %th= t("activerecord.attributes.build_list/item.name") + %th= t("activerecord.attributes.build_list/item.version") + %th= t("activerecord.attributes.build_list/item.status") + %tbody + %tr{:class => "{{build_list.itemStatusColor(item.status)}}"} + %td {{item.name}} + %td + %a{'ng-href' => '{{item.path.href}}' } {{item.path.text}} + %td {{build_list.humanStatus(item.status) | i18n}} + .both + + %div{'ng-show' => 'build_list.packages'} + .hr + %h3= t("layout.build_lists.packages_header") %table.tablesorter.width565{:cellpadding => "0", :cellspacing => "0"} %thead %tr - %th= t("activerecord.attributes.build_list/item.name") - %th= t("activerecord.attributes.build_list/item.version") - %th= t("activerecord.attributes.build_list/item.status") + %th= t("activerecord.attributes.build_list/package.fullname") + %th= t("activerecord.attributes.build_list/package.name") + %th= t("activerecord.attributes.build_list/package.epoch") + %th= t("activerecord.attributes.build_list/package.version") + %th= t("activerecord.attributes.build_list/package.release") %tbody - %tr{:class => build_list_item_status_color(item.status)} - %td= item.name - %td= build_list_item_version_link item - %td= item.human_status -.both + %tr{'ng-repeat' => 'package in build_list.packages'} + %td{'ng-show' => 'package.url'} + %a{'ng-href' => "{{package.url}}" } {{package.fullname}} + %td{'ng-hide' => 'package.url'} {{package.fullname}} + %td {{package.name}} + %td {{package.epoch}} + %td {{package.version}} + %td {{package.release}} + .both -- if @build_list.packages.present? - .hr - %h3= t("layout.build_lists.packages_header") - %table.tablesorter.width565{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th= t("activerecord.attributes.build_list/package.fullname") - %th= t("activerecord.attributes.build_list/package.name") - %th= t("activerecord.attributes.build_list/package.version") - %th= t("activerecord.attributes.build_list/package.release") - %tbody - - @build_list.packages.each do |package| - %tr - - if package.sha1.present? - %td= link_to package.fullname, "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{package.sha1}" - - else - %td= package.fullname - %td= package.name - %td= package.version - %td= package.release - .both - -- if @build_list.new_core? - .hr - = render 'platforms/product_build_lists/results', :subject => @build_list + - if @build_list.new_core? + .hr + = render 'shared/build_results', :subject => @build_list :javascript $('article .all').addClass('bigpadding'); diff --git a/app/views/projects/build_lists/show.json.jbuilder b/app/views/projects/build_lists/show.json.jbuilder new file mode 100644 index 000000000..4a9b46b16 --- /dev/null +++ b/app/views/projects/build_lists/show.json.jbuilder @@ -0,0 +1,62 @@ +json.build_list do + json.(@build_list, :id, :container_status, :status) + json.(@build_list, :update_type) + json.updated_at @build_list.updated_at + json.updated_at_utc @build_list.updated_at.strftime('%Y-%m-%d %H:%M:%S UTC') + + if !@build_list.in_work? && @build_list.started_at + json.human_duration @build_list.human_duration + elsif @build_list.in_work? + json.human_duration "#{@build_list.human_current_duration} / #{@build_list.human_average_build_time}" + end + + json.can_publish can?(:publish, @build_list) + json.can_publish_into_testing can?(:publish_into_testing, @build_list) && @build_list.can_publish_into_testing? + json.can_cancel @build_list.can_cancel? + json.can_create_container @build_list.can_create_container? + json.can_reject_publish @build_list.can_reject_publish? + + json.extra_build_lists_published @build_list.extra_build_lists_published? + json.can_publish_in_future can_publish_in_future?(@build_list) + + + json.container_path container_url if @build_list.container_published? + + json.publisher do + json.fullname @build_list.publisher.try(:fullname) + json.path user_path(@build_list.publisher) + end if @build_list.publisher + + json.builder do + json.fullname @build_list.builder.try(:fullname) + json.path user_path(@build_list.builder) + end if @build_list.builder + + json.advisory do + json.(@build_list.advisory, :description, :advisory_id) + json.path advisory_path(@build_list.advisory) + end if @build_list.advisory + + json.results @build_list.results do |result| + json.file_name result['file_name'] + json.sha1 result['sha1'] + json.size result['size'] + json.url file_store_results_url(result['sha1'], result['file_name']) + end if @build_list.new_core? && @build_list.results.present? + + json.packages @build_list.packages do |package| + json.(package, :id, :name, :fullname, :release, :version, :sha1, :epoch) + json.url "#{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{package.sha1}" if package.sha1 + end if @build_list.packages.present? + + json.item_groups do |group| + @item_groups.each_with_index do |group, level| + json.group group do |item| + json.(item, :name, :status) + json.path build_list_item_version_link item + json.level level + end + end + end if @item_groups.present? + +end diff --git a/app/views/projects/collaborators/_collaborator.json.jbuilder b/app/views/projects/collaborators/_collaborator.json.jbuilder index f1d105a32..55790d266 100644 --- a/app/views/projects/collaborators/_collaborator.json.jbuilder +++ b/app/views/projects/collaborators/_collaborator.json.jbuilder @@ -1,10 +1,9 @@ -json.id collaborator.id - -json.actor_id collaborator.actor_id -json.actor_name collaborator.actor_name -json.actor_type collaborator.actor_type +json.(collaborator, :id, :actor_name) +json.collaborator do # attr_accessible for AngularJS + json.(collaborator, :role, :actor_id, :actor_type, :project_id) +end +json.project do + json.(collaborator.project, :name, :owner_uname) +end json.avatar avatar_url(collaborator.actor) -json.actor_path participant_path(collaborator.actor) - -json.project_id collaborator.project_id -json.role collaborator.role +json.actor_path participant_path(collaborator.actor) \ No newline at end of file diff --git a/app/views/projects/collaborators/_collaborators.json.jbuilder b/app/views/projects/collaborators/_collaborators.json.jbuilder index 9e8d099a2..f7fba1505 100644 --- a/app/views/projects/collaborators/_collaborators.json.jbuilder +++ b/app/views/projects/collaborators/_collaborators.json.jbuilder @@ -1,12 +1,3 @@ -json.array!(collaborators) do |json, cb| - json.id cb.id - - json.actor_id cb.actor_id - json.actor_name cb.actor_name - json.actor_type cb.actor_type - json.avatar avatar_url(cb.actor) - json.actor_path participant_path(cb.actor) - - json.project_id cb.project_id - json.role cb.role +json.array!(collaborators) do |collaborator| + json.partial! 'projects/collaborators/collaborator', :collaborator => collaborator end diff --git a/app/views/projects/collaborators/add.html.haml b/app/views/projects/collaborators/add.html.haml deleted file mode 100644 index 028862297..000000000 --- a/app/views/projects/collaborators/add.html.haml +++ /dev/null @@ -1,53 +0,0 @@ -.block - .secondary-navigation - %ul.wat-cf - %li.first= link_to t("layout.collaborators.list"), project_collaborators_path(@project) - %li.active= link_to t("layout.collaborators.add"), add_project_collaborators_path(@project) - .content - .inner - = form_tag do - %h2.title= t("layout.users.list_header") - %table.table - %tr - %th.first ID - %th= t("activerecord.attributes.user.name") - %th= t("activerecord.attributes.user.email") - %th= t("activerecord.attributes.user.uname") - %th.last= t("layout.collaborators.add") - - @users.each do |user| - %tr{:class => cycle("odd", "even")} - %td - = user.id - %td - = link_to user.name, user_path(user) - %td - = user.email - %td - = user.uname - %td.last - = check_box_tag "user[#{user.id}]", '1', (@project.collaborators.include? user) ? :checked : nil - = label_tag "user[#{user.id}]", t("layout.collaborators.add") - %h2.title= t("layout.groups.list_header") - %table.table - %tr - %th.first ID - %th= t("activerecord.attributes.group.name") - %th= t("activerecord.attributes.group.uname") - %th.last= t("layout.collaborators.add") - - @groups.each do |group| - %tr{:class => cycle("odd", "even")} - %td - = group.id - %td - = link_to group.name, group_path(group) - %td - = group.uname - %td.last - = check_box_tag "group[#{group.id}]", '1', (@project.groups.include? group) ? :checked : nil - = label_tag "group[#{group.id}]", t("layout.collaborators.add") - .group.navform.wat-cf - %button.button{:type => "submit"} - = image_tag("choose.png", :alt => t("layout.save")) - = t("layout.save") - %span.text_button_padding= t("layout.or") - = link_to t("layout.cancel"), project_collaborators_path(@project), :class => "text_button_padding link_button" diff --git a/app/views/projects/collaborators/edit.html.haml b/app/views/projects/collaborators/edit.html.haml deleted file mode 100644 index 0474cec64..000000000 --- a/app/views/projects/collaborators/edit.html.haml +++ /dev/null @@ -1,93 +0,0 @@ --set_meta_tags :title => [title_object(@project), t('layout.projects.members')] -= render 'sidebar' -= render 'submenu' - -%a{:name => 'users'} -%h3= t("layout.users.list_header") - -= form_tag add_project_collaborators_path(@project) do - .admin-search - = autocomplete_field_tag 'member_id', params[:member_id], autocomplete_user_uname_autocompletes_path, :id_element => '#member_id_field' - .admin-role - .lineForm - = select_tag 'role', options_for_collaborators_roles_select - = hidden_field_tag 'member_id', nil, :id => 'member_id_field' - = submit_tag t("layout.add"), :class => 'button' - .both - -= form_tag project_collaborators_path(@project), :id => 'members_form', :delete_url => remove_project_collaborators_path(@project) do - = hidden_field_tag "_method", "post" - %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th - \ - %th - = t("layout.collaborators.members") - %th{:colspan => "3"} - = t("layout.collaborators.roles") - %tbody - - @users.each_with_index do |user, num| - %tr{:id => "admin-table-members-row#{num}"} - %td - %span#niceCheckbox1.niceCheck-main{ :style => "background-position: 0px 0px; "} - = check_box_tag "user_remove[#{user.id}][]" - %td - .img - = image_tag avatar_url(user) - .forimg= link_to user.fullname, user_path(user) - - Relation::ROLES.each_with_index do |role, i| - %td - .radio - = radio_button_tag "user[#{user.id}]", role, ((@project.relations.exists? :actor_id => user.id, :actor_type => 'User', :role => role) ? :checked : nil), :class => 'niceRadio' - .forradio= t("layout.collaborators.role_names.#{ role }") - = link_to_function t("layout.delete_selected"), "deleteAdminMember();", :class => 'button' - = link_to_function t("layout.save"), "saveAdminMember();", :class => 'button right_floated' - .both -%br - -.hr.bottom -.both - -%a{:name => 'groups'} -%h3= t("layout.groups.list_header") - -= form_tag add_project_collaborators_path(@project) do - .admin-search - = autocomplete_field_tag 'group_id', params[:group_id], autocomplete_group_uname_autocompletes_path, :id_element => '#group_id_field' - .admin-role - .lineForm - = select_tag 'role', options_for_collaborators_roles_select, :id => 'group_role' - = hidden_field_tag 'group_id', nil, :id => 'group_id_field' - = submit_tag t("layout.add"), :class => 'button' - .both - -= form_tag project_collaborators_path(@project), :id => 'groups_form', :delete_url => remove_project_collaborators_path(@project) do - = hidden_field_tag "_method", "post", :id => 'groups_method' - %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th - \ - %th - = t("layout.collaborators.members") - %th{:colspan => "3"} - = t("layout.collaborators.roles") - %tbody - - @groups.each_with_index do |group, num| - %tr{:id => "admin-table-members-row#{num + @users.size + 1}"} - %td - %span#niceCheckbox1.niceCheck-main{ :style => "background-position: 0px 0px; "} - = check_box_tag "group_remove[#{group.id}][]" - %td - .forimg= link_to "#{group.uname}", group_path(group) - - Relation::ROLES.each_with_index do |role, i| - %td - .radio - = radio_button_tag "group[#{group.id}]", role, ((@project.relations.exists? :actor_id => group.id, :actor_type => 'Group', :role => role) ? :checked : nil), :class => 'niceRadio' - .forradio= t("layout.collaborators.role_names.#{ role }") - = link_to_function t("layout.delete_selected"), "deleteAdminGroup();", :class => 'button' - = link_to_function t("layout.save"), "saveAdminGroup();", :class => 'button right_floated' - .both -.both - diff --git a/app/views/projects/collaborators/index.html.haml b/app/views/projects/collaborators/index.html.haml index 7b9a468ae..6e633abab 100644 --- a/app/views/projects/collaborators/index.html.haml +++ b/app/views/projects/collaborators/index.html.haml @@ -5,40 +5,70 @@ %a{:name => 'users'} %h3= t("layout.users.list_header") -#add_collaborator_form - .admin-search.withimage - .img - %img{ :alt => 'avatar', :src => '', :style => 'display: none;' } - = text_field_tag :collaborator_name, nil +#collaborators{'ng-controller' => 'CollaboratorsController'} + = hidden_field_tag :owner_name, @project.try(:owner).try(:uname) + = hidden_field_tag :project_name, @project.try(:name) + + #add_collaborator_form + .admin-search.withimage + .img + %img{:alt => 'avatar', 'ng-src' => '{{new_collaborator.avatar}}', 'ng-show' => 'new_collaborator.avatar'} + = text_field_tag :collaborator_name, nil, 'ng-model' => 'new_collaborator.term', 'ng-keyup' => 'search()' + + .admin-role + .lineForm + = select_tag 'role', options_for_collaborators_roles_select, 'ng-model' => 'new_collaborator.collaborator.role' + .admin-add + %a.button{:rel => 'nofollow', :href => '', 'ng-click' => 'add()'} + = t('layout.add') .both - .admin-role - .lineForm - = select_tag 'role', options_for_collaborators_roles_select - .admin-add - %a{:id => 'add_collaborator_button', :class => 'button', :rel => 'nofollow', :href => 'javascript:void(0)'} - = t('layout.add') - .both -%table#collaborators.tablesorter{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th.centered - %span#collaborators_deleter.hidden - %span.delete - %th - = t("layout.collaborators.members") - %th{:colspan => "3"} - = t("layout.collaborators.roles") - %tr.search - %th{:colspan => "5"} - %input{ :type => "text", :placeholder => "#{ t('layout.filter_by_name') }"} - %tbody -%br + .users-search-popup + .header + .title= t('layout.issues.search_user') + %span.icon-remove-circle + .list + .people{'ng-repeat' => 'c in new_collaborators', 'ng-click' => 'select(c)'} + .avatar + %img{width: '16px', 'ng-src' => '{{c.avatar}}', alt: 'avatar'} + .name {{c.actor_name}} + .both + + .nothing{'ng-hide' => 'new_collaborators.length > 0'}= t('layout.issues.nothing_to_show') + .both + .both -.both + %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} + %thead + %tr + %th.centered + %span.delete{'ng-click' => 'deleteCollaborators()'} + %th + = t("layout.collaborators.members") + %th{:colspan => "3"} + = t("layout.collaborators.roles") + %tr.search + %th{:colspan => "5"} + %input{:type => "text", :placeholder => "#{t('layout.filter_by_name')}", 'ng-model' => 'query.actor_name'} -:javascript - $(function() { - Rosa.bootstrapedData.collaborators = #{ render 'collaborators.json.jbuilder', :collaborators => @collaborators }; - r = new Rosa.Routers.CollaboratorsRouter(); - }); + %tbody + %tr{'ng-repeat' => 'c in collaborators | filter:query'} + %td + %input{:type => 'checkbox', 'ng-model' => 'c.removed' } + %td + .img + %img{'ng-src' => '{{c.avatar}}', alt: 'avatar' } + .forimg + %a{'ng-href' => '{{c.actor_path}}'} {{c.actor_name}} + + - Relation::ROLES.each do |role| + %td + .radio + %input{:type => 'radio', 'ng-model' => 'c.collaborator.role', :value => role, 'ng-click' => 'update(c)'} + .forradio + %label= t("layout.collaborators.role_names.#{role}") + + + %br + + .both \ No newline at end of file diff --git a/app/views/projects/comments/_comment.html.haml b/app/views/projects/comments/_comment.html.haml index 0c25b2ac3..88c0e9f78 100644 --- a/app/views/projects/comments/_comment.html.haml +++ b/app/views/projects/comments/_comment.html.haml @@ -1,10 +1,11 @@ - CommentPresenter.present(comment, data) do |presenter| = render 'shared/feed_message', :presenter => presenter -#open-comment.comment.hidden{:class => "comment-#{comment.id}"} - =render 'projects/comments/button_md_help' - %h3.tmargin0= t("layout.comments.edit_header") - = form_for comment, :url => project_commentable_comment_path(data[:project], data[:commentable], comment), :html => { :class => 'form edit_comment' } do |f| - = render "projects/comments/form", :f => f, :id => "#{data[:add_id]}edit_#{comment.id}" - .comment-left - =link_to t('layout.cancel'), '#', :id => "comment-#{comment.id}", :class => 'cancel_edit_comment button' - .both +-unless comment.automatic + #open-comment.comment.hidden{:class => "comment-#{comment.id}"} + =render 'projects/comments/button_md_help' + %h3.tmargin0= t("layout.comments.edit_header") + = form_for comment, :url => project_commentable_comment_path(data[:project], data[:commentable], comment), :html => { :class => 'form edit_comment' } do |f| + = render "projects/comments/form", :f => f, :id => "#{data[:add_id]}edit_#{comment.id}" + .comment-left + =link_to t('layout.cancel'), '#', :id => "comment-#{comment.id}", :class => 'cancel_edit_comment button' + .both diff --git a/app/views/projects/comments/_form.html.haml b/app/views/projects/comments/_form.html.haml index f37286e42..07e6b688d 100644 --- a/app/views/projects/comments/_form.html.haml +++ b/app/views/projects/comments/_form.html.haml @@ -1,2 +1,2 @@ =render 'projects/comments/body', :f => f, :id => id -.comment-right= submit_tag t("layout.save") +.comment-right= submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} diff --git a/app/views/projects/comments/_list.html.haml b/app/views/projects/comments/_list.html.haml index e63505aa7..f7edaff1d 100644 --- a/app/views/projects/comments/_list.html.haml +++ b/app/views/projects/comments/_list.html.haml @@ -2,5 +2,9 @@ .hr %h3#block-list= t("layout.comments.comments_header") - list.each do |comment| - = render 'projects/comments/comment', :comment => comment, :data => {:project => project, :commentable => commentable} + -unless comment.created_from_commit_hash + = render 'projects/comments/comment', :comment => comment, :data => {:project => project, :commentable => commentable} + -else + - GitPresenters::CommitAsMessagePresenter.present(nil, :comment => comment) do |presenter| + = render 'shared/feed_message', :presenter => presenter, :item_no => "-#{comment.id}" = render "projects/comments/markdown_help" diff --git a/app/views/projects/comments/_markdown_help.html.haml b/app/views/projects/comments/_markdown_help.html.haml index 28cf08dd8..3c9a27af4 100644 --- a/app/views/projects/comments/_markdown_help.html.haml +++ b/app/views/projects/comments/_markdown_help.html.haml @@ -17,23 +17,27 @@ _This will also be italic_ **This text will be bold** __This will also be bold__ + %p=link_to t('layout.comments.md_cheatsheet.emoji_header'), 'http://www.emoji-cheat-sheet.com/', :target => '_blank' + %pre + =":smile:" + =image_tag(image_path('emoji/smile.png'), :class => 'emoji', :title => 'smile', :alt => 'smile', :size => "20x20") + =" :+1:" + =image_tag(image_path('emoji/+1.png'), :class => 'emoji', :title => '+1', :alt => '+1', :size => "20x20") .col %h3=t 'layout.comments.md_cheatsheet.lists' - %p=t 'layout.comments.md_cheatsheet.unordered' + %p{:style => 'float:left;margin-left:20px;'}=t 'layout.comments.md_cheatsheet.unordered' + %p{:style => 'float:right;margin-right:40px;'}=t 'layout.comments.md_cheatsheet.ordered' + .both %pre :preserve - * Item 1 - * Item 2 - * Item 2a - * Item 2b - %p=t 'layout.comments.md_cheatsheet.ordered' + * Item 1 1. Item 1 + * Item 2 2. Item 2 + * Item 2a 3. Item 3 + * Item 2b * Item 3a + * Item 3b + %p=t 'layout.comments.md_cheatsheet.reference_format' %pre - :preserve - 1. Item 1 - 2. Item 2 - 3. Item 3 - * Item 3a - * Item 3b + =preserve t('layout.comments.md_cheatsheet.reference_format_example').html_safe .col %h3=t 'layout.comments.md_cheatsheet.miscellaneous' %p=t 'layout.comments.md_cheatsheet.images' @@ -84,3 +88,4 @@ :preserve I think you should use an `[addr]` element here instead. + .both diff --git a/app/views/projects/git/base/_choose_fork.html.haml b/app/views/projects/git/base/_choose_fork.html.haml index e627dd77c..f71676821 100644 --- a/app/views/projects/git/base/_choose_fork.html.haml +++ b/app/views/projects/git/base/_choose_fork.html.haml @@ -1,12 +1,15 @@ -- if owner.own_projects.exists? :name => @project.name - - is_group = owner.class == Group ? "(#{t 'activerecord.models.group'})" : '' +- is_group = owner.class == Group ? "(#{t 'activerecord.models.group'})" : '' +- full_name = "#{owner.uname}/#{name} #{is_group}" + +- if owner.own_projects.exists? :name => name %p.center =t 'layout.projects.already_exists' - =link_to "#{owner.uname}/#{@project.name} #{is_group}", project_path(owner, @project.name) + =link_to full_name, project_path(owner, name) - else = form_for @project, :url => fork_project_path(@project), :html => { :class => :form, :multipart => true, :method => :post } do |f| = hidden_field_tag :group, owner.id if owner.class == Group - =f.submit t('layout.projects.fork_to', :to => "#{owner.uname} #{is_group}"), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :id => 'create_fork' + = hidden_field_tag :fork_name, name, :name => 'fork_name' + =f.submit t('layout.projects.fork_to', :to => full_name), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :id => 'create_fork' :javascript $('#create_fork').click(function () { diff --git a/app/views/projects/git/base/_fork.html.haml b/app/views/projects/git/base/_fork.html.haml index be9cf54d4..6f15afbcb 100644 --- a/app/views/projects/git/base/_fork.html.haml +++ b/app/views/projects/git/base/_fork.html.haml @@ -1,3 +1,5 @@ += hidden_field_tag :possible_forks_path, possible_forks_project_path(@project) + - if can? :write, @project .r{:style => "display: block"} =link_to t("projects.pull_requests.show.pull"), new_project_pull_request_path(@project, :treeish => @treeish), :id => 'send_pull_request', :class => 'button' @@ -8,11 +10,10 @@ .modal-header %a.close{"data-dismiss" => "modal"} × %h3=t 'layout.projects.fork_modal_header' - .modal-body.modal-body-fork - =render 'choose_fork', :owner => current_user - %hr.bootstrap - - Group.can_own_project(current_user).each do |group| - =render 'choose_fork', :owner => group - %hr.bootstrap -- if can? :create, @project.build_lists.new + = hidden_field_tag :possible_forks, possible_forks_project_path(@project) + %div{:align => 'center'}= text_field_tag 'fork_name', @project.name, :id => 'fork_name', :class => 'fork_name' + #forks_list.modal-body.modal-body-fork + = render 'forks', :owner => current_user, :name => @project.name + +- if @project.is_package && can?(:create, @project.build_lists.new) .r{:style => "display: block"}= link_to t('layout.projects.new_build_list'), new_project_build_list_path(@project), :class => 'button' diff --git a/app/views/projects/git/base/_forks.html.haml b/app/views/projects/git/base/_forks.html.haml new file mode 100644 index 000000000..a4d442860 --- /dev/null +++ b/app/views/projects/git/base/_forks.html.haml @@ -0,0 +1,5 @@ +=render 'projects/git/base/choose_fork', :owner => current_user, :name => name +%hr.bootstrap +- Group.can_own_project(current_user).each do |group| + =render 'projects/git/base/choose_fork', :owner => group, :name => name + %hr.bootstrap \ No newline at end of file diff --git a/app/views/projects/git/blobs/_blame_table.html.haml b/app/views/projects/git/blobs/_blame_table.html.haml index fc0a608a8..eb79fd716 100644 --- a/app/views/projects/git/blobs/_blame_table.html.haml +++ b/app/views/projects/git/blobs/_blame_table.html.haml @@ -12,7 +12,7 @@ (#{commit_author_link(committer)}) %br %span.date= commit_date(elem[0].committed_date) - %span.message{:title => elem[0].message}= short_commit_message(elem[0].message) + %span.message{:title => elem[0].message}= short_message(elem[0].message) %td.lines = index diff --git a/app/views/projects/git/blobs/_editor.html.haml b/app/views/projects/git/blobs/_editor.html.haml index 3cd15157b..9ed1345f9 100644 --- a/app/views/projects/git/blobs/_editor.html.haml +++ b/app/views/projects/git/blobs/_editor.html.haml @@ -13,7 +13,7 @@ %br %br - = submit_tag t("layout.save"), :title => t("layout.save") + = submit_tag t('layout.save'), :title => t('layout.save'), :data => {'disable-with' => t('layout.saving')} = t("layout.or") = link_to t("layout.cancel"), blob_path(@project, @treeish, @path), :class => 'button' diff --git a/app/views/projects/git/commits/_commits_small.html.haml b/app/views/projects/git/commits/_commits_small.html.haml index 3302753fb..dc4b84831 100644 --- a/app/views/projects/git/commits/_commits_small.html.haml +++ b/app/views/projects/git/commits/_commits_small.html.haml @@ -7,8 +7,7 @@ %tr %td %img{:height => 16, :alt => "avatar", :src => presenter.image} - %td.date - = presenter.date + = datetime_moment presenter.date, :tag => :td, :class => :date %td.name = presenter.header %td.subject diff --git a/app/views/projects/git/trees/_branch.html.haml b/app/views/projects/git/trees/_branch.html.haml deleted file mode 100644 index 7d21b547a..000000000 --- a/app/views/projects/git/trees/_branch.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- base = branch.name == @branch.name -%tr{:class => (base ? 'base' : '')} - %td.name= link_to branch.name, tree_path(@project, branch.name) - %td.actions - %ul.actions - - if base - %li.text= t('layout.projects.base_branch') - - else - %li - = link_to t('layout.projects.compare'), diff_path(@project, "#{@branch.name}...#{branch.name}") \ No newline at end of file diff --git a/app/views/projects/git/trees/_header.html.haml b/app/views/projects/git/trees/_header.html.haml deleted file mode 100644 index edda53ee0..000000000 --- a/app/views/projects/git/trees/_header.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -- subjects_name = action_name.to_s - -%h3= t("layout.projects.#{subjects_name}") -- if subject.blank? - %p= t("layout.projects.no_#{subjects_name}") -- elsif subject.count == 1 - %p= t("layout.projects.showing_#{subjects_name.singularize}") -- else - %p= t("layout.projects.showing_#{subjects_name}", :count => subject.count) -.both \ No newline at end of file diff --git a/app/views/projects/git/trees/_show.html.haml b/app/views/projects/git/trees/_show.html.haml index 35bae8bea..88e88fe1f 100644 --- a/app/views/projects/git/trees/_show.html.haml +++ b/app/views/projects/git/trees/_show.html.haml @@ -20,18 +20,31 @@ %td== %td== %td== - - @project.tree_info(@tree, @treeish, @path).each_pair do |entry, commit| + - @project.tree_info(@tree, @treeish, @path).each do |node, node_path, commit| %tr %td - - entry_path = File.join([@path.present? ? @path : nil, entry.name].compact) - - if entry.is_a? Grit::Blob - .pic= image_tag 'code.png' - .name= link_to(entry.name, blob_path(@project, @treeish, entry_path), :class => 'files-see') + - if node.is_a? Grit::Submodule + .pic= image_tag 'folder-submodule.png' + .name + - if url = submodule_url(node, @treeish) + = link_to(node.name, url, :class => 'files-see') + = '@' + = link_to(node.id[0..6], "#{url}/tree/#{node.id}", :class => 'files-see') + - else + = "#{node.name} @ #{node.id[0..6]}" - else - .pic= image_tag 'folder.png' - .name= link_to(entry.name, tree_path(@project, @treeish, entry_path), :class => 'files-see') - %td - %span{:style => "display: none;"}= date = commit.committed_date || commit.authored_date - = l(date, :format => :short) - %td= commit.short_message - %td= (commit.committer || commit.author).name \ No newline at end of file + - options = [@project, @treeish, node_path] + - if node.is_a?(Grit::Tree) + - pic = 'folder.png' + - path = tree_path *options + .pic= image_tag pic || 'code.png' + .name= link_to(node.name, path || blob_path(*options), :class => 'files-see') + + - if commit + = datetime_moment(commit.committed_date || commit.authored_date, :tag => :td) + %td= commit.short_message + %td= (commit.committer || commit.author).name + - else + %td + %td + %td diff --git a/app/views/projects/git/trees/_tag.html.haml b/app/views/projects/git/trees/_tag.html.haml deleted file mode 100644 index 66421ead6..000000000 --- a/app/views/projects/git/trees/_tag.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%li - = link_to t('layout.projects.browse_code'), tree_path(@project, tag.name), :class => 'detail-link' - - file_name = "#{@project.name}-#{tag.name}" - - %w(zip tar.gz).each do |type| - = link_to t('layout.projects.source_code', :type => type), archive_path(@project, file_name, type), :class => 'detail-link' - %p.name - %b= tag.name - .date= tag.commit.authored_date.strftime('%d.%m.%Y') diff --git a/app/views/projects/git/trees/branches.html.haml b/app/views/projects/git/trees/branches.html.haml new file mode 100644 index 000000000..304ce7515 --- /dev/null +++ b/app/views/projects/git/trees/branches.html.haml @@ -0,0 +1,43 @@ +-set_meta_tags :title => "#{title_object @project}" + += render 'submenu' += render 'repo_block', :project => @project + +%div{'ng-controller' => 'ProjectBranchesController', 'ng-init' => "init('#{@project.owner.uname}', '#{@project.name}','#{@branch.try(:name)}')"} + + %h3= t('layout.projects.branches') + %p{'ng-show' => '!branches.length'}= t('layout.projects.no_branches') + %p{'ng-show' => 'branches.length > 0'} {{'project.total_branches' | i18n:'plural':branches.length}} + .both + %br + + %input.mediumheight{'ng-model' => 'query.ref'} + .both + + %table#project-branches + %tbody + %tr{'ng-repeat' => 'branch in branches | filter:query', 'ng-class' => '{base: branch.ref == current_ref}'} + %td.name + %a{'ng-href' => '{{branch.path(project)}}' } {{branch.ref}} + %td.actions + %ul.actions + - if can?(:write, @project) + %li{'ng-hide' => 'branch.ref == current_ref || branch.ui_container'} + %a{:href => '', 'ng-click' => 'destroy(branch)'} + = t('layout.projects.delete_branch') + %li{'ng-hide' => 'branch.ui_container'} + %a{:href => '', 'ng-click' => 'branch.ui_container = true'} + = t('layout.projects.new_branch') + %li{'ng-show' => 'branch.ui_container'} + %form{'ng-submit' => 'create(branch)'} + %input{'ng-model' => 'branch.new_ref'} + %input{:type => 'submit', :value =>t('layout.create')} + %a{:href => '', 'ng-click' => 'branch.ui_container = false'} + = t('layout.cancel') + %li{'ng-hide' => 'branch.ref == current_ref || branch.ui_container'} + %a{'ng-href' => '{{branch.diff_path(project, current_ref)}}' } + = t('layout.projects.compare') + %li.text{'ng-show' => 'branch.ref == current_ref && !branch.ui_container'} + = t('layout.projects.base_branch') + + diff --git a/app/views/projects/git/trees/refs.html.haml b/app/views/projects/git/trees/refs.html.haml deleted file mode 100644 index 586087c02..000000000 --- a/app/views/projects/git/trees/refs.html.haml +++ /dev/null @@ -1,14 +0,0 @@ --set_meta_tags :title => "#{title_object @project}" - -= render 'submenu' -= render 'repo_block', :project => @project -= render 'header', :subject => (@branches || @tags) - -- if @tags.present? - %div#project-tags - %ol.release-list - = render :partial => 'tag', :collection => @tags -- elsif @branches.present? - %table#project-branches - %tbody - = render :partial => 'branch', :collection => @branches diff --git a/app/views/projects/git/trees/refs_list.json.jbuilder b/app/views/projects/git/trees/refs_list.json.jbuilder new file mode 100644 index 000000000..c53ee0a8a --- /dev/null +++ b/app/views/projects/git/trees/refs_list.json.jbuilder @@ -0,0 +1,8 @@ +json.refs_list @refs do |grit| + json.ref grit.name + json.object do + json.type (grit.class.name =~ /Tag/ ? 'tag' : 'commit') + json.sha grit.commit.id + json.authored_date grit.commit.authored_date.to_i + end +end \ No newline at end of file diff --git a/app/views/projects/git/trees/show.json.jbuilder b/app/views/projects/git/trees/show.json.jbuilder new file mode 100644 index 000000000..b01b52153 --- /dev/null +++ b/app/views/projects/git/trees/show.json.jbuilder @@ -0,0 +1,8 @@ +json.project do + json.(@project, :id, :name) + json.fullname @project.name_with_owner + + json.owner do + json.(@project.owner, :id, :name, :uname) + end +end \ No newline at end of file diff --git a/app/views/projects/git/trees/tags.html.haml b/app/views/projects/git/trees/tags.html.haml new file mode 100644 index 000000000..f8a074c12 --- /dev/null +++ b/app/views/projects/git/trees/tags.html.haml @@ -0,0 +1,27 @@ +-set_meta_tags :title => "#{title_object @project}" + += render 'submenu' += render 'repo_block', :project => @project + +%div{'ng-controller' => 'ProjectTagsController', 'ng-init' => "init('#{@project.owner.uname}', '#{@project.name}')"} + + %h3= t('layout.projects.tags') + %p{'ng-show' => '!tags.length'}= t('layout.projects.no_tags') + %p{'ng-show' => 'tags.length > 0'} {{'project.total_tags' | i18n:'plural':tags.length}} + .both + %br + + %input.mediumheight{'ng-model' => 'query.ref'} + .both + + #project-tags + %ol.release-list + %li{'ng-repeat' => 'tag in tags | filter:query'} + %a.detail-link{'ng-href' => '{{tag.path(project)}}' } + = t('layout.projects.browse_code') + - %w(zip tar.gz).each do |type| + %a.detail-link{'ng-href' => "{{tag.archive_path(project, '#{type}')}}" } + = t('layout.projects.source_code', :type => type) + %p.name + %b {{tag.ref}} + .date {{tag.object.authored_date * 1000 | date:'yyyy.MM.dd'}} diff --git a/app/views/projects/hooks/_form.html.haml b/app/views/projects/hooks/_form.html.haml new file mode 100644 index 000000000..95104573d --- /dev/null +++ b/app/views/projects/hooks/_form.html.haml @@ -0,0 +1,12 @@ += hidden_field_tag 'hook[name]', @hook.name +- Hook::SCHEMA[@hook.name.to_sym].each do |type, field| + .leftlist= t("activerecord.attributes.hook.data.#{field}") + .rightlist + - name, value = "hook[data][#{field}]", @hook.data[field] + - if type == :boolean + = check_box_tag name, value, 1 + - elsif type == :password + = password_field name, value + - else + = text_field_tag name, value + .both \ No newline at end of file diff --git a/app/views/projects/hooks/docs/_irc.en.html.haml b/app/views/projects/hooks/docs/_irc.en.html.haml new file mode 100644 index 000000000..8a4af7cd2 --- /dev/null +++ b/app/views/projects/hooks/docs/_irc.en.html.haml @@ -0,0 +1,23 @@ +:markdown + + 1. `server` - IRC server, IE. irc.freenode.net + 2. `port` - Normally 6667 (No SSL) or 9999 (SSL) (optional). These are the defaults based on whether the value of `ssl` checkbox. + 3. `room` - Supports single or multiple rooms (comma separated). Also supports room passwords (room_name::password). Prefixing '#' to the room is optional. + 4. `password` - Server password (optional) + 5. `nick` - Nickname (optional) + 6. `long_url` - If enabled, displays full compare/commit url's. If disabled uses git.io. + 7. `message_without_join` - If enabled prevents joining and immediately leaving the channel. + 8. `no_colors` - Disables color support for messages + 9. `notice` - Enables notice support. Make sure you configure channel to support notices ("/mode #yourchannelname -n" or "/msg chanserv set mlock -n") + 10. `branch_regexes` - Regular expressions for branch name matching (optional, comma separated). For example, only master => `^master$`, master & starts with bug => `master,^bug`. + 11. Configure your IRC channel to allow external messages (/mode #yourchannelname -n). + + For freenode, try the following: + + # server: irc.freenode.net + # port: 6667 + # room: #yourroom + # message_without_join: checked + # long_url: checked + # notice: checked + # NOTE: Ensure you enable notice support (see above) diff --git a/app/views/projects/hooks/docs/_irc.ru.html.haml b/app/views/projects/hooks/docs/_irc.ru.html.haml new file mode 100644 index 000000000..189a0bcdc --- /dev/null +++ b/app/views/projects/hooks/docs/_irc.ru.html.haml @@ -0,0 +1,23 @@ +:markdown + + 1. `server` - IRC сервер, например irc.freenode.net + 2. `port` - Стандартный 6667 (без SSL) или 9999 (SSL) (опционально). Это значения по умолчанию в зависимости от значения `ssl` чекбокса. + 3. `room` - Поддержка одной или нескольких комнат (через запятую). Также поддерживается пароль к комнате (room_name::password). Префикс '#' у комнаты опционально. + 4. `password` - пароль к серверу (опционально) + 5. `nick` - никнейм (опционально) + 6. `long_url` - Если включено, показывает полные compare/commit url's. Если отключено, использует git.io. + 7. `message_without_join` - Если включено, предварительно заходит на канал и немедленно покидает его. + 8. `no_colors` - Отключает поддержку цветов для сообщений + 9. `notice` - Включает поддержку уведомлений. Убедитесь, что ваш канал поддерживает уведомления ("/mode #yourchannelname -n" или "/msg chanserv set mlock -n") + 10. `branch_regexes` - Регулярное выражение для фильтрации по имении ветки (опционально, через запятую). Например, только master => `^master$`, master & начинающиеся на bug => `master,^bug`. + 11. Сконфигурируйте ваш IRC канал на поддержку внешних сообщений (/mode #yourchannelname -n). + + Для freenode, подходит следующее: + + # server: irc.freenode.net + # port: 6667 + # room: #yourroom + # message_without_join: checked + # long_url: checked + # notice: checked + # ЗАМЕЧАНИЕ: Убедитесь, что поддержка уведомлений включена (см. выше) diff --git a/app/views/projects/hooks/docs/_jabber.en.html.haml b/app/views/projects/hooks/docs/_jabber.en.html.haml new file mode 100644 index 000000000..443e90455 --- /dev/null +++ b/app/views/projects/hooks/docs/_jabber.en.html.haml @@ -0,0 +1,4 @@ +:markdown + + 1. **User** is the Jabber ID (e.g.: myusername@jabber.org). Multiple users can be added by separating them with commas. Currently, there is a maximum of 25 users. + 2. You should add `abf-notification@rosalab.ru` user into your contact list. \ No newline at end of file diff --git a/app/views/projects/hooks/docs/_jabber.ru.html.haml b/app/views/projects/hooks/docs/_jabber.ru.html.haml new file mode 100644 index 000000000..2fb5101ad --- /dev/null +++ b/app/views/projects/hooks/docs/_jabber.ru.html.haml @@ -0,0 +1,4 @@ +:markdown + + 1. **User** это Jabber ID (например: myusername@jabber.org). Несколько пользователей могут быть добавленны через запятую (максимум 25 пользователей). + 2. Вы должны добавить `abf-notification@rosalab.ru` пользователя в ваш список контактов. \ No newline at end of file diff --git a/app/views/projects/hooks/docs/_web.en.html.haml b/app/views/projects/hooks/docs/_web.en.html.haml new file mode 100644 index 000000000..f2bef3247 --- /dev/null +++ b/app/views/projects/hooks/docs/_web.en.html.haml @@ -0,0 +1,3 @@ +:markdown + + We’ll hit these URLs with POST requests when you push to us, passing along information about the push. \ No newline at end of file diff --git a/app/views/projects/hooks/docs/_web.ru.html.haml b/app/views/projects/hooks/docs/_web.ru.html.haml new file mode 100644 index 000000000..a3e46286a --- /dev/null +++ b/app/views/projects/hooks/docs/_web.ru.html.haml @@ -0,0 +1,3 @@ +:markdown + + Мы будем отправлять POST запрос на эти URLs, когда вы обновите проект, передавая информацию об обновлении. \ No newline at end of file diff --git a/app/views/projects/hooks/edit.html.haml b/app/views/projects/hooks/edit.html.haml new file mode 100644 index 000000000..230d0334a --- /dev/null +++ b/app/views/projects/hooks/edit.html.haml @@ -0,0 +1,13 @@ +-set_meta_tags :title => [title_object(@project), t('layout.projects.hooks')] += render 'submenu' += render 'sidebar' + +%h1= t("layout.hooks.services.#{@hook.name}") + += form_for @hook, :url => project_hook_path(@project, @hook), :method => :put, :html => { :class => :form } do |f| + = render 'form' + .actions + = f.submit t('layout.update'), :data => {'disable-with' => t('layout.processing')} + +%br += render "projects/hooks/docs/#{@hook.name}" \ No newline at end of file diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml new file mode 100644 index 000000000..ba4df47c1 --- /dev/null +++ b/app/views/projects/hooks/index.html.haml @@ -0,0 +1,20 @@ +-set_meta_tags :title => [title_object(@project), t('layout.projects.hooks')] += render 'submenu' += render 'sidebar' + +%h1= t('layout.projects.hooks') + +%table#datatable.tablesorter{:cellpadding => "0", :cellspacing => "0"} + %thead + %tr + %th.th1= t('attributes.name') + %th + %tbody + - Hook::NAMES.each do |name| + %tr + %td + = link_to project_hooks_path(@project, :name => name) do + = t("layout.hooks.services.#{name}") + = "(#{@hooks.where(:name => name).count})" + %td.right + = link_to t('layout.create'), new_project_hook_path(@project, :hook => {:name => name}), :class => 'button' diff --git a/app/views/projects/hooks/new.html.haml b/app/views/projects/hooks/new.html.haml new file mode 100644 index 000000000..80751cd5f --- /dev/null +++ b/app/views/projects/hooks/new.html.haml @@ -0,0 +1,13 @@ +-set_meta_tags :title => [title_object(@project), t('layout.projects.hooks')] += render 'submenu' += render 'sidebar' + +%h1= t("layout.hooks.services.#{@hook.name}") + += form_for @hook, :url => project_hooks_path(@project), :method => :post, :html => { :class => :form } do |f| + = render 'form' + .actions + = f.submit t('layout.create'), :data => {'disable-with' => t('layout.processing')} + +%br += render "projects/hooks/docs/#{@hook.name}" \ No newline at end of file diff --git a/app/views/projects/hooks/show.html.haml b/app/views/projects/hooks/show.html.haml new file mode 100644 index 000000000..25b57f9f5 --- /dev/null +++ b/app/views/projects/hooks/show.html.haml @@ -0,0 +1,26 @@ +-set_meta_tags :title => [title_object(@project), t('layout.projects.hooks')] += render 'submenu' += render 'sidebar' + +%h1= t("layout.hooks.services.#{@name}") + += link_to t('layout.create'), new_project_hook_path(@project, :hook => {:name => @name}), :class => 'button' +.booth +%br + +- @hooks.all.each do |hook| + - schema = Hook::SCHEMA[hook.name.to_sym] + - hook.data.each do |field, value| + .leftlist= t("activerecord.attributes.hook.data.#{field}") + .rightlist + - if schema.find{ |type, attr| type == :password && field.to_sym == attr } + = '******' + - else + = value + .both + + .leftlist + .rightlist + = link_to t('layout.edit'), edit_project_hook_path(@project, hook), :class => 'button' + = link_to t('layout.delete'), project_hook_path(@project, hook), :method => :delete, :confirm => t('layout.confirm'), :class => 'button' + .hr diff --git a/app/views/projects/issues/_assigned_popup.html.haml b/app/views/projects/issues/_assigned_popup.html.haml index 8f31e036e..51d06bf7a 100644 --- a/app/views/projects/issues/_assigned_popup.html.haml +++ b/app/views/projects/issues/_assigned_popup.html.haml @@ -1,4 +1,4 @@ -#assigned-popup +#assigned-popup.users-search-popup .header .title= t('layout.issues.assign_someone') %span.icon-remove-circle @@ -10,5 +10,5 @@ - unless [:new, :create].include?(action_name.to_sym) = form_for :issue, :url => [@project, @issue], :method => :put, :html => { :class => 'edit_assignee issue'} do |f| = hidden_field_tag "user-default_assignee", nil, :name => 'issue[assignee_id]' - #manage_issue_users_list + .list = render 'projects/issues/search_collaborators' \ No newline at end of file diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index a0948aebb..871b4d272 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -1,14 +1,15 @@ =render 'title_body', :f => f, :id => 'new' -.leftlist= t('activerecord.attributes.issue.assignee') + ':' -#assigned-container.rightlist - =render 'user_container', :user => @issue.assignee -.both -.leftlist= t('layout.issues.labels') + ':' -.rightlist - %span#flag-span.small-text= t('layout.issues.choose_labels_on_left') - #issue_labels -.both +- if can?(:write, @project) + .leftlist= t('activerecord.attributes.issue.assignee') + ':' + #assigned-container.rightlist + =render 'user_container', :user => @issue.assignee + .both + .leftlist= t('layout.issues.labels') + ':' + .rightlist + %span#flag-span.small-text= t('layout.issues.choose_labels_on_left') + #issue_labels + .both .leftlist .rightlist - %input{:type => "submit", :value => t(@issue.new_record? ? 'layout.create' : 'layout.update')} + = submit_tag t(@issue.new_record? ? 'layout.create' : 'layout.update'), :data => {'disable-with' => t('layout.processing')} .both diff --git a/app/views/projects/issues/_header.html.haml b/app/views/projects/issues/_header.html.haml index 2f56a9a2e..b6895a9b3 100644 --- a/app/views/projects/issues/_header.html.haml +++ b/app/views/projects/issues/_header.html.haml @@ -3,7 +3,7 @@ .image =image_tag(avatar_url(@issue.user, :medium), :alt => 'avatar') if @issue.user .created - %span=@issue.created_at.to_s(:long) + = datetime_moment @issue.created_at, :tag => :span - if @issue.user %span= t('layout.by') %span.name=link_to(@issue.user.fullname, user_path(@issue.user)) diff --git a/app/views/projects/issues/_index_sidebar.html.haml b/app/views/projects/issues/_index_sidebar.html.haml index 51e7e8e18..154ee8ba1 100644 --- a/app/views/projects/issues/_index_sidebar.html.haml +++ b/app/views/projects/issues/_index_sidebar.html.haml @@ -5,12 +5,12 @@ %table %tr %td.width18=radio_button_tag :myradio, 'all', !@is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'} - %td.width135=t("layout.issues.all") - %td.width30.right=@project.issues.without_pull_requests.count + %td.width135=t('layout.issues.all') + %td.width30.right=@project.issues.without_pull_requests.not_closed_or_merged.count %tr - %td=radio_button_tag :myradio, 'to_me', @is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'} - %td=t("layout.issues.to_me") - %td.width30.right=@project.issues.without_pull_requests.where(:assignee_id => current_user.id).count + %td=radio_button_tag :myradio, 'assigned', @is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'} + %td=t('layout.issues.assigned') + %td.width30.right=@project.issues.without_pull_requests.where(:assignee_id => current_user.id).not_closed_or_merged.count =form_tag project_issues_path(@project), :id => 'search_issue', :class => 'ajax_search_form', :method => :get do .bordered.bpadding20 - search = params[:search_issue].present? ? params[:search_issue] : t('layout.issues.search') diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 3d2d0025e..cb7cdc363 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -1,4 +1,4 @@ --path = polymorphic_path [@project, issue.pull_request ? issue.pull_request : issue] +- path = polymorphic_path [@project || issue.project, issue.pull_request ? issue.pull_request : issue] %tr#row1{:name => "row", :class => issue.labels.map(&:name).compact} %td.td0 @@ -6,23 +6,22 @@ %td.td1=issue.serial_id %td %a{:href => path} - %div.issue_title=issue.title + %div.issue_title + -prefix = @project ? '' : "#{issue.project.name}: " + ="#{prefix} #{issue.title}".html_safe .smalltext - =issue.send(@sort == :created ? :created_at : :updated_at).to_s(:long) + = datetime_moment issue.send(@sort == :created ? :created_at : :updated_at) =t("layout.by") if issue.user =link_to(issue.user.uname, user_path(issue.user)) if issue.user -issue.labels.each do |label| .left.nomargin .label.selected.tracker.left .labeltext.selected{:style => "background: ##{label.color};"}=label.name - %td.td3 - -if issue.pull_request + %td.td3{:class => (issue.pull_request ? 'td3-pull' : '')} + - if issue.pull_request %a{:href => path} .code # - .avatar - =link_to image_tag(avatar_url(issue.assignee), :alt => 'avatar'), user_path(issue.assignee) if issue.assignee - %a{:href => "#{path}#block-list"} - .answers - .pic= image_tag 'answers.png' - .count=issue.comments.count - .both + = link_to image_tag(avatar_url(issue.assignee), :alt => 'avatar', :class => 'avatar'), user_path(issue.assignee) if issue.assignee + %a.answers{:href => "#{path}#block-list"} + = image_tag 'answers.png', :class => 'pic' + .count=issue.comments.where(:automatic => false).count diff --git a/app/views/projects/issues/_manage_sidebar.html.haml b/app/views/projects/issues/_manage_sidebar.html.haml index 98144b2d2..1ba6fa829 100644 --- a/app/views/projects/issues/_manage_sidebar.html.haml +++ b/app/views/projects/issues/_manage_sidebar.html.haml @@ -1,8 +1,8 @@ -content_for :sidebar do - - can_manage = can?(:update, @issue) && @issue.persisted? || @issue.new_record? - if @issue.persisted? .bordered.nopadding %h3=t('activerecord.attributes.issue.status') + - can_manage = can?(:update, @issue) #switcher.issue_status{:class => "#{@issue.closed? ? 'switcher-off' : 'switcher'} #{can_manage ? "switch_issue_status" : ''}"} .swleft=t('layout.issues.status.open') .swright=t('layout.issues.status.closed') @@ -11,7 +11,7 @@ =hidden_field_tag "issue_status", @issue.closed? ? 'closed' : 'open', :name => "issue[status]" .block %h3=t('layout.issues.labels') - - if can_manage + - if can?(:write, @project) .current_labels - (@project.labels || []).each do |label| - is_issue_label = @issue.labels.include? label @@ -29,6 +29,6 @@ .label.nopointer .labeltext.selected{:style => "background: ##{label.color};"}=label.name .both - - if can_manage && @issue.persisted? + - if can?(:write, @project) && @issue.persisted? =link_to(t('layout.issues.label_manage'), '#', :class => "button tmargin10 manage_labels") =link_to(t('layout.issues.done'), '#', :class => "button tmargin10 update_labels", :style => 'display:none') diff --git a/app/views/projects/issues/_status.html.haml b/app/views/projects/issues/_status.html.haml index ecccf8157..1bf7b4602 100644 --- a/app/views/projects/issues/_status.html.haml +++ b/app/views/projects/issues/_status.html.haml @@ -4,6 +4,6 @@ .state=t('layout.issues.status.closed') .text .avatar= image_tag(avatar_url(@issue.closer), :alt => 'avatar') - .name="#{@issue.closer.fullname} #{t('layout.issues.at')} #{@issue.closed_at.to_s(:long)}" + .name="#{@issue.closer.fullname} #{datetime_moment(@issue.closed_at, :tag => :span)}".html_safe .both %br/ diff --git a/app/views/projects/issues/_user_container.html.haml b/app/views/projects/issues/_user_container.html.haml index 47b78037d..21c1ca3a6 100644 --- a/app/views/projects/issues/_user_container.html.haml +++ b/app/views/projects/issues/_user_container.html.haml @@ -6,5 +6,5 @@ %span= t('layout.issues.is_assigned') - else %span= t('layout.issues.no_one_is_assigned') - -if can?(:update, @issue) || @issue.new_record? + -if can?(:write, @project) %span.icon-share \ No newline at end of file diff --git a/app/views/projects/projects/_filters.html.haml b/app/views/projects/projects/_filters.html.haml index 12577ac68..6b578a3b1 100644 --- a/app/views/projects/projects/_filters.html.haml +++ b/app/views/projects/projects/_filters.html.haml @@ -6,6 +6,10 @@ - if can?(:create, Project) .bordered.bpadding20 = link_to t('layout.projects.new'), new_project_path, :class => 'button' + - if can?(:mass_import, Project) + .both + %br + = link_to t('layout.projects.mass_import'), mass_import_projects_path, :class => 'button' .bordered.bpadding20 %h3=t('layout.relations.filters') - options_for_filters(@all_projects, @groups, @owners).each do |options| diff --git a/app/views/projects/projects/_form.html.haml b/app/views/projects/projects/_form.html.haml index 27cb0ae02..04b3f4cb9 100644 --- a/app/views/projects/projects/_form.html.haml +++ b/app/views/projects/projects/_form.html.haml @@ -1,79 +1,69 @@ - act = controller.action_name.to_sym -- if [:new, :create].include? act +%div{'ng-controller' => 'ProjectFromController'} .leftlist= f.label :name - .rightlist= f.text_field :name, :class => 'text_field', :disabled => f.object.try(:persisted?) + .rightlist= f.text_field :name, :class => 'text_field' .both -.leftlist= f.label :description -.rightlist= f.text_area :description, :class => 'text_field', :cols => 80 -.both -- if [:new, :create].include? act - .leftlist= f.label :owner - .rightlist - = label_tag t("activerecord.attributes.project.who_owns.me") - - if Group.can_own_project(current_user).count > 0 - = radio_button_tag :who_owns, 'me', @who_owns == :me #{}.merge( (@who_owns == :me) ? {:checked => 'checked'} : {} ) - = label_tag t("activerecord.attributes.project.who_owns.group") - = radio_button_tag :who_owns, 'group', @who_owns == :group #{}.merge( (@who_owns == :group) ? {:checked => 'checked'} : {} ) - -# TODO: Make our own select_box helper with new design, blackjack and bitches! - = select_tag :owner_id, options_from_collection_for_select( Group.can_own_project(current_user), :id, :name ) - - else - = hidden_field_tag :who_owns, :me + .leftlist= f.label :description + .rightlist= f.text_area :description, :class => 'text_field', :cols => 80 .both + - if [:new, :create].include? act + = render 'owner', :f => f -.leftlist= f.label :visibility -.rightlist - =# f.select :visibility, Project::VISIBILITIES - - Project::VISIBILITIES.each do |visibility| - = f.radio_button :visibility, visibility, :class => 'niceRadio' - - if visibility == 'open' - = image_tag("unlock.png") - - else - = image_tag("lock.png") - = t("activerecord.attributes.project.visibilities.#{visibility}") -.both -.leftlist - \ -.rightlist - .check - %span#niceCheckbox1.niceCheck-main= f.check_box :is_package - .forcheck= f.label :is_package - .both - - unless [:new, :create].include? act - #publish_form{:class => @project.publish_i686_into_x86_64 ? '' : 'hidden'} - .check - %span.niceCheck-main= f.check_box :publish_i686_into_x86_64 - .forcheck= f.label :publish_i686_into_x86_64 - .both - -.both -- if [:edit, :update].include? act - .leftlist= f.label :default_branch + .leftlist= f.label :visibility .rightlist - = f.select :default_branch, - options_from_collection_for_select( @project.repo.branches, - :name, :name, @project.default_branch), - :class => 'sel80', :id => 'branch_selector' + - Project::VISIBILITIES.each do |visibility| + = f.radio_button :visibility, visibility, :class => 'niceRadio' + - if visibility == 'open' + = image_tag("unlock.png") + - else + = image_tag("lock.png") + = t("activerecord.attributes.project.visibilities.#{visibility}") .both - #maintainer_form{:class => @project.is_package ? '' : 'hidden'} - = f.hidden_field :maintainer_id, :value => @project.maintainer_id - .leftlist - = f.label :maintainer + .leftlist + \ + .rightlist + .check= f.check_box :is_package, 'ng-model' => 'project.is_package', 'ng-change' => 'project.publish_i686_into_x86_64 = false' + .forcheck= f.label :is_package + .both + - unless [:new, :create].include? act + #publish_form{'ng-show' => 'project.is_package'} + .check= f.check_box :publish_i686_into_x86_64, 'ng-model' => 'project.publish_i686_into_x86_64' + .forcheck= f.label :publish_i686_into_x86_64 + .both + + .both + - if [:edit, :update].include? act + .leftlist= f.label :default_branch .rightlist - -# TODO: Maybe use something like Chosen with filter and prepopulated - -# list of potential maintainers? - = autocomplete_field_tag :maintainer_name, @project.maintainer.fullname, - autocomplete_maintainers_path(@project.owner, @project), - :id_element => '#project_maintainer_id', - :placeholder => @project.maintainer.fullname -- if [:new, :create].include? act - .leftlist= f.label :srpm - .rightlist= f.file_field :srpm, :class => 'file_field' + = f.select :default_branch, + options_from_collection_for_select( @project.repo.branches, + :name, :name, @project.default_branch), + :class => 'sel80', :id => 'branch_selector' + .both + #maintainer_form{'ng-show' => 'project.is_package'} + = f.hidden_field :maintainer_id, :value => @project.maintainer_id + .leftlist + = f.label :maintainer + .rightlist + -# TODO: Maybe use something like Chosen with filter and prepopulated + -# list of potential maintainers? + = autocomplete_field_tag :maintainer_name, @project.maintainer.fullname, + autocomplete_maintainers_path(@project.owner, @project), + :id_element => '#project_maintainer_id', + :placeholder => @project.maintainer.fullname + - if [:new, :create].include? act + .leftlist= f.label :srpm + .rightlist= f.file_field :srpm, :class => 'file_field' + .both + .leftlist + \ + .rightlist= submit_tag t('layout.save'), :class => 'button', :data => {'disable-with' => t('layout.saving')} .both -.leftlist - \ -.rightlist= submit_tag t("layout.save"), :class => 'button' -.both + :javascript - $(function() { - ( new Rosa.Views.ProjectModifyView ).render(); - }); + RosaABF.controller('ProjectFromController', ['$scope', function($scope) { + $scope.project = { + is_package: #{@project.is_package}, + publish_i686_into_x86_64: #{@project.publish_i686_into_x86_64} + } + }]); \ No newline at end of file diff --git a/app/views/projects/projects/_owner.html.haml b/app/views/projects/projects/_owner.html.haml new file mode 100644 index 000000000..3d1d19653 --- /dev/null +++ b/app/views/projects/projects/_owner.html.haml @@ -0,0 +1,12 @@ +.leftlist= f.label :owner +.rightlist + = label_tag t("activerecord.attributes.project.who_owns.me") + - if Group.can_own_project(current_user).count > 0 + = radio_button_tag :who_owns, 'me', @who_owns == :me #{}.merge( (@who_owns == :me) ? {:checked => 'checked'} : {} ) + = label_tag t("activerecord.attributes.project.who_owns.group") + = radio_button_tag :who_owns, 'group', @who_owns == :group #{}.merge( (@who_owns == :group) ? {:checked => 'checked'} : {} ) + -# TODO: Make our own select_box helper with new design, blackjack and bitches! + = select_tag :owner_id, options_from_collection_for_select( Group.can_own_project(current_user), :id, :name ) + - else + = hidden_field_tag :who_owns, :me +.both \ No newline at end of file diff --git a/app/views/projects/projects/mass_import.html.haml b/app/views/projects/projects/mass_import.html.haml new file mode 100644 index 000000000..796ca274a --- /dev/null +++ b/app/views/projects/projects/mass_import.html.haml @@ -0,0 +1,27 @@ +%h3.bpadding10= title t("layout.projects.mass_import") += form_for @project, :url => run_mass_import_projects_path, :html => { :class => :form } do |f| + = f.hidden_field :mass_import + .leftlist= f.label :url + .rightlist= f.text_field :url + .both + .leftlist= f.label :srpms_list + .rightlist= f.text_area :srpms_list + .both + .leftlist= f.label :add_to_repository_id + .rightlist= f.select :add_to_repository_id, repositories_grouped_by_platform + .both + = render 'owner', :f => f + + .leftlist= f.label :visibility + .rightlist + - Project::VISIBILITIES.each do |visibility| + = f.radio_button :visibility, visibility, :class => 'niceRadio' + - if visibility == 'open' + = image_tag("unlock.png") + - else + = image_tag("lock.png") + = t("activerecord.attributes.project.visibilities.#{visibility}") + .both + .hr + .button_block + = f.submit t('layout.add'), :data => {'disable-with' => t('layout.saving')} \ No newline at end of file diff --git a/app/views/projects/projects/sections.html.haml b/app/views/projects/projects/sections.html.haml index 6bae42c0f..7289ecfb9 100644 --- a/app/views/projects/projects/sections.html.haml +++ b/app/views/projects/projects/sections.html.haml @@ -17,7 +17,7 @@ %br %span{:style => "font-size: 11px;"}= t("layout.projects.has_wiki_description") .both - .padd25= submit_tag t("layout.save"), :class => 'button' + .padd25= submit_tag t('layout.save'), :class => 'button', :data => {'disable-with' => t('layout.saving')} .both :javascript diff --git a/app/views/projects/pull_requests/_activity.html.haml b/app/views/projects/pull_requests/_activity.html.haml index cbde0e05b..7141c49db 100644 --- a/app/views/projects/pull_requests/_activity.html.haml +++ b/app/views/projects/pull_requests/_activity.html.haml @@ -5,7 +5,11 @@ -if item.is_a? Comment =render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present? -commits_queue.clear - =render 'projects/comments/comment', :comment => item, :data => {:project => @project, :commentable => @commentable} + -unless item.created_from_commit_hash + = render 'projects/comments/comment', :comment => item, :data => {:project => @project, :commentable => @commentable} + -else + - GitPresenters::CommitAsMessagePresenter.present(nil, :comment => item) do |presenter| + = render 'shared/feed_message', :presenter => presenter, :item_no => "-#{item.id}" -elsif item.is_a? Grit::Commit -commits_queue << item -elsif item.is_a? Array @@ -22,4 +26,3 @@ =render 'projects/pull_requests/discussion_comments', :item => item, :diff_counter => diff_counter - diff_counter += 1 =render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present? - diff --git a/app/views/projects/pull_requests/_index_sidebar.html.haml b/app/views/projects/pull_requests/_index_sidebar.html.haml index 05c051d32..df07380c7 100644 --- a/app/views/projects/pull_requests/_index_sidebar.html.haml +++ b/app/views/projects/pull_requests/_index_sidebar.html.haml @@ -6,11 +6,11 @@ %tr %td.width18=radio_button_tag :myradio, 'all', !@is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'} %td.width135=t("layout.pull_requests.all") - %td.width30.right=@project.issues.joins(:pull_request).count + %td.width30.right=@project.issues.joins(:pull_request).not_closed_or_merged.count %tr %td=radio_button_tag :myradio, 'to_me', @is_assigned_to_me, {:id => 'myradio1', :class => 'niceRadio', :name => 'filter'} %td=t("layout.pull_requests.to_me") - %td.width30.right=@project.issues.joins(:pull_request).where(:assignee_id => current_user.id).count + %td.width30.right=@project.issues.joins(:pull_request).where(:assignee_id => current_user.id).not_closed_or_merged.count =form_tag project_pull_requests_path(@project), :id => 'filter_pull_requests', :method => :get, :class => 'ajax_search_form' do .bordered.bpadding20 - search = params[:search_pull_request].present? ? params[:search_pull_request] : t('layout.pull_requests.search') diff --git a/app/views/projects/pull_requests/_pull_diff.html.haml b/app/views/projects/pull_requests/_pull_diff.html.haml index 60fbe55ff..baf8b9ece 100644 --- a/app/views/projects/pull_requests/_pull_diff.html.haml +++ b/app/views/projects/pull_requests/_pull_diff.html.haml @@ -2,9 +2,8 @@ .file %a{:name => "diff-#{pull_diff_counter}"} .top - .l= h(pull_diff.renamed_file ? "#{pull_diff.a_path.rtruncate 60} -> #{pull_diff.b_path.rtruncate 60}" : pull_diff.a_path.rtruncate(120)) - - if pull_diff.b_path.present? - .r= link_to "view file @ #{short_hash_id(commit_id)}", blob_path(@project, commit_id, pull_diff.b_path) + .l= h(pull_diff.renamed_file ? "#{pull_diff.a_path.rtruncate 60}=>#{pull_diff.b_path.rtruncate 60}" : pull_diff.b_path.rtruncate(120)) + .r= link_to "view file @ #{short_hash_id(commit_id)}", blob_path(@project, commit_id, pull_diff.b_path) .clear -if pull_diff.diff.present? && !(@pull.repo.tree(commit_id) / pull_diff.b_path).binary? .diff_data=render_diff(pull_diff, :diff_counter => pull_diff_counter, :comments => @comments) diff --git a/app/views/projects/pull_requests/_status.html.haml b/app/views/projects/pull_requests/_status.html.haml index de98651d4..84fbeb1d1 100644 --- a/app/views/projects/pull_requests/_status.html.haml +++ b/app/views/projects/pull_requests/_status.html.haml @@ -1,14 +1,36 @@ -- if can?(:merge, @pull) && @pull.can_merging? - %br - =form_for PullRequest.new, :url => merge_project_pull_request_path(@project, @pull), :html => { :method => :put, :class => :form } do |f| - =f.submit t 'projects.pull_requests.ready' --else - .flash - %div{:class => @pull.ready? ? 'notice' : 'alert'} - =pull_status @pull +- if can?(:merge, @pull) + %a.button{:href => '', 'ng-click' => 'merge()', 'ng-show' => "pull.status == 'ready'"} + = t 'projects.pull_requests.ready' + .both + +.flash{'ng-show' => '!pull.mergeable'} + .notice{'ng-show' => "pull.status == 'blocked'"} + = t "projects.pull_requests.blocked" + .alert{'ng-show' => "pull.status == 'merged'"} + = t("projects.pull_requests.merged", + :user => '{{pull.merged_by.uname}}', + :to_ref => show_ref(@pull, 'to'), + :from_ref => show_ref(@pull, 'from'), + :time => '{{merged_at}}').html_safe + .alert{'ng-show' => "pull.status == 'closed'"} + = t("projects.pull_requests.closed", + :user => '{{pull.closed_by.uname}}', + :time => '{{closed_at}}') +.both + + +- if !@pull.cross_pull? && can?(:write, @project) + %div{'ng-init' => "getBranch('#{@pull.from_ref}')", 'ng-show' => "pull.status == 'closed' || pull.status == 'merged'"} + %a.button{:href => '', 'ng-click' => 'deleteBranch()', 'ng-show' => "branch && branch.object.sha == pull.from_ref.sha"} + = t('layout.projects.delete_branch') + %a.button{:href => '', 'ng-click' => 'restoreBranch()', 'ng-hide' => "branch"} + = t('layout.projects.restore_branch') + .both + + -if can? :update, @pull - -if action = @pull.can_close? ? 'close' : ('reopen' if @pull.can_reopen?) - %br - =form_for :pull, :url => [@project, @pull], :html => { :id => 'do_pull_action',:method => :put, :class => :form } do |f| - =hidden_field_tag "pull_request_action", action - =f.submit t ".#{action}" + %br + %a.button{:href => '', 'ng-click' => 'reopen()', 'ng-show' => "pull.status == 'closed'"} + = t '.reopen' + %a.button{:href => '', 'ng-click' => 'close()', 'ng-show' => "pull.status == 'ready' || pull.status == 'open' || pull.status == 'blocked'"} + = t '.close' \ No newline at end of file diff --git a/app/views/projects/pull_requests/new.html.haml b/app/views/projects/pull_requests/new.html.haml index a4d30a2d8..96f559cec 100644 --- a/app/views/projects/pull_requests/new.html.haml +++ b/app/views/projects/pull_requests/new.html.haml @@ -21,7 +21,7 @@ =render 'ref_select', :kind => 'to', :project => @pull.to_project, :current => @pull.to_ref .both .leftlist.big-list - .rightlist=f.submit t('.update'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :style => @pull.already? ? '' : 'display: none;', :id => 'update_pull' + .rightlist=f.submit t('.update'), :class => 'btn btn-primary', :style => @pull.already? ? '' : 'display: none;', :id => 'update_pull', :data => {'disable-with' => t('layout.processing')} .both -unless @pull.already? =f.fields_for :issue do |issue| @@ -32,14 +32,14 @@ %div{:class => @pull.ready? ? 'notice' : 'alert'} =pull_status @pull .both - - .leftlist.big-list= t('activerecord.attributes.issue.assignee') + ':' - #assigned-container.rightlist - =render 'projects/issues/user_container', :user => @pull.assignee - .both + - if can?(:write, @pull.to_project) + .leftlist.big-list= t('activerecord.attributes.issue.assignee') + ':' + #assigned-container.rightlist + =render 'projects/issues/user_container', :user => @pull.assignee + .both .leftlist.big-list .rightlist - =f.submit t('.submit'), :class => 'btn btn-primary disabled', 'data-loading-text' => t('layout.processing'), :id => 'create_pull' unless @pull.already? + =f.submit t('.submit'), :class => 'btn btn-primary', :id => 'create_pull', :data => {'disable-with' => t('layout.processing')} unless @pull.already? .both =render 'diff_commits_tabs' if !@pull.already? && @stats != nil diff --git a/app/views/projects/pull_requests/show.html.haml b/app/views/projects/pull_requests/show.html.haml index c1de1d3b9..9e653b0c3 100644 --- a/app/views/projects/pull_requests/show.html.haml +++ b/app/views/projects/pull_requests/show.html.haml @@ -1,19 +1,23 @@ -ar = 'activerecord.attributes.pull_requests' -set_meta_tags :title => [title_object(@project), t('.title', :name => @pull.title.truncate(40), :user => @pull.user.try(:uname))] = render :partial => 'submenu' -%h3.bpadding10 - =pull_status_label @pull - =pull_header @pull -#repo-wrapper - =render 'nav_tabs' - .tab-content.pull_diff_fix - #discussion.tab-pane.active - =render 'projects/issues/header' - =render 'activity' - %br - =render "projects/comments/add", :project => @project, :commentable => @issue if current_user - .pull_status - =render 'status' - =render 'diff_commits_tabs' unless @pull.already? -=hidden_field_tag :preview_url, project_md_preview_path(@project) -= render "projects/comments/markdown_help" + +%div{'ng-controller' => 'PullRequestController', 'ng-init' => "init('#{@project.owner.uname}', '#{@project.name}', '#{@pull.serial_id}')"} + + %h3.bpadding10 + - PullRequest::STATUSES.each do |status| + = pull_status_label status, {'ng-show' => "pull.status == '#{status}'", :style => 'display: none;'} + = pull_header @pull + #repo-wrapper + =render 'nav_tabs' + .tab-content.pull_diff_fix + #discussion.tab-pane.active + =render 'projects/issues/header' + =render 'activity' + %br + =render "projects/comments/add", :project => @project, :commentable => @issue if current_user + .pull_status + =render 'status' + =render 'diff_commits_tabs' unless @pull.already? + =hidden_field_tag :preview_url, project_md_preview_path(@project) + = render "projects/comments/markdown_help" diff --git a/app/views/projects/pull_requests/show.json.jbuilder b/app/views/projects/pull_requests/show.json.jbuilder new file mode 100644 index 000000000..2496d7742 --- /dev/null +++ b/app/views/projects/pull_requests/show.json.jbuilder @@ -0,0 +1,41 @@ +json.pull_request do + + json.number @pull.serial_id + json.(@pull, :status) + json.to_ref do + json.ref @pull.to_ref + json.sha @pull.to_commit.try(:id) + json.project do + json.(@pull.to_project, :id, :name) + json.owner_uname @pull.to_project.owner.uname + end + end + json.from_ref do + json.ref @pull.from_ref + json.sha @pull.from_commit.try(:id) + json.project do + json.(@pull.from_project, :id, :name) + json.owner_uname @pull.to_project.owner.uname + end + end + + json.owner do + json.(@pull.user, :id, :name, :uname) + end + + json.assignee do + json.(@pull.issue.assignee, :id, :name, :uname) + end if @pull.issue.assignee + json.mergeable @pull.can_merging? + json.merged_at @pull.issue.closed_at.to_i if @pull.merged? + + json.closed_at @pull.issue.closed_at.to_i if @pull.merged? || @pull.closed? + if @pull.issue.closer + json.closed_by do + json.(@pull.issue.closer, :id, :name, :uname) + end + json.merged_by do + json.(@pull.issue.closer, :id, :name, :uname) + end if @pull.merged? + end +end diff --git a/app/views/projects/wiki/_editor.html.haml b/app/views/projects/wiki/_editor.html.haml index cddc9323d..1869eaf58 100644 --- a/app/views/projects/wiki/_editor.html.haml +++ b/app/views/projects/wiki/_editor.html.haml @@ -33,7 +33,7 @@ %span.jaws %br - = submit_tag t("wiki.save_button"), :id => "gollum-editor-submit", :title => t("wiki.save_changes") + = submit_tag t('wiki.save_button'), :id => 'gollum-editor-submit', :title => t('wiki.save_changes'), :data => {'disable-with' => t('layout.saving')} = link_to t("wiki.preview"), "javascript:void(0)", :id => "gollum-editor-preview", :class => "minibutton", :title => t("wiki.preview_title"), :'data-url' => preview_project_wiki_index_path(@project) / - content_for :javascripts do diff --git a/app/views/projects/wiki/_history.html.haml b/app/views/projects/wiki/_history.html.haml index 253717874..6b7c91127 100644 --- a/app/views/projects/wiki/_history.html.haml +++ b/app/views/projects/wiki/_history.html.haml @@ -16,7 +16,7 @@ %span.username= user.present? ? user.fullname : v.author.name .both %td.td3 - %span.wiki-gray= "#{l v.committed_date.to_date, :format => :long}:" + = datetime_moment v.committed_date, :tag => :span, :class => 'wiki-gray' = v.message - if @name = raw "[#{link_to v.id[0..6], versioned_project_wiki_path(@project, escaped_name, v.id), :title => t("wiki.view_commit")}]" diff --git a/app/views/projects/wiki/_page.html.haml b/app/views/projects/wiki/_page.html.haml index e7b51c2e0..e759c99ff 100644 --- a/app/views/projects/wiki/_page.html.haml +++ b/app/views/projects/wiki/_page.html.haml @@ -12,8 +12,7 @@ %p#last-edit = t("wiki.last_edited_by") %b= user_link_by_user User.where(:email => author_email).first - = time_ago_in_words date.to_time - 4.hours, true - = t("layout.time.ago") + = datetime_moment date, :tag => :span - unless action_name == 'preview' or cannot? :write, @project %p#delete-link = link_to project_wiki_path(@project, escaped_name), :method => :delete, :confirm => t("layout.confirm") do diff --git a/app/views/search/_form_advanced.html.haml b/app/views/search/_form_advanced.html.haml index ab704ec69..7615e109e 100644 --- a/app/views/search/_form_advanced.html.haml +++ b/app/views/search/_form_advanced.html.haml @@ -1,5 +1,5 @@ = form_tag search_index_path, :method => 'get' do .leftside= text_field_tag 'query', @query, :placeholder => t("layout.search.header"), :class => 'exsearch' .lineForm.leftside.rmargin10= select_tag 'type', options_for_select(t('layout.search.types').invert, @type), :class => 'sel80 cusel', :id => 'selSearch' - .leftside= submit_tag t("layout.search.header"), :class => 'button width100' + .leftside= submit_tag t('layout.search.header'), :class => 'button width100', :data => {'disable-with' => t('layout.processing')} .both \ No newline at end of file diff --git a/app/views/shared/_angularjs_will_paginate.html.haml b/app/views/shared/_angularjs_will_paginate.html.haml new file mode 100644 index 000000000..d2193cce9 --- /dev/null +++ b/app/views/shared/_angularjs_will_paginate.html.haml @@ -0,0 +1,14 @@ +#will_paginate{'ng-show' => 'pages'} + .pagination + %div{'ng-class' => "{'disabled': !page.active}", 'ng-repeat' => 'page in pages', 'ng-switch' => 'page.type'} + %a{'ng-switch-when' => 'previous_page', 'ng-click' => 'goToPage(page.number)', :href => ''} + = t('datatables.previous_label') + %a{'ng-switch-when' => 'first', :href => ''} + {{page.number}} + %a{'ng-switch-when' => 'page', 'ng-click' => 'goToPage(page.number)', :href => ''} + {{page.number}} + %a{'ng-switch-when' => 'more', 'ng-click' => 'goToPage(page.number)', :href => ''} … + %a{'ng-switch-when' => 'last', 'ng-click' => 'goToPage(page.number)', :href => ''} + {{page.number}} + %a{'ng-switch-when' => 'next_page', 'ng-click' => 'goToPage(page.number)', :href => ''} + = t('datatables.next_label') \ No newline at end of file diff --git a/app/views/shared/_autocomplete_form.html.haml b/app/views/shared/_autocomplete_form.html.haml new file mode 100644 index 000000000..cef3191bc --- /dev/null +++ b/app/views/shared/_autocomplete_form.html.haml @@ -0,0 +1,44 @@ +-# + Variables: + subject + field + field_class + autocomplete_path + placeholder + default_values (optional) + +- default_values ||= [] +- subject_class = subject.class.name.underscore +.autocomplete-form{:subject_class => subject_class, :field => field, :path => autocomplete_path, :class => field} + %h3= t("activerecord.attributes.build_list.#{field}") + %span.icon-question-sign + - if !(params[:show] == 'inline' && params[:build_list_id].present?) + .dialog{:title => t("activerecord.attributes.build_list.#{field}"), :id => "#{field}_dialog"} + = render "shared/autocomplete_docs/#{field}" + .both + = autocomplete_field_tag field, nil, "#{autocomplete_path}?#{{:platform_id => subject.save_to_platform.try(:id)}.to_param}", :placeholder => placeholder, :class => 'autocomplete', :update_elements => {:id => "##{field}_field", :path => "##{field}_field_path", :label => "##{field}_field_label"} + = hidden_field_tag field, nil, :id => "#{field}_field" + = hidden_field_tag field, nil, :id => "#{field}_field_path" + = hidden_field_tag field, nil, :id => "#{field}_field_label" + = submit_tag t('layout.add'), :class => 'button add' + + %table.tablesorter{:cellpadding => "0", :cellspacing => "0"} + %tbody + - field_name = "#{subject_class}[#{field}][]" + - field_class.where(:id => params[:build_list].try(:[], field) ).each do |extra| + %tr + - if extra.is_a?(BuildList) + %td= link_to "#{extra.id} (#{extra.project.name} - #{extra.arch.name})", extra + - else + %td= link_to "#{extra.platform.name}/#{extra.name}", [extra.platform, extra] + %td.actions + - field = extra.is_a?(BuildList) ? 'extra_build_lists' : 'extra_repositories' + = hidden_field_tag field_name, extra.id + %span.delete + .default-values + - field_class.where(:id => default_values).each do |extra| + .hidden{:label => "#{extra.platform.name}/#{extra.name}", + :path => url_for([extra.platform, extra]), + :name => field_name, :value => extra.id} + + diff --git a/app/views/shared/_build_results.html.haml b/app/views/shared/_build_results.html.haml new file mode 100644 index 000000000..7d68edc0d --- /dev/null +++ b/app/views/shared/_build_results.html.haml @@ -0,0 +1,15 @@ +%h3= subject.class.human_attribute_name(subject.is_a?(BuildList) ? 'logs' : 'results') +%h4.nomargin{'ng-hide' => 'subject.results'}= t('layout.no_') +%table.tablesorter.width565{:cellpadding => "0", :cellspacing => "0", 'ng-show' => 'subject.results'} + %thead + %tr + %th= t("activerecord.attributes.product_build_list/results.file_name") + %th= t("activerecord.attributes.product_build_list/results.sha1") + %th= t("activerecord.attributes.product_build_list/results.size") + %tbody + %tr{'ng-repeat' => 'item in subject.results'} + %td + %a{'ng-href' => '{{item.url}}' } {{item.file_name}} + %td {{item.sha1}} + %td {{item.size}} +.both \ No newline at end of file diff --git a/app/views/shared/_feed_message.html.haml b/app/views/shared/_feed_message.html.haml index 414b4cc9b..c498b07a2 100644 --- a/app/views/shared/_feed_message.html.haml +++ b/app/views/shared/_feed_message.html.haml @@ -1,23 +1,28 @@ -.activity{:id => presenter.comment_id? ? presenter.comment_anchor : ''} - .top - - if presenter.buttons? - %span.buttons= raw presenter.buttons.join(' | ').html_safe - .image - %img{:alt => "avatar", :src => presenter.image} - .text - -#.imaged move up a line. - %span.name= presenter.header - .both - %span.date= presenter.date - .both - - if presenter.caption? - %span.subject= presenter.caption - - if presenter.expandable? and presenter.content? - %span.data-expander.collapsed{:id => "expand#{item_no}"} +-if !presenter.is_reference_to_issue || can?(:show, presenter.reference_project) + .activity{:id => presenter.comment_id? ? presenter.comment_anchor : ''} + .top + - if presenter.buttons? + %span.buttons= raw presenter.buttons.join(' | ').html_safe + .image + %img{:alt => "avatar", :src => presenter.image} + .text + -#.imaged move up a line. + %span.name= presenter.header .both - .both - - if presenter.content? - .fulltext{:class => "#{presenter.expandable? ? "hidden" : ''} #{presenter.caption? ? "" : "alone"}", - :id => presenter.expandable? ? "content-expand#{item_no}" : ''} - .cm-s-default.md_and_cm=markdown presenter.content + = datetime_moment presenter.date, :tag => :span, :class => :date + .both + - if presenter.caption? + %span.subject= presenter.caption + - if presenter.expandable? and presenter.content? + %span.data-expander.collapsed{:id => "expand#{item_no}"} + .both .both + - if presenter.content? + %div + =presenter.issue_referenced_state if presenter.issue_referenced_state? + .fulltext{:class => "#{presenter.expandable? ? "hidden" : ''} #{presenter.caption? ? "" : "alone"}", + :id => presenter.expandable? ? "content-expand#{item_no}" : ''} + .md_and_cm{:class => presenter.is_reference_to_issue ? '' : 'cm-s-default'} + =presenter.is_reference_to_issue ? presenter.content : markdown(presenter.content) + .both + diff --git a/app/views/shared/_log.html.haml b/app/views/shared/_log.html.haml index 6ff0518d7..30bc027ec 100644 --- a/app/views/shared/_log.html.haml +++ b/app/views/shared/_log.html.haml @@ -28,19 +28,15 @@ = check_box_tag :autoreload, true, build_started = t("layout.build_lists.log.autoreload") = select_tag :reload_interval, log_reload_time_options - %tr.bottom - %td.first - - if download_log_url - = link_to t("layout.build_lists.log.download"), download_log_url, :id => :log_url - %td.last{ :class => build_started ? nil : :hidden } - = label_tag :load_lines do - = raw t("layout.build_lists.log.load_lines", :count => select_tag(:load_lines, log_reload_lines_options)) + + .both + #output.cm-s-default.log{ :readonly => :readonly, + :data => { :url => get_log_path, :log_type => :build } } + %pre#code .both - %textarea.log{ :readonly => :readonly, :wrap => 'off', - :data => { :url => get_log_path, :log_type => :build } } - = t("layout.build_lists.log.not_available") .both + :javascript $(function() { initLogWrapper(); diff --git a/app/views/shared/_members_table.html.haml b/app/views/shared/_members_table.html.haml index 306e9e8aa..816287a83 100644 --- a/app/views/shared/_members_table.html.haml +++ b/app/views/shared/_members_table.html.haml @@ -25,8 +25,8 @@ %td.buttons = link_to "#{remove_member_path}?member_id=#{user.id}", :method => :delete, :confirm => t("layout.confirm") do %span.delete - - if can? :remove_memvers, editable_object - = submit_tag t("layout.delete"), :class => 'button' + - if can? :remove_members, editable_object + = submit_tag t("layout.delete"), :class => 'button', :data => {'disable-with' => t('layout.processing')} .both - if can? :add_member, editable_object @@ -35,5 +35,5 @@ .admin-search = autocomplete_field_tag 'member_id', params[:member_id], autocomplete_user_uname_autocompletes_path, :id_element => '#member_id_field' = hidden_field_tag 'member_id', nil, :id => 'member_id_field' - = submit_tag t("layout.add"), :class => 'button' + = submit_tag t('layout.add'), :class => 'button', :data => {'disable-with' => t('layout.processing')} .both diff --git a/app/views/shared/_profile.html.haml b/app/views/shared/_profile.html.haml index 6f8c14778..51a229d0d 100644 --- a/app/views/shared/_profile.html.haml +++ b/app/views/shared/_profile.html.haml @@ -1,38 +1,54 @@ -- edit_link ||= nil +- edit_url ||= nil - user ||= nil - group ||= nil - name ||= uname -.avatar - = image_tag avatar_url(user || group, :big) - - if edit_link - %br - = edit_link -.info - %h3= title uname - = name - - if user - %br - = mail_to user.email, user.email, :encode => "javascript" - %br - - if user - %h4= t("activerecord.attributes.user.professional_experience") + ":" - %p= user.professional_experience - - else - %h4= t("activerecord.attributes.group.description") + ":" - %p= group.description -.content - %h4= t("layout.projects.public_projects_list") + ":" - %p - =form_tag search_path, :id => 'filter_projects', :method => :get do - =tracker_search_field(:search, t('layout.find_project')) - %br - %p - - projects.each do |project| - = link_to project.name, project - %br - %br - = will_paginate projects - %br +- desc, desc_title = if user + - [user.professional_experience, t('activerecord.attributes.user.professional_experience')] +- else + - [group.description , t('activerecord.attributes.group.description')] +- max_length = 35 -:javascript - $('article .all').addClass('verybigpadding'); += hidden_field_tag :profile_path, @profile_path +.row + .span3.profile + .avatar= image_tag avatar_url(user || group, :big), :alt => (user || group).uname + .base_info + %h3{:title => uname}= title short_message(uname, 16) + %p{:title => user.try(:name)} + - if user + = short_message(user.name, 28) + = link_to image_tag('gears.png'), edit_url if edit_url.present? + .both + - if user + %p.info.first + - message = "#{t 'activerecord.attributes.user.email'}: " + = message + = mail_to user.email, short_message(user.email, max_length - message.length), :encode => 'javascript', :title => user.email + %p.info + - message = "#{t 'activerecord.attributes.user.site'}: " + = message + = link_to short_message(user.site, max_length - message.length), user.site, :title => user.site + %p.info{:title => user.company}= short_message("#{t 'activerecord.attributes.user.company'}: #{user.company}", max_length) + %p.info{:title => user.location}= short_message("#{t 'activerecord.attributes.user.location'}: #{user.location}", max_length) + .span6 + %h3{:style => 'margin-top: 0;'}= desc_title + = desc + +%hr.profile_line{:color => 'dfe8ef', :size => '3'} + +.row-fluid.profile-content + .span12.content + %nav + %ul + %li + = link_to t('layout.projects.list_header'), '#', :class => 'projects active' + .span12.sub-menu + %nav + %ul + %li= link_to t('layout.projects.public'), '#', :class => "public-projects #{!@hidden ? 'active' : ''}" + %li= link_to t('layout.projects.private'), '#', :class => "private-projects #{@hidden ? 'active' : ''}" + .search + .pic + .field= text_field_tag :query_projects, @query, :placeholder => t('layout.find_project') + .both + .profile-table= render 'shared/profile_projects', :projects => projects diff --git a/app/views/shared/_profile_projects.html.haml b/app/views/shared/_profile_projects.html.haml new file mode 100644 index 000000000..c832cadab --- /dev/null +++ b/app/views/shared/_profile_projects.html.haml @@ -0,0 +1,17 @@ +- pr_groups = projects.in_groups(2) +%table + %tbody + - pr_groups[0].each_with_index do |project, ind| + %tr{:class => ind.odd? ? 'odd' : 'even'} + - [project, pr_groups[1][ind]].each do |project| + %th + - if project.present? + .project-link= link_to short_message(project.name, 60), project, :title => project.name + .both + .row-fluid + = datetime_moment project.updated_at, :class => :span3 + - commits_count = project.total_commits_count + .span3= "#{commits_count > 10000 ? '10000+' : commits_count} #{commits_pluralize(commits_count)}" +%br +%div{:style => 'margin: 10px;'}= will_paginate projects + diff --git a/app/views/shared/_search_form.html.haml b/app/views/shared/_search_form.html.haml deleted file mode 100644 index 656cc717b..000000000 --- a/app/views/shared/_search_form.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -= form_tag '#', :method => :get do#platform_repository_path(@platform, @repository), :method => :get do - .group - = label_tag :query, t("layout.search_by_name"), :class => :label - = text_field_tag :query - %button.search{:type => "submit"}= t("layout.search.header") \ No newline at end of file diff --git a/app/views/shared/autocomplete_docs/_extra_build_lists.en.html.haml b/app/views/shared/autocomplete_docs/_extra_build_lists.en.html.haml new file mode 100644 index 000000000..5feb8d951 --- /dev/null +++ b/app/views/shared/autocomplete_docs/_extra_build_lists.en.html.haml @@ -0,0 +1,12 @@ +:markdown + + __Ability to attach at assembly packages of build lists as additional sources of packages.__ +
+ + Requirements for attaching build lists: + + - only build list with container can be connected; + - for main platform You can connect only build lists which destined for same platform; + - only build lists with the same architecture will be connected or oriented to the both architectures (the property Publish i686 packages into x86_64 repository (only for rhel) in the settings of project is true). + + _Example: only build lists with x86_64 architecture will be connected to x86_64._ \ No newline at end of file diff --git a/app/views/shared/autocomplete_docs/_extra_build_lists.ru.html.haml b/app/views/shared/autocomplete_docs/_extra_build_lists.ru.html.haml new file mode 100644 index 000000000..2b44d61e4 --- /dev/null +++ b/app/views/shared/autocomplete_docs/_extra_build_lists.ru.html.haml @@ -0,0 +1,12 @@ +:markdown + + __Возможность подключить для сборки пакеты из сборочных заданий как дополнительные источники пакетов.__ +
+ + Требования для подключаемых сборочных заданий: + + - можно подключить только задание с контейнером; + - для основных платформ возможно подключить только задания, которые предназначены для этой же платформы; + - будут подключены только задания с архитектурой, соотвествующей создаваемой, или предназначенные для обеих архитектур (если установлено соответствующее свойство в настройках rhel-проекта). + + _Пример: для x86_64 архитектуры будут подключены только сборочные задания, собранные для x86_64._ \ No newline at end of file diff --git a/app/views/shared/autocomplete_docs/_extra_repositories.en.html.haml b/app/views/shared/autocomplete_docs/_extra_repositories.en.html.haml new file mode 100644 index 000000000..d11733dfa --- /dev/null +++ b/app/views/shared/autocomplete_docs/_extra_repositories.en.html.haml @@ -0,0 +1,14 @@ +:markdown + + __Ability to attach at assembly repositories of platforms as additional sources of packages.__ +
+ + Requirements for attaching repositories: + + - attaching repositories from other platform available only for build list into the personal platform. + + How to attach a repository: + + - write the name of platform, choose repository from the list for attaching and click to "Add" button. + + _Example: correct input "uxteam_personal", wrong - "uxteam_personal/main"._ \ No newline at end of file diff --git a/app/views/shared/autocomplete_docs/_extra_repositories.ru.html.haml b/app/views/shared/autocomplete_docs/_extra_repositories.ru.html.haml new file mode 100644 index 000000000..c26de1d1e --- /dev/null +++ b/app/views/shared/autocomplete_docs/_extra_repositories.ru.html.haml @@ -0,0 +1,14 @@ +:markdown + + __Возможность подключить для сборки репозитории платформ как дополнительные источники пакетов.__ +
+ + Требования для репозиториев: + + - использовать репозитории из других персональных платформ возможно только для сборки в персональную платформу. + + Как подключить репозиторий: + + - добавьте имя платформы, затем из списка выберете репозиторий для поключения и нажмите кнопку "Добавить". + + _Пример: правильно ввести "uxteam_personal", неправильно: "uxteam_personal/main"._ \ No newline at end of file diff --git a/app/views/user_mailer/build_list_notification.en.haml b/app/views/user_mailer/build_list_notification.en.haml index afd0752d6..b2baaf6df 100644 --- a/app/views/user_mailer/build_list_notification.en.haml +++ b/app/views/user_mailer/build_list_notification.en.haml @@ -10,6 +10,6 @@ = "#{@build_list.arch.name}." %p More detailed information you can get by link: - = link_to "task [№ #{@build_list.bs_id ? @build_list.bs_id : t("layout.build_lists.bs_id_not_set")}]", build_list_url(@build_list) + = link_to "task [№ #{@build_list.id}]", build_list_url(@build_list) = render 'footer' diff --git a/app/views/user_mailer/build_list_notification.ru.haml b/app/views/user_mailer/build_list_notification.ru.haml index 21401beaa..34ea53d51 100644 --- a/app/views/user_mailer/build_list_notification.ru.haml +++ b/app/views/user_mailer/build_list_notification.ru.haml @@ -10,6 +10,6 @@ = "#{@build_list.arch.name}." %p Более подробную информацию можно получить по ссылке: - = link_to "задание [№ #{@build_list.bs_id ? @build_list.bs_id : t("layout.build_lists.bs_id_not_set")}]", build_list_url(@build_list) + = link_to "задание [№ #{@build_list.id}]", build_list_url(@build_list) = render 'footer' diff --git a/app/views/user_mailer/git_delete_branch_notification.html.haml b/app/views/user_mailer/git_delete_branch_notification.html.haml new file mode 100644 index 000000000..31b46c01f --- /dev/null +++ b/app/views/user_mailer/git_delete_branch_notification.html.haml @@ -0,0 +1,8 @@ +- user = User.where(:email => user_email).first || User.new(:email => user_email) if defined?(user_email) + +%p + - _user_link = defined?(user_email) ? user_link(user, defined?(user_name) ? user_name : user_email, true) : nil + = t('notifications.bodies.delete_branch', :branch_name => branch_name, :user_link => _user_link).html_safe + = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_url(project_owner, project_name)) ) + += render 'footer' \ No newline at end of file diff --git a/app/views/user_mailer/git_new_push_notification.html.haml b/app/views/user_mailer/git_new_push_notification.html.haml new file mode 100644 index 000000000..62d24ec8f --- /dev/null +++ b/app/views/user_mailer/git_new_push_notification.html.haml @@ -0,0 +1,20 @@ +- user = User.where(:email => user_email).first || User.new(:email => user_email) if defined?(user_email) + + +%p + - _user_link = defined?(user_email) ? user_link(user, defined?(user_name) ? user_name : user_email, true) : nil + = raw t("notifications.bodies.#{change_type}_branch", {:branch_name => branch_name, :user_link => _user_link}) + = raw t("notifications.bodies.project", :project_link => link_to("#{project_owner}/#{project_name}", project_url(project_owner, project_name)) ) + + +%p + - last_commits.each do |commit| + = link_to shortest_hash_id(commit[0]), commit_url(project_owner, project_name, commit[0]) + = commit[1] + %br + - if defined? other_commits + %br + =link_to t('notifications.bodies.more_commits', :count => other_commits_count, :commits => commits_pluralize(other_commits_count)), + diff_url(project_owner, project_name, :diff => other_commits) + += render 'footer' \ No newline at end of file diff --git a/app/views/user_mailer/issue_assign_notification.en.haml b/app/views/user_mailer/issue_assign_notification.en.haml index 3aa4a049a..91522375b 100644 --- a/app/views/user_mailer/issue_assign_notification.en.haml +++ b/app/views/user_mailer/issue_assign_notification.en.haml @@ -1,7 +1,3 @@ -%p== Hello, #{@user.user_appeal}. - - %p You have been assigned to issue #{ link_to @issue.title, project_issue_url(@issue.project, @issue) } - -= render 'footer' += render 'footer' \ No newline at end of file diff --git a/app/views/user_mailer/issue_assign_notification.ru.haml b/app/views/user_mailer/issue_assign_notification.ru.haml index 5b5dcd7d5..616f120de 100644 --- a/app/views/user_mailer/issue_assign_notification.ru.haml +++ b/app/views/user_mailer/issue_assign_notification.ru.haml @@ -1,7 +1,3 @@ -%p== Здравствуйте, #{@user.user_appeal}. - - %p Вам была назначена задача #{ link_to @issue.title, project_issue_url(@issue.project, @issue) } - -= render 'footer' += render 'footer' \ No newline at end of file diff --git a/app/views/users/base/_form.html.haml b/app/views/users/base/_form.html.haml index e661a9191..c4cccf559 100644 --- a/app/views/users/base/_form.html.haml +++ b/app/views/users/base/_form.html.haml @@ -32,7 +32,10 @@ .leftlist= f.label :professional_experience, t("activerecord.attributes.user.professional_experience") .rightlist= f.text_area :professional_experience .both +.leftlist= f.label :sound_notifications, t("activerecord.attributes.user.sound_notifications") +.rightlist= f.check_box :sound_notifications +.both .leftlist \ -.rightlist= submit_tag t("layout.save"), :data => {:"disable-with" => t("layout.saving")} +.rightlist= submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} .both diff --git a/app/views/users/profile/show.html.haml b/app/views/users/profile/show.html.haml index 5c16bf2fa..914a2d558 100644 --- a/app/views/users/profile/show.html.haml +++ b/app/views/users/profile/show.html.haml @@ -1,4 +1,10 @@ -set_meta_tags :title => title_object(@user) -- edit_link = can?(:edit, @user) ? link_to(t("layout.users.settings"), current_user == @user ? profile_settings_path : edit_admin_user_path(@user), :class => 'button width81') : nil -= render 'shared/profile', :uname => @user.uname, :name => @user.name, :user => @user, :search_path => user_path, :projects => @projects, :edit_link => edit_link \ No newline at end of file +- edit_url = can?(:edit, @user) ? (current_user == @user ? profile_settings_path : edit_admin_user_path(@user)) : nil + += render 'shared/profile', :uname => @user.uname, + :name => @user.name, + :user => @user, + :search_path => user_path, + :projects => @projects, + :edit_url => edit_url \ No newline at end of file diff --git a/app/views/users/settings/notifiers.html.haml b/app/views/users/settings/notifiers.html.haml index d5917480a..78bb398c6 100644 --- a/app/views/users/settings/notifiers.html.haml +++ b/app/views/users/settings/notifiers.html.haml @@ -9,7 +9,7 @@ = form_for @user.notifier, :url => notifiers_settings_path, :html => {:class => :form} do |f| = render 'notifier', :f => f, :field => :can_notify %h3= t("layout.settings.notifiers.code_header") - - [:new_comment_commit_owner, :new_comment_commit_repo_owner, :new_comment_commit_commentor].each do |field| + - [:update_code, :new_comment_commit_owner, :new_comment_commit_repo_owner, :new_comment_commit_commentor].each do |field| = render 'notifier', :f => f, :field => field %h3= t("layout.settings.notifiers.tracker_header") - [:new_comment, :new_comment_reply, :new_issue, :issue_assign].each do |field| @@ -21,7 +21,7 @@ %br .leftside.w25 \ - .leftside.w420= submit_tag t("layout.save") + .leftside.w420= submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} .both :javascript diff --git a/app/views/users/settings/private.html.haml b/app/views/users/settings/private.html.haml index 3553c4d44..2eb30eeb3 100644 --- a/app/views/users/settings/private.html.haml +++ b/app/views/users/settings/private.html.haml @@ -13,7 +13,16 @@ .both .leftlist \ - .rightlist= submit_tag t('layout.save') + .rightlist= submit_tag t('layout.save'), :data => {'disable-with' => t('layout.saving')} + .both +%br + += form_for @user, :url => reset_auth_token_settings_path, :html => {:class => :form} do |f| + .leftlist= f.label :authentication_token + .rightlist= @user.authentication_token + .both + .leftlist + .rightlist= submit_tag t('layout.users.reset_token'), :data => {'disable-with' => t('layout.saving')} .both :javascript diff --git a/app/views/users/ssh_keys/index.html.haml b/app/views/users/ssh_keys/index.html.haml index 9f744fab1..e1764966f 100644 --- a/app/views/users/ssh_keys/index.html.haml +++ b/app/views/users/ssh_keys/index.html.haml @@ -21,6 +21,6 @@ .leftlist= f.label :key, t('activerecord.attributes.ssh_key.key') .rightlist= f.text_area :key %br - = f.submit t('layout.add')#, :class => 'button' + = f.submit t('layout.add'), :data => {'disable-with' => t('layout.processing')} - content_for :sidebar, render('sidebar') diff --git a/config/application.rb b/config/application.rb index 0ccdcd359..77751f953 100644 --- a/config/application.rb +++ b/config/application.rb @@ -33,7 +33,7 @@ module Rosa # config.plugins = [ :exception_notification, :ssl_requirement, :all ] # Activate observers that should always be running. - config.active_record.observers = :event_log_observer, :activity_feed_observer, :build_list_observer + config.active_record.observers = :event_log_observer, :build_list_observer # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. diff --git a/config/application.yml.sample b/config/application.yml.sample index 07a3e369a..f2824c609 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -2,16 +2,32 @@ common: &common project_name: ABF repo_project_name: ABF anonymous_access: true + preregistration: false file_store_url: 'http://file-store.rosalinux.ru' distr_types: ['mdv', 'rhel', 'nau5'] + allowed_addresses: + - 127.0.0.100 abf_worker: publish_workers_count: 2 + log_server: + host: 127.0.0.1 + port: 6379 keys: key_pair_secret_key: 'key_pair_secret_key' airbrake_api_key: 'airbrake_api_key' + logentries_key: 'logentries_key' devise_pepper: 'devise_pepper' secret_token: 'secret_token' - + github: + id: 'APP_ID' + secret: 'APP_SECRET' + google: + id: 'APP_ID' + secret: 'APP_SECRET' + facebook: + id: 'APP_ID' + secret: 'APP_SECRET' + downloads_url: 'http://abf-downloads.rosalinux.ru' wiki_formats: markdown: "Markdown" textile: "Textile" @@ -41,17 +57,26 @@ development: <<: *common root_path: /var/rosa git_path: /var/rosa + tmpfs_path: /dev/shm do-not-reply-email: do-not-reply@localhost + github_services: + ip: 127.0.0.1 + port: 1234 production: <<: *common root_path: /share git_path: /mnt/gitstore + tmpfs_path: /dev/shm do-not-reply-email: do-not-reply@abf.rosalinux.ru mailer_https_url: false + github_services: + ip: 127.0.0.1 + port: 1234 test: <<: *common + tmpfs_path: "use Rails.root/tmp/test_root in spec" root_path: "use Rails.root/tmp/test_root in spec" git_path: "use Rails.root/tmp/test_root in spec" do-not-reply-email: do-not-reply@localhost diff --git a/config/application.yml.travis b/config/application.yml.travis new file mode 100644 index 000000000..6715379ef --- /dev/null +++ b/config/application.yml.travis @@ -0,0 +1,59 @@ +common: &common + project_name: ABF + repo_project_name: ABF + anonymous_access: true + preregistration: false + file_store_url: 'http://file-store.rosalinux.ru' + distr_types: ['mdv', 'rhel', 'nau5'] + allowed_addresses: + - 127.0.0.100 + abf_worker: + publish_workers_count: 2 + log_server: + host: 127.0.0.1 + port: 6379 + keys: + key_pair_secret_key: 'key_pair_secret_key' + airbrake_api_key: 'airbrake_api_key' + devise_pepper: 'e295a79fb7966e94a6e8b184ba65791a' + secret_token: 'e295a79fb7966e94a6e8b184ba65791a' + github: + id: 'APP_ID' + secret: 'APP_SECRET' + google: + id: 'APP_ID' + secret: 'APP_SECRET' + facebook: + id: 'APP_ID' + secret: 'APP_SECRET' + downloads_url: 'http://abf-downloads.rosalinux.ru' + wiki_formats: + markdown: "Markdown" + textile: "Textile" + # rdoc: "RDoc" + org: "Org-mode" + # creole: "Creole" + # mediawiki: "MediaWiki" + feedback: + email: + - 'test@example.com' + - 'test1@example.com' + # or + # email: 'test@example.com' + + # optional parameters + cc: + - 'test2@example.com' # or like email + bcc: + - 'test3@example.com' # or like email + subject_prefixes: # or one line + - 'from_feedback' + subject_postfixes: # or one line + - 'sample_postfix' + shell_user: 'git' + +test: + <<: *common + root_path: /home/travis/build/rosa-abf/rosa-build/tmp/test_root + git_path: /home/travis/build/rosa-abf/rosa-build/tmp/test_root + do-not-reply-email: do-not-reply@localhost diff --git a/config/boot.rb b/config/boot.rb index 4489e5868..6397af4d8 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -2,5 +2,6 @@ require 'rubygems' # Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +ENV['NEWRELIC_DISPATCHER'] ||= 'puma' require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) diff --git a/config/database.yml.sample b/config/database.yml.sample index e49b4c8db..7b27709d7 100644 --- a/config/database.yml.sample +++ b/config/database.yml.sample @@ -6,3 +6,10 @@ production: pool: 5 username: rosa password: rosa + +test: + adapter: postgresql + encoding: unicode + template: template0 + database: rosa_build_test + username: postgres \ No newline at end of file diff --git a/config/deploy.rb.sample b/config/deploy.rb.sample index 27889acf3..f78974b31 100644 --- a/config/deploy.rb.sample +++ b/config/deploy.rb.sample @@ -9,7 +9,6 @@ set :default_environment, { require 'rvm/capistrano' require 'bundler/capistrano' -require 'airbrake/capistrano' set :whenever_command, "bundle exec whenever" # require "whenever/capistrano" @@ -33,7 +32,8 @@ set :repository, "git@github.com:uname/repository.git" set :deploy_via, :remote_cache require './lib/recipes/nginx' -require './lib/recipes/unicorn' +# require './lib/recipes/unicorn' +require 'puma/capistrano' #require './lib/recipes/bluepill' set :workers_count, 4 require './lib/recipes/resque' @@ -85,6 +85,7 @@ after "deploy:start", "resque:start" after "deploy:restart", "resque:restart" after "deploy:restart", "deploy:cleanup" +after :deploy, 'notify_rollbar' namespace :rake_tasks do Cape do @@ -92,6 +93,14 @@ namespace :rake_tasks do end end +task :notify_rollbar, :roles => :app do + set :revision, `git log -n 1 --pretty=format:"%H"` + set :local_user, `whoami` + set :rollbar_token, 'rollbar_token' + rails_env = fetch(:rails_env, 'production') + run "curl https://api.rollbar.com/api/1/deploy/ -F access_token=#{rollbar_token} -F environment=#{rails_env} -F revision=#{revision} -F local_username=#{local_user} >/dev/null 2>&1", :once => true +end + namespace :update do desc "Copy remote production shared files to localhost" task :shared do diff --git a/config/environments/development.rb b/config/environments/development.rb index 6809679f4..c75da8c27 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,3 +1,19 @@ +# https://github.com/rails/rails/issues/2639#issuecomment-6591735 +class DisableAssetsLogger + def initialize(app) + @app = app + Rails.application.assets.logger = Logger.new('/dev/null') + end + + def call(env) + previous_level = Rails.logger.level + Rails.logger.level = Logger::ERROR if env['PATH_INFO'].index("/assets/") == 0 + @app.call(env) + ensure + Rails.logger.level = previous_level + end +end + Rosa::Application.configure do # Settings specified here will take precedence over those in config/application.rb @@ -6,6 +22,8 @@ Rosa::Application.configure do # since you don't have to restart the webserver when you make code changes. config.cache_classes = false + config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 10.minutes } + # Log error messages when you accidentally call methods on nil. config.whiny_nils = true @@ -39,4 +57,6 @@ Rosa::Application.configure do # Log the query plan for queries taking more than this (works with SQLite, MySQL, and PostgreSQL) config.active_record.auto_explain_threshold_in_seconds = 0.5 + + config.middleware.insert_before Rails::Rack::Logger, DisableAssetsLogger end diff --git a/config/environments/production.rb b/config/environments/production.rb index eef80d48e..03bf1daf2 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -26,6 +26,7 @@ Rosa::Application.configure do # Use a different cache store in production # config.cache_store = :mem_cache_store + config.cache_store = :redis_store, 'redis://localhost:6379/0/cache', { expires_in: 10.minutes } # Disable Rails's static asset server # In production, Apache or nginx will already do this @@ -36,7 +37,7 @@ Rosa::Application.configure do # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false - config.action_mailer.default_url_options = { :host => 'abf.rosalinux.ru' } + config.action_mailer.default_url_options = { :host => 'abf.io' } config.delivery_method = :sendmail # Enable threaded mode @@ -62,5 +63,5 @@ Rosa::Application.configure do config.assets.digest = true # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js) + config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js moment/ru.js) end diff --git a/config/environments/staging.rb b/config/environments/staging.rb new file mode 100644 index 000000000..1b56c5299 --- /dev/null +++ b/config/environments/staging.rb @@ -0,0 +1,67 @@ +# -*- encoding : utf-8 -*- +Rosa::Application.configure do + # Settings specified here will take precedence over those in config/application.rb + + # The production environment is meant for finished, "live" apps. + # Code is not reloaded between requests + config.cache_classes = true + + # Full error reports are disabled and caching is turned on + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Specifies the header that your server uses for sending files +# config.action_dispatch.x_sendfile_header = "X-Sendfile" + + # For nginx: + config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' + + # If you have no front-end server that supports something like X-Sendfile, + # just comment this out and Rails will serve the files + + # See everything in the log (default is :info) + # config.log_level = :debug + + # Use a different logger for distributed setups + # config.logger = SyslogLogger.new + + # Use a different cache store in production + # config.cache_store = :mem_cache_store + + # Disable Rails's static asset server + # In production, Apache or nginx will already do this + config.serve_static_assets = false + + # Enable serving of images, stylesheets, and javascripts from an asset server + # config.action_controller.asset_host = "http://assets.example.com" + + # Disable delivery errors, bad email addresses will be ignored + # config.action_mailer.raise_delivery_errors = false + config.action_mailer.default_url_options = { :host => 'abf.rosalinux.ru' } + config.delivery_method = :sendmail + + # Enable threaded mode + # config.threadsafe! + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation can not be found) + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners + config.active_support.deprecation = :notify + + # Force SSL + # config.force_ssl = true + + # Compress JavaScripts and CSS + config.assets.compress = true + + # Don't fallback to assets pipeline if a precompiled asset is missed + config.assets.compile = false + + # Generate digests for assets URLs + config.assets.digest = true + + # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) + config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js moment/ru.js) +end diff --git a/config/initializers/a_app_config.rb b/config/initializers/a_app_config.rb index 2517aeb60..d0cc9192c 100644 --- a/config/initializers/a_app_config.rb +++ b/config/initializers/a_app_config.rb @@ -1 +1,5 @@ -APP_CONFIG = YAML.load_file("#{Rails.root}/config/application.yml")[Rails.env] \ No newline at end of file +APP_CONFIG = YAML.load_file("#{Rails.root}/config/application.yml")[Rails.env] +# Remove '/' from the end of url +APP_CONFIG.keys.select {|key| key =~ /_url\Z/}.each {|key| APP_CONFIG[key] = APP_CONFIG[key].chomp('/') if APP_CONFIG[key].respond_to?(:chomp)} +# Paginates a static array +require 'will_paginate/array' diff --git a/config/initializers/airbrake.rb b/config/initializers/airbrake.rb index 69ed3db93..d95c4f37d 100644 --- a/config/initializers/airbrake.rb +++ b/config/initializers/airbrake.rb @@ -1,3 +1,8 @@ +require 'airbrake' + Airbrake.configure do |config| config.api_key = APP_CONFIG['keys']['airbrake_api_key'] -end rescue nil + config.host = 'errbit.rosalinux.ru' + config.port = 80 + config.secure = config.port == 443 +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 6d592eee8..1517e6c7d 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -187,8 +187,13 @@ Devise.setup do |config| # Add a new OmniAuth provider. Check the wiki for more information on setting # up on your models and hooks. # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' - require 'openid/store/filesystem' - config.omniauth :openid, :name => 'open_id' #, :store => OpenID::Store::Filesystem.new('./tmp') + + # require 'openid/store/filesystem' + # config.omniauth :openid, :name => 'open_id' #, :store => OpenID::Store::Filesystem.new('./tmp') + + config.omniauth :facebook, APP_CONFIG['keys']['facebook']['id'], APP_CONFIG['keys']['facebook']['secret'] + config.omniauth :google_oauth2, APP_CONFIG['keys']['google']['id'], APP_CONFIG['keys']['google']['secret'], {:access_type => 'offline', :approval_prompt => ''} + config.omniauth :github, APP_CONFIG['keys']['github']['id'], APP_CONFIG['keys']['github']['secret'], {:scope => 'user:email'} # ==> Warden configuration # If you want to use other strategies, that are not supported by Devise, or diff --git a/config/initializers/jsroutes.rb b/config/initializers/jsroutes.rb new file mode 100644 index 000000000..0394aae60 --- /dev/null +++ b/config/initializers/jsroutes.rb @@ -0,0 +1,3 @@ +JsRoutes.setup do |config| + config.exclude = [/token/, /admin/, /api/, /key/] +end \ No newline at end of file diff --git a/config/initializers/localeapp.rb b/config/initializers/localeapp.rb new file mode 100644 index 000000000..f9d8db4f4 --- /dev/null +++ b/config/initializers/localeapp.rb @@ -0,0 +1,5 @@ +if Rails.env.development? + Localeapp.configure do |config| + config.sending_environments = [] + end +end \ No newline at end of file diff --git a/config/initializers/logentries.rb b/config/initializers/logentries.rb new file mode 100644 index 000000000..a7d195dda --- /dev/null +++ b/config/initializers/logentries.rb @@ -0,0 +1,8 @@ +# require 'le' + +# key = APP_CONFIG['keys']['logentries_key'] +# if Rails.env.development? +# Rails.logger = Le.new key, :debug => true +# else +# Rails.logger = Le.new key +# end \ No newline at end of file diff --git a/config/initializers/logglier.rb b/config/initializers/logglier.rb new file mode 100644 index 000000000..67bda1aaa --- /dev/null +++ b/config/initializers/logglier.rb @@ -0,0 +1,5 @@ +# require 'logglier' + +# if Rails.env.production? +# Rails.logger = Logglier.new("https://logs-01.loggly.com/inputs/#{APP_CONFIG['keys']['logglier_key']}/tag/ruby/", :threaded => true) +# end \ No newline at end of file diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index c85b642b3..51d3edb4e 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -8,12 +8,13 @@ Mime::Type.register "text/plain", 'diff' Mime::Type.register "text/plain", 'patch' # add rpm spec as mime type for *.spec files -[["text/x-python", ['py'], '8bit'], - ["text/x-rpm-spec", ['spec'], '8bit'], - ["text/x-csrc", ['h', 'c'], '8bit'], - ["text/x-c++src", ['cpp'], '8bit'], - ["text/x-diff", ['diff'], '8bit'], - ["text/x-markdown", ['md'], '8bit'] +[["text/x-python", ['py'], '8bit'], + ["text/x-rpm-spec", ['spec'], '8bit'], + ["application/x-csrc", ['h', 'c'], '8bit'], + ["application/x-c++src", ['cpp', 'cc'], '8bit'], + ["application/x-csharp", ['cs'], '8bit'], + ["text/x-diff", ['diff'], '8bit'], + ["text/x-markdown", ['md'], '8bit'] ].each do |type| MIME::Types.add MIME::Type.from_array(type) end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 000000000..d5f26a3d8 --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1 @@ +OmniAuth.config.logger = Rails.logger \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index be090706d..246f0a180 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,7 @@ en: publish: Publish publish_again: Publish again publish_again_warning: Secondary publication will be able to break relationships in the repository. Be careful! + publish_into_testing: '[testing] Publish' reject_publish: Reject add: Add upload: Upload @@ -52,6 +53,7 @@ en: atom_link_tag_title: Private feed for %{nickname} | %{app_name} preview: Preview link: Link + noscript_message: You need javascript to properly use this site settings: label: Settings @@ -87,6 +89,7 @@ en: sessions: sign_in_header: Sign in + sign_up_with: or sign in with private_users: list: List @@ -151,11 +154,11 @@ en: group_already_added: Group already added successfully_added: Member %s successfully added error_in_adding: Member %s adding error - wrong_user: User with nickname '%{uname}' not found! + wrong_user: "User with nickname '%{uname}' not found!" blob: - successfully_updated: File '%{name}' successfully updated - updating_error: Error updating file '%{name}' + successfully_updated: "File '%{name}' successfully updated" + updating_error: "Error updating file '%{name}'" attributes: password: Password @@ -185,6 +188,7 @@ en: new_comment_reply: New reply of comment notifications new_issue: New task notifications issue_assign: New task assignment notifications + update_code: Notify about changes of code in my projects new_comment_commit_owner: Notify about comments to my commit new_comment_commit_repo_owner: Notify about comments to my repository commits new_comment_commit_commentor: Notify about comments after my commit diff --git a/config/locales/layout/commits.en.yml b/config/locales/layout/commits.en.yml index 33b5b42c3..359d0f4d8 100644 --- a/config/locales/layout/commits.en.yml +++ b/config/locales/layout/commits.en.yml @@ -6,4 +6,7 @@ en: pluralize: commit: commit commits: commits - commits2: commits \ No newline at end of file + commits2: commits + reference: "%{committer} referenced this issue from a commit %{commit}" + deleted: Commit has since been removed from the git-repository and is no longer available. + unknown_committer: Unknown \ No newline at end of file diff --git a/config/locales/layout/commits.ru.yml b/config/locales/layout/commits.ru.yml index 3e88b0da3..4f3f5d4a8 100644 --- a/config/locales/layout/commits.ru.yml +++ b/config/locales/layout/commits.ru.yml @@ -6,4 +6,7 @@ ru: pluralize: commit: коммит commits: коммита - commits2: коммитов \ No newline at end of file + commits2: коммитов + reference: "%{committer} ссылается на данную задачу в коммите %{commit}" + deleted: Коммит был удален и более недоступен в git-репозитории. + unknown_committer: Неизвестный \ No newline at end of file diff --git a/config/locales/menu.en.yml b/config/locales/menu.en.yml index a2b0ccdec..ebd4d1c86 100644 --- a/config/locales/menu.en.yml +++ b/config/locales/menu.en.yml @@ -35,6 +35,10 @@ en: readme: Readme settings: Settings pull_requests: Pull Requests (%{count}) + activity_menu: + activity_feed: Activity Feed + tracker: Tracker + pull_requests: Pull Requests feed_menu: all: All code: Code diff --git a/config/locales/menu.ru.yml b/config/locales/menu.ru.yml index dcd696821..9bf4f1f16 100644 --- a/config/locales/menu.ru.yml +++ b/config/locales/menu.ru.yml @@ -35,6 +35,10 @@ ru: readme: Readme settings: Настройки pull_requests: Пул реквесты (%{count}) + activity_menu: + activity_feed: Лента активности + tracker: Трекер + pull_requests: Пул реквесты feed_menu: all: Все code: Код diff --git a/config/locales/models/activity_feed.en.yml b/config/locales/models/activity_feed.en.yml index 52f70eef8..221fcf0ca 100644 --- a/config/locales/models/activity_feed.en.yml +++ b/config/locales/models/activity_feed.en.yml @@ -12,6 +12,7 @@ en: notifications: subjects: + update_code: "[%{project_name}] Update of project" new_comment_notification: New comment to your task new_commit_comment_notification: New comment to commit new_issue_notification: New task added to project @@ -39,7 +40,7 @@ en: delete_branch: '%{user_link} deleted a %{branch_name}' create_branch: '%{user_link} created a new branch %{branch_name}' update_branch: '%{user_link} pushed to branch %{branch_name}' - build_task: 'Build task #%{task_num}' + build_task: 'Build task #%{id}' build_status: published: published successfully success: completed successfully diff --git a/config/locales/models/activity_feed.ru.yml b/config/locales/models/activity_feed.ru.yml index 5aed74727..3a4bd70e4 100644 --- a/config/locales/models/activity_feed.ru.yml +++ b/config/locales/models/activity_feed.ru.yml @@ -12,6 +12,7 @@ ru: notifications: subjects: + update_code: "[%{project_name}] Обновление проекта" new_comment_notification: Новый комментарий к Вашей задаче new_commit_comment_notification: Новый комментарий к коммиту new_issue_notification: Новая задача добавлена к проекту @@ -40,7 +41,7 @@ ru: delete_branch: '%{user_link} удалил ветку %{branch_name}' create_branch: '%{user_link} создал новую ветку %{branch_name}' update_branch: '%{user_link} внес изменения в ветку %{branch_name}' - build_task: 'Сборочное задание №%{task_num}' + build_task: 'Сборочное задание №%{id}' build_status: published: успешно опубликовано success: успешно собрано diff --git a/config/locales/models/advisory.en.yml b/config/locales/models/advisory.en.yml index fe3e1a16f..db8ccbef4 100644 --- a/config/locales/models/advisory.en.yml +++ b/config/locales/models/advisory.en.yml @@ -1,7 +1,7 @@ en: layout: advisories: - atom_header: Advisories + atom_title: Advisories list_header: Advisories form_header: New advisory project_name: Project diff --git a/config/locales/models/build_list.en.yml b/config/locales/models/build_list.en.yml index 02bed316b..8abaa2253 100644 --- a/config/locales/models/build_list.en.yml +++ b/config/locales/models/build_list.en.yml @@ -5,9 +5,10 @@ en: build_list_item: Build list item attributes: build_list: - bs_id: Id + id: Id name: Name - extra_repos: Extra repositories and build lists + extra_repositories: Extra repositories + extra_build_lists: Extra build lists auto_create_container: Create container automatically container_path: Container path status: Status @@ -20,22 +21,31 @@ en: is_circle: Recurrent build updated_at: Notified at additional_repos: Additional repositories + include_testing_subrepository: "Include 'testing' subrepository" include_repos: Included repositories created_at: Created on save_to_repository: Save to repository - use_save_to_repository: Use 'save to repository' for assembly build_for_platform: Build for platform update_type: Update type - auto_publish: Automated publising + auto_publish: Automated publishing project_version: Version user: User publisher: Publisher + builder: Builder preferences: Preferences started_at: Build started at duration: Build duration in seconds mass_build_id: Mass build commit_hash: Commit hash logs: Logs + external_nodes: External nodes + + extra_params: + label: Extra params + cfg_options: "'urpmi_options' for *.cfg file" + cfg_urpm_options: "'urpm_options' for *.cfg file" + build_src_rpm: Build src.rpm + build_rpm: Build rpm build_list/item: name: Name @@ -47,6 +57,7 @@ en: build_list/package: name: Name fullname: Fullname + epoch: Epoch release: Release version: Version @@ -60,9 +71,8 @@ en: created_at_end: "Build to start until:" updated_at_start: "Last update from BS on:" updated_at_end: " Last update from BS until:" - bs_id_search: 'Search by Id' + id_search: 'Search by Id' project_name_search: Search by project name - bs_id_not_set: Id has not been configured yet items_header: Build items packages_header: Packages no_items_data: No data @@ -73,7 +83,9 @@ en: create_container_success: 'Container is queued for creating' create_container_fail: 'Errors during container creating!' publish_success: 'Build is queued for publishing' + publish_into_testing_success: 'Build is queued for publishing' publish_fail: 'Errors during build publishing!' + publish_into_testing_fail: 'Errors during build publishing!' publish_with_extra_fail: 'All extra build lists should be published before publishing this build list!' cancel_success: 'Build canceled' cancel_fail: 'Errors during build cancelation!' @@ -97,14 +109,21 @@ en: related: Related everything: All + external_nodes: + owned: My + everything: All + build_server_status: header: Build server status - count: '- count' + amount: '- amount' + abf: '-- ABF' tasks: '- tasks in queue' + custom: "-- user's" + mass_build_tasks: "-- mass build's" build_tasks: '- tasks in execution' - rpm_workers: Workers for building - iso_workers: Workers for building - publish_workers: Workers for publishing + rpm_workers: Workers of building + iso_workers: Workers of building + publish_workers: Workers of publishing items: statuses: @@ -132,7 +151,9 @@ en: success: Build complete build_started: Build started platform_pending: Platform pending - project_version_not_found: Project version not found + build_published_into_testing: '[testing] Build has been published' + build_publish_into_testing: '[testing] Build is being published' + failed_publish_into_testing: '[testing] Publishing error' log: build_log: Build Log @@ -152,21 +173,11 @@ en: show_filter: Show filters hide_filter: Hide filters - helpers: - extra_repos_and_build_lists: - header: 'Ability to attach at assembly additional sources of packages: repositories of platforms and packages of build lists.' - build_lists: - header: 'Requirements for attaching build lists:' - message1: '- only build list with container can be connected;' - message2: '- for main platform You can connect only build lists which destined for same platform;' - message3: '- only build lists with the same architecture will be connected or oriented to the both architectures (the property Publish i686 packages into x86_64 repository (only for rhel) in the settings of project is true).' - message4: 'Example: only build lists with x86_64 architecture will be connected to x86_64' - repos: - header: 'Requirements for attaching repositories:' - message1: '- attaching repositories from other platform available only for build list into the personal platform.' - header2: 'How to attach a repository:' - message2: '- write the name of platform, choose repository from the list for attaching and click to "Add" button.' - message3: 'Example: correct input "uxteam_personal", wrong - "uxteam_personal/main".' + last_build_lists: Last Build Lists + recreate_build_list: Recreate Build List + only_my_build_lists: Only My + failed_build_lists: Only Failed + flash: build_list: saved: Build list for project version '%{project_version}', platform '%{build_for_platform}' and architecture '%{arch}' has been created successfully diff --git a/config/locales/models/build_list.ru.yml b/config/locales/models/build_list.ru.yml index c3c93fbed..1e4a2cc5e 100644 --- a/config/locales/models/build_list.ru.yml +++ b/config/locales/models/build_list.ru.yml @@ -5,9 +5,10 @@ ru: build_list_item: Элемент сборочного листа attributes: build_list: - bs_id: Id + id: Id name: Название - extra_repos: Дополнительные репозитории и сборки + extra_repositories: Дополнительные репозитории + extra_build_lists: Дополнительные сборки auto_create_container: Создать контейнер автоматически container_path: Путь до контейнера status: Статус @@ -20,21 +21,30 @@ ru: is_circle: Циклическая сборка updated_at: Информация получена additional_repos: Дополнительные репозитории + include_testing_subrepository: "Подключить 'testing' подрепозиторий" include_repos: Подключаемые репозитории created_at: Создан save_to_repository: Сохранить в репозиторий - use_save_to_repository: Использовать 'cохранить в репозиторий' для сборки build_for_platform: Собрано для платформы update_type: Критичность обновления auto_publish: Автоматическая публикация project_version: Версия user: Пользователь publisher: Публикатор + builder: Сборщик preferences: Настройки duration: Длительность билда в секундах mass_build_id: Массовая сборка commit_hash: Хэш коммита logs: Логи + external_nodes: Дополнительные ноды + + extra_params: + label: Дополнительные параметры + cfg_options: "'urpmi_options' для *.cfg файла" + cfg_urpm_options: "'urpm_options' для *.cfg файла" + build_src_rpm: Сборка src.rpm + build_rpm: Сборка rpm build_list/item: name: Название @@ -46,6 +56,7 @@ ru: build_list/package: name: Название fullname: Полное имя + epoch: Эпоха release: Релиз version: Версия @@ -59,9 +70,8 @@ ru: created_at_end: "Время постановки на сборку по:" updated_at_start: "Время последнего обновления от BS с:" updated_at_end: "Время последнего обновления от BS по:" - bs_id_search: 'Поиск по Id' + id_search: 'Поиск по Id' project_name_search: Поиск по названию проекта - bs_id_not_set: Id еще не присвоен items_header: Элементы сборки packages_header: Пакеты no_items_data: Данных нет @@ -74,7 +84,9 @@ ru: cancel_success: 'Сборка отменена.' cancel_fail: 'При отмене сборки произошла ошибка!' publish_success: 'Сборка поставлена в очередь на публикацию.' + publish_into_testing_success: 'Сборка поставлена в очередь на публикацию.' publish_fail: 'При публикации сборки произошла ошибка!' + publish_into_testing_fail: 'При публикации сборки произошла ошибка!' publish_with_extra_fail: 'Все дополнительные сборки должны быть опубликованы до публикации этой сборки!' reject_publish_success: 'Публикация отклонена' reject_publish_fail: 'Не удалось отклонить публикацию сборки' @@ -96,14 +108,21 @@ ru: related: Связанные everything: Все + external_nodes: + owned: Мои + everything: Все + build_server_status: header: Статус сборочного сервера - count: '- число' + amount: '- количество' + abf: '-- ABF' tasks: '- заданий в очереди' + custom: '-- пользовательских' + mass_build_tasks: '-- массовой сборки' build_tasks: '- заданий выполняется' - rpm_workers: Воркеров для сборки - iso_workers: Воркеров для сборки - publish_workers: Воркеров для публикации + rpm_workers: Воркеры сборки + iso_workers: Воркеры сборки + publish_workers: Воркеры публикации items: statuses: @@ -131,7 +150,10 @@ ru: success: собран build_started: собирается platform_pending: платформа в процессе создания - project_version_not_found: версия не найдена + build_published_into_testing: '[testing] опубликован' + build_publish_into_testing: '[testing] публикуется' + failed_publish_into_testing: '[testing] ошибка публикации' + log: build_log: Лог сборки @@ -151,21 +173,11 @@ ru: show_filter: Показать фильтры hide_filter: Скрыть фильтры - helpers: - extra_repos_and_build_lists: - header: 'Возможность подключить для сборки дополнительные источники пакетов: репозитории из платформ и пакеты из сборочных заданий.' - build_lists: - header: 'Требования для подключемых сборочных заданий:' - message1: '- только задание с контейнером может быть подключен;' - message2: '- для основных платформ возможно подключить только задания, которые предназначены для этой же платформы;' - message3: '- будут подключены только задания с архитектурой, соотвествующей создаваемой, или предназначененные для обеих архитектур (установлено свойство Публиковать i686 пакеты в x86_64 репозиторий (только для rhel) в настройках проекта).' - message4: 'Пример: для x86_64 архитектуры будут подключены только сборочные задания, собранные для x86_64' - repos: - header: 'Требования для репозиториев:' - message1: '- использовать репозитории из других платформ возможно только для сборки в персональную платформу.' - header2: 'Как подключить репозиторий:' - message2: '- добавьте имя платформы, затем из списка выберете репозиторий для поключения и нажмите кнопку "Добавить".' - message3: 'Пример: правильно ввести "uxteam_personal", неправильно: "uxteam_personal/main".' + last_build_lists: Последние сборки + recreate_build_list: Пересоздать сборку + only_my_build_lists: Только мои + failed_build_lists: Только сбойные + flash: build_list: saved: Билд лист для версии '%{project_version}', платформы '%{build_for_platform}' и архитектуры '%{arch}' создан успешно diff --git a/config/locales/models/comment.en.yml b/config/locales/models/comment.en.yml index 8f3e5a4a6..ed1f6f504 100644 --- a/config/locales/models/comment.en.yml +++ b/config/locales/models/comment.en.yml @@ -25,6 +25,22 @@ en: syntax_highlighting: Syntax highlighting indent_code: indent your code 4 spaces inline_code: Inline code for comments + emoji_header: Emoji Cheat Sheet + reference_format: Reference Format + reference_format_example: | + for members: @abf + for issues and pull requests: + #123 + abf#123 + abf/rosa-build#123 + for commits: 123456 + + issues: Issues + pull_requests: Pull Requests + members: Members + commits: Commits + reference: "%{user} referenced this issue" + removed: Comment has since been removed and is no longer available. flash: comment: diff --git a/config/locales/models/comment.ru.yml b/config/locales/models/comment.ru.yml index f481d904c..0b8c199a4 100644 --- a/config/locales/models/comment.ru.yml +++ b/config/locales/models/comment.ru.yml @@ -25,6 +25,21 @@ ru: syntax_highlighting: Подсветка синтаксиса indent_code: Отступ кода на 4 пробела inline_code: Встроенный код в строке + emoji_header: Шпаргалка по Emoji + reference_format: Формат ссылок + reference_format_example: | + для участников: @abf + для задач и пул реквестов: + #123 + abf#123 + abf/rosa-build#123 + для коммитов: 123456 + issues: Задачи + pull_requests: Пул реквесты + members: Участники + commits: Коммиты + reference: "%{user} ссылается на данную задачу" + removed: Комментарий был удален и более недоступен. flash: comment: diff --git a/config/locales/models/hook.en.yml b/config/locales/models/hook.en.yml new file mode 100644 index 000000000..db154d105 --- /dev/null +++ b/config/locales/models/hook.en.yml @@ -0,0 +1,39 @@ +en: + layout: + hooks: + services: + web: WebHook URLs + hipchat: HipChat + irc: IRC + jabber: Jabber + + flash: + hook: + save_error: Unable to save hook + created: Hook was successfully created + updated: Hook was successfully updated + + activerecord: + attributes: + hook: + data: + url: URL + auth_token: Auth Token + room: Room + restrict_to_branch: Restrict To Branch + notify: Notify + server: Server + port: Port + nick: Nick + branch_regexes: Branch Regexes + password: Password + ssl: SSL + message_without_join: Message Without Join + no_colors: No Colors + long_url: Long Url + notice: Notice + user: User + token: Token + secret: Secret + digest: Digest + short_format: Short Format diff --git a/config/locales/models/hook.ru.yml b/config/locales/models/hook.ru.yml new file mode 100644 index 000000000..f29c162b3 --- /dev/null +++ b/config/locales/models/hook.ru.yml @@ -0,0 +1,39 @@ +ru: + layout: + hooks: + services: + web: WebHook URLs + hipchat: HipChat + irc: IRC + jabber: Jabber + + flash: + hook: + save_error: Не удалось сохранить хук + created: Хук успешно сохранен + updated: Хук успешно обновлен + + activerecord: + attributes: + hook: + data: + url: URL + auth_token: Auth Token + room: Room + restrict_to_branch: Restrict To Branch + notify: Notify + server: Server + port: Port + nick: Nick + branch_regexes: Branch Regexes + password: Password + ssl: SSL + message_without_join: Message Without Join + no_colors: No Colors + long_url: Long Url + notice: Notice + user: User + token: Token + secret: Secret + digest: Digest + short_format: Short Format diff --git a/config/locales/models/issue.en.yml b/config/locales/models/issue.en.yml index c06dfd908..c6ed5d582 100644 --- a/config/locales/models/issue.en.yml +++ b/config/locales/models/issue.en.yml @@ -1,5 +1,7 @@ en: activerecord: + models: + issue: Issue attributes: issue: title: Name @@ -18,7 +20,8 @@ en: assign_someone: Assign someone to this issue list: List all: All issues - to_me: Assigned to me + assigned: Assigned to me + created: Created by you edit: Edit search: Find issue... comments_header: Comments diff --git a/config/locales/models/issue.ru.yml b/config/locales/models/issue.ru.yml index 1e1e3c190..427f95510 100644 --- a/config/locales/models/issue.ru.yml +++ b/config/locales/models/issue.ru.yml @@ -1,5 +1,7 @@ ru: activerecord: + models: + issue: Задача attributes: issue: title: Название @@ -18,7 +20,8 @@ ru: assign_someone: Назначить кого-либо на задачу list: Список all: Все задачи - to_me: Назначенные мне + assigned: Назначенные мне + created: Созданные мной edit: Редактировать search: Найти задачу... comments_header: Комментарии diff --git a/config/locales/models/mass_build.en.yml b/config/locales/models/mass_build.en.yml index bafb62b01..9336ab05a 100644 --- a/config/locales/models/mass_build.en.yml +++ b/config/locales/models/mass_build.en.yml @@ -1,6 +1,7 @@ en: layout: mass_builds: + new: New mass build publish_success: Publish success builds publish_test_failed: Publish test failed builds repositories: Repositories @@ -22,6 +23,7 @@ en: updated_at: Updated arch_names: Architectures user: User - auto_publish: Auto Publish + auto_publish: Automated publishing + increase_release_tag: Increase release tag repositories: Repositories projects_list: Projects list diff --git a/config/locales/models/mass_build.ru.yml b/config/locales/models/mass_build.ru.yml index 974e7f09d..f28c4ede5 100644 --- a/config/locales/models/mass_build.ru.yml +++ b/config/locales/models/mass_build.ru.yml @@ -1,6 +1,7 @@ ru: layout: mass_builds: + new: Новая массовая сборка publish_success: Опубликовать успешные сборки publish_test_failed: Опубликовать сборки с проваленными тестами repositories: Репозитории @@ -22,6 +23,7 @@ ru: updated_at: Обновлен arch_names: Архитектуры user: Пользователь - auto_publish: Авто Публикация + auto_publish: Автоматическая публикация + increase_release_tag: Увеличить release тег repositories: Репозитории projects_list: Список проектов diff --git a/config/locales/models/platform.en.yml b/config/locales/models/platform.en.yml index b834312d1..d4722ed81 100644 --- a/config/locales/models/platform.en.yml +++ b/config/locales/models/platform.en.yml @@ -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 @@ -46,10 +49,15 @@ en: mass_build: Mass build build_task: Build Task refresh_button: Refresh + change_visibility_from_hidden: Change status to "Public" + change_visibility_from_open: Change status to "Private" + confirm_change_visibility: Are you sure you want to change visibility of this platform? + metadata: Metadata for Software Center flash: platform: released_status_can_not_be_changed: Released status can't be changed if platform has been released + owner_can_not_be_changed: Owner of personal platform can't be changed saved: Platform saved created: Platform created save_error: Platform save error @@ -72,6 +80,8 @@ en: models: platform: Platform attributes: + platform/platform_arch_settings: + time_living: Max time build (in minutes) platform: name: Name description: Description diff --git a/config/locales/models/platform.ru.yml b/config/locales/models/platform.ru.yml index a59233458..7b8db4de3 100644 --- a/config/locales/models/platform.ru.yml +++ b/config/locales/models/platform.ru.yml @@ -1,6 +1,9 @@ ru: layout: platforms: + contents: Содержимое + contents_of: Содержимое + search_contents: Найти имя файла/папки... admin_id: Владелец build_all: Собрать все list: Список @@ -46,10 +49,15 @@ ru: build_task: Сборочное задание refresh_button: Обновить project: Проект + change_visibility_from_hidden: Сменить статус на "Публичный" + change_visibility_from_open: Сменить статус на "Приватный" + confirm_change_visibility: Вы уверены, что хотите сменить статус этой платформы? + metadata: Метаданные для Software Center flash: platform: released_status_can_not_be_changed: Released статус платформы не может быть изменен, если платформа уже выпущена + owner_can_not_be_changed: Нельзя сменить владельца персональной платформы saved: Платформа успешно сохранена created: Платформа успешно добавлена save_error: Не удалось сохранить платформу @@ -72,6 +80,8 @@ ru: models: platform: Платформа attributes: + platform/platform_arch_settings: + time_living: Максимальное время сборки (в минутах) platform: name: Название description: Описание diff --git a/config/locales/models/platform_arch_settings.en.yml b/config/locales/models/platform_arch_settings.en.yml new file mode 100644 index 000000000..5db539702 --- /dev/null +++ b/config/locales/models/platform_arch_settings.en.yml @@ -0,0 +1,13 @@ +en: + layout: + platform_arch_settings: + extra_settings: Extra settings + + flash: + platform_arch_settings: + + activerecord: + attributes: + platform_arch_setting: + default: Use by default at build + time_living: Max time build (in minutes) diff --git a/config/locales/models/platform_arch_settings.ru.yml b/config/locales/models/platform_arch_settings.ru.yml new file mode 100644 index 000000000..f6aa351cf --- /dev/null +++ b/config/locales/models/platform_arch_settings.ru.yml @@ -0,0 +1,13 @@ +ru: + layout: + platform_arch_settings: + extra_settings: Дополнительные настройки + + flash: + platform_arch_settings: + + activerecord: + attributes: + platform_arch_setting: + default: Использовать по умолчанию при сборке + time_living: Максимальное время сборки (в минутах) diff --git a/config/locales/models/project.en.yml b/config/locales/models/project.en.yml index 58aa0dd1a..586f0c5fb 100644 --- a/config/locales/models/project.en.yml +++ b/config/locales/models/project.en.yml @@ -1,17 +1,16 @@ en: layout: projects: + mass_import: Mass import branches: Branches - showing_branches: Showing %{count} branches - showing_branch: Showing 1 branch + delete_branch: Delete branch + restore_branch: Restore branch no_branches: No branches base_branch: Base branch compare: Compare browse_code: Browse code source_code: Source code (%{type}) tags: Tags - showing_tags: Showing %{count} tags - showing_tag: Showing 1 tag no_tags: No tags add: Add public_projects_list: Public projects list @@ -30,6 +29,7 @@ en: new_build_list: New build confirm_delete: Are you sure you want to delete this project? new: New project + new_branch: New branch location: Location git_repo_location: Path to git repo current_project_header: Current project @@ -39,6 +39,7 @@ en: members: Members groups: Groups edit_collaborators: Members + hooks: Service hooks role: Project role remove_user: Leave project issues: Issues @@ -47,7 +48,6 @@ en: sections: Sections has_issue_description: Tracker adds a lightweight issue management system tightly integrated with your repository. has_wiki_description: Wikis are the simplest way to allow other users to contribute content. Any user can create and edit pages for documentation, examples, support or anything you wish. - human_average_build_time: Expected time is %{hours} h. %{minutes} min. git_global_setup: Git global setup create_repository: Create Repository move_files_to_folder: Move files you need to the project or create them. @@ -72,8 +72,12 @@ en: current_commit: Current commit files_in_project: Files in + public: Public + private: Private + flash: project: + mass_import_added_to_queue: Mass import added to queue saved: Project saved save_error: Unable to save project save_warning_ssh_key: Project owner must provide a SSH key in his profile @@ -87,6 +91,9 @@ en: project: Project attributes: project: + url: URL + add_to_repository_id: Add to repository + srpms_list: SRPMs list name: Name description: Descripton owner: Owner @@ -100,7 +107,7 @@ en: updated_at: Updated on has_issues: Issues tracker enabled has_wiki: Wiki enabled - srpm: Import code from src.rpm + srpm: Import code from src.rpm (optional) who_owns: me: Myself group: Group diff --git a/config/locales/models/project.ru.yml b/config/locales/models/project.ru.yml index 1e7b20ec9..12821d64c 100644 --- a/config/locales/models/project.ru.yml +++ b/config/locales/models/project.ru.yml @@ -1,17 +1,16 @@ ru: layout: projects: + mass_import: Массовый импорт branches: Ветки - showing_branches: Показано %{count} веток - showing_branch: Показана 1 ветка - no_branch: Нет веток + delete_branch: Удалить ветку + restore_branch: Восстановить ветку + no_branches: Нет веток base_branch: Текущая ветка compare: Сравнить browse_code: Просмотреть код source_code: Исходный код (%{type}) tags: Теги - showing_tags: Показано %{count} тегов - showing_tag: Показан 1 тег no_tags: Нет тегов add: Добавить public_projects_list: Список публичных проектов @@ -30,6 +29,7 @@ ru: new_build_list: Новая сборка confirm_delete: Вы уверены, что хотите удалить этот проект? new: Новый проект + new_branch: Новая ветка location: Расположение git_repo_location: Путь к git-репозиторию current_project_header: Текущий проект @@ -39,6 +39,7 @@ ru: members: Участники groups: Группы edit_collaborators: Участники + hooks: Веб хуки role: Роль в проекте remove_user: Покинуть проект issues: Задачи @@ -47,7 +48,6 @@ ru: sections: Разделы has_issue_description: Трэкер предоставляет лекговесный менеджер для задач по разработке Вашего проекта. has_wiki_description: Wiki - это самый простой способ предоставить другим вносить свой вклад в развитие Вашего проекта. Каждый пользователь нашего сервиса может использовать Wiki для документирования, примеров, поддержки или всего другого, в чем у Вас появится необходимость. - human_average_build_time: 'Ожидаемое время: %{hours} ч. %{minutes} мин.' git_global_setup: Общие настройки Git create_repository: Создание репозитория move_files_to_folder: Переместите нужные файлы в проект или создайте их. @@ -72,8 +72,12 @@ ru: cloning: Клонирование этого репозитория remote: Добавление этого репозитория как удаленного к существующему локальному репозиторию + public: Публичные + private: Приватные + flash: project: + mass_import_added_to_queue: Массовый импорт добавлен в очередь saved: Проект успешно сохранен save_error: Не удалось сохранить проект save_warning_ssh_key: Владельцу проекта необходимо указать в профиле свой SSH ключ @@ -87,6 +91,9 @@ ru: project: Проект attributes: project: + url: URL + add_to_repository_id: Добавить в репозиторий + srpms_list: Список SRPMs name: Название description: Описание owner: Владелец @@ -100,7 +107,7 @@ ru: updated_at: Обновлен has_issues: Включить трэкер has_wiki: Включить Wiki - srpm: Импортировать код из src.rpm + srpm: Импортировать код из src.rpm (опционально) who_owns: me: Я group: Группа diff --git a/config/locales/models/project_statistic.en.yml b/config/locales/models/project_statistic.en.yml new file mode 100644 index 000000000..aff286d3e --- /dev/null +++ b/config/locales/models/project_statistic.en.yml @@ -0,0 +1,14 @@ +en: + layout: + project_statistics: + human_average_build_time: Expected time is %{hours} h. %{minutes} min. + + flash: + project_statistic: + + + activerecord: + models: + project_statistic: Project statistic + attributes: + project_statistic: \ No newline at end of file diff --git a/config/locales/models/project_statistic.ru.yml b/config/locales/models/project_statistic.ru.yml new file mode 100644 index 000000000..71e41b735 --- /dev/null +++ b/config/locales/models/project_statistic.ru.yml @@ -0,0 +1,16 @@ +ru: + layout: + project_statistics: + human_average_build_time: 'Ожидаемое время: %{hours} ч. %{minutes} мин.' + + flash: + project_statistic: + + + activerecord: + models: + project_statistic: Статистика проекта + attributes: + project_statistic: + + diff --git a/config/locales/models/project_to_repository.en.yml b/config/locales/models/project_to_repository.en.yml new file mode 100644 index 000000000..553d2e8f3 --- /dev/null +++ b/config/locales/models/project_to_repository.en.yml @@ -0,0 +1,5 @@ +en: + activerecord: + errors: + project_to_repository: + project: Project already exists in platform \ No newline at end of file diff --git a/config/locales/models/project_to_repository.ru.yml b/config/locales/models/project_to_repository.ru.yml new file mode 100644 index 000000000..503a54f54 --- /dev/null +++ b/config/locales/models/project_to_repository.ru.yml @@ -0,0 +1,5 @@ +ru: + activerecord: + errors: + project_to_repository: + project: Проект уже присутствует в платформе diff --git a/config/locales/models/pull_request.en.yml b/config/locales/models/pull_request.en.yml index 156bf8192..57a0f3a7a 100644 --- a/config/locales/models/pull_request.en.yml +++ b/config/locales/models/pull_request.en.yml @@ -45,6 +45,8 @@ en: save_error: Unable to save pull request activerecord: + models: + pull_request: Pull Request attributes: pull_requests: to_ref: Source @@ -58,4 +60,6 @@ en: search: Find pull request... all: All requests to_me: Assigned to me + assigned: Assigned to me + created: Created by you view_full_changes: View full changes diff --git a/config/locales/models/pull_request.ru.yml b/config/locales/models/pull_request.ru.yml index 26dd0f761..2a9c64888 100644 --- a/config/locales/models/pull_request.ru.yml +++ b/config/locales/models/pull_request.ru.yml @@ -21,7 +21,7 @@ ru: ready: Данный пул реквест можно смержить автоматически. merged: | %{user} смержил %{to_ref} - с %{from_ref} в %{time}' + с %{from_ref} в %{time} closed: '%{user} закрыл пул реквест в %{time}' is_big: Этот пул реквест слишком большой! Мы показываем только последние %{count} коммитов. open: '' @@ -46,6 +46,8 @@ ru: save_error: Не удалось сохранить пул реквест activerecord: + models: + pull_request: Пул реквест attributes: pull_requests: to_ref: Приемник @@ -59,4 +61,6 @@ ru: search: Найти пул реквест... all: Все пул реквесты to_me: Назначенные мне + assigned: Назначенные мне + created: Созданные мной view_full_changes: Посмотреть все изменения diff --git a/config/locales/models/regeneration_status.en.yml b/config/locales/models/regeneration_status.en.yml new file mode 100644 index 000000000..8ac264eba --- /dev/null +++ b/config/locales/models/regeneration_status.en.yml @@ -0,0 +1,31 @@ +en: + layout: + regeneration_statuses: + regenerate_metadata: Regenerate metadata + statuses: + no_data: No data + ready: No actions + waiting_for_regeneration: Waiting for regeneration metadata + regenerating: Regeneration of metadata + waiting_for_resign: Waiting for resign of packages + publish: Publish + resign: Resign of packages + waiting_for_resign_after_publish: Publish, waiting for resign of packages + waiting_for_resign_after_regeneration: Regeneration of metadata, waiting for resign of packages + waiting_for_regeneration_after_publish: Publish, waiting for regeneration metadata + waiting_for_regeneration_after_resign: Resign of packages, waiting for regeneration metadata + waiting_for_resign_and_regeneration_after_publish: Publish, waiting for resign of packages and regeneration metadata + waiting_for_resign_and_regeneration: Waiting for resign of packages and regeneration metadata + last_regenerated_statuses: + no_data: No data + completed: Completed succesfully + failed: Completed not succesfully + canceled: Canceled + + activerecord: + attributes: + regeneration_status: + last_regenerated_at: Last regeneration of metadata + last_regenerated_status: Last status of regeneration metadata + last_regenerated_log_sha1: Last log of regeneration metadata + status: Current status diff --git a/config/locales/models/regeneration_status.ru.yml b/config/locales/models/regeneration_status.ru.yml new file mode 100644 index 000000000..03878398b --- /dev/null +++ b/config/locales/models/regeneration_status.ru.yml @@ -0,0 +1,31 @@ +ru: + layout: + regeneration_statuses: + regenerate_metadata: Регенерировать метаданные + statuses: + no_data: Нет данных + ready: Нет действий + waiting_for_regeneration: Ожидание регенерации метаданных + regenerating: Идет регенерация метаданных + waiting_for_resign: Ожидание подписи пакетов + publish: Идет публикация + resign: Идет подпись пакетов + waiting_for_resign_after_publish: Идет публикация, ожидание подписи пакетов + waiting_for_resign_after_regeneration: Идет регенерация метаданных, ожидание подписи пакетов + waiting_for_regeneration_after_publish: Идет публикация, ожидание регенерации метаданных + waiting_for_regeneration_after_resign: Идет подпись пакетов, ожидание регенерации метаданных + waiting_for_resign_and_regeneration_after_publish: Идет публикация, ожидание подписи пакетов и регенерации метаданных + waiting_for_resign_and_regeneration: Ожидание подписи пакетов и регенерации метаданных + last_regenerated_statuses: + no_data: Нет данных + completed: Завершена успешно + failed: Завершена с ошибкой + canceled: Отменена + + activerecord: + attributes: + regeneration_status: + last_regenerated_at: Последняя регенерация метаданных + last_regenerated_status: Статус последней регенерации метаданных + last_regenerated_log_sha1: Последний лог регенерации метаданных + status: Текущее состояние diff --git a/config/locales/models/repository.en.yml b/config/locales/models/repository.en.yml index 11dcae4db..a431aea3d 100644 --- a/config/locales/models/repository.en.yml +++ b/config/locales/models/repository.en.yml @@ -1,7 +1,12 @@ en: layout: repositories: - add_project_to: Add project to repository + extra_actions: Extra actions + add_sync_lock_file: "Add '.sync.lock' file" + remove_sync_lock_file: "Remove '.sync.lock' file" + sync_lock_file_info: "Presence of '.sync.lock' file means that repository is not ready for sync with mirror" + add_projects_to: Add projects to repository + remove_projects_from: Remove projects from repository edit: Settings list: List about: About repository @@ -19,24 +24,29 @@ en: clear_confirm: Are you sure you want to clear this platform? clear_warning: Attention! Cleared packages cannot be restored! regenerate_metadata: Regenerate metadata + mass_delete: Mass delete personal_repositories: settings_header: Settings - change_visibility_from_hidden: Change status to "Public" - change_visibility_from_open: Change status to "Private" settings: Settings show: My repository private_users: Private repository users flash: repository: + sync_lock_file_added: "'.sync.lock' file has been added to repository" + sync_lock_file_removed: "'.sync.lock' file has been removed from repository" + projects_will_be_removed: Projects added to queue for removing + projects_will_be_added: Projects added to queue for adding + no_access_to_read_project: You have no access to read this project + saved: Repository added updated: Repository updated save_error: Unable to add repository update_error: Unable to update repository destroyed: Repository deleted project_added: Project added to repository - project_not_added: Project adding error. A project with such name already exists in this repository. Remove the old project first + project_not_added: Project adding error. A project with such name already exists in one repository of platform. Remove the old project first project_removed: Project deleted project_not_removed: Unable to delete project from repository clear: Platform successfully cleared! @@ -51,6 +61,7 @@ en: repository: Repository attributes: repository: + projects_list: Projects list name: Name description: Description publish_without_qa: Publication without QA diff --git a/config/locales/models/repository.ru.yml b/config/locales/models/repository.ru.yml index f5e5a58fa..9474f1ffb 100644 --- a/config/locales/models/repository.ru.yml +++ b/config/locales/models/repository.ru.yml @@ -1,7 +1,12 @@ ru: layout: repositories: - add_project_to: Добавить проект к репозиторию + extra_actions: Дополнительные действия + add_sync_lock_file: "Добавить '.sync.lock' файл" + remove_sync_lock_file: "Удалить '.sync.lock' файл" + sync_lock_file_info: "Наличие '.sync.lock' файла означает, что репозиторий не готов для синхронизации с зеркалом" + add_projects_to: Добавить проекты к репозиторию + remove_projects_from: Удалить проекты из репозитория edit: Настройки list: Список about: О репозитории @@ -19,24 +24,29 @@ ru: clear_confirm: Уверены, что хотите очистить платформу? clear_warning: Внимание! Очищенные пакеты не могут быть восстановлены! regenerate_metadata: Регенерировать метаданные + mass_delete: Массовое удаление personal_repositories: settings_header: Настройки - change_visibility_from_hidden: Сменить статус на "Публичный" - change_visibility_from_open: Сменить статус на "Приватный" settings: Настройки show: Мой репозиторий private_users: Пользователи приватного репозитория flash: repository: + sync_lock_file_added: "'.sync.lock' файл добавлен в репозиторий" + sync_lock_file_removed: "'.sync.lock' файл удален из репозитория" + projects_will_be_removed: Проекты добавлены в очередь на удаление + projects_will_be_added: Проекты добавлены в очередь на добавление + no_access_to_read_project: У вас нет прав на чтение этого проекта + saved: Репозиторий успешно добавлен updated: Репозиторий успешно обновлен save_error: Не удалось добавить репозиторий update_error: Не удалось обновить репозиторий destroyed: Репозиторий успешно удален project_added: Проект добавлен к репозиторию - project_not_added: Не удалось добавить проект. В этом репозитории уже есть проект с таким именем. Сначала нужно удалить старый проект + project_not_added: Не удалось добавить проект. В одном из репозиториев платформы уже есть проект с таким именем. Сначала нужно удалить старый проект project_removed: Проект удален из репозитория project_not_removed: Не удалось удалить проект из репозитория clear: Платформа успешно очищена! @@ -51,6 +61,7 @@ ru: repository: Репозиторий attributes: repository: + projects_list: Список проектов name: Название description: Описание publish_without_qa: Публикация без участия QA diff --git a/config/locales/models/time_living.en.yml b/config/locales/models/time_living.en.yml index c7c4cd11f..0659b4b91 100644 --- a/config/locales/models/time_living.en.yml +++ b/config/locales/models/time_living.en.yml @@ -1,4 +1,4 @@ en: flash: time_living: - numericality_error: must be 2 to 720 minutes \ No newline at end of file + numericality_error: must be %{min} to %{max} minutes \ No newline at end of file diff --git a/config/locales/models/time_living.ru.yml b/config/locales/models/time_living.ru.yml index ea0ef50b2..e8600ca10 100644 --- a/config/locales/models/time_living.ru.yml +++ b/config/locales/models/time_living.ru.yml @@ -1,4 +1,4 @@ ru: flash: time_living: - numericality_error: должно быть от 2 до 720 минут \ No newline at end of file + numericality_error: должно быть от %{min} до %{max} минут \ No newline at end of file diff --git a/config/locales/models/token.en.yml b/config/locales/models/token.en.yml new file mode 100644 index 000000000..31a55aeb3 --- /dev/null +++ b/config/locales/models/token.en.yml @@ -0,0 +1,32 @@ +en: + layout: + tokens: + header: Tokens + new: New token + about: Token of platform + withdraw: Withdraw + withdraw_confirm: Are you sure you want to withdraw this token? + + statuses: + active: Active + blocked: Withdrawed + + flash: + tokens: + saved: Token added + save_error: Unable to add token + withdraw_success: Token withdrawed + withdraw_fail: Unable to withdraw token + + activerecord: + models: + token: Token + attributes: + token: + description: Description + status: Status + authentication_token: Token + created_at: Created + updated_at: Updated + creator: Creator + updater: Updater diff --git a/config/locales/models/token.ru.yml b/config/locales/models/token.ru.yml new file mode 100644 index 000000000..26da79171 --- /dev/null +++ b/config/locales/models/token.ru.yml @@ -0,0 +1,32 @@ +ru: + layout: + tokens: + header: Токены + new: Новый токен + about: Токен платформы + withdraw: Отозвать + withdraw_confirm: Уверены, что хотите отозвать токен? + + statuses: + active: Активный + blocked: Отозван + + flash: + tokens: + saved: Токен успешно добавлен + save_error: Не удалось добавить токен + withdraw_success: Токен успешно отозван! + withdraw_fail: Не удалось отозвать токен! + + activerecord: + models: + token: Токен + attributes: + token: + description: Описание + status: Статус + authentication_token: Токен + created_at: Создан + updated_at: Обновлен + creator: Создал + updater: Обновил diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 1afe052cd..7bf16e90a 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -40,6 +40,7 @@ ru: publish: Опубликовать publish_again: Опубликовать снова publish_again_warning: Повторная публикация может привести к нарушению зависимостей в репозитории. Будьте осторожны! + publish_into_testing: '[testing] Опубликовать' reject_publish: Отклонить add: Добавить upload: Загрузить @@ -52,6 +53,7 @@ ru: atom_link_tag_title: Приватная лента для %{nickname} | %{app_name} preview: Предосмотр link: Ссылка + noscript_message: Включите javascript для корректной работы сайта settings: label: 'Настройки' @@ -87,6 +89,7 @@ ru: sessions: sign_in_header: Вход в систему + sign_up_with: или войти с помощью private_users: list: Список @@ -151,11 +154,11 @@ ru: group_already_added: Группа уже добавлена successfully_added: Участник %s успешно добавлен error_in_adding: Ошибка при добавлении участника %s - wrong_user: Пользователь с ником '%{uname}' не найден. + wrong_user: "Пользователь с ником '%{uname}' не найден." blob: - successfully_updated: Файл '%{name}' успешно обновлен - updating_error: Ошибка обновления файла '%{name}' + successfully_updated: "Файл '%{name}' успешно обновлен" + updating_error: "Ошибка обновления файла '%{name}'" attributes: password: Пароль @@ -176,7 +179,6 @@ ru: models: private_user: Приватный пользователь product_build_list: Сборочный лист продукта - auto_build_list: Автоматическая пересборка пакетов attributes: settings: @@ -186,6 +188,7 @@ ru: new_comment_reply: Оповещать о новом ответе на мой комментарий new_issue: Оповещать о новых задачах в моих проектах issue_assign: Оповещать, когда на меня выставляют задачу + update_code: Оповещать об изменении кода в моих проектах new_comment_commit_owner: Оповещать о комментариях к моему коммиту new_comment_commit_repo_owner: Оповещать о комментариях к коммитам в моем репозитории new_comment_commit_commentor: Оповещать о комментариях к коммиту после моего diff --git a/config/locales/title.en.yml b/config/locales/title.en.yml index 01c37f6b7..887e2ada2 100644 --- a/config/locales/title.en.yml +++ b/config/locales/title.en.yml @@ -33,3 +33,8 @@ en: product_build_lists: index: title: 'Products Monitoring' + home: + issues: + title: 'Your Issues' + pull_requests: + title: 'Your Pull Requests' diff --git a/config/locales/title.ru.yml b/config/locales/title.ru.yml index 736eb83c9..b991fc6a3 100644 --- a/config/locales/title.ru.yml +++ b/config/locales/title.ru.yml @@ -33,3 +33,8 @@ ru: product_build_lists: index: title: 'Мониторинг продуктов' + home: + issues: + title: 'Ваши задачи' + pull_requests: + title: 'Ваши пул реквесты' diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml index b910b21f6..670b678d2 100644 --- a/config/locales/users.en.yml +++ b/config/locales/users.en.yml @@ -42,6 +42,7 @@ en: role: Role created_at: Created updated_at: Updated + sound_notifications: Enable sound notifications role: System role language: Language password: Password @@ -52,3 +53,4 @@ en: company: Company avatar: Avatar avatar_file_size: Avatar file size + authentication_token: API token diff --git a/config/locales/users.ru.yml b/config/locales/users.ru.yml index bd30181e5..a79c1bf57 100644 --- a/config/locales/users.ru.yml +++ b/config/locales/users.ru.yml @@ -42,6 +42,7 @@ ru: role: Роль created_at: Создан updated_at: Обновлен + sound_notifications: Включить звуковые оповещения role: Роль в системе language: Язык password: Пароль @@ -52,3 +53,4 @@ ru: company: Компания avatar: Аватар avatar_file_size: Размер аватара + authentication_token: API токен diff --git a/config/newrelic.yml.sample b/config/newrelic.yml.sample index 5c716151d..15ad09c1d 100644 --- a/config/newrelic.yml.sample +++ b/config/newrelic.yml.sample @@ -217,6 +217,7 @@ test: production: <<: *default_settings monitor_mode: true + dispatcher: 'puma' # Many applications have a staging environment which behaves # identically to production. Support for that environment is provided @@ -225,3 +226,4 @@ staging: <<: *default_settings monitor_mode: true app_name: ABF (Staging) + dispatcher: 'puma' diff --git a/config/puma/production.rb b/config/puma/production.rb new file mode 100644 index 000000000..38f02c028 --- /dev/null +++ b/config/puma/production.rb @@ -0,0 +1,28 @@ +# -*- encoding : utf-8 -*- +base_path = "/srv/rosa_build" +pidfile File.join(base_path, 'shared', 'pids', 'unicorn.pid') +state_path File.join(base_path, 'shared', 'pids', 'puma.state') +bind 'unix:///tmp/rosa_build_unicorn.sock' + +environment ENV['RAILS_ENV'] || 'production' +threads *(ENV['PUMA_THREADS'] || '1,4').split(',') +workers ENV['PUMA_WORKERS'] || 7 + + +preload_app! + +on_worker_boot do + if defined?(ActiveRecord::Base) + ActiveSupport.on_load(:active_record) do + ActiveRecord::Base.connection.disconnect! rescue ActiveRecord::ConnectionNotEstablished + ActiveRecord::Base.establish_connection + end + # QC::Conn.connect + Rails.logger.info('Connected to PG') + end + + # Redis.connect! + # Rails.logger.info('Connected to Redis') +end + +activate_control_app 'unix:///tmp/rosa_build_pumactl.sock' \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 25b9c93ac..cfefca5ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,7 +7,10 @@ Rosa::Application.routes.draw do devise_scope :users do get '/users/auth/:provider' => 'users/omniauth_callbacks#passthru' end - devise_for :users, :controllers => {:omniauth_callbacks => 'users/omniauth_callbacks'} + devise_for :users, :controllers => {:omniauth_callbacks => 'users/omniauth_callbacks'}, :skip => [:registrations] do + get 'users/sign_up' => 'users/registrations#new', :as => :new_user_registration + post 'users' => 'users/registrations#create', :as => :user_registration + end namespace :api do namespace :v1 do @@ -19,12 +22,14 @@ Rosa::Application.routes.draw do put :reject_publish put :cancel put :create_container + put :publish_into_testing } end resources :arches, :only => [:index] resources :platforms, :only => [:index, :show, :update, :destroy, :create] do collection { get :platforms_for_build + get :allowed } member { get :members @@ -37,13 +42,15 @@ Rosa::Application.routes.draw do end resources :repositories, :only => [:show, :update, :destroy] do member { - get :projects - get :key_pair - put :add_member - delete :remove_member - put :add_project - delete :remove_project - put :signatures + get :projects + get :key_pair + put :add_member + delete :remove_member + put :add_project + delete :remove_project + put :signatures + put :add_repo_lock_file + delete :remove_repo_lock_file } end resources :projects, :only => [:index, :show, :update, :create, :destroy] do @@ -57,6 +64,14 @@ Rosa::Application.routes.draw do put :update_member } resources :build_lists, :only => :index + resources :issues, :only => [:index, :create, :show, :update] + resources :pull_requests, :only => [:index, :create, :show, :update] do + member { + get :commits + get :files + put :merge + } + end end resources :users, :only => [:show] get 'user' => 'users#show_current_user' @@ -64,6 +79,8 @@ Rosa::Application.routes.draw do member { get :notifiers put :notifiers + get '/issues' => 'issues#user_index' + get '/pull_requests' => 'pull_requests#user_index' } end resources :groups, :only => [:index, :show, :update, :create, :destroy] do @@ -72,6 +89,8 @@ Rosa::Application.routes.draw do put :add_member delete :remove_member put :update_member + get '/issues' => 'issues#group_index' + get '/pull_requests' => 'pull_requests#group_index' } end resources :products, :only => [:show, :update, :create, :destroy] do @@ -80,7 +99,20 @@ Rosa::Application.routes.draw do resources :product_build_lists, :only => [:index, :show, :destroy, :create, :update] do put :cancel, :on => :member end + + resources :jobs do + collection do + get :shift + get :status + put :feedback + put :logs + put :statistics + end + end + #resources :ssh_keys, :only => [:index, :create, :destroy] + get 'issues' => 'issues#all_index' + get 'pull_requests' => 'pull_requests#all_index' end end @@ -89,16 +121,19 @@ Rosa::Application.routes.draw do get '/forbidden' => 'pages#forbidden', :as => 'forbidden' get '/terms-of-service' => 'pages#tos', :as => 'tos' get '/tour/:id' => 'pages#tour_inside', :as => 'tour_inside', :id => /projects|sources|builds/ - match '/invite.html' => redirect('/register_requests/new') + #match '/invite.html' => redirect('/register_requests/new') + + get '/activity_feeds.:format' => 'home#activity', :as => 'atom_activity_feeds', :format => /atom/ + get '/issues' => 'home#issues' + get '/pull_requests' => 'home#pull_requests' - get '/activity_feeds.:format' => 'activity_feeds#index', :as => 'atom_activity_feeds', :format => /atom/ if APP_CONFIG['anonymous_access'] authenticated do - root :to => 'activity_feeds#index' + root :to => 'home#activity' end - root :to => 'pages#root' + root :to => 'home#root' else - root :to => 'activity_feeds#index' + root :to => 'home#activity' end namespace :admin do @@ -128,20 +163,25 @@ Rosa::Application.routes.draw do end scope :module => 'platforms' do - resources :platforms do + resources :platforms, :constraints => {:id => Platform::NAME_PATTERN} do resources :private_users, :except => [:show, :destroy, :update] member do + put :regenerate_metadata put :clear get :clone get :members post :remove_members # fixme: change post to delete + post :change_visibility delete :remove_member - put :add_member + post :add_member post :make_clone get :advisories end - resources :mass_builds, :only => [:create, :index] do + resources :contents, :only => [:index] + match '/contents/*path' => 'contents#index', :format => false + + resources :mass_builds, :only => [:create, :new, :index] do member do post :cancel post :publish @@ -151,16 +191,24 @@ Rosa::Application.routes.draw do resources :repositories do member do - get :add_project - delete :remove_project - get :projects_list - post :remove_members # fixme: change post to delete - delete :remove_member - post :add_member - put :regenerate_metadata + get :add_project + put :add_project + get :remove_project + delete :remove_project + get :projects_list + post :remove_members # fixme: change post to delete + delete :remove_member + post :add_member + put :regenerate_metadata + put :sync_lock_file end end resources :key_pairs, :only => [:create, :index, :destroy] + resources :tokens, :only => [:create, :index, :show, :new] do + member do + post :withdraw + end + end resources :products do resources :product_build_lists, :only => [:create, :destroy, :new, :show, :update] do member { @@ -181,6 +229,8 @@ Rosa::Application.routes.draw do collection do get :autocomplete_user_uname get :autocomplete_group_uname + get :autocomplete_extra_build_list + get :autocomplete_extra_repositories end end @@ -197,6 +247,7 @@ Rosa::Application.routes.draw do put :private get :notifiers put :notifiers + put :reset_auth_token end end resources :register_requests, :only => [:new, :create], :format => /ru|en/ #view support only two languages @@ -222,20 +273,23 @@ Rosa::Application.routes.draw do end scope :module => 'projects' do - resources :build_lists, :only => [:index, :show, :update] do + resources :build_lists, :only => [:index, :show] do member do put :cancel put :create_container get :log + put :publish + put :reject_publish + put :publish_into_testing end - collection { - get :autocomplete_to_extra_repos_and_builds - get :update_extra_repos_and_builds - post :search - } end - resources :projects, :only => [:index, :new, :create] + resources :projects, :only => [:index, :new, :create] do + collection do + post :run_mass_import + get :mass_import + end + end scope ':owner_name/:project_name', :constraints => {:project_name => Project::NAME_REGEXP} do # project scope :as => 'project' do resources :wiki do @@ -261,7 +315,7 @@ Rosa::Application.routes.draw do match 'compare/:versions' => 'wiki#compare', :versions => /([a-f0-9\^]{6,40})(\.\.\.[a-f0-9\^]{6,40})/, :as => :compare_versions, :via => :get end end - resources :issues, :except => :edit do + resources :issues, :except => [:destroy, :edit] do resources :comments, :only => [:edit, :create, :update, :destroy] resources :subscribes, :only => [:create, :destroy] collection do @@ -271,12 +325,14 @@ Rosa::Application.routes.draw do end post "/labels/:label_id" => "issues#destroy_label", :as => :issues_delete_label post "/labels/:label_id/update" => "issues#update_label", :as => :issues_update_label + resources :build_lists, :only => [:index, :new, :create] do - collection { post :search } + get :list, :on => :collection end resources :collaborators do get :find, :on => :collection end + resources :hooks, :except => :show resources :pull_requests, :except => :destroy do get :autocomplete_to_project, :on => :collection put :merge, :on => :member @@ -293,6 +349,7 @@ Rosa::Application.routes.draw do delete '/' => 'projects#destroy' # Member post '/fork' => 'projects#fork', :as => :fork_project + get '/possible_forks' => 'projects#possible_forks', :as => :possible_forks_project get '/sections' => 'projects#sections', :as => :sections_project post '/sections' => 'projects#sections' delete '/remove_user' => 'projects#remove_user', :as => :remove_user_project @@ -304,7 +361,11 @@ Rosa::Application.routes.draw do # Tags get '/tags' => "git/trees#tags", :as => :tags # Branches - get '/branches/:treeish' => "git/trees#branches", :as => :branches + get '/branches' => "git/trees#branches", :as => :branches + get '/branches/:treeish' => "git/trees#branches", :as => :branch + delete '/branches/:treeish' => "git/trees#destroy", :as => :branch + put '/branches/:treeish' => "git/trees#restore_branch", :as => :branch + post '/branches' => "git/trees#create", :as => :branches # Commits get '/commits/:treeish(/*path)' => "git/commits#index", :as => :commits, :format => false get '/commit/:id(.:format)' => "git/commits#show", :as => :commit diff --git a/config/schedule.rb b/config/schedule.rb index 44a7142b2..20dbff353 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -6,10 +6,9 @@ # runner "Download.parse_and_remove_nginx_log" #end -# TODO: Uncomment when all needed product build lists will be updated. -# every :day, :at => '4:10 am' do -# rake "product_build_list:clear:outdated", :output => 'log/product_build_list_clear.log' -# end +every :day, :at => '4:10 am' do + rake "product_build_list:clear:outdated", :output => 'log/product_build_list_clear.log' +end every :day, :at => '4:00 am' do rake "import:sync:all", :output => 'log/sync.log' @@ -31,6 +30,10 @@ every 3.minute do runner 'AbfWorker::BuildListsPublishTaskManager.new.run', :output => 'log/task_manager.log' end +every 1.minute do + runner 'RpmBuildNode.cleanup!' +end + every :day, :at => '4am' do runner 'Product.autostart_iso_builds_once_a_12_hours', :output => 'log/autostart_iso_builds.log' runner 'Product.autostart_iso_builds_once_a_day', :output => 'log/autostart_iso_builds.log' diff --git a/db/migrate/20130319172358_add_automatic_to_comments.rb b/db/migrate/20130319172358_add_automatic_to_comments.rb new file mode 100644 index 000000000..a3f2d24bc --- /dev/null +++ b/db/migrate/20130319172358_add_automatic_to_comments.rb @@ -0,0 +1,9 @@ +class AddAutomaticToComments < ActiveRecord::Migration + def change + add_column :comments, :automatic, :boolean, :default => false + + add_index :comments, :commentable_type + add_index :comments, :automatic + add_index :comments, :commentable_id + end +end diff --git a/db/migrate/20130326165628_add_add_info_to_comments.rb b/db/migrate/20130326165628_add_add_info_to_comments.rb new file mode 100644 index 000000000..5a88f8414 --- /dev/null +++ b/db/migrate/20130326165628_add_add_info_to_comments.rb @@ -0,0 +1,9 @@ +class AddAddInfoToComments < ActiveRecord::Migration + def change + add_column :comments, :created_from_commit_hash, :decimal, :precision => 50, :scale => 0 + add_column :comments, :created_from_issue_id, :integer + + add_index :comments, :created_from_issue_id + add_index :comments, :created_from_commit_hash + end +end diff --git a/db/migrate/20130403202853_add_name_with_owner_to_project.rb b/db/migrate/20130403202853_add_name_with_owner_to_project.rb new file mode 100644 index 000000000..7f7cd58f2 --- /dev/null +++ b/db/migrate/20130403202853_add_name_with_owner_to_project.rb @@ -0,0 +1,22 @@ +class AddNameWithOwnerToProject < ActiveRecord::Migration + def up + add_column :projects, :owner_uname, :string + + execute <<-SQL + UPDATE projects SET owner_uname = owners.uname + FROM users as owners + WHERE projects.owner_type = 'User' AND projects.owner_id = owners.id + SQL + + execute <<-SQL + UPDATE projects SET owner_uname = owners.uname + FROM groups as owners + WHERE projects.owner_type = 'Group' AND projects.owner_id = owners.id + SQL + change_column :projects, :owner_uname, :string, :null => false + end + + def down + remove_column :projects, :owner_uname + end +end diff --git a/db/migrate/20130412124536_create_hooks.rb b/db/migrate/20130412124536_create_hooks.rb new file mode 100644 index 000000000..cdfbc1857 --- /dev/null +++ b/db/migrate/20130412124536_create_hooks.rb @@ -0,0 +1,11 @@ +class CreateHooks < ActiveRecord::Migration + def change + create_table :hooks do |t| + t.text :data + t.integer :project_id + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20130417162427_add_user_index_to_issue.rb b/db/migrate/20130417162427_add_user_index_to_issue.rb new file mode 100644 index 000000000..b11c42283 --- /dev/null +++ b/db/migrate/20130417162427_add_user_index_to_issue.rb @@ -0,0 +1,5 @@ +class AddUserIndexToIssue < ActiveRecord::Migration + def change + add_index :issues, :user_id + end +end diff --git a/db/migrate/20130527181351_drop_use_save_to_repository_from_build_lists.rb b/db/migrate/20130527181351_drop_use_save_to_repository_from_build_lists.rb new file mode 100644 index 000000000..8207562ad --- /dev/null +++ b/db/migrate/20130527181351_drop_use_save_to_repository_from_build_lists.rb @@ -0,0 +1,9 @@ +class DropUseSaveToRepositoryFromBuildLists < ActiveRecord::Migration + def up + remove_column :build_lists, :use_save_to_repository + end + + def down + add_column :build_lists, :use_save_to_repository, :boolean, :default => true + end +end diff --git a/db/migrate/20130603124853_add_extra_repos_and_build_lists_to_mass_build.rb b/db/migrate/20130603124853_add_extra_repos_and_build_lists_to_mass_build.rb new file mode 100644 index 000000000..68abdc439 --- /dev/null +++ b/db/migrate/20130603124853_add_extra_repos_and_build_lists_to_mass_build.rb @@ -0,0 +1,22 @@ +class AddExtraReposAndBuildListsToMassBuild < ActiveRecord::Migration + class MassBuild < ActiveRecord::Base + end + + def up + add_column :mass_builds, :save_to_platform_id, :integer + MassBuild.update_all('save_to_platform_id = platform_id') + change_column :mass_builds, :save_to_platform_id, :integer, :null => false + change_column :mass_builds, :platform_id, :integer, :null => false + rename_column :mass_builds, :platform_id, :build_for_platform_id + add_column :mass_builds, :extra_repositories, :text + add_column :mass_builds, :extra_build_lists, :text + end + + def down + remove_column :mass_builds, :extra_repositories + remove_column :mass_builds, :extra_build_lists + remove_column :mass_builds, :save_to_platform_id + rename_column :mass_builds, :build_for_platform_id, :platform_id + end + +end diff --git a/db/migrate/20130624095928_create_tokens.rb b/db/migrate/20130624095928_create_tokens.rb new file mode 100644 index 000000000..a3bde8ba5 --- /dev/null +++ b/db/migrate/20130624095928_create_tokens.rb @@ -0,0 +1,19 @@ +class CreateTokens < ActiveRecord::Migration + + def change + create_table :tokens do |t| + t.integer :subject_id, :null => false + t.string :subject_type, :null => false + t.integer :creator_id, :null => false + t.integer :updater_id + t.string :status, :default => 'active' + t.text :description + t.string :authentication_token, :null => false + + t.timestamps + end + add_index :tokens, :authentication_token, :unique => true + add_index :tokens, [:subject_id, :subject_type] + end + +end diff --git a/db/migrate/20130701121313_drop_bs_id_from_build_lists.rb b/db/migrate/20130701121313_drop_bs_id_from_build_lists.rb new file mode 100644 index 000000000..d5db043d5 --- /dev/null +++ b/db/migrate/20130701121313_drop_bs_id_from_build_lists.rb @@ -0,0 +1,17 @@ +class DropBsIdFromBuildLists < ActiveRecord::Migration + + class BuildList < ActiveRecord::Base + end + + def up + remove_index :build_lists, :bs_id + remove_column :build_lists, :bs_id + end + + def down + add_column :build_lists, :bs_id, :integer + add_index :build_lists, :bs_id, :unique => true + BuildList.update_all('bs_id = id') + end + +end diff --git a/db/migrate/20130717112337_add_index_to_relation.rb b/db/migrate/20130717112337_add_index_to_relation.rb new file mode 100644 index 000000000..978d498bd --- /dev/null +++ b/db/migrate/20130717112337_add_index_to_relation.rb @@ -0,0 +1,6 @@ +class AddIndexToRelation < ActiveRecord::Migration + def change + add_index :relations, [:actor_type, :actor_id] + add_index :relations, [:target_type, :target_id] + end +end diff --git a/db/migrate/20130724105821_create_platform_arch_settings.rb b/db/migrate/20130724105821_create_platform_arch_settings.rb new file mode 100644 index 000000000..d83af5364 --- /dev/null +++ b/db/migrate/20130724105821_create_platform_arch_settings.rb @@ -0,0 +1,29 @@ +class CreatePlatformArchSettings < ActiveRecord::Migration + + def up + create_table :platform_arch_settings do |t| + t.integer :platform_id, :null => false + t.integer :arch_id, :null => false + t.integer :time_living, :null => false + t.boolean :default + t.timestamps + end + add_index :platform_arch_settings, [:platform_id, :arch_id], :unique => true + + arch_ids = Arch.where(:name => %w(i586 x86_64)).pluck(:id) + Platform.main.each do |platform| + arch_ids.each do |arch_id| + platform.platform_arch_settings.create( + :arch_id => arch_id, + :default => true, + :time_living => PlatformArchSetting::DEFAULT_TIME_LIVING / 60 + ) + end + end + + end + + def down + drop_table :platform_arch_settings + end +end diff --git a/db/migrate/20130731120901_create_project_statistics.rb b/db/migrate/20130731120901_create_project_statistics.rb new file mode 100644 index 000000000..3d7103210 --- /dev/null +++ b/db/migrate/20130731120901_create_project_statistics.rb @@ -0,0 +1,13 @@ +class CreateProjectStatistics < ActiveRecord::Migration + def change + create_table :project_statistics do |t| + t.integer :average_build_time, :null => false, :default => 0 + t.integer :build_count, :null => false, :default => 0 + t.integer :arch_id, :null => false + t.integer :project_id, :null => false + + t.timestamps + end + add_index :project_statistics, [:project_id, :arch_id], :unique => true + end +end diff --git a/db/migrate/20130731130518_drop_average_build_time_and_build_count_from_project.rb b/db/migrate/20130731130518_drop_average_build_time_and_build_count_from_project.rb new file mode 100644 index 000000000..723d331aa --- /dev/null +++ b/db/migrate/20130731130518_drop_average_build_time_and_build_count_from_project.rb @@ -0,0 +1,11 @@ +class DropAverageBuildTimeAndBuildCountFromProject < ActiveRecord::Migration + def up + remove_column :projects, :average_build_time + remove_column :projects, :build_count + end + + def down + add_column :projects, :average_build_time, :integer, :null => false, :default => 0 + add_column :projects, :build_count, :integer, :null => false, :default => 0 + end +end diff --git a/db/migrate/20130820195938_add_sound_notifications_to_user.rb b/db/migrate/20130820195938_add_sound_notifications_to_user.rb new file mode 100644 index 000000000..a7b32696c --- /dev/null +++ b/db/migrate/20130820195938_add_sound_notifications_to_user.rb @@ -0,0 +1,5 @@ +class AddSoundNotificationsToUser < ActiveRecord::Migration + def change + add_column :users, :sound_notifications, :boolean, :default => true + end +end diff --git a/db/migrate/20130822154741_create_repository_statuses.rb b/db/migrate/20130822154741_create_repository_statuses.rb new file mode 100644 index 000000000..3687c9532 --- /dev/null +++ b/db/migrate/20130822154741_create_repository_statuses.rb @@ -0,0 +1,14 @@ +class CreateRepositoryStatuses < ActiveRecord::Migration + def change + create_table :repository_statuses do |t| + t.integer :repository_id, :null => false + t.integer :platform_id, :null => false + t.integer :status, :default => 0 + t.datetime :last_regenerated_at + t.integer :last_regenerated_status + + t.timestamps + end + add_index :repository_statuses, [:repository_id, :platform_id], :unique => true + end +end diff --git a/db/migrate/20130822160501_add_status_to_platform.rb b/db/migrate/20130822160501_add_status_to_platform.rb new file mode 100644 index 000000000..674858e73 --- /dev/null +++ b/db/migrate/20130822160501_add_status_to_platform.rb @@ -0,0 +1,7 @@ +class AddStatusToPlatform < ActiveRecord::Migration + def change + add_column :platforms, :status, :integer, :default => 0 + add_column :platforms, :last_regenerated_at, :datetime + add_column :platforms, :last_regenerated_status, :integer + end +end diff --git a/db/migrate/20130827144022_add_last_regenerated_log_sha1_to_platform_and_repository_status.rb b/db/migrate/20130827144022_add_last_regenerated_log_sha1_to_platform_and_repository_status.rb new file mode 100644 index 000000000..1445541b7 --- /dev/null +++ b/db/migrate/20130827144022_add_last_regenerated_log_sha1_to_platform_and_repository_status.rb @@ -0,0 +1,6 @@ +class AddLastRegeneratedLogSha1ToPlatformAndRepositoryStatus < ActiveRecord::Migration + def change + add_column :platforms, :last_regenerated_log_sha1, :string + add_column :repository_statuses, :last_regenerated_log_sha1, :string + end +end diff --git a/db/migrate/20130829161042_add_group_id_to_build_list.rb b/db/migrate/20130829161042_add_group_id_to_build_list.rb new file mode 100644 index 000000000..6662f14b0 --- /dev/null +++ b/db/migrate/20130829161042_add_group_id_to_build_list.rb @@ -0,0 +1,5 @@ +class AddGroupIdToBuildList < ActiveRecord::Migration + def change + add_column :build_lists, :group_id, :integer + end +end diff --git a/db/migrate/20130912113545_add_epoch_to_build_list_package.rb b/db/migrate/20130912113545_add_epoch_to_build_list_package.rb new file mode 100644 index 000000000..cb17ac841 --- /dev/null +++ b/db/migrate/20130912113545_add_epoch_to_build_list_package.rb @@ -0,0 +1,5 @@ +class AddEpochToBuildListPackage < ActiveRecord::Migration + def change + add_column :build_list_packages, :epoch, :integer + end +end diff --git a/db/migrate/20130918164616_add_increase_release_tag_to_mass_build.rb b/db/migrate/20130918164616_add_increase_release_tag_to_mass_build.rb new file mode 100644 index 000000000..f1197eaf3 --- /dev/null +++ b/db/migrate/20130918164616_add_increase_release_tag_to_mass_build.rb @@ -0,0 +1,5 @@ +class AddIncreaseReleaseTagToMassBuild < ActiveRecord::Migration + def change + add_column :mass_builds, :increase_release_tag, :boolean, :default => false, :null => false + end +end diff --git a/db/migrate/20130920133720_add_extra_params_to_build_list.rb b/db/migrate/20130920133720_add_extra_params_to_build_list.rb new file mode 100644 index 000000000..6811767fb --- /dev/null +++ b/db/migrate/20130920133720_add_extra_params_to_build_list.rb @@ -0,0 +1,5 @@ +class AddExtraParamsToBuildList < ActiveRecord::Migration + def change + add_column :build_lists, :extra_params, :text + end +end diff --git a/db/migrate/20131016190149_add_external_nodes_into_build_list.rb b/db/migrate/20131016190149_add_external_nodes_into_build_list.rb new file mode 100644 index 000000000..7d88c3356 --- /dev/null +++ b/db/migrate/20131016190149_add_external_nodes_into_build_list.rb @@ -0,0 +1,5 @@ +class AddExternalNodesIntoBuildList < ActiveRecord::Migration + def change + add_column :build_lists, :external_nodes, :string + end +end diff --git a/db/migrate/20131017171426_add_builder_into_build_list.rb b/db/migrate/20131017171426_add_builder_into_build_list.rb new file mode 100644 index 000000000..4d989bcf5 --- /dev/null +++ b/db/migrate/20131017171426_add_builder_into_build_list.rb @@ -0,0 +1,5 @@ +class AddBuilderIntoBuildList < ActiveRecord::Migration + def change + add_column :build_lists, :builder_id, :integer + end +end diff --git a/db/migrate/20131022082357_remove_default_status_from_platform.rb b/db/migrate/20131022082357_remove_default_status_from_platform.rb new file mode 100644 index 000000000..0fd2822ec --- /dev/null +++ b/db/migrate/20131022082357_remove_default_status_from_platform.rb @@ -0,0 +1,5 @@ +class RemoveDefaultStatusFromPlatform < ActiveRecord::Migration + def change + change_column :platforms, :status, :integer, :default => nil + end +end diff --git a/db/migrate/20131022082416_remove_default_status_from_product_build_list.rb b/db/migrate/20131022082416_remove_default_status_from_product_build_list.rb new file mode 100644 index 000000000..8846e5a2e --- /dev/null +++ b/db/migrate/20131022082416_remove_default_status_from_product_build_list.rb @@ -0,0 +1,5 @@ +class RemoveDefaultStatusFromProductBuildList < ActiveRecord::Migration + def change + change_column :product_build_lists, :status, :integer, :default => nil + end +end diff --git a/db/migrate/20131107152408_add_use_testing_repo_to_build_list.rb b/db/migrate/20131107152408_add_use_testing_repo_to_build_list.rb new file mode 100644 index 000000000..5c8c04a99 --- /dev/null +++ b/db/migrate/20131107152408_add_use_testing_repo_to_build_list.rb @@ -0,0 +1,5 @@ +class AddUseTestingRepoToBuildList < ActiveRecord::Migration + def change + add_column :build_lists, :include_testing_subrepository, :boolean + end +end diff --git a/db/migrate/20131122130913_add_user_index_to_activity_feed.rb b/db/migrate/20131122130913_add_user_index_to_activity_feed.rb new file mode 100644 index 000000000..7e391ac1f --- /dev/null +++ b/db/migrate/20131122130913_add_user_index_to_activity_feed.rb @@ -0,0 +1,5 @@ +class AddUserIndexToActivityFeed < ActiveRecord::Migration + def change + add_index :activity_feeds, [:user_id, :kind] + end +end diff --git a/db/migrate/20131126154305_add_new_commit_to_settings_notifier.rb b/db/migrate/20131126154305_add_new_commit_to_settings_notifier.rb new file mode 100644 index 000000000..cb4b49f6f --- /dev/null +++ b/db/migrate/20131126154305_add_new_commit_to_settings_notifier.rb @@ -0,0 +1,5 @@ +class AddNewCommitToSettingsNotifier < ActiveRecord::Migration + def change + add_column :settings_notifiers, :update_code, :boolean, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index 723c833d8..f90c5de5a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130328112110) do +ActiveRecord::Schema.define(:version => 20131126154305) do create_table "activity_feeds", :force => true do |t| t.integer "user_id", :null => false @@ -21,6 +21,8 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.datetime "updated_at" end + add_index "activity_feeds", ["user_id", "kind"], :name => "index_activity_feeds_on_user_id_and_kind" + create_table "advisories", :force => true do |t| t.string "advisory_id" t.text "description", :default => "" @@ -95,6 +97,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.datetime "updated_at", :null => false t.boolean "actual", :default => false t.string "sha1" + t.integer "epoch" end add_index "build_list_packages", ["actual", "platform_id"], :name => "index_build_list_packages_on_actual_and_platform_id" @@ -104,7 +107,6 @@ ActiveRecord::Schema.define(:version => 20130328112110) do add_index "build_list_packages", ["project_id"], :name => "index_build_list_packages_on_project_id" create_table "build_lists", :force => true do |t| - t.integer "bs_id" t.integer "status" t.string "project_version" t.integer "project_id" @@ -112,7 +114,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.datetime "notified_at" t.datetime "created_at" t.datetime "updated_at" - t.boolean "is_circle", :default => false + t.boolean "is_circle", :default => false t.text "additional_repos" t.string "name" t.string "update_type" @@ -120,30 +122,33 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.integer "save_to_platform_id" t.text "include_repos" t.integer "user_id" - t.boolean "auto_publish", :default => true + t.boolean "auto_publish", :default => true t.string "package_version" t.string "commit_hash" - t.integer "priority", :default => 0, :null => false + t.integer "priority", :default => 0, :null => false t.datetime "started_at" t.integer "duration" t.integer "advisory_id" t.integer "mass_build_id" t.integer "save_to_repository_id" t.text "results" - t.boolean "new_core", :default => true + t.boolean "new_core", :default => true t.string "last_published_commit_hash" t.integer "container_status" - t.boolean "use_save_to_repository", :default => true - t.boolean "auto_create_container", :default => false + t.boolean "auto_create_container", :default => false t.text "extra_repositories" t.text "extra_build_lists" t.integer "publisher_id" + t.integer "group_id" + t.text "extra_params" + t.string "external_nodes" + t.integer "builder_id" + t.boolean "include_testing_subrepository" end add_index "build_lists", ["advisory_id"], :name => "index_build_lists_on_advisory_id" add_index "build_lists", ["arch_id"], :name => "index_build_lists_on_arch_id" add_index "build_lists", ["project_id", "save_to_repository_id", "build_for_platform_id", "arch_id"], :name => "maintainer_search_index" - add_index "build_lists", ["bs_id"], :name => "index_build_lists_on_bs_id", :unique => true add_index "build_lists", ["project_id"], :name => "index_build_lists_on_project_id" create_table "comments", :force => true do |t| @@ -152,11 +157,20 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.text "body" t.datetime "created_at" t.datetime "updated_at" - t.decimal "commentable_id", :precision => 50, :scale => 0 + t.decimal "commentable_id", :precision => 50, :scale => 0 t.integer "project_id" t.text "data" + t.boolean "automatic", :default => false + t.decimal "created_from_commit_hash", :precision => 50, :scale => 0 + t.integer "created_from_issue_id" end + add_index "comments", ["automatic"], :name => "index_comments_on_automatic" + add_index "comments", ["commentable_id"], :name => "index_comments_on_commentable_id" + add_index "comments", ["commentable_type"], :name => "index_comments_on_commentable_type" + add_index "comments", ["created_from_commit_hash"], :name => "index_comments_on_created_from_commit_hash" + add_index "comments", ["created_from_issue_id"], :name => "index_comments_on_created_from_issue_id" + create_table "event_logs", :force => true do |t| t.integer "user_id" t.string "user_name" @@ -195,6 +209,14 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.datetime "avatar_updated_at" end + create_table "hooks", :force => true do |t| + t.text "data" + t.integer "project_id" + t.string "name" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "issues", :force => true do |t| t.integer "serial_id" t.integer "project_id" @@ -210,6 +232,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do end add_index "issues", ["project_id", "serial_id"], :name => "index_issues_on_project_id_and_serial_id", :unique => true + add_index "issues", ["user_id"], :name => "index_issues_on_user_id" create_table "key_pairs", :force => true do |t| t.text "public", :null => false @@ -254,7 +277,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do add_index "labels", ["project_id"], :name => "index_labels_on_project_id" create_table "mass_builds", :force => true do |t| - t.integer "platform_id" + t.integer "build_for_platform_id", :null => false t.string "name" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false @@ -274,20 +297,39 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.boolean "new_core", :default => true t.integer "success_count", :default => 0, :null => false t.integer "build_canceled_count", :default => 0, :null => false + t.integer "save_to_platform_id", :null => false + t.text "extra_repositories" + t.text "extra_build_lists" + t.boolean "increase_release_tag", :default => false, :null => false end + create_table "platform_arch_settings", :force => true do |t| + t.integer "platform_id", :null => false + t.integer "arch_id", :null => false + t.integer "time_living", :null => false + t.boolean "default" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "platform_arch_settings", ["platform_id", "arch_id"], :name => "index_platform_arch_settings_on_platform_id_and_arch_id", :unique => true + create_table "platforms", :force => true do |t| t.string "description" - t.string "name", :null => false + t.string "name", :null => false t.integer "parent_platform_id" t.datetime "created_at" t.datetime "updated_at" - t.boolean "released", :default => false, :null => false + t.boolean "released", :default => false, :null => false t.integer "owner_id" t.string "owner_type" - t.string "visibility", :default => "open", :null => false - t.string "platform_type", :default => "main", :null => false - t.string "distrib_type", :null => false + t.string "visibility", :default => "open", :null => false + t.string "platform_type", :default => "main", :null => false + t.string "distrib_type", :null => false + t.integer "status" + t.datetime "last_regenerated_at" + t.integer "last_regenerated_status" + t.string "last_regenerated_log_sha1" end add_index "platforms", ["name"], :name => "index_platforms_on_name", :unique => true, :case_sensitive => false @@ -303,7 +345,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do create_table "product_build_lists", :force => true do |t| t.integer "product_id" - t.integer "status", :default => 2, :null => false + t.integer "status", :null => false t.datetime "created_at" t.datetime "updated_at" t.integer "project_id" @@ -347,6 +389,17 @@ ActiveRecord::Schema.define(:version => 20130328112110) do add_index "project_imports", ["platform_id", "name"], :name => "index_project_imports_on_name_and_platform_id", :unique => true, :case_sensitive => false + create_table "project_statistics", :force => true do |t| + t.integer "average_build_time", :default => 0, :null => false + t.integer "build_count", :default => 0, :null => false + t.integer "arch_id", :null => false + t.integer "project_id", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "project_statistics", ["project_id", "arch_id"], :name => "index_project_statistics_on_project_id_and_arch_id", :unique => true + create_table "project_tags", :force => true do |t| t.integer "project_id" t.string "commit_id" @@ -383,10 +436,9 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.boolean "has_wiki", :default => false t.string "default_branch", :default => "master" t.boolean "is_package", :default => true, :null => false - t.integer "average_build_time", :default => 0, :null => false - t.integer "build_count", :default => 0, :null => false t.integer "maintainer_id" t.boolean "publish_i686_into_x86_64", :default => false + t.string "owner_uname", :null => false end add_index "projects", ["owner_id", "name", "owner_type"], :name => "index_projects_on_name_and_owner_id_and_owner_type", :unique => true, :case_sensitive => false @@ -431,6 +483,9 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.string "role" end + add_index "relations", ["actor_type", "actor_id"], :name => "index_relations_on_actor_type_and_actor_id" + add_index "relations", ["target_type", "target_id"], :name => "index_relations_on_target_type_and_target_id" + create_table "repositories", :force => true do |t| t.string "description", :null => false t.integer "platform_id", :null => false @@ -442,8 +497,21 @@ ActiveRecord::Schema.define(:version => 20130328112110) do add_index "repositories", ["platform_id"], :name => "index_repositories_on_platform_id" + create_table "repository_statuses", :force => true do |t| + t.integer "repository_id", :null => false + t.integer "platform_id", :null => false + t.integer "status", :default => 0 + t.datetime "last_regenerated_at" + t.integer "last_regenerated_status" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "last_regenerated_log_sha1" + end + + add_index "repository_statuses", ["repository_id", "platform_id"], :name => "index_repository_statuses_on_repository_id_and_platform_id", :unique => true + create_table "settings_notifiers", :force => true do |t| - t.integer "user_id", :null => false + t.integer "user_id", :null => false t.boolean "can_notify", :default => true t.boolean "new_comment", :default => true t.boolean "new_comment_reply", :default => true @@ -456,6 +524,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.boolean "new_comment_commit_commentor", :default => true t.boolean "new_build", :default => true t.boolean "new_associated_build", :default => true + t.boolean "update_code", :default => false end create_table "ssh_keys", :force => true do |t| @@ -480,6 +549,21 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.decimal "subscribeable_id", :precision => 50, :scale => 0 end + create_table "tokens", :force => true do |t| + t.integer "subject_id", :null => false + t.string "subject_type", :null => false + t.integer "creator_id", :null => false + t.integer "updater_id" + t.string "status", :default => "active" + t.text "description" + t.string "authentication_token", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "tokens", ["authentication_token"], :name => "index_tokens_on_authentication_token", :unique => true + add_index "tokens", ["subject_id", "subject_type"], :name => "index_tokens_on_subject_id_and_subject_type" + create_table "users", :force => true do |t| t.string "name" t.string "email", :default => "", :null => false @@ -510,6 +594,7 @@ ActiveRecord::Schema.define(:version => 20130328112110) do t.datetime "confirmation_sent_at" t.string "authentication_token" t.integer "build_priority", :default => 50 + t.boolean "sound_notifications", :default => true end add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token" diff --git a/lib/abf_worker/build_lists_publish_task_manager.rb b/lib/abf_worker/build_lists_publish_task_manager.rb index 58dc6e8b7..ec8f57ed6 100644 --- a/lib/abf_worker/build_lists_publish_task_manager.rb +++ b/lib/abf_worker/build_lists_publish_task_manager.rb @@ -2,14 +2,10 @@ module AbfWorker class BuildListsPublishTaskManager REDIS_MAIN_KEY = 'abf-worker::build-lists-publish-task-manager::' - %w(RESIGN_REPOSITORIES - PROJECTS_FOR_CLEANUP + %w(PROJECTS_FOR_CLEANUP LOCKED_PROJECTS_FOR_CLEANUP - LOCKED_REPOSITORIES - LOCKED_REP_AND_PLATFORMS LOCKED_BUILD_LISTS - PACKAGES_FOR_CLEANUP - REGENERATE_METADATA).each do |kind| + PACKAGES_FOR_CLEANUP).each do |kind| const_set kind, "#{REDIS_MAIN_KEY}#{kind.downcase.gsub('_', '-')}" end @@ -19,21 +15,31 @@ module AbfWorker end def run + create_tasks_for_regenerate_metadata_for_software_center create_tasks_for_resign_repositories create_tasks_for_repository_regenerate_metadata create_tasks_for_build_rpms + create_tasks_for_build_rpms true end class << self def destroy_project_from_repository(project, repository) if repository.platform.personal? Platform.main.each do |main_platform| - redis.lpush PROJECTS_FOR_CLEANUP, "#{project.id}-#{repository.id}-#{main_platform.id}" + key = "#{project.id}-#{repository.id}-#{main_platform.id}" + redis.lpush PROJECTS_FOR_CLEANUP, key gather_old_packages project.id, repository.id, main_platform.id + + redis.lpush PROJECTS_FOR_CLEANUP, ('testing-' << key) + gather_old_packages project.id, repository.id, main_platform.id, true end else - redis.lpush PROJECTS_FOR_CLEANUP, "#{project.id}-#{repository.id}-#{repository.platform.id}" + key = "#{project.id}-#{repository.id}-#{repository.platform.id}" + redis.lpush PROJECTS_FOR_CLEANUP, key gather_old_packages project.id, repository.id, repository.platform.id + + redis.lpush PROJECTS_FOR_CLEANUP, ('testing-' << key) + gather_old_packages project.id, repository.id, repository.platform.id, true end end @@ -51,25 +57,14 @@ module AbfWorker end end - def resign_repository(key_pair) - redis.lpush RESIGN_REPOSITORIES, key_pair.repository_id - end - - def repository_regenerate_metadata(repository_id) - return false if Resque.redis.lrange(REGENERATE_METADATA, 0, -1).include? repository_id.to_s - redis.lpush REGENERATE_METADATA, repository_id - end - - def unlock_repository(repository_id) - redis.lrem LOCKED_REPOSITORIES, 0, repository_id - end - def unlock_build_list(build_list) redis.lrem LOCKED_BUILD_LISTS, 0, build_list.id end - def unlock_rep_and_platform(lock_str) - redis.lrem LOCKED_REP_AND_PLATFORMS, 0, lock_str + def packages_structure + structure = {:sources => [], :binaries => {}} + Arch.pluck(:name).each{ |name| structure[:binaries][name.to_sym] = [] } + structure end def redis @@ -80,35 +75,40 @@ module AbfWorker platform_path = "#{build_list.save_to_platform.path}/container/#{build_list.id}" system "rm -rf #{platform_path} && mkdir -p #{platform_path}" - packages = {:sources => [], :binaries => {:x86_64 => [], :i586 => []}} + packages = packages_structure packages[:sources] = build_list.packages.by_package_type('source').pluck(:sha1).compact packages[:binaries][build_list.arch.name.to_sym] = build_list.packages.by_package_type('binary').pluck(:sha1).compact distrib_type = build_list.build_for_platform.distrib_type cmd_params = { - 'RELEASED' => false, - 'REPOSITORY_NAME' => build_list.save_to_repository.name, - 'TYPE' => distrib_type, - 'IS_CONTAINER' => true, - 'ID' => build_list.id, - 'PLATFORM_NAME' => build_list.save_to_platform.name + 'RELEASED' => false, + 'REPOSITORY_NAME' => build_list.save_to_repository.name, + 'TYPE' => distrib_type, + 'IS_CONTAINER' => true, + 'ID' => build_list.id, + 'SAVE_TO_PLATFORM' => build_list.save_to_platform.name, + 'BUILD_FOR_PLATFORM' => build_list.build_for_platform.name }.map{ |k, v| "#{k}=#{v}" }.join(' ') - + # Low priority Resque.push( - 'publish_worker_default', - 'class' => 'AbfWorker::PublishWorkerDefault', + 'publish_worker', + 'class' => 'AbfWorker::PublishWorker', 'args' => [{ :id => build_list.id, - :arch => build_list.arch.name, - :distrib_type => distrib_type, :cmd_params => cmd_params, - :platform => {:platform_path => platform_path}, + :main_script => 'build.sh', + :rollback_script => 'rollback.sh', + :platform => { + :platform_path => platform_path, + :type => distrib_type, + :name => build_list.build_for_platform.name, + :arch => build_list.arch.name + }, :repository => {:id => build_list.save_to_repository_id}, - :type => :publish, :time_living => 9600, # 160 min :packages => packages, - :old_packages => {:sources => [], :binaries => {:x86_64 => [], :i586 => []}}, + :old_packages => packages_structure, :build_list_ids => [build_list.id], :projects_for_cleanup => [], :extra => {:create_container => true} @@ -116,11 +116,12 @@ module AbfWorker ) end - def gather_old_packages(project_id, repository_id, platform_id) + def gather_old_packages(project_id, repository_id, platform_id, testing = false) build_lists_for_cleanup = [] + status = testing ? BuildList::BUILD_PUBLISHED_INTO_TESTING : BuildList::BUILD_PUBLISHED Arch.pluck(:id).each do |arch_id| bl = BuildList.where(:project_id => project_id). - where(:new_core => true, :status => BuildList::BUILD_PUBLISHED). + where(:new_core => true, :status => status). where(:save_to_repository_id => repository_id). where(:build_for_platform_id => platform_id). where(:arch_id => arch_id). @@ -128,14 +129,14 @@ module AbfWorker build_lists_for_cleanup << bl if bl end - old_packages = {:sources => [], :binaries => {:x86_64 => [], :i586 => []}} + old_packages = packages_structure build_lists_for_cleanup.each do |bl| - bl.last_published.includes(:packages).limit(2).each{ |old_bl| + bl.last_published(testing).includes(:packages).limit(2).each{ |old_bl| fill_packages(old_bl, old_packages, :fullname) } end - - redis.hset PACKAGES_FOR_CLEANUP, "#{project_id}-#{repository_id}-#{platform_id}", old_packages.to_json + key = (testing ? 'testing-' : '') << "#{project_id}-#{repository_id}-#{platform_id}" + redis.hset PACKAGES_FOR_CLEANUP, key, old_packages.to_json end def fill_packages(bl, results_map, field = :sha1) @@ -154,18 +155,15 @@ module AbfWorker private - - def locked_repositories - @redis.lrange LOCKED_REPOSITORIES, 0, -1 - end - def create_tasks_for_resign_repositories - resign_repos = @redis.lrange RESIGN_REPOSITORIES, 0, -1 - - Repository.where(:id => (resign_repos - locked_repositories)).each do |r| - @redis.lrem RESIGN_REPOSITORIES, 0, r.id - @redis.lpush LOCKED_REPOSITORIES, r.id - + RepositoryStatus.platform_ready + .for_resign + .includes(:repository => :platform) + .readonly(false) + .each do |repository_status| + r = repository_status.repository + # Checks mirror sync status + next if r.repo_lock_file_exists? distrib_type = r.platform.distrib_type cmd_params = { @@ -179,75 +177,74 @@ module AbfWorker 'class' => "AbfWorker::PublishWorkerDefault", 'args' => [{ :id => r.id, - :arch => 'x86_64', - :distrib_type => distrib_type, :cmd_params => cmd_params, - :platform => {:platform_path => "#{r.platform.path}/repository"}, + :main_script => 'resign.sh', + :platform => { + :platform_path => "#{r.platform.path}/repository", + :type => distrib_type, + :name => r.platform.name, + :arch => 'x86_64' + }, :repository => {:id => r.id}, - :type => :resign, :skip_feedback => true, - :time_living => 9600 # 160 min + :time_living => 9600, # 160 min + :extra => {:repository_status_id => repository_status.id, :resign => true} }] - ) + ) if repository_status.start_resign end end - def create_tasks_for_build_rpms + def create_tasks_for_build_rpms(testing = false) available_repos = BuildList. select('MIN(updated_at) as min_updated_at, save_to_repository_id, build_for_platform_id'). - where(:new_core => true, :status => BuildList::BUILD_PUBLISH). + where(:new_core => true, :status => (testing ? BuildList::BUILD_PUBLISH_INTO_TESTING : BuildList::BUILD_PUBLISH)). group(:save_to_repository_id, :build_for_platform_id). order(:min_updated_at). limit(@workers_count * 2) # because some repos may be locked - locked_rep = locked_repositories + locked_rep = RepositoryStatus.not_ready.joins(:platform). + where(:platforms => {:platform_type => 'main'}).pluck(:repository_id) available_repos = available_repos.where('save_to_repository_id NOT IN (?)', locked_rep) unless locked_rep.empty? - counter = 1 - - # looks like: - # ['save_to_repository_id-build_for_platform_id', ...] - locked_rep_and_pl = @redis.lrange(LOCKED_REP_AND_PLATFORMS, 0, -1) - for_cleanup = @redis.lrange(PROJECTS_FOR_CLEANUP, 0, -1).map do |key| - pr, rep, pl = *key.split('-') - if locked_rep.present? && locked_rep.include?(rep) - nil - else - [rep.to_i, pl.to_i] - end + next if testing && key !~ /^testing-/ + rep, pl = *key.split('-').last(2) + locked_rep.present? && locked_rep.include?(rep.to_i) ? nil : [rep.to_i, pl.to_i] end.compact - available_repos = available_repos.map{ |bl| [bl.save_to_repository_id, bl.build_for_platform_id] } | for_cleanup + counter = 1 + available_repos = available_repos.map{ |bl| [bl.save_to_repository_id, bl.build_for_platform_id] } | for_cleanup available_repos.each do |save_to_repository_id, build_for_platform_id| - next if locked_rep_and_pl.include?("#{save_to_repository_id}-#{build_for_platform_id}") + next if RepositoryStatus.not_ready.where(:repository_id => save_to_repository_id, :platform_id => build_for_platform_id).exists? break if counter > @workers_count - counter += 1 if create_rpm_build_task(save_to_repository_id, build_for_platform_id) + counter += 1 if create_rpm_build_task(save_to_repository_id, build_for_platform_id, testing) end end - def create_rpm_build_task(save_to_repository_id, build_for_platform_id) - projects_for_cleanup = @redis.lrange(PROJECTS_FOR_CLEANUP, 0, -1). - select{ |k| k =~ /#{save_to_repository_id}\-#{build_for_platform_id}$/ } + def create_rpm_build_task(save_to_repository_id, build_for_platform_id, testing) + key = "#{save_to_repository_id}-#{build_for_platform_id}" + projects_for_cleanup = @redis.lrange(PROJECTS_FOR_CLEANUP, 0, -1).select do |k| + (testing && k =~ /^testing-[\d]+-#{key}$/) || (!testing && k =~ /^[\d]+-#{key}$/) + end # We should not to publish new builds into repository # if project of builds has been removed from repository. BuildList.where( - :project_id => projects_for_cleanup.map{ |k| k.split('-')[0] }.uniq, + :project_id => projects_for_cleanup.map{ |k| k.split('-')[testing ? 1 : 0] }.uniq, :save_to_repository_id => save_to_repository_id, - :status => BuildList::BUILD_PUBLISH + :status => [BuildList::BUILD_PUBLISH, BuildList::BUILD_PUBLISH_INTO_TESTING] ).update_all(:status => BuildList::FAILED_PUBLISH) build_lists = BuildList. - where(:new_core => true, :status => BuildList::BUILD_PUBLISH). + where(:new_core => true, :status => (testing ? BuildList::BUILD_PUBLISH_INTO_TESTING : BuildList::BUILD_PUBLISH)). where(:save_to_repository_id => save_to_repository_id). where(:build_for_platform_id => build_for_platform_id). order(:updated_at) locked_ids = @redis.lrange(LOCKED_BUILD_LISTS, 0, -1) build_lists = build_lists.where('build_lists.id NOT IN (?)', locked_ids) unless locked_ids.empty? - build_lists = build_lists.limit(50) + build_lists = build_lists.limit(150) - old_packages = {:sources => [], :binaries => {:x86_64 => [], :i586 => []}} + old_packages = self.class.packages_structure projects_for_cleanup.each do |key| @redis.lrem PROJECTS_FOR_CLEANUP, 0, key @@ -255,8 +252,8 @@ module AbfWorker next unless packages packages = JSON.parse packages old_packages[:sources] |= packages['sources'] - [:x86_64, :i586].each do |arch| - old_packages[:binaries][arch] |= packages['binaries'][arch.to_s] + Arch.pluck(:name).each do |arch| + old_packages[:binaries][arch.to_sym] |= packages['binaries'][arch] end end @@ -264,6 +261,12 @@ module AbfWorker return false if !bl && old_packages[:sources].empty? save_to_repository = Repository.find save_to_repository_id + # Checks mirror sync status + return false if save_to_repository.repo_lock_file_exists? || !save_to_repository.platform.ready? + + repository_status = save_to_repository.repository_statuses.find_or_create_by_platform_id(build_for_platform_id) + return false unless repository_status.publish + save_to_platform = save_to_repository.platform build_for_platform = Platform.find build_for_platform_id platform_path = "#{save_to_platform.path}/repository" @@ -276,35 +279,43 @@ module AbfWorker distrib_type = build_for_platform.distrib_type cmd_params = { - 'RELEASED' => save_to_platform.released, - 'REPOSITORY_NAME' => save_to_repository.name, - 'TYPE' => distrib_type + 'RELEASED' => save_to_platform.released, + 'REPOSITORY_NAME' => save_to_repository.name, + 'TYPE' => distrib_type, + 'SAVE_TO_PLATFORM' => save_to_platform.name, + 'BUILD_FOR_PLATFORM' => build_for_platform.name, + 'TESTING' => testing }.map{ |k, v| "#{k}=#{v}" }.join(' ') - lock_str = "#{save_to_repository_id}-#{build_for_platform_id}" options = { - :id => (bl ? bl.id : Time.now.to_i), - :arch => (bl ? bl.arch.name : 'x86_64'), - :distrib_type => distrib_type, - :cmd_params => cmd_params, - :platform => {:platform_path => platform_path}, + :id => (bl ? bl.id : Time.now.to_i), + :cmd_params => cmd_params, + :main_script => 'build.sh', + :rollback_script => 'rollback.sh', + :platform => { + :platform_path => platform_path, + :type => distrib_type, + :name => build_for_platform.name, + :arch => (bl ? bl.arch.name : 'x86_64') + }, :repository => {:id => save_to_repository_id}, - :type => :publish, :time_living => 9600, # 160 min - :extra => {:lock_str => lock_str} + :extra => {:repository_status_id => repository_status.id} } - packages = {:sources => [], :binaries => {:x86_64 => [], :i586 => []}} - build_list_ids = [] - - new_sources = {} + packages, build_list_ids, new_sources = self.class.packages_structure, [], {} build_lists.each do |bl| # remove duplicates of sources for different arches bl.packages.by_package_type('source').each{ |s| new_sources["#{s.fullname}"] = s.sha1 } self.class.fill_packages(bl, packages) - bl.last_published.includes(:packages).limit(2).each{ |old_bl| + bl.last_published(testing).includes(:packages).limit(2).each{ |old_bl| self.class.fill_packages(old_bl, old_packages, :fullname) } + # TODO: do more flexible + # Removes old packages which already in the main repo + bl.last_published(false).includes(:packages).limit(3).each{ |old_bl| + self.class.fill_packages(old_bl, old_packages, :fullname) + } if testing build_list_ids << bl.id @redis.lpush(LOCKED_BUILD_LISTS, bl.id) end @@ -314,9 +325,9 @@ module AbfWorker worker_queue, 'class' => worker_class, 'args' => [options.merge({ - :packages => packages, - :old_packages => old_packages, - :build_list_ids => build_list_ids, + :packages => packages, + :old_packages => old_packages, + :build_list_ids => build_list_ids, :projects_for_cleanup => projects_for_cleanup })] ) @@ -325,53 +336,92 @@ module AbfWorker @redis.lpush LOCKED_PROJECTS_FOR_CLEANUP, key end - @redis.lpush(LOCKED_REP_AND_PLATFORMS, lock_str) return true end + def create_tasks_for_regenerate_metadata_for_software_center + Platform.main.waiting_for_regeneration.each do |platform| + repos = platform.repositories + statuses = RepositoryStatus.where(:platform_id => platform.id) + next if repos.find{ |r| r.repo_lock_file_exists? } + next if statuses.present? && + statuses.map{ |s| s.ready? || s.can_start_regeneration? || s.can_start_resign? }.uniq != [true] + + cmd_params = { + 'RELEASED' => platform.released, + 'REPOSITORY_NAMES' => platform.repositories.map(&:name).join(','), + 'TYPE' => platform.distrib_type, + 'REGENERATE_PLATFORM_METADATA' => true, + 'SAVE_TO_PLATFORM' => platform.name, + 'BUILD_FOR_PLATFORM' => platform.name + }.map{ |k, v| "#{k}=#{v}" }.join(' ') + + Resque.push( + 'publish_worker_default', + 'class' => 'AbfWorker::PublishWorkerDefault', + 'args' => [{ + :id => Time.now.to_i, + :cmd_params => cmd_params, + :main_script => 'regenerate_platform_metadata.sh', + :platform => { + :platform_path => "#{platform.path}/repository", + :type => platform.distrib_type, + :name => platform.name, + :arch => 'x86_64' + }, + :time_living => 9600, # 160 min + :extra => {:platform_id => platform.id, :regenerate_platform => true} + }] + ) if platform.start_regeneration + + end + end + def create_tasks_for_repository_regenerate_metadata - worker_queue = 'publish_worker_default' - worker_class = 'AbfWorker::PublishWorkerDefault' - regen_repos = @redis.lrange REGENERATE_METADATA, 0, -1 - locked_rep_and_pl = @redis.lrange(LOCKED_REP_AND_PLATFORMS, 0, -1) + RepositoryStatus.platform_ready + .for_regeneration + .includes(:repository => :platform) + .readonly(false) + .each do |repository_status| + rep = repository_status.repository + # Checks mirror sync status + next if rep.repo_lock_file_exists? - Repository.where(:id => regen_repos).each do |rep| - lock_str = "#{rep.id}-#{rep.platform_id}" - next if locked_rep_and_pl.include?("#{rep.id}-#{rep.platform_id}") - @redis.lrem REGENERATE_METADATA, 0, rep.id - - platform_path = "#{rep.platform.path}/repository" - distrib_type = rep.platform.distrib_type - cmd_params = { - 'RELEASED' => rep.platform.released, - 'REPOSITORY_NAME' => rep.name, - 'TYPE' => distrib_type, - 'REGENERATE_METADATA' => true + build_for_platform = repository_status.platform + cmd_params = { + 'RELEASED' => rep.platform.released, + 'REPOSITORY_NAME' => rep.name, + 'TYPE' => build_for_platform.distrib_type, + 'REGENERATE_METADATA' => true, + 'SAVE_TO_PLATFORM' => rep.platform.name, + 'BUILD_FOR_PLATFORM' => build_for_platform.name }.map{ |k, v| "#{k}=#{v}" }.join(' ') - options = { - :id => Time.now.to_i, - :arch => 'x86_64', - :distrib_type => distrib_type, - :cmd_params => cmd_params, - :platform => {:platform_path => platform_path}, - :repository => {:id => rep.id}, - :type => :publish, - :time_living => 9600, # 160 min - :skip_feedback => true, - :extra => {:lock_str => lock_str, :regenerate => true} - } + platform_path = "#{rep.platform.path}/repository" + if rep.platform.personal? + platform_path << '/' << build_for_platform.name + system "mkdir -p #{platform_path}" + end Resque.push( - worker_queue, - 'class' => worker_class, - 'args' => [options.merge({ - })] - ) - - @redis.lpush(LOCKED_REP_AND_PLATFORMS, lock_str) + 'publish_worker_default', + 'class' => 'AbfWorker::PublishWorkerDefault', + 'args' => [{ + :id => Time.now.to_i, + :cmd_params => cmd_params, + :main_script => 'build.sh', + :rollback_script => 'rollback.sh', + :platform => { + :platform_path => platform_path, + :type => build_for_platform.distrib_type, + :name => build_for_platform.name, + :arch => 'x86_64' + }, + :time_living => 9600, # 160 min + :extra => {:repository_status_id => repository_status.id, :regenerate => true} + }] + ) if repository_status.start_regeneration end - return true end end end diff --git a/lib/abf_worker/model_helper.rb b/lib/abf_worker/model_helper.rb index 9d8de6653..9aa000095 100644 --- a/lib/abf_worker/model_helper.rb +++ b/lib/abf_worker/model_helper.rb @@ -1,59 +1,79 @@ -module AbfWorker - module ModelHelper - # In model which contains this helper should be: - # - #abf_worker_args - # - #build_canceled - - def abf_worker_log - Resque.redis.get(service_queue) || I18n.t('layout.build_lists.log.not_available') - end - - def add_job_to_abf_worker_queue - Resque.push( - worker_queue_with_priority, - 'class' => worker_queue_class, - 'args' => [abf_worker_args] - ) - end - - def cancel_job - deleted = Resque::Job.destroy( - worker_queue_with_priority, - worker_queue_class, - abf_worker_args - ) - if deleted == 1 - build_canceled - else - send_stop_signal - end - true - end - - def worker_queue_with_priority(queue = nil) - queue ||= abf_worker_base_queue - queue << '_' << abf_worker_priority if abf_worker_priority.present? - queue - end - - def worker_queue_class(queue_class = nil) - queue_class ||= "AbfWorker::#{abf_worker_base_queue.classify}" - queue_class << abf_worker_priority.capitalize - end - - private - - def send_stop_signal - Resque.redis.setex( - "#{service_queue}::live-inspector", - 240, # Data will be removed from Redis after 240 sec. - 'USR1' # Immediately kill child but don't exit - ) - end - - def service_queue - "abfworker::#{abf_worker_base_queue.gsub(/\_/, '-')}-#{id}" - end +module AbfWorker::ModelHelper + # In model which contains this helper should be: + # - #abf_worker_args + # - #build_canceled + def self.included(base) + base.extend(ClassMethods) end + + module ClassMethods + def log_server + @log_server ||= Redis.new( + :host => APP_CONFIG['abf_worker']['log_server']['host'], + :port => APP_CONFIG['abf_worker']['log_server']['port'] + ) + end + end + + def abf_worker_log + self.class.log_server.get(service_queue) || I18n.t('layout.build_lists.log.not_available') + end + + def add_job_to_abf_worker_queue + Resque.push( + worker_queue_with_priority, + 'class' => worker_queue_class, + 'args' => [abf_worker_args] + ) + end + + def restart_job + redis = Resque.redis + redis.lpush "queue:#{worker_queue_with_priority}", + Resque.encode({'class' => worker_queue_class, 'args' => [abf_worker_args]}) + end + + def cancel_job + if destroy_from_resque_queue == 1 + build_canceled + else + send_stop_signal + end + true + end + + def destroy_from_resque_queue + Resque::Job.destroy( + worker_queue_with_priority, + worker_queue_class, + abf_worker_args + ) + end + + def worker_queue_with_priority(queue = nil) + queue ||= abf_worker_base_queue + queue << '_' << abf_worker_priority if abf_worker_priority.present? + queue + end + + def worker_queue_class(queue_class = nil) + queue_class ||= "AbfWorker::#{abf_worker_base_queue.classify}" + queue_class << abf_worker_priority.capitalize + end + + private + + def send_stop_signal + Resque.redis.setex( + "#{service_queue}::live-inspector", + 240, # Data will be removed from Redis after 240 sec. + 'USR1' # Immediately kill child but don't exit + ) + end + + def service_queue + "abfworker::#{abf_worker_base_queue.gsub(/\_/, '-')}-#{id}" + end + end \ No newline at end of file diff --git a/lib/abf_worker/publish_observer.rb b/lib/abf_worker/publish_observer.rb index a6166535a..7ad128c9a 100644 --- a/lib/abf_worker/publish_observer.rb +++ b/lib/abf_worker/publish_observer.rb @@ -9,12 +9,26 @@ module AbfWorker def perform return if status == STARTED # do nothing when publication started - if options['type'] == 'resign' - AbfWorker::BuildListsPublishTaskManager.unlock_repository options['id'] - else - if options['extra']['regenerate'] # Regenerate metadata - AbfWorker::BuildListsPublishTaskManager.unlock_rep_and_platform options['extra']['lock_str'] - elsif options['extra']['create_container'] # Container has been created + extra = options['extra'] + repository_status = RepositoryStatus.where(:id => extra['repository_status_id']).first + begin + + if extra['regenerate'] || extra['regenerate_platform'] + log_sha1 = (options['results'].try(:first) || {}).fetch('sha1', nil) + end + + if extra['regenerate'] # Regenerate metadata + repository_status.last_regenerated_at = Time.now.utc + repository_status.last_regenerated_status = status + repository_status.last_regenerated_log_sha1 = log_sha1 + elsif extra['regenerate_platform'] # Regenerate metadata for Software Center + if platform = Platform.where(:id => extra['platform_id']).first + platform.last_regenerated_at = Time.now.utc + platform.last_regenerated_status = status + platform.last_regenerated_log_sha1 = log_sha1 + platform.ready + end + elsif extra['create_container'] # Container has been created case status when COMPLETED subject.published_container @@ -22,9 +36,11 @@ module AbfWorker subject.fail_publish_container end update_results - else + elsif !extra['resign'] # Simple publish update_rpm_builds end + ensure + repository_status.ready if repository_status.present? end end @@ -36,10 +52,18 @@ module AbfWorker update_results build_list case status when COMPLETED - # 'update_column' - when project of build_list has been removed from repository - build_list.published || build_list.update_column(:status, BuildList::BUILD_PUBLISHED) + if build_list.build_publish? + # 'update_column' - when project of build_list has been removed from repository + build_list.published || build_list.update_column(:status, BuildList::BUILD_PUBLISHED) + elsif build_list.build_publish_into_testing? + build_list.published_into_testing || build_list.update_column(:status, BuildList::BUILD_PUBLISHED_INTO_TESTING) + end when FAILED, CANCELED - build_list.fail_publish || build_list.update_column(:status, BuildList::FAILED_PUBLISH) + if build_list.build_publish? + build_list.fail_publish || build_list.update_column(:status, BuildList::FAILED_PUBLISH) + elsif build_list.build_publish_into_testing? + build_list.fail_publish_into_testing || build_list.update_column(:status, BuildList::FAILED_PUBLISH_INTO_TESTING) + end end AbfWorker::BuildListsPublishTaskManager.unlock_build_list build_list end @@ -50,8 +74,6 @@ module AbfWorker when FAILED, CANCELED AbfWorker::BuildListsPublishTaskManager.cleanup_failed options['projects_for_cleanup'] end - - AbfWorker::BuildListsPublishTaskManager.unlock_rep_and_platform options['extra']['lock_str'] end def update_results(build_list = subject) diff --git a/lib/abf_worker/rpm_worker_observer.rb b/lib/abf_worker/rpm_worker_observer.rb index bc128adfc..3e9201f1c 100644 --- a/lib/abf_worker/rpm_worker_observer.rb +++ b/lib/abf_worker/rpm_worker_observer.rb @@ -10,6 +10,10 @@ module AbfWorker def perform return if restart_task + if options['feedback_from_user'] + user = User.find options['feedback_from_user'] + return if !user.system? && subject.builder != user + end item = find_or_create_item fill_container_data if status != STARTED @@ -17,7 +21,7 @@ module AbfWorker case status when COMPLETED subject.build_success - subject.now_publish if subject.auto_publish? && subject.can_publish? + subject.now_publish if subject.can_auto_publish? when FAILED subject.build_error item.update_attributes({:status => BuildList::BUILD_ERROR}) @@ -55,7 +59,7 @@ module AbfWorker else redis.lpush RESTARTED_BUILD_LISTS, subject.id subject.update_column(:status, BuildList::BUILD_PENDING) - subject.add_job_to_abf_worker_queue + subject.restart_job if subject.external_nodes.blank? return true end end diff --git a/lib/abf_worker/status_inspector.rb b/lib/abf_worker/status_inspector.rb index 6aa722c01..54e10fcad 100644 --- a/lib/abf_worker/status_inspector.rb +++ b/lib/abf_worker/status_inspector.rb @@ -3,9 +3,17 @@ module AbfWorker class << self def projects_status - get_status(:rpm, :publish) { |w, worker| - w.to_s =~ /#{worker}_worker_default/ - } + Rails.cache.fetch([AbfWorker::StatusInspector, :projects_status], :expires_in => 10.seconds) do + result = get_status(:rpm, :publish) { |w, worker| w.to_s =~ /#{worker}_worker_default/ } + nodes = RpmBuildNode.total_statistics + result[:rpm][:workers] += nodes[:systems] + result[:rpm][:build_tasks] += nodes[:busy] + result[:rpm][:other_workers] = nodes[:others] + external_bls = BuildList.for_status(BuildList::BUILD_PENDING).external_nodes(:everything).count + result[:rpm][:default_tasks] += external_bls + result[:rpm][:tasks] += external_bls + result + end end def products_status @@ -28,10 +36,13 @@ module AbfWorker def status_of_worker(workers, worker) redis, key = Resque.redis, "queue:#{worker}_worker" + default_tasks, tasks = redis.llen("#{key}_default"), redis.llen(key) { - :count => workers.count, - :build_tasks => workers.select{ |w| w.working? }.count, - :tasks => (redis.llen("#{key}_default") + redis.llen(key)) + :workers => workers.count, + :build_tasks => workers.select{ |w| w.working? }.count, + :default_tasks => default_tasks, + :low_tasks => tasks, + :tasks => (default_tasks + tasks) } end diff --git a/lib/api_defender.rb b/lib/api_defender.rb index dd3489a7b..de24917d2 100644 --- a/lib/api_defender.rb +++ b/lib/api_defender.rb @@ -51,7 +51,9 @@ class ApiDefender < Rack::Throttle::Hourly # only API calls should be throttled def need_defense?(request) - request.env['PATH_INFO'] =~ /^\/api\/v1\// && !system_user?(request) + APP_CONFIG['allowed_addresses'].exclude?(request.ip) && + request.env['PATH_INFO'] =~ /^\/api\/v1\// && + !system_user?(request) end def authorized?(request) diff --git a/lib/ext/angularjs_link_renderer.rb b/lib/ext/angularjs_link_renderer.rb new file mode 100644 index 000000000..d7b508800 --- /dev/null +++ b/lib/ext/angularjs_link_renderer.rb @@ -0,0 +1,43 @@ +class Array + def html_safe + self + end +end + + +class AngularjsLinkRenderer < WillPaginate::ActionView::LinkRenderer + + def to_html + pagination.map do |item| + item.is_a?(Fixnum) ? page_number(item) : send(item) + end + end + + protected + + def page_number(page) + unless page == current_page + {:active => true, :number => page, :type => :page} + else + {:active => false, :number => page, :type => :first} + end + end + + def gap + nil + end + + def next_page + num = @collection.current_page < @collection.total_pages && @collection.current_page + 1 + previous_or_next_page(num, @options[:next_label], :next_page) + end + + def previous_or_next_page(page, text, classname) + if page + {:active => true, :number => page, :type => classname} + else + {:active => false, :number => page, :type => classname} + end + end + +end diff --git a/lib/ext/core/string.rb b/lib/ext/core/string.rb index 3266b0557..c7c887c28 100644 --- a/lib/ext/core/string.rb +++ b/lib/ext/core/string.rb @@ -23,15 +23,13 @@ class String # same as reverse.truncate.reverse def rtruncate(length, options = {}) - text = self.dup + chars = self.dup.mb_chars + return self if chars.length <= length options[:omission] ||= "..." options[:separator] ||= '/' - length_with_room_for_omission = length - options[:omission].mb_chars.length - chars = text.mb_chars - stop = options[:separator] ? - (chars.index(options[:separator].mb_chars, length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission - - (chars.length > length ? "#{options[:omission]}#{chars[-(stop+1)...-1]}" : text).to_s + start = chars.length - length + options[:omission].mb_chars.length + stop = options[:separator] ? (chars.index(options[:separator].mb_chars, start) || start) : start + "#{options[:omission]}#{chars[stop..-1]}".to_s end end diff --git a/lib/ext/git/grit.rb b/lib/ext/git/grit.rb index c62bacf81..6df6c1e03 100644 --- a/lib/ext/git/grit.rb +++ b/lib/ext/git/grit.rb @@ -8,6 +8,12 @@ module Grit end end + class Submodule + def binary? + false + end + end + class Blob include Linguist::BlobHelper diff --git a/lib/ext/preregistration.rb b/lib/ext/preregistration.rb index aeb3fdb6c..661984341 100644 --- a/lib/ext/preregistration.rb +++ b/lib/ext/preregistration.rb @@ -50,10 +50,10 @@ module Preregistration end end - end #RegistrationsController - end #Devise -end #Preregistration + end # RegistrationsController + end # Devise +end # Preregistration Rails.application.config.to_prepare do - ::Devise::RegistrationsController.send :include, Preregistration::Devise::RegistrationsController + ::Devise::RegistrationsController.send :include, Preregistration::Devise::RegistrationsController if APP_CONFIG['preregistration'] end diff --git a/lib/ext/rails/reserved_name_validator.rb b/lib/ext/rails/reserved_name_validator.rb index 7d578e6c4..cfc1a1a5e 100644 --- a/lib/ext/rails/reserved_name_validator.rb +++ b/lib/ext/rails/reserved_name_validator.rb @@ -3,8 +3,8 @@ class ReservedNameValidator < ActiveModel::EachValidator about account add admin administrator api autocomplete_group_uname app apps archive archives auth blog - config connect contact create commit commits - dashboard delete direct_messages downloads + config connect contact create commit commits + dashboard delete direct_messages download downloads edit email faq favorites feed feeds follow followers following help home @@ -12,18 +12,17 @@ class ReservedNameValidator < ActiveModel::EachValidator jobs login log-in log_in logout log-out log_out logs map maps - new + new none oauth oauth_clients openid privacy register remove replies rss root save search sessions settings signup sign-up sign_up signin sign-in sign_in signout sign-out sign_out sitemap ssl subscribe - teams terms test trends tree - unfollow unsubscribe url user + teams terms test tour trends tree + unfollow unsubscribe upload uploads url user widget widgets wiki xfn xmpp - tour } def reserved_names diff --git a/lib/modules/models/file_store_clean.rb b/lib/modules/models/file_store_clean.rb index 003eaedf8..86412c92e 100644 --- a/lib/modules/models/file_store_clean.rb +++ b/lib/modules/models/file_store_clean.rb @@ -29,6 +29,11 @@ module Modules end end end + + def later_destroy_files_from_file_store(args) + destroy_files_from_file_store(args) + end + later :later_destroy_files_from_file_store, :queue => :clone_build end def self.file_exist_on_file_store?(sha1) diff --git a/lib/modules/models/git.rb b/lib/modules/models/git.rb index b76ba2af6..a756519ca 100644 --- a/lib/modules/models/git.rb +++ b/lib/modules/models/git.rb @@ -1,3 +1,7 @@ +require 'nokogiri' +require 'open-uri' +require 'iconv' + module Modules module Models module Git @@ -32,6 +36,26 @@ module Modules repo.tags.map(&:name) + repo.branches.map(&:name) end + def create_branch(new_ref, from_ref, user) + return false if new_ref.blank? || from_ref.blank? || !(from_commit = repo.commit(from_ref)) + status, out, err = repo.git.native(:branch, {:process_info => true}, new_ref, from_commit.id) + if status == 0 + Resque.enqueue(GitHook, owner.uname, name, from_commit.id, GitHook::ZERO, "refs/heads/#{new_ref}", 'commit', "user-#{user.id}", nil) + return true + end + return false + + end + + def delete_branch(branch, user) + return false if default_branch == branch.name + message = repo.git.native(:branch, {}, '-D', branch.name) + if message.present? + Resque.enqueue(GitHook, owner.uname, name, GitHook::ZERO, branch.commit.id, "refs/heads/#{branch.name}", 'commit', "user-#{user.id}", message) + end + return message.present? + end + def update_file(path, data, options = {}) head = options[:head].to_s || default_branch actor = get_actor(options[:actor]) @@ -69,24 +93,19 @@ module Modules end def tree_info(tree, treeish = nil, path = nil) - treeish ||= tree.id - # initialize result as hash of
![\":trollface:\"](\"/images/trollface.png" "\\":trollface:\\"")
+ module Markdown
+ include IssuesHelper
+
+ attr_reader :html_options
+
+ # Public: Parse the provided text with GitLab-Flavored Markdown
+ #
+ # text - the source text
+ # html_options - extra options for the reference links as given to link_to
+ #
+ # Note: reference links will only be generated if @project is set
+ def gfm(text, html_options = {})
+ return text if text.nil?
+
+ # Duplicate the string so we don't alter the original, then call to_str
+ # to cast it back to a String instead of a SafeBuffer. This is required
+ # for gsub calls to work as we need them to.
+ text = text.dup.to_str
+
+ @html_options = html_options
+
+ # Extract pre blocks so they are not altered
+ # from http://github.github.com/github-flavored-markdown/
+ text.gsub!(%r{.*?|
.*?}m) { |match| extract_piece(match) }
+ # Extract links with probably parsable hrefs
+ text.gsub!(%r{ tag for next case:
+ #
+ # # Title kinda h1
+ #
+ # ruby code here
+ #
+ code_class = "class=\"#{language.downcase}\"" if language.present?
+ <<-HTML
+
+ #{code}
+
+ HTML
+ end
+
+ def link(link, title, content)
+ h.link_to_gfm(content, link, title: title)
+ end
+
+ def postprocess(full_document)
+ h.gfm(full_document)
+ end
+end
diff --git a/lib/tasks/add_branch.rake b/lib/tasks/add_branch.rake
index 47c0bf9ed..c8055d8c4 100644
--- a/lib/tasks/add_branch.rake
+++ b/lib/tasks/add_branch.rake
@@ -12,6 +12,21 @@ namespace :add_branch do
FileUtils.rm_rf tmp_path
end
+ desc "Add branch for group projects"
+ task :group => :environment do
+ src_branch = ENV['SRC_BRANCH']
+ dst_branch = ENV['DST_BRANCH']
+ group = ENV['GROUP']
+ say "START add branch #{dst_branch} from #{src_branch} in #{group} group"
+ Group.find_by_uname(group).projects.find_each do |p|
+ next if p.repo.branches.map(&:name).include?(dst_branch)
+ next if p.repo.branches.map(&:name).exclude?(src_branch)
+ say "===== Process #{p.name} project"
+ Rake::Task['add_branch:fork_branch'].execute(:path => p.path, :src_branch => src_branch, :dst_branch => dst_branch)
+ end
+ say 'DONE'
+ end
+
desc "Add branch for platform projects"
task :platform => :environment do
src_branch = ENV['SRC_BRANCH'] || 'import_mandriva2011'
diff --git a/lib/tasks/build.rake b/lib/tasks/build.rake
deleted file mode 100644
index c0f414df6..000000000
--- a/lib/tasks/build.rake
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'highline/import'
-require 'open-uri'
-
-namespace :build do
- desc "Build projects from list"
- task :projects => :environment do
- source = ENV['SOURCE'] || 'http://dl.dropbox.com/u/984976/rebuild_list.txt'
- owner = User.find_by_uname!(ENV['OWNER'] || 'warpc')
- platform = Platform.find_by_name!(ENV['PLATFORM'] || 'rosa2012lts')
- arch = Arch.find_by_name!(ENV['ARCH'] || 'i586')
-
- say "START build projects from #{source} for platform=#{platform.name}, owner=#{owner.uname}, arch=#{arch.name}"
- open(source).readlines.each do |name|
- name.chomp!; name.strip! #; name.downcase!
- if p = Project.joins(:repositories).where('repositories.id IN (?)', platform.repositories).find_by_name(name)
- # Old code p.build_for(platform, owner, arch)
- say "== Build #{p.name} =="
- else
- say "== Not found #{name} =="
- end
- sleep 0.2
- end
- say 'DONE'
- end
-end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 309315e27..d63718df1 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -26,12 +26,13 @@ namespace :import do
say 'DONE'
end
- # bundle exec rake import:srpm RAILS_ENV=production BASE=/share/platforms/naulinux5x_personal/tmp/SRPMS LIST=https://dl.dropbox.com/u/984976/nauschool5x.srpms.txt OWNER=naulinux PLATFORM=naulinux REPO=main CLEAR=true > log/srpm_naulinux.log &
+ # bundle exec rake import:srpm RAILS_ENV=production BASE=/share/platforms/naulinux5x_personal/tmp/SRPMS LIST=https://dl.dropbox.com/u/984976/nauschool5x.srpms.txt OWNER=naulinux PLATFORM=naulinux REPO=main CLEAR=true HIDDEN=true > log/srpm_naulinux.log &
desc 'Import SRPMs as projects'
task :srpm => :environment do
base = ENV['BASE'] || '/share/alt_repos/rsync'
list = ENV['LIST'] #|| 'https://dl.dropbox.com/u/984976/alt_import.txt'
mask = ENV['MASK'] || '*.src.rpm'
+ hidden = ENV['HIDDEN'] == 'true' ? true : false
owner = User.find_by_uname(ENV['OWNER']) || Group.find_by_uname!(ENV['OWNER'] || 'altlinux')
platform = Platform.find_by_name!(ENV['PLATFORM'] || 'altlinux5')
repo = platform.repositories.find_by_name!(ENV['REPO'] || 'main')
@@ -44,14 +45,14 @@ namespace :import do
if name = `rpm -q --qf '[%{Name}]' -p #{srpm_file}` and $?.success? and name.present?
if clear # simply add
project = Project.find_or_create_by_name_and_owner_type_and_owner_id(name, owner.class.to_s, owner.id)
- repo.projects << project
+ repo.projects << project rescue nil
else # check if project already added
if project = repo.projects.find_by_name(name) || repo.projects.by_name(name).first # fallback to speedup
print "Found project '#{project.name_with_owner}' in '#{platform.name}/#{repo.name}'."
elsif scoped = Project.where(:owner_id => owner.id, :owner_type => owner.class) and
project = scoped.find_by_name(name) || scoped.by_name(name).first
begin
- repo.projects << project
+ repo.projects << project rescue nil
rescue Exception => e
print "Add project '#{project.name_with_owner}' to '#{platform.name}/#{repo.name}' FAILED: #{e.message}."
else
@@ -60,10 +61,11 @@ namespace :import do
else
description = `rpm -q --qf '[%{Description}]' -p #{srpm_file}`
project = Project.create!(:name => name, :description => description) {|p| p.owner = owner}
- repo.projects << project
+ repo.projects << project rescue nil
print "Create project #{project.name_with_owner} in #{platform.name}/#{repo.name} OK."
end
end
+ project.update_attributes(:visibility => 'hidden') if hidden
project.import_srpm(srpm_file, platform.name)
print " Code import complete!"
else
diff --git a/lib/tasks/new_core.rake b/lib/tasks/new_core.rake
index bdaf4bab0..a38753d2c 100644
--- a/lib/tasks/new_core.rake
+++ b/lib/tasks/new_core.rake
@@ -1,58 +1,4 @@
namespace :new_core do
- desc 'Sets bs_id field for all BuildList which use new_core'
- task :update_bs_id => :environment do
- say "[#{Time.zone.now}] Starting to update bs_id..."
-
- BuildList.select(:id).
- where(:new_core => true, :bs_id => nil).
- find_in_batches(:batch_size => 500) do | bls |
-
- puts "[#{Time.zone.now}] - where build_lists.id from #{bls.first.id} to #{bls.last.id}"
- BuildList.where(:id => bls.map(&:id), :bs_id => nil).
- update_all("bs_id = id")
- end
-
- say "[#{Time.zone.now}] done"
- end
-
- desc 'Publish mass-build 73'
- task :publish_mass_build_73 => :environment do
- say "[#{Time.zone.now}] Starting to publish mass-build 317..."
-
- bl = BuildList.where(:mass_build_id => 73).first
- platform_repository_folder = "#{bl.save_to_platform.path}/repository"
- BuildList.where(:mass_build_id => 73).
- where(:status => [
- BuildList::SUCCESS,
- BuildList::FAILED_PUBLISH
- ]).
- order(:id).
- find_in_batches(:batch_size => 1) do | bls |
-
- bl = bls.first
- puts "[#{Time.zone.now}] - where build_lists.id #{bl.id}"
-
- sha1 = bl.results.find{ |r| r['file_name'] =~ /.*\.tar\.gz$/ }['sha1']
-
- system "cd #{platform_repository_folder} && curl -L -O #{APP_CONFIG['file_store_url']}/api/v1/file_stores/#{sha1}"
- system "cd #{platform_repository_folder} && tar -xzf #{sha1}"
- system "rm -f #{platform_repository_folder}/#{sha1}"
-
- archive_folder = "#{platform_repository_folder}/archives"
- system "sudo chown root:root #{archive_folder}/SRC_RPM/*"
- system "sudo chmod 0666 #{archive_folder}/SRC_RPM/*"
- system "sudo chown root:root #{archive_folder}/RPM/*"
- system "sudo chmod 0666 #{archive_folder}/RPM/*"
-
- system "sudo mv #{archive_folder}/SRC_RPM/* #{platform_repository_folder}/SRPMS/main/release/"
- system "sudo mv #{archive_folder}/RPM/* #{platform_repository_folder}/#{bl.arch.name}/main/release/"
-
- system "sudo rm -rf #{archive_folder}"
- bl.update_column(:status, BuildList::BUILD_PUBLISH)
- end
-
- say "[#{Time.zone.now}] done"
- end
desc 'Extracts all rpms from BuildList container and updates BuildList::Package#sha1 field'
task :update_packages => :environment do
diff --git a/lib/tasks/projects.rake b/lib/tasks/projects.rake
index bfe2d982f..973123b73 100644
--- a/lib/tasks/projects.rake
+++ b/lib/tasks/projects.rake
@@ -26,3 +26,20 @@ namespace :project do
task :maintainer => 'maintainer:set_to_owner'
end
+
+namespace :projects do
+ desc 'Add projects from one platform repository to another'
+ task :copy_to_repo => :environment do
+ source_platform = Platform.find_by_name!(ENV['SRC_PLATFORM'])
+ dest_platform = Platform.find_by_name!(ENV['DST_PLATFORM'])
+ source_repo = source_platform.repositories.find_by_name!(ENV['SRC_REPO'])
+ dest_repo = dest_platform.repositories.find_by_name!(ENV['DST_REPO'])
+
+ say "Add from repo '#{source_platform.name}/#{source_repo.name}' to repo '#{dest_platform.name}/#{dest_repo.name}'."
+ source_repo.projects.each do |pr|
+ say "project #{pr.name}"
+ dest_repo.projects << pr rescue print ' Add to repo failed!'
+ end
+ say 'DONE'
+ end
+end
\ No newline at end of file
diff --git a/lib/tasks/remove_branch.rake b/lib/tasks/remove_branch.rake
new file mode 100644
index 000000000..89281d5a1
--- /dev/null
+++ b/lib/tasks/remove_branch.rake
@@ -0,0 +1,14 @@
+namespace :remove_branch do
+ desc "Remove branch for group projects"
+ task :group => :environment do
+ branch = ENV['BRANCH']
+ group = ENV['GROUP']
+ say "START remove branch #{branch} from #{group} group"
+ Group.find_by_uname(group).projects.find_each do |p|
+ next if p.repo.branches.map(&:name).exclude?(branch)
+ say "===== Process #{p.name} project"
+ p.repo.git.native(:branch, {}, '-D', branch)
+ end
+ say 'DONE'
+ end
+end
diff --git a/spec/controllers/activity_feeds_controller_spec.rb b/spec/controllers/activity_feeds_controller_spec.rb
deleted file mode 100644
index 54ce3026a..000000000
--- a/spec/controllers/activity_feeds_controller_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe ActivityFeedsController do
-
-end
diff --git a/spec/controllers/advisories_controller_spec.rb b/spec/controllers/advisories_controller_spec.rb
new file mode 100644
index 000000000..f2006fd93
--- /dev/null
+++ b/spec/controllers/advisories_controller_spec.rb
@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe AdvisoriesController do
+ context 'for all' do
+ it "should be able to perform search action" do
+ get :search
+ response.should_not redirect_to(forbidden_path)
+ end
+ end
+end
\ No newline at end of file
diff --git a/spec/controllers/api/v1/advisories_controller_spec.rb b/spec/controllers/api/v1/advisories_controller_spec.rb
index e4f9048bb..dcc24b12e 100644
--- a/spec/controllers/api/v1/advisories_controller_spec.rb
+++ b/spec/controllers/api/v1/advisories_controller_spec.rb
@@ -86,7 +86,7 @@ describe Api::V1::AdvisoriesController do
stub_symlink_methods
@advisory = FactoryGirl.create(:advisory)
- @build_list = FactoryGirl.create(:build_list_core)
+ @build_list = FactoryGirl.create(:build_list)
@build_list.save_to_platform.update_column(:released, true)
@build_list.save_to_repository.update_column(:publish_without_qa, false)
@build_list.update_column(:status, BuildList::BUILD_PUBLISHED)
diff --git a/spec/controllers/api/v1/build_lists_controller_spec.rb b/spec/controllers/api/v1/build_lists_controller_spec.rb
index 42a65f1e4..47e0dca86 100644
--- a/spec/controllers/api/v1/build_lists_controller_spec.rb
+++ b/spec/controllers/api/v1/build_lists_controller_spec.rb
@@ -100,7 +100,7 @@ describe Api::V1::BuildListsController do
Arch.destroy_all
User.destroy_all
- @build_list = FactoryGirl.create(:build_list_core)
+ @build_list = FactoryGirl.create(:build_list)
@params = @build_list.attributes.symbolize_keys
@project = @build_list.project
@platform = @build_list.save_to_platform
@@ -114,9 +114,8 @@ describe Api::V1::BuildListsController do
@build_list.save_to_platform.relations.create(:role => 'admin', :actor => @owner_user) # Why it's really need it??
# Create and show params:
- @create_params = {:build_list => @build_list.attributes.symbolize_keys.except(:bs_id)
- .merge(:qwerty=>'!')} # wrong parameter
- @create_params = @create_params.merge(:arches => [@params[:arch_id]], :build_for_platforms => [@params[:build_for_platform_id]], :format => :json)
+ @create_params = {:build_list => @build_list.attributes.symbolize_keys.merge(:qwerty=>'!')} # wrong parameter
+ @create_params = @create_params.merge(:arches => [@params[:arch_id]], :build_for_platform_id => @platform.id, :format => :json)
any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
http_login(@user)
@@ -151,14 +150,14 @@ describe Api::V1::BuildListsController do
context "if it has another status" do
before do
- @build_list.update_column(:status, BuildList::PROJECT_VERSION_NOT_FOUND)
+ @build_list.update_column(:status, BuildList::SUCCESS)
do_cancel
end
it_should_behave_like 'validation error via build list api', I18n.t('layout.build_lists.cancel_fail')
it "should not change status of build list" do
- @build_list.reload.status.should == BuildList::PROJECT_VERSION_NOT_FOUND
+ @build_list.reload.status.should == BuildList::SUCCESS
end
end
end
@@ -238,6 +237,107 @@ describe Api::V1::BuildListsController do
end
end
+ context 'do publish_into_testing' do
+ def do_publish_into_testing
+ put :publish_into_testing, :id => @build_list, :format => :json
+ end
+
+ context 'if user is project && platform owner' do
+ before(:each) do
+ http_login(@owner_user)
+ end
+
+ context "if it has :failed_publish status" do
+ before do
+ @build_list.update_column(:status, BuildList::FAILED_PUBLISH)
+ do_publish_into_testing
+ end
+ it "should return correct json message" do
+ response.body.should == { :build_list => {:id => @build_list.id, :message => I18n.t('layout.build_lists.publish_success')} }.to_json
+ end
+
+ it 'should return 200 response code' do
+ response.should be_success
+ end
+
+ it "should change status of build list" do
+ @build_list.reload.status.should == BuildList::BUILD_PUBLISH_INTO_TESTING
+ end
+ end
+
+ context "if it has :build_published_into_testing status" do
+ before do
+ @build_list.update_column(:status, BuildList::BUILD_PUBLISHED_INTO_TESTING)
+ do_publish_into_testing
+ end
+
+ it "should return correct json message" do
+ response.body.should == { :build_list => {:id => @build_list.id, :message => I18n.t('layout.build_lists.publish_success')} }.to_json
+ end
+
+ it 'should return 200 response code' do
+ response.should be_success
+ end
+
+ it "should change status of build list" do
+ @build_list.reload.status.should == BuildList::BUILD_PUBLISH_INTO_TESTING
+ end
+ end
+
+ context "if it has another status" do
+ before(:each) do
+ @build_list.update_column(:status, BuildList::BUILD_CANCELED)
+ do_publish_into_testing
+ end
+
+ it "should return access violation message" do
+ response.body.should == {"message" => "Access violation to this page!"}.to_json
+ end
+
+ it "should not change status of build list" do
+ @build_list.reload.status.should == BuildList::BUILD_CANCELED
+ end
+ end
+
+ end
+
+ context 'if user is not project owner' do
+
+ context "if it has :build_published_into_testing status" do
+ before do
+ @build_list.update_column(:status, BuildList::BUILD_PUBLISHED_INTO_TESTING)
+ do_publish_into_testing
+ end
+
+ it 'should not be able to perform create action' do
+ response.body.should == {"message" => "Access violation to this page!"}.to_json
+ end
+
+ it 'should return 403 response code' do
+ response.status.should == 403
+ end
+
+ it "should not change status of build list" do
+ @build_list.reload.status.should == BuildList::BUILD_PUBLISHED_INTO_TESTING
+ end
+ end
+
+ context "if it has :failed_publish status" do
+ before do
+ @build_list.update_column(:status, BuildList::FAILED_PUBLISH_INTO_TESTING)
+ do_publish_into_testing
+ end
+ it "should return access violation message" do
+ response.body.should == {"message" => "Access violation to this page!"}.to_json
+ end
+
+ it "should not change status of build list" do
+ @build_list.reload.status.should == BuildList::FAILED_PUBLISH_INTO_TESTING
+ end
+ end
+ end
+ end
+
context "do publish" do
def do_publish
put :publish, :id => @build_list, :format => :json
@@ -287,7 +387,7 @@ describe Api::V1::BuildListsController do
context "if it has another status" do
before(:each) do
- @build_list.update_column(:status, BuildList::PROJECT_VERSION_NOT_FOUND)
+ @build_list.update_column(:status, BuildList::BUILD_CANCELED)
do_publish
end
@@ -296,7 +396,7 @@ describe Api::V1::BuildListsController do
end
it "should not change status of build list" do
- @build_list.reload.status.should == BuildList::PROJECT_VERSION_NOT_FOUND
+ @build_list.reload.status.should == BuildList::BUILD_CANCELED
end
end
@@ -387,14 +487,14 @@ describe Api::V1::BuildListsController do
context "if it has another status" do
before(:each) do
- @build_list.update_column(:status, BuildList::PROJECT_VERSION_NOT_FOUND)
+ @build_list.update_column(:status, BuildList::BUILD_CANCELED)
do_reject_publish
end
it_should_behave_like 'validation error via build list api', I18n.t('layout.build_lists.reject_publish_fail')
it "should not change status of build list" do
- @build_list.reload.status.should == BuildList::PROJECT_VERSION_NOT_FOUND
+ @build_list.reload.status.should == BuildList::BUILD_CANCELED
end
end
end
@@ -415,6 +515,49 @@ describe Api::V1::BuildListsController do
@build_list.reload.status.should == BuildList::SUCCESS
end
end
+
+ context 'if user is project reader' do
+ before(:each) do
+ @another_user = FactoryGirl.create(:user)
+ @build_list.update_column(:status, BuildList::SUCCESS)
+ @build_list.save_to_repository.update_column(:publish_without_qa, true)
+ @build_list.project.collaborators.create(:actor_type => 'User', :actor_id => @another_user.id, :role => 'reader')
+ http_login(@another_user)
+ do_reject_publish
+ end
+
+ it "should return access violation message" do
+ response.body.should == {"message" => "Access violation to this page!"}.to_json
+ end
+
+ it "should not change status of build list" do
+ do_reject_publish
+ @build_list.reload.status.should == BuildList::SUCCESS
+ end
+ end
+
+ context 'if user is project writer' do
+ before(:each) do
+ @another_user = FactoryGirl.create(:user)
+ @build_list.update_column(:status, BuildList::SUCCESS)
+ @build_list.save_to_repository.update_column(:publish_without_qa, true)
+ @build_list.project.relations.create!(:actor_type => 'User', :actor_id => @another_user.id, :role => 'writer')
+ http_login(@another_user)
+ do_reject_publish
+ end
+
+ it "should return correct json message" do
+ response.body.should == { :build_list => {:id => @build_list.id, :message => I18n.t('layout.build_lists.reject_publish_success')} }.to_json
+ end
+
+ it 'should return 200 response code' do
+ response.should be_success
+ end
+
+ it "should reject publish build list" do
+ @build_list.reload.status.should == BuildList::REJECTED_PUBLISH
+ end
+ end
end
context 'for open project' do
@@ -423,10 +566,25 @@ describe Api::V1::BuildListsController do
context 'if user is project owner' do
before(:each) {http_login(@owner_user)}
it_should_behave_like 'create build list via api'
+
+ context 'no ability to read build_for_platform' do
+ before do
+ repository = FactoryGirl.create(:repository)
+ repository.platform.change_visibility
+ Platform.where(:id => @platform.id).update_all(:platform_type => 'personal')
+ @create_params[:build_list].merge!({
+ :include_repos => [repository.id],
+ :build_for_platform_id => repository.platform_id
+ })
+ end
+ it_should_behave_like 'not create build list via api'
+ end
+
end
context 'if user is project read member' do
before(:each) {http_login(@member_user)}
+ it_should_behave_like 'not create build list via api'
end
end
@@ -455,7 +613,7 @@ describe Api::V1::BuildListsController do
Arch.destroy_all
User.destroy_all
- @build_list = FactoryGirl.create(:build_list_core)
+ @build_list = FactoryGirl.create(:build_list)
@params = @build_list.attributes.symbolize_keys
@project = @build_list.project
@platform = @build_list.save_to_platform
@@ -466,8 +624,8 @@ describe Api::V1::BuildListsController do
@member_user = FactoryGirl.create(:user)
# Create and show params:
- @create_params = {:build_list => @build_list.attributes.symbolize_keys.except(:bs_id)}
- @create_params = @create_params.merge(:arches => [@params[:arch_id]], :build_for_platforms => [@params[:build_for_platform_id]], :format => :json)
+ @create_params = {:build_list => @build_list.attributes.symbolize_keys}
+ @create_params = @create_params.merge(:arches => [@params[:arch_id]], :build_for_platform_id => @platform.id, :format => :json)
any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
# Groups:
@@ -479,8 +637,11 @@ describe Api::V1::BuildListsController do
@user = FactoryGirl.create(:user)
@group.actors.create :role => 'reader', :actor_id => @user.id, :actor_type => 'User'
+ old_path = @project.path
@project.owner = @owner_group
@project.save
+ # Move GIT repo into new folder
+ system "mkdir -p #{@project.path} && mv -f #{old_path}/* #{@project.path}/"
@project.relations.create :role => 'reader', :actor_id => @member_group.id, :actor_type => 'Group'
@project.relations.create :role => 'admin', :actor_id => @owner_group.id, :actor_type => 'Group'
@@ -533,22 +694,22 @@ describe Api::V1::BuildListsController do
@user = FactoryGirl.create(:user)
# Build Lists:
- @build_list1 = FactoryGirl.create(:build_list_core)
+ @build_list1 = FactoryGirl.create(:build_list)
- @build_list2 = FactoryGirl.create(:build_list_core)
+ @build_list2 = FactoryGirl.create(:build_list)
@build_list2.project.update_column(:visibility, 'hidden')
project = FactoryGirl.create(:project_with_commit, :visibility => 'hidden', :owner => @user)
- @build_list3 = FactoryGirl.create(:build_list_core_with_attaching_project, :project => project)
+ @build_list3 = FactoryGirl.create(:build_list_with_attaching_project, :project => project)
- @build_list4 = FactoryGirl.create(:build_list_core)
+ @build_list4 = FactoryGirl.create(:build_list)
@build_list4.project.update_column(:visibility, 'hidden')
@build_list4.project.relations.create! :role => 'reader', :actor_id => @user.id, :actor_type => 'User'
- @filter_build_list1 = FactoryGirl.create(:build_list_core)
- @filter_build_list2 = FactoryGirl.create(:build_list_core)
- @filter_build_list3 = FactoryGirl.create(:build_list_core)
- @filter_build_list4 = FactoryGirl.create(:build_list_core, :updated_at => (Time.now - 1.day),
+ @filter_build_list1 = FactoryGirl.create(:build_list)
+ @filter_build_list2 = FactoryGirl.create(:build_list)
+ @filter_build_list3 = FactoryGirl.create(:build_list)
+ @filter_build_list4 = FactoryGirl.create(:build_list, :updated_at => (Time.now - 1.day),
:project => @build_list3.project, :save_to_platform => @build_list3.save_to_platform,
:arch => @build_list3.arch)
end
@@ -590,8 +751,8 @@ describe Api::V1::BuildListsController do
http_login FactoryGirl.create(:admin)
end
- it 'should filter by bs_id' do
- get :index, :filter => {:bs_id => @filter_build_list1.bs_id, :project_name => 'fdsfdf', :any_other_field => 'do not matter'}, :format => :json
+ it 'should filter by id' do
+ get :index, :filter => {:id => @filter_build_list1.id, :project_name => 'fdsfdf', :any_other_field => 'do not matter'}, :format => :json
assigns[:build_lists].should include(@filter_build_list1)
assigns[:build_lists].should_not include(@filter_build_list2)
assigns[:build_lists].should_not include(@filter_build_list3)
@@ -619,7 +780,7 @@ describe Api::V1::BuildListsController do
context "for user" do
before(:each) do
- @build_list = FactoryGirl.create(:build_list_core)
+ @build_list = FactoryGirl.create(:build_list)
@params = @build_list.attributes.symbolize_keys
@project = @build_list.project
@@ -675,7 +836,7 @@ describe Api::V1::BuildListsController do
context "for group" do
before(:each) do
@platform = FactoryGirl.create(:platform_with_repos)
- @build_list = FactoryGirl.create(:build_list_core, :save_to_platform => @platform)
+ @build_list = FactoryGirl.create(:build_list, :save_to_platform => @platform)
@project = @build_list.project
@params = @build_list.attributes.symbolize_keys
@@ -741,6 +902,5 @@ describe Api::V1::BuildListsController do
end
end
end
-
end
end
diff --git a/spec/controllers/api/v1/issues_controller_spec.rb b/spec/controllers/api/v1/issues_controller_spec.rb
new file mode 100644
index 000000000..f7342a774
--- /dev/null
+++ b/spec/controllers/api/v1/issues_controller_spec.rb
@@ -0,0 +1,222 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe Api::V1::IssuesController do
+ before(:all) do
+ stub_symlink_methods
+ stub_redis
+ any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
+
+ @project = FactoryGirl.create(:project_with_commit)
+ @issue = FactoryGirl.create(:issue, :project => @project)
+
+ @membered_issue = FactoryGirl.create(:issue)
+ @membered_project = @membered_issue.project
+ @membered_project.relations.create(:role => 'reader', :actor => @issue.user)
+
+ @open_issue = FactoryGirl.create(:issue)
+ @open_project = @open_issue.project
+
+ @own_hidden_project = FactoryGirl.create(:project, :owner => @issue.user)
+ @own_hidden_project.update_column :visibility, 'hidden'
+ @own_hidden_issue = FactoryGirl.create(:issue, :project => @own_hidden_project, :assignee => @issue.user)
+
+ @hidden_issue = FactoryGirl.create(:issue)
+ @hidden_project = @hidden_issue.project
+ @hidden_project.update_column :visibility, 'hidden'
+
+ @create_params = {:issue => {:title => 'title', :body => 'body'}, :project_id => @project.id, :format => :json}
+ @update_params = {:issue => {:title => 'new title'}, :project_id => @project.id, :id => @issue.serial_id, :format => :json}
+
+ @pull = @project.pull_requests.new :issue_attributes => {:title => 'test', :body => 'testing'}
+ @pull.issue.user, @pull.issue.project = @project.owner, @pull.to_project
+ @pull.to_ref = 'master'
+ @pull.from_project, @pull.from_ref = @project, 'non_conflicts'
+ @pull.save
+ end
+
+ context 'read and accessible abilities' do
+ context 'for user' do
+ before(:each) do
+ http_login(@issue.user)
+ end
+
+ it 'can show issue in own project' do
+ get :show, :project_id => @project.id, :id => @issue.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it 'should render right template for show action' do
+ get :show, :project_id => @project.id, :id => @issue.serial_id, :format => :json
+ response.should render_template('api/v1/issues/show')
+ end
+
+ it 'can show issue in open project' do
+ get :show, :project_id => @open_project.id, :id => @open_issue.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it 'can show issue in own hidden project' do
+ get :show, :project_id => @own_hidden_project.id, :id => @own_hidden_issue.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it "can't show issue in hidden project" do
+ get :show, :project_id => @hidden_project.id, :id => @hidden_issue.serial_id, :format => :json
+ response.status.should == 403
+ end
+
+ it 'should return three issues' do
+ get :all_index, :filter => 'all', :format => :json
+ assigns[:issues].should include(@issue)
+ assigns[:issues].should include(@own_hidden_issue)
+ assigns[:issues].should include(@membered_issue)
+ end
+
+ it 'should render right template for all index action' do
+ get :all_index, :format => :json
+ response.should render_template('api/v1/issues/index')
+ end
+
+ it 'should return only assigned issue' do
+ get :user_index, :format => :json
+ assigns[:issues].should include(@own_hidden_issue)
+ assigns[:issues].should have(1).item
+ end
+
+ it 'should render right template for user index action' do
+ get :user_index, :format => :json
+ response.should render_template('api/v1/issues/index')
+ end
+
+ it 'should return 404' do
+ get :show, :project_id => @project.id, :id => 999999, :format => :json
+ response.status.should == 404
+ end
+
+ it 'should redirect to pull request page' do
+ get :show, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should redirect_to(api_v1_project_pull_request_path(@project.id, @pull.serial_id))
+ end
+ end
+
+ context 'for anonymous user' do
+ it 'can show issue in open project', :anonymous_access => true do
+ get :show, :project_id => @project.id, :id => @issue.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it "can't show issue in hidden project", :anonymous_access => true do
+ get :show, :project_id => @hidden_project.id, :id => @hidden_issue.serial_id, :format => :json
+ response.status.should == 403
+ end
+
+ it 'should not return any issues' do
+ get :all_index, :filter => 'all', :format => :json
+ response.status.should == 401
+ end
+ end
+ end
+
+ context 'create accessibility' do
+ context 'for user' do
+ before(:each) do
+ http_login(@issue.user)
+ end
+
+ it 'can create issue in own project' do
+ lambda { post :create, @create_params}.should change{ Issue.count }.by(1)
+ end
+
+ it 'can create issue in own hidden project' do
+ lambda { post :create, @create_params.merge(:project_id => @own_hidden_project.id)}.should change{ Issue.count }.by(1)
+ end
+
+ it 'can create issue in open project' do
+ lambda { post :create, @create_params.merge(:project_id => @open_project.id)}.should change{ Issue.count }.by(1)
+ end
+
+ it "can't create issue in hidden project" do
+ lambda { post :create, @create_params.merge(:project_id => @hidden_project.id)}.should change{ Issue.count }.by(0)
+ end
+
+ it 'can assignee issue in own project' do
+ post :create, @create_params.deep_merge(:project_id => @own_hidden_project, :issue => {:assignee_id => @issue.user.id})
+ @own_hidden_project.issues.reload.last.assignee.id.should == @issue.user.id
+ end
+
+ it "can't assignee issue in open project" do
+ post :create, @create_params.deep_merge(:project_id => @open_project.id, :issue => {:assignee_id => @issue.user.id})
+ @open_project.issues.reload.last.assignee.should be_nil
+ end
+ end
+
+ context 'for anonymous user' do
+ it "can't create issue in project", :anonymous_access => true do
+ lambda { post :create, @create_params}.should change{ Issue.count }.by(0)
+ end
+
+ it "can't create issue in hidden project", :anonymous_access => true do
+ lambda { post :create, @create_params.merge(:project_id => @hidden_project.id)}.should change{ Issue.count }.by(0)
+ end
+ end
+ end
+
+ context 'update accessibility' do
+ context 'for user' do
+ before(:each) do
+ http_login(@issue.user)
+ end
+
+ it 'can update issue in own project' do
+ put :update, @update_params
+ @issue.reload.title.should == 'new title'
+ end
+
+ it 'can update issue in own hidden project' do
+ put :update, @update_params.merge(:project_id => @own_hidden_project.id, :id => @own_hidden_issue.serial_id)
+ @own_hidden_issue.reload.title.should == 'new title'
+ end
+
+ it "can't update issue in open project" do
+ put :update, @update_params.merge(:project_id => @open_project.id, :id => @open_issue.serial_id)
+ @open_issue.reload.title.should_not == 'new title'
+ end
+
+ it "can't update issue in hidden project" do
+ put :update, @update_params.merge(:project_id => @hidden_project.id, :id => @hidden_issue.serial_id)
+ @hidden_issue.reload.title.should_not == 'title'
+ end
+
+ it "can't assignee issue in open project" do
+ post :create, @update_params.deep_merge(:project_id => @open_project.id, :issue => {:assignee_id => @issue.user.id})
+ @open_issue.reload.assignee.id.should_not == @issue.user.id
+ end
+
+ it 'can assignee issue in own project' do
+ post :create, @update_params.deep_merge(:issue => {:assignee_id => @issue.user.id})
+ @issue.reload.assignee.id.should_not == @issue.user.id
+ end
+ end
+
+ context 'for anonymous user' do
+ before(:each) do
+ @count = Issue.count
+ end
+ it "can't update issue in project", :anonymous_access => true do
+ put :update, @update_params
+ response.status.should == 401
+ end
+
+ it "can't update issue in hidden project", :anonymous_access => true do
+ put :update, @update_params.merge(:project_id => @hidden_project.id, :id => @hidden_issue.serial_id)
+ response.status.should == 401
+ end
+ end
+ end
+
+ after(:all) do
+ User.destroy_all
+ Platform.destroy_all
+ end
+end
diff --git a/spec/controllers/api/v1/maintainers_controller_spec.rb b/spec/controllers/api/v1/maintainers_controller_spec.rb
index 837539ec9..6d28e2aad 100644
--- a/spec/controllers/api/v1/maintainers_controller_spec.rb
+++ b/spec/controllers/api/v1/maintainers_controller_spec.rb
@@ -1,21 +1,42 @@
require 'spec_helper'
+shared_examples_for 'api maintainers user with reader rights' do
+ it 'should be able to perform index action' do
+ get :index, :platform_id => package.platform_id, :format => :json
+ should render_template(:index)
+ end
+
+ it 'loads all of the maintainers into @maintainers' do
+ get :index, :platform_id => package.platform_id, :format => :json
+ assigns(:maintainers).should have(2).items
+ assigns(:maintainers).should include(package, package2)
+ end
+
+ it 'loads all of the maintainers into @maintainers when search by name' do
+ get :index, :platform_id => package.platform_id, :package_name => 'package1', :format => :json
+ assigns(:maintainers).should have(1).item
+ assigns(:maintainers).should include(package)
+ end
+
+end
+
describe Api::V1::MaintainersController do
before do
stub_symlink_methods
+ FactoryGirl.create(:build_list_package, :platform => package.platform)
end
+ let(:package) { FactoryGirl.create(:build_list_package, :name => 'package1', :actual => true) }
+ let!(:package2) { FactoryGirl.create(:build_list_package, :platform => package.platform, :actual => true) }
- let(:package) { FactoryGirl.create(:build_list_package) }
context 'for guest' do
- it "should be able to perform index action", :anonymous_access => true do
- get :index, :platform_id => package.platform_id, :format => :json
- should render_template(:index)
- end
-
- it 'should be able to perform get_id action', :anonymous_access => false do
- get :index, :platform_id => package.platform_id, :format => :json
- response.status.should == 401
+ if APP_CONFIG['anonymous_access']
+ it_should_behave_like 'api maintainers user with reader rights'
+ else
+ it 'should not be able to perform index action', :anonymous_access => false do
+ get :index, :platform_id => package.platform_id, :format => :json
+ response.status.should == 401
+ end
end
end
@@ -24,9 +45,6 @@ describe Api::V1::MaintainersController do
http_login(FactoryGirl.create(:user))
end
- it "should be able to perform index action" do
- get :index, :platform_id => package.platform_id, :format => :json
- should render_template(:index)
- end
+ it_should_behave_like 'api maintainers user with reader rights'
end
end
diff --git a/spec/controllers/api/v1/platforms_controller_spec.rb b/spec/controllers/api/v1/platforms_controller_spec.rb
index 355c04869..18553c737 100644
--- a/spec/controllers/api/v1/platforms_controller_spec.rb
+++ b/spec/controllers/api/v1/platforms_controller_spec.rb
@@ -224,13 +224,17 @@ describe Api::V1::PlatformsController do
response.status.should == 401
end
- [:show, :platforms_for_build].each do |action|
- it "should not be able to perform #{ action } action", :anonymous_access => false do
- get action, :format => :json
- response.status.should == 401
- end
+ it "should not be able to perform platforms_for_build action", :anonymous_access => false do
+ get :platforms_for_build, :format => :json
+ response.status.should == 401
end
+ it "should not be able to perform show action", :anonymous_access => false do
+ get :show, :id => @platform, :format => :json
+ response.status.should == 401
+ end
+
+
it 'should be able to perform members action', :anonymous_access => true do
get :members, :id => @platform.id, :format => :json
response.should render_template(:members)
@@ -241,6 +245,91 @@ describe Api::V1::PlatformsController do
it_should_behave_like 'api platform user without member rights'
it_should_behave_like 'api platform user without owner rights'
it_should_behave_like 'api platform user without global admin rights'
+
+
+ context 'perform allowed action' do
+ it 'ensures that status 200 if platform empty' do
+ get :allowed
+ response.status.should == 200
+ end
+
+ it 'ensures that status 403 if platform does not exist' do
+ get :allowed, :path => "/rosa-server/repository/SRPMS/base/release/repodata/"
+ response.status.should == 403
+ end
+
+ it 'ensures that status 200 if platform open' do
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 200
+ end
+
+ context 'for hidden platform' do
+ before { @platform.change_visibility }
+
+ it 'ensures that status 403 if no token' do
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 403
+ end
+
+ it 'ensures that status 403 if no token and a lot of "/"' do
+ get :allowed, :path => "///#{@platform.name}///repository/SRPMS/base/release/repodata/"
+ response.status.should == 403
+ end
+
+ it 'ensures that status 200 if token correct and a lot of "/"' do
+ token = FactoryGirl.create(:platform_token, :subject => @platform)
+ http_login token.authentication_token, ''
+ get :allowed, :path => "///#{@platform.name}///repository/SRPMS/base/release/repodata/"
+ response.status.should == 200
+ end
+
+ it 'ensures that status 403 on access to root of platform if no token' do
+ get :allowed, :path => "///#{@platform.name}"
+ response.status.should == 403
+ end
+
+ it 'ensures that status 200 on access to root of platform if token correct' do
+ token = FactoryGirl.create(:platform_token, :subject => @platform)
+ http_login token.authentication_token, ''
+ get :allowed, :path => "///#{@platform.name}"
+ response.status.should == 200
+ end
+
+ it 'ensures that status 403 if wrong token' do
+ http_login 'KuKu', ''
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 403
+ end
+
+ it 'ensures that status 200 if token correct' do
+ token = FactoryGirl.create(:platform_token, :subject => @platform)
+ http_login token.authentication_token, ''
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 200
+ end
+
+ it 'ensures that status 403 if token correct but blocked' do
+ token = FactoryGirl.create(:platform_token, :subject => @platform)
+ token.block
+ http_login token.authentication_token, ''
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 403
+ end
+
+ it 'ensures that status 200 if user token correct and user has ability to read platform' do
+ http_login @platform.owner.authentication_token, ''
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 200
+ end
+
+ it 'ensures that status 403 if user token correct but user has no ability to read platform' do
+ user = FactoryGirl.create(:user)
+ http_login user.authentication_token, ''
+ get :allowed, :path => "/#{@platform.name}/repository/SRPMS/base/release/repodata/"
+ response.status.should == 403
+ end
+ end
+ end
end
context 'for global admin' do
@@ -311,6 +400,38 @@ describe Api::V1::PlatformsController do
it_should_behave_like 'api platform user without global admin rights'
end
+ context 'for member of repository' do
+ before do
+ http_login(@user)
+ repository = FactoryGirl.create(:repository, :platform => @platform)
+ repository.add_member(@user)
+ personal_repository = FactoryGirl.create(:repository, :platform => @personal_platform)
+ personal_repository.add_member(@user)
+ end
+
+ context 'perform index action with type param' do
+ render_views
+ %w(main personal).each do |type|
+ it "ensures that filter by type = #{type} returns true result" do
+ get :index, :format => :json, :type => "#{type}"
+ JSON.parse(response.body)['platforms'].map{ |p| p['platform_type'] }.
+ uniq.should == ["#{type}"]
+ end
+ end
+ end
+
+ it 'should not be able to perform members action for hidden platform' do
+ @platform.update_column(:visibility, 'hidden')
+ get :members, :id => @platform.id, :format => :json
+ response.status.should == 403
+ end
+ it_should_behave_like 'api platform user with reader rights'
+ it_should_behave_like 'api platform user with reader rights for hidden platform'
+ it_should_behave_like 'api platform user without member rights'
+ it_should_behave_like 'api platform user without owner rights'
+ it_should_behave_like 'api platform user without global admin rights'
+ end
+
context 'for simple user' do
before do
http_login(@user)
diff --git a/spec/controllers/api/v1/projects_controller_spec.rb b/spec/controllers/api/v1/projects_controller_spec.rb
index 65e5055e2..49526ed8f 100644
--- a/spec/controllers/api/v1/projects_controller_spec.rb
+++ b/spec/controllers/api/v1/projects_controller_spec.rb
@@ -61,6 +61,17 @@ shared_examples_for 'api projects user with fork rights' do
it 'ensures that project has been forked' do
lambda { post :fork, :id => @project.id, :format => :json }.should change{ Project.count }.by(1)
end
+
+ it 'should be able to perform fork action with different name' do
+ post :fork, :id => @project.id, :fork_name => (@project.name + '_forked'), :format => :json
+ response.should be_success
+ end
+
+ it 'ensures that project has been forked' do
+ new_name = @project.name + '_forked'
+ lambda { post :fork, :id => @project.id, :fork_name => new_name, :format => :json }.should
+ change{ Project.where(:name => new_name).count }.by(1)
+ end
end
shared_examples_for 'api projects user with fork rights for hidden project' do
@@ -235,7 +246,6 @@ shared_examples_for 'api projects user without admin rights' do
@project.members.should include(member)
end
end
-
end
shared_examples_for 'api projects user with owner rights' do
@@ -313,6 +323,18 @@ describe Api::V1::ProjectsController do
it 'ensures that project has been created' do
lambda { post :create, params, :format => :json }.should change{ Project.count }.by(1)
end
+
+ it 'writer group should be able to create project for their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'writer')
+ lambda { post :create, params.deep_merge({:project => {:owner_type => 'Group', :owner_id => group.id}})}.should change{ Project.count }.by(1)
+ end
+
+ it 'reader group should not be able to create project for their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ lambda { post :create, params.deep_merge({:project => {:owner_type => 'Group', :owner_id => group.id}})}.should change{ Project.count }.by(0)
+ end
end
it_should_behave_like 'api projects user with reader rights'
@@ -321,6 +343,38 @@ describe Api::V1::ProjectsController do
it_should_behave_like 'api projects user without fork rights for hidden project'
it_should_behave_like 'api projects user without admin rights'
it_should_behave_like 'api projects user without owner rights'
+
+ context 'group writer' do
+ it 'should be able to fork project to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'writer')
+ lambda {post :fork, :id => @project.id, :group_id => group.id}.should change{ Project.count }.by(1)
+ end
+
+ it 'should be able to fork project with different name to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'writer')
+ new_name = @project.name + '_forked'
+ lambda { post :fork, :id => @project.id, :group_id => group.id, :fork_name => new_name }.should
+ change { Project.where(:name => new_name).count }.by(1)
+ end
+ end
+
+ context 'group reader' do
+ it 'should not be able to fork project to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ lambda {post :fork, :id => @project.id, :group_id => group.id}.should change{ Project.count }.by(0)
+ end
+
+ it 'should not be able to fork project with different name to their group' do
+ group = FactoryGirl.create(:group)
+ new_name = @project.name + '_forked'
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ lambda { post :fork, :id => @project.id, :group_id => group.id, :fork_name => new_name }.should
+ change{ Project.where(:name => new_name.count) }.by(0)
+ end
+ end
end
context 'for admin' do
diff --git a/spec/controllers/api/v1/pull_requests_controller.rb b/spec/controllers/api/v1/pull_requests_controller.rb
new file mode 100644
index 000000000..e3469a172
--- /dev/null
+++ b/spec/controllers/api/v1/pull_requests_controller.rb
@@ -0,0 +1,324 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+def create_pull to_ref, from_ref, owner, project = @project
+ pull = project.pull_requests.new :issue_attributes => {:title => 'test', :body => 'testing'}
+ pull.issue.user, pull.issue.project = owner, pull.to_project
+ pull.to_ref, pull.from_ref, pull.from_project = to_ref, from_ref, project
+ pull.save; pull.check
+ pull
+end
+
+describe Api::V1::PullRequestsController do
+ before(:all) do
+ stub_symlink_methods
+ stub_redis
+ @project = FactoryGirl.create(:project_with_commit)
+ @pull = create_pull 'master', 'non_conflicts', @project.owner
+
+ @another_project = FactoryGirl.create(:project_with_commit)
+ @another_pull = create_pull 'master', 'non_conflicts', @another_project.owner, @another_project
+
+ @hidden_project = FactoryGirl.create(:project_with_commit)
+ @hidden_project.update_column :visibility, 'hidden'
+ @hidden_pull = create_pull 'master', 'non_conflicts', @hidden_project.owner, @hidden_project
+
+ @own_hidden_project = FactoryGirl.create(:project_with_commit, :owner => @project.owner)
+ @own_hidden_project.update_column :visibility, 'hidden'
+ @own_hidden_pull = create_pull 'master', 'non_conflicts', @own_hidden_project.owner, @own_hidden_project
+ @own_hidden_pull.issue.update_column :assignee_id, @project.owner.id
+
+ @membered_project = FactoryGirl.create(:project_with_commit)
+ @membered_pull = create_pull 'master', 'non_conflicts', @membered_project.owner, @membered_project
+ @membered_project.relations.create(:role => 'reader', :actor => @pull.user)
+
+ @create_params = {:pull_request => {:title => 'title', :body => 'body',
+ :from_ref => 'conflicts', :to_ref => 'master'},
+ :project_id => @project.id, :format => :json}
+
+ @update_params = {:pull_request => {:title => 'new title'},
+ :project_id => @project.id, :id => @pull.serial_id, :format => :json}
+
+ @issue = FactoryGirl.create(:issue, :project => @project)
+ end
+
+ context 'read and accessible abilities' do
+ context 'for user' do
+ before(:each) do
+ http_login(@project.owner)
+ end
+
+ it 'can show pull request in own project' do
+ get :show, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it 'should render right template for show action' do
+ get :show, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should render_template('api/v1/pull_requests/show')
+ end
+
+ it 'can show pull request in open project' do
+ get :show, :project_id => @another_project.id, :id => @another_pull.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it 'can show pull request in own hidden project' do
+ get :show, :project_id => @own_hidden_project.id, :id => @own_hidden_pull.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it 'cant show pull request in hidden project' do
+ get :show, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
+ response.status.should == 403
+ end
+
+ it 'should return three pull requests' do
+ get :all_index, :filter => 'all', :format => :json
+ assigns[:pulls].should include(@pull)
+ assigns[:pulls].should include(@own_hidden_pull)
+ assigns[:pulls].should include(@membered_pull)
+ end
+
+ it 'should render right template for all index action' do
+ get :all_index, :format => :json
+ response.should render_template('api/v1/pull_requests/index')
+ end
+
+ it 'should return only assigned pull request' do
+ get :user_index, :format => :json
+ assigns[:pulls].should include(@own_hidden_pull)
+ assigns[:pulls].should have(1).item
+ end
+
+ it 'should render right template for user index action' do
+ get :user_index, :format => :json
+ response.should render_template('api/v1/pull_requests/index')
+ end
+
+ %w(commits files).each do |action|
+ it "can show pull request #{action} in own project" do
+ get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it "should render right template for commits action" do
+ get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should render_template("api/v1/pull_requests/#{action}")
+ end
+
+ it "can't show pull request #{action} in hidden project" do
+ get action, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
+ response.should_not be_success
+ end
+ end
+
+ it 'should return 404' do
+ get :show, :project_id => @project.id, :id => 999999, :format => :json
+ response.status.should == 404
+ end
+
+ it 'should redirect to issue page' do
+ get :show, :project_id => @project.id, :id => @issue.serial_id, :format => :json
+ response.should redirect_to(api_v1_project_issue_path(@project.id, @issue.serial_id))
+ end
+ end
+
+ context 'for anonymous user' do
+ it 'can show pull request in open project', :anonymous_access => true do
+ get :show, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it 'cant show pull request in hidden project', :anonymous_access => true do
+ @project.update_column :visibility, 'hidden'
+ get :show, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.status.should == 403
+ end
+
+ it 'should not return any pull requests' do
+ get :all_index, :filter => 'all', :format => :json
+ response.status.should == 401
+ end
+
+ %w(commits files).each do |action|
+ it "can show pull request #{action} in project", :anonymous_access => true do
+ get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should be_success
+ end
+
+ it "should render right template for commits action", :anonymous_access => true do
+ get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ response.should render_template("api/v1/pull_requests/#{action}")
+ end
+
+ it "can't show pull request #{action} in hidden project", :anonymous_access => true do
+ get action, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
+ response.should_not be_success
+ end
+ end
+ end
+ end
+
+ context 'create accessibility' do
+ context 'for user' do
+ before(:each) do
+ http_login(@pull.user)
+ end
+
+ it 'can create pull request in own project' do
+ lambda { post :create, @create_params }.should change{ PullRequest.count }.by(1)
+ end
+
+ it 'can create pull request in own hidden project' do
+ lambda { post :create, @create_params.merge(:project_id => @own_hidden_project.id) }.should
+ change{ PullRequest.count }.by(1)
+ end
+
+ it 'can create pull request in open project' do
+ lambda { post :create, @create_params.merge(:project_id => @another_project.id) }.should
+ change{ PullRequest.count }.by(1)
+ end
+
+ it 'cant create pull request in hidden project' do
+ lambda { post :create, @create_params.merge(:project_id => @hidden_project.id) }.should
+ change{ PullRequest.count }.by(0)
+ end
+ end
+
+ context 'for anonymous user' do
+ it 'cant create pull request in project', :anonymous_access => true do
+ lambda { post :create, @create_params }.should change{ PullRequest.count }.by(0)
+ end
+
+ it 'cant create pull request in hidden project', :anonymous_access => true do
+ lambda { post :create, @create_params.merge(:project_id => @hidden_project.id) }.should
+ change{ PullRequest.count }.by(0)
+ end
+ end
+ end
+
+ context 'update accessibility' do
+ context 'for user' do
+ before(:each) do
+ http_login(@project.owner)
+ end
+
+ it 'can update pull request in own project' do
+ put :update, @update_params
+ @pull.reload.title.should == 'new title'
+ end
+
+ it 'can update pull request in own hidden project' do
+ put :update, @update_params.merge(:project_id => @own_hidden_project.id, :id => @own_hidden_pull.serial_id)
+ @own_hidden_pull.reload.title.should == 'new title'
+ end
+
+ it 'cant update pull request in open project' do
+ put :update, @update_params.merge(:project_id => @another_project.id, :id => @another_pull.serial_id)
+ @another_pull.reload.title.should_not == 'new title'
+ end
+
+ it 'cant update pull request in hidden project' do
+ put :update, @update_params.merge(:project_id => @hidden_project.id, :id => @hidden_pull.serial_id)
+ @hidden_pull.reload.title.should_not == 'title'
+ end
+
+ it 'can merge pull request in own project' do
+ put :merge, :project_id => @project.id, :id => @pull.serial_id, :format => :json
+ @pull.reload.status.should == 'merged'
+ response.should be_success
+ end
+
+ it 'can merge pull request in own hidden project' do
+ put :merge, :project_id => @own_hidden_project.id, :id => @own_hidden_pull.serial_id, :format => :json
+ @own_hidden_pull.reload.status.should == 'merged'
+ response.should be_success
+ end
+
+ it 'cant merge pull request in open project' do
+ put :merge, :project_id => @another_project.id, :id => @another_pull.serial_id, :format => :json
+ @another_pull.reload.status.should == 'ready'
+ response.status.should == 403
+ end
+
+ it 'cant merge pull request in hidden project' do
+ put :merge, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
+ @hidden_pull.reload.status.should == 'ready'
+ response.status.should == 403
+ end
+ end
+
+ context 'for anonymous user' do
+ it 'cant update pull request in project', :anonymous_access => true do
+ put :update, @update_params
+ response.status.should == 401
+ end
+
+ it 'cant update pull request in hidden project', :anonymous_access => true do
+ put :update, @update_params.merge(:project_id => @hidden_project.id, :id => @hidden_pull.serial_id)
+ response.status.should == 401
+ end
+
+ it 'cant merge pull request in open project' do
+ put :merge, :project_id => @another_project.id, :id => @another_pull.serial_id, :format => :json
+ @another_pull.reload.status.should == 'ready'
+ response.status.should == 401
+ end
+
+ it 'cant merge pull request in hidden project' do
+ put :merge, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
+ @hidden_pull.reload.status.should == 'ready'
+ response.status.should == 401
+ end
+ 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
+ http_login(@project_admin)
+ 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
+ end
+end
diff --git a/spec/controllers/api/v1/repositories_controller_spec.rb b/spec/controllers/api/v1/repositories_controller_spec.rb
index cb812db39..bdf88710b 100644
--- a/spec/controllers/api/v1/repositories_controller_spec.rb
+++ b/spec/controllers/api/v1/repositories_controller_spec.rb
@@ -61,6 +61,15 @@ shared_examples_for 'api repository user with writer rights' do
end
end
+ context 'api repository user with add/remove repo_lock_file rights' do
+ [:add_repo_lock_file, :remove_repo_lock_file].each do |action|
+ it "should be able to perform #{action} action" do
+ put action, :id => @repository.id, :format => :json
+ response.should be_success
+ end
+ end
+ end
+
context 'api repository user with add_member rights' do
let(:member) { FactoryGirl.create(:user) }
before do
@@ -98,15 +107,44 @@ shared_examples_for 'api repository user with writer rights' do
it 'ensures that repository of main platform has been destroyed' do
lambda { delete :destroy, :id => @repository.id, :format => :json }.should change{ Repository.count }.by(-1)
end
- it 'should not be able to perform destroy action for repository of personal platform' do
- delete :destroy, :id => @personal_repository.id, :format => :json
- response.should_not be_success
+
+ context 'repository with name "main" of personal platform' do
+ # hook for "ActiveRecord::ActiveRecordError: name is marked as readonly"
+ before { Repository.where(:id => @personal_repository.id).update_all("name = 'main'") }
+ it 'should not be able to perform destroy action' do
+ delete :destroy, :id => @personal_repository.id, :format => :json
+ response.should_not be_success
+ end
+ it 'ensures that repository has not been destroyed' do
+ lambda { delete :destroy, :id => @personal_repository.id, :format => :json }.should_not change{ Repository.count }
+ end
end
- it 'ensures that repository of personal platform has not been destroyed' do
- lambda { delete :destroy, :id => @personal_repository.id, :format => :json }.should_not change{ Repository.count }
+ it 'should be able to perform destroy action for repository with name not "main" of personal platform' do
+ delete :destroy, :id => @personal_repository.id, :format => :json
+ response.should be_success
+ end
+ it 'ensures that repository with name not "main" of personal platform has been destroyed' do
+ lambda { delete :destroy, :id => @personal_repository.id, :format => :json }.should change{ Repository.count }.by(-1)
end
end
+ context 'api repository user with update signatures rights' do
+ before do
+ kp = FactoryGirl.build(:key_pair)
+ put :signatures, :id => @repository.id, :repository => {:public => kp.public, :secret => kp.secret}, :format => :json
+ end
+ it 'should be able to perform signatures action' do
+ response.should be_success
+ end
+ it 'ensures that signatures has been updated' do
+ @repository.key_pair.should_not be_nil
+ end
+ end
+
+end
+
+shared_examples_for 'api repository user with project manage rights' do
+
context 'api repository user with add_project rights' do
before { put :add_project, :id => @repository.id, :project_id => @project.id, :format => :json }
it 'should be able to perform add_project action' do
@@ -131,19 +169,6 @@ shared_examples_for 'api repository user with writer rights' do
end
end
- context 'api repository user with update signatures rights' do
- before do
- kp = FactoryGirl.build(:key_pair)
- put :signatures, :id => @repository.id, :repository => {:public => kp.public, :secret => kp.secret}, :format => :json
- end
- it 'should be able to perform signatures action' do
- response.should be_success
- end
- it 'ensures that signatures has been updated' do
- @repository.key_pair.should_not be_nil
- end
- end
-
end
shared_examples_for 'api repository user without writer rights' do
@@ -162,6 +187,15 @@ shared_examples_for 'api repository user without writer rights' do
end
end
+ context 'api repository user without add/remove repo_lock_file rights' do
+ [:add_repo_lock_file, :remove_repo_lock_file].each do |action|
+ it "should not be able to perform #{action} action" do
+ put action, :id => @repository.id, :format => :json
+ response.should_not be_success
+ end
+ end
+ end
+
context 'api repository user without add_member rights' do
let(:member) { FactoryGirl.create(:user) }
before do
@@ -208,6 +242,22 @@ shared_examples_for 'api repository user without writer rights' do
end
end
+ context 'api repository user without update signatures rights' do
+ before do
+ kp = FactoryGirl.build(:key_pair)
+ put :signatures, :id => @repository.id, :repository => {:public => kp.public, :secret => kp.secret}, :format => :json
+ end
+ it 'should not be able to perform signatures action' do
+ response.should_not be_success
+ end
+ it 'ensures that signatures has not been updated' do
+ @repository.key_pair.should be_nil
+ end
+ end
+
+end
+
+shared_examples_for 'api repository user without project manage rights' do
context 'api repository user without add_project rights' do
before { put :add_project, :id => @repository.id, :project_id => @project.id, :format => :json }
it 'should not be able to perform add_project action' do
@@ -231,20 +281,6 @@ shared_examples_for 'api repository user without writer rights' do
@repository.projects.should include(@project)
end
end
-
- context 'api repository user without update signatures rights' do
- before do
- kp = FactoryGirl.build(:key_pair)
- put :signatures, :id => @repository.id, :repository => {:public => kp.public, :secret => kp.secret}, :format => :json
- end
- it 'should not be able to perform signatures action' do
- response.should_not be_success
- end
- it 'ensures that signatures has not been updated' do
- @repository.key_pair.should be_nil
- end
- end
-
end
@@ -271,6 +307,7 @@ describe Api::V1::RepositoriesController do
it_should_behave_like 'api repository user with show rights'
end
it_should_behave_like 'api repository user without writer rights'
+ it_should_behave_like 'api repository user without project manage rights'
it_should_behave_like 'api repository user without key_pair rights'
it 'should not be able to perform projects action', :anonymous_access => false do
@@ -295,9 +332,11 @@ describe Api::V1::RepositoriesController do
before(:each) do
@user = FactoryGirl.create(:user)
http_login(@user)
- platform = @repository.platform
- platform.owner = @user; platform.save
- @repository.platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
+ [@repository, @personal_repository].each do |repository|
+ platform = repository.platform
+ platform.owner = @user; platform.save
+ repository.platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
+ end
end
it_should_behave_like 'api repository user with reader rights'
@@ -316,6 +355,22 @@ describe Api::V1::RepositoriesController do
it_should_behave_like 'api repository user without reader rights for hidden platform'
it_should_behave_like 'api repository user with show rights'
it_should_behave_like 'api repository user without writer rights'
+ it_should_behave_like 'api repository user without project manage rights'
+ it_should_behave_like 'api repository user without key_pair rights'
+ end
+
+ context 'for member of repository' do
+ before(:each) do
+ @user = FactoryGirl.create(:user)
+ @repository.add_member @user
+ http_login @user
+ end
+
+ it_should_behave_like 'api repository user with reader rights'
+ it_should_behave_like 'api repository user with reader rights for hidden platform'
+ it_should_behave_like 'api repository user with show rights'
+ it_should_behave_like 'api repository user with project manage rights'
+ it_should_behave_like 'api repository user without writer rights'
it_should_behave_like 'api repository user without key_pair rights'
end
diff --git a/spec/controllers/autocompletes_controller_spec.rb b/spec/controllers/autocompletes_controller_spec.rb
index ac1f61e19..a80d70991 100644
--- a/spec/controllers/autocompletes_controller_spec.rb
+++ b/spec/controllers/autocompletes_controller_spec.rb
@@ -4,8 +4,9 @@ describe AutocompletesController do
before {stub_symlink_methods}
context 'for user' do
+ let(:user) { FactoryGirl.create(:user) }
before do
- set_session_for(FactoryGirl.create(:user))
+ set_session_for user
end
it 'should be able to perform autocomplete_group_uname action' do
@@ -18,6 +19,44 @@ describe AutocompletesController do
response.should be_success
end
+ context 'autocomplete_extra_build_list' do
+ let(:build_list) { FactoryGirl.create(:build_list, :user => user) }
+ let(:params) { { :term => build_list.id,
+ :platform_id => build_list.save_to_platform_id } }
+
+ it 'no data when build_list without container' do
+ get :autocomplete_extra_build_list, params
+ response.body.should == '[]'
+ end
+
+ it 'shows data when build_list with container' do
+ build_list.update_column(:container_status, BuildList::BUILD_PUBLISHED)
+ get :autocomplete_extra_build_list, params
+ response.body.should_not == '[]'
+ end
+ end
+
+ context 'autocomplete_extra_repositories' do
+ let(:repository) { FactoryGirl.create(:repository) }
+ let(:params) { { :term => repository.platform.name,
+ :platform_id => repository.platform_id } }
+
+ before do
+ repository.platform.add_member(user)
+ end
+
+ it 'no data when repository of main platform' do
+ get :autocomplete_extra_repositories, params
+ response.body.should == '[]'
+ end
+
+ it 'shows data when repository of personal platform' do
+ Platform.update_all(:platform_type => 'personal')
+ get :autocomplete_extra_repositories, params
+ response.body.should_not == '[]'
+ end
+ end
+
end
context 'for guest' do
@@ -26,14 +65,16 @@ describe AutocompletesController do
set_session_for(User.new)
end
- it 'should not be able to perform autocomplete_group_uname action' do
- get :autocomplete_group_uname
- response.should redirect_to(new_user_session_path)
- end
-
- it 'should not be able to perform autocomplete_user_uname action' do
- get :autocomplete_user_uname
- response.should redirect_to(new_user_session_path)
+ [
+ :autocomplete_group_uname,
+ :autocomplete_user_uname,
+ :autocomplete_extra_build_list,
+ :autocomplete_extra_repositories
+ ].each do |action|
+ it "should not be able to perform #{action} action" do
+ get action
+ response.should redirect_to(new_user_session_path)
+ end
end
end
diff --git a/spec/controllers/groups/profile_controller_spec.rb b/spec/controllers/groups/profile_controller_spec.rb
index 93119ad35..567ae26e2 100644
--- a/spec/controllers/groups/profile_controller_spec.rb
+++ b/spec/controllers/groups/profile_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
shared_examples_for 'group user with project show rights' do
it 'should be able to perform show action' do
- get :show, :id => @group
+ get :show, :uname => @group.uname
response.should render_template(:show)
end
end
diff --git a/spec/controllers/platforms/contents_controller_spec.rb b/spec/controllers/platforms/contents_controller_spec.rb
new file mode 100644
index 000000000..e5cca7814
--- /dev/null
+++ b/spec/controllers/platforms/contents_controller_spec.rb
@@ -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
diff --git a/spec/controllers/platforms/key_pairs_controller_spec.rb b/spec/controllers/platforms/key_pairs_controller_spec.rb
index cef278b35..bb21c11ac 100644
--- a/spec/controllers/platforms/key_pairs_controller_spec.rb
+++ b/spec/controllers/platforms/key_pairs_controller_spec.rb
@@ -78,7 +78,7 @@ describe Platforms::KeyPairsController do
@create_params = {
:platform_id => @platform,
:key_pair => {
- :repository_id => @repository,
+ :repository_id => @repository.id,
:public => kp.public,
:secret => kp.secret
}
diff --git a/spec/controllers/platforms/mass_builds_controller_spec.rb b/spec/controllers/platforms/mass_builds_controller_spec.rb
index bc70d7054..d5fbc4b06 100644
--- a/spec/controllers/platforms/mass_builds_controller_spec.rb
+++ b/spec/controllers/platforms/mass_builds_controller_spec.rb
@@ -6,6 +6,11 @@ shared_examples_for 'mass_build platform owner' do
response.should render_template(:index)
end
+ it 'should be able to perform new action' do
+ get :new, :platform_id => @platform
+ response.should render_template(:new)
+ end
+
it 'should be able to perform create action' do
post :create, @create_params
response.should redirect_to(platform_mass_builds_path(@platform))
@@ -45,19 +50,19 @@ shared_examples_for 'mass_build platform owner' do
get :get_list, :platform_id => @platform, :id => @mass_build, :kind => 'failed_builds_list'
response.should be_success
end
+end
- context 'for personal platform' do
- before(:each) do
- Platform.update_all(:platform_type => 'personal')
- end
-
- [:cancel, :get_list, :create, :publish].each do |action|
- it "should not be able to perform #{ action } action" do
- get action, :platform_id => @platform, :id => @mass_build.id
- response.should redirect_to(forbidden_path)
- end
+shared_examples_for 'mass_build platform owner of personal platform' do
+ before(:each) do
+ Platform.update_all(:platform_type => 'personal')
+ repository = FactoryGirl.create(:repository)
+ @mass_build.build_lists.each do |bl|
+ bl.build_for_platform = repository.platform
+ bl.include_repos = [repository.id]
+ bl.save
end
end
+ it_should_behave_like 'mass_build platform owner'
end
shared_examples_for 'mass_build platform reader' do
@@ -71,6 +76,11 @@ shared_examples_for 'mass_build platform reader' do
response.should be_success
end
+ it "should not be able to perform new action" do
+ get :new, :platform_id => @platform
+ response.should redirect_to(forbidden_path)
+ end
+
it "should not be able to perform create action" do
get :create, :platform_id => @platform
response.should redirect_to(forbidden_path)
@@ -112,14 +122,17 @@ describe Platforms::MassBuildsController do
@repository.projects << project
@create_params = {
- :platform_id => @platform,
- :projects_list => @repository.projects.map(&:name).join("\n"),
- :arches => [Arch.first.id],
- :auto_publish => true
+ :mass_build => {
+ :projects_list => @repository.projects.map(&:name).join("\n"),
+ :auto_publish => true,
+ :build_for_platform_id => @platform
+ },
+ :platform_id => @platform,
+ :arches => [Arch.first.id],
}
- @mass_build = FactoryGirl.create(:mass_build, :platform => @platform, :user => @user, :projects_list => project.name)
- FactoryGirl.create(:build_list_core, :mass_build => @mass_build, :status => BuildList::SUCCESS)
+ @mass_build = FactoryGirl.create(:mass_build, :save_to_platform => @platform, :user => @user, :projects_list => project.name)
+ FactoryGirl.create(:build_list, :mass_build => @mass_build, :status => BuildList::SUCCESS)
end
context 'for guest' do
@@ -144,12 +157,12 @@ describe Platforms::MassBuildsController do
response.should redirect_to(new_user_session_path)
end
- it "should not be able to perform create action" do
- get :create, :platform_id => @platform
+ it "should not be able to perform new action" do
+ get :new, :platform_id => @platform
response.should redirect_to(new_user_session_path)
end
- [:cancel, :publish].each do |action|
+ [:cancel, :publish, :create].each do |action|
it "should not be able to perform #{action} action" do
post action, :platform_id => @platform, :id => @mass_build
response.should redirect_to(new_user_session_path)
@@ -180,6 +193,7 @@ describe Platforms::MassBuildsController do
end
it_should_behave_like 'mass_build platform owner'
+ it_should_behave_like 'mass_build platform owner of personal platform'
end
context 'for owner user' do
@@ -192,6 +206,7 @@ describe Platforms::MassBuildsController do
end
it_should_behave_like 'mass_build platform owner'
+ it_should_behave_like 'mass_build platform owner of personal platform'
end
context 'for admin user' do
@@ -202,6 +217,7 @@ describe Platforms::MassBuildsController do
end
it_should_behave_like 'mass_build platform owner'
+ it_should_behave_like 'mass_build platform owner of personal platform'
end
context 'for reader user' do
diff --git a/spec/controllers/platforms/platforms_controller_spec.rb b/spec/controllers/platforms/platforms_controller_spec.rb
index dee03b79c..e4498d871 100644
--- a/spec/controllers/platforms/platforms_controller_spec.rb
+++ b/spec/controllers/platforms/platforms_controller_spec.rb
@@ -28,6 +28,22 @@ shared_examples_for 'platform user with owner rights' do
end
end
+ context 'perform change_visibility action' do
+ before do
+ @visibility = @platform.visibility
+ post :change_visibility, :id => @platform.id
+ end
+
+ it 'should be able to perform action' do
+ response.should redirect_to(platform_path(@platform))
+ end
+
+ it 'ensures that visibility of platform has been changed' do
+ @platform.reload
+ @platform.visibility.should_not == @visibility
+ end
+ end
+
context 'platform user with destroy rights for main platforms only' do
it 'should be able to perform destroy action for main platform' do
delete :destroy, :id => @platform.id
@@ -61,6 +77,22 @@ shared_examples_for 'platform user without owner rights' do
end
end
+ context 'perform change_visibility action' do
+ before do
+ @visibility = @platform.visibility
+ post :change_visibility, :id => @platform.id
+ end
+
+ it 'should not be able to perform action' do
+ response.should_not be_success
+ end
+
+ it 'ensures that visibility of platform has not been changed' do
+ @platform.reload
+ @platform.visibility.should == @visibility
+ end
+ end
+
context 'platform user without destroy rights' do
it 'should not be able to perform destroy action for main platform' do
delete :destroy, :id => @platform.id
@@ -345,6 +377,22 @@ describe Platforms::PlatformsController do
it_should_behave_like 'platform user without global admin rights'
end
+ context 'for member of repository' do
+ before do
+ http_login(@user)
+ repository = FactoryGirl.create(:repository, :platform => @platform)
+ repository.add_member(@user)
+ personal_repository = FactoryGirl.create(:repository, :platform => @personal_platform)
+ personal_repository.add_member(@user)
+ end
+
+ it_should_behave_like 'platform user with reader rights'
+ it_should_behave_like 'platform user with reader rights for hidden platform'
+ it_should_behave_like 'platform user without member rights'
+ it_should_behave_like 'platform user without owner rights'
+ it_should_behave_like 'platform user without global admin rights'
+ end
+
context 'for simple user' do
before do
http_login(@user)
diff --git a/spec/controllers/platforms/products_controller_spec.rb b/spec/controllers/platforms/products_controller_spec.rb
index 5ade7f3ad..61560f955 100644
--- a/spec/controllers/platforms/products_controller_spec.rb
+++ b/spec/controllers/platforms/products_controller_spec.rb
@@ -4,7 +4,7 @@ shared_examples_for 'admin user' do
it 'should be able to create product' do
lambda { post :create, @create_params }.should change{ Product.count }.by(1)
- response.should redirect_to(platform_product_path( Product.last.platform.id, Product.last ))
+ response.should redirect_to(platform_product_path( Product.last.platform, Product.last ))
end
it 'should be able to update product' do
@@ -30,7 +30,7 @@ describe Platforms::ProductsController do
@product = FactoryGirl.create(:product, :platform => @platform)
@project = FactoryGirl.create(:project)
- params = {:platform_id => @platform.id, :src_project => @project.name_with_owner}
+ params = {:platform_id => @platform, :src_project => @project.name_with_owner}
@create_params = params.merge({:product => {:name => 'pro', :time_living => 150}})
@update_params = params.merge({:product => {:name => 'pro2'}})
diff --git a/spec/controllers/platforms/repositories_controller_spec.rb b/spec/controllers/platforms/repositories_controller_spec.rb
index a2f96d5df..68993464a 100644
--- a/spec/controllers/platforms/repositories_controller_spec.rb
+++ b/spec/controllers/platforms/repositories_controller_spec.rb
@@ -1,13 +1,5 @@
require 'spec_helper'
-shared_examples_for 'not destroy personal repository' do
- it 'should not be able to destroy personal repository' do
- lambda { delete :destroy, :id => @personal_repository.id, :platform_id =>
- @personal_repository.platform.id}.should change{ Repository.count }.by(0)
- response.should redirect_to(redirect_path)
- end
-end
-
shared_examples_for 'user with change projects in repository rights' do
it 'should be able to see add_project page' do
@@ -29,6 +21,20 @@ shared_examples_for 'user with change projects in repository rights' do
end
+shared_examples_for 'user with rights of add/remove sync_lock_file to repository' do
+ it 'should be able to perform sync_lock_file action' do
+ put :sync_lock_file, :id => @repository.id, :platform_id => @platform.id
+ response.should redirect_to(edit_platform_repository_path(@platform, @repository))
+ end
+end
+
+shared_examples_for 'user without rights of add/remove sync_lock_file to repository' do
+ it 'should not be able to perform #{action} action' do
+ put :sync_lock_file, :id => @repository.id, :platform_id => @platform.id
+ response.should redirect_to(redirect_path)
+ end
+end
+
shared_examples_for 'user without change projects in repository rights' do
it 'should not be able to add project to repository' do
get :add_project, :id => @repository.id, :platform_id => @platform.id, :project_id => @project.id
@@ -36,6 +42,12 @@ shared_examples_for 'user without change projects in repository rights' do
@repository.projects.should_not include(@project)
end
+ it 'should not be able to perform regenerate_metadata action' do
+ put :regenerate_metadata, :id => @repository.id, :platform_id => @platform.id
+ response.should redirect_to(redirect_path)
+ @repository.repository_statuses.should have(:no).items
+ end
+
it 'should not be able to remove project from repository' do
delete :remove_project, :id => @repository.id, :platform_id => @platform.id, :project_id => @project.id
response.should redirect_to(redirect_path)
@@ -49,6 +61,18 @@ shared_examples_for 'registered user or guest' do
response.should redirect_to(redirect_path)
end
+ it 'should not be able to perform regenerate_metadata action' do
+ put :regenerate_metadata, :id => @repository.id, :platform_id => @platform.id
+ response.should redirect_to(redirect_path)
+ @repository.repository_statuses.should have(:no).items
+ end
+
+ it 'should not be able to perform regenerate_metadata action of personal repository' do
+ put :regenerate_metadata, :id => @personal_repository.id, :platform_id => @personal_repository.platform.id
+ response.should redirect_to(redirect_path)
+ @personal_repository.repository_statuses.should have(:no).items
+ end
+
it 'should not be able to perform create action' do
post :create, @create_params
lambda { post :create, @create_params }.should change{ Repository.count }.by(0)
@@ -89,12 +113,16 @@ shared_examples_for 'registered user or guest' do
end
it 'should not be able to destroy repository in main platform' do
- delete :destroy, :id => @repository.id
+ delete :destroy, :id => @repository.id, :platform_id => @platform.id
response.should redirect_to(redirect_path)
lambda { delete :destroy, :id => @repository.id }.should_not change{ Repository.count }.by(-1)
end
- it_should_behave_like 'not destroy personal repository'
+ it 'should not be able to destroy personal repository' do
+ lambda { delete :destroy, :id => @personal_repository.id, :platform_id => @personal_repository.platform.id}
+ .should change{ Repository.count }.by(0)
+ response.should redirect_to(redirect_path)
+ end
end
shared_examples_for 'registered user' do
@@ -118,19 +146,40 @@ end
shared_examples_for 'platform admin user' do
it_should_behave_like 'registered user'
+ it_should_behave_like 'user with rights of add/remove sync_lock_file to repository'
it 'should be able to perform new action' do
get :new, :platform_id => @platform.id
response.should render_template(:new)
end
+ it 'should be able to perform regenerate_metadata action' do
+ put :regenerate_metadata, :id => @repository.id, :platform_id => @platform.id
+ response.should redirect_to(platform_repository_path(@platform, @repository))
+ @repository.repository_statuses.find_by_platform_id(@platform.id).
+ waiting_for_regeneration?.should be_true
+ end
+
+ it 'should be able to perform regenerate_metadata action of personal repository' do
+ put :regenerate_metadata, :id => @personal_repository.id, :platform_id => @personal_repository.platform.id, :build_for_platform_id => @platform.id
+ response.should redirect_to(platform_repository_path(@personal_repository.platform, @personal_repository))
+ @personal_repository.repository_statuses.find_by_platform_id(@platform.id).
+ waiting_for_regeneration?.should be_true
+ end
+
+ it 'should not be able to perform regenerate_metadata action of personal repository when build_for_platform does not exist' do
+ put :regenerate_metadata, :id => @personal_repository.id, :platform_id => @personal_repository.platform.id
+ response.should render_template(:file => "#{Rails.root}/public/404.html")
+ @personal_repository.repository_statuses.should have(:no).items
+ end
+
it 'should be able to create repository' do
lambda { post :create, @create_params }.should change{ Repository.count }.by(1)
response.should redirect_to(platform_repository_path(@platform, Repository.last))
end
it 'should be able to destroy repository in main platform' do
- lambda { delete :destroy, :id => @repository.id }.should change{ Repository.count }.by(-1)
+ lambda { delete :destroy, :id => @repository.id, :platform_id => @platform.id }.should change{ Repository.count }.by(-1)
response.should redirect_to(platform_repositories_path(@repository.platform))
end
@@ -162,15 +211,27 @@ shared_examples_for 'platform admin user' do
@repository.members.should_not include(@another_user, another_user2)
end
- it_should_behave_like 'user with change projects in repository rights'
- it_should_behave_like 'not destroy personal repository' do
- let(:redirect_path) { forbidden_path }
+ it 'should not be able to destroy personal repository with name "main"' do
+ # hook for "ActiveRecord::ActiveRecordError: name is marked as readonly"
+ Repository.where(:id => @personal_repository.id).update_all("name = 'main'")
+ lambda { delete :destroy, :id => @personal_repository.id, :platform_id => @personal_repository.platform.id}
+ .should change{ Repository.count }.by(0)
+ response.should redirect_to(forbidden_path)
end
+
+ it 'should be able to destroy personal repository with name not "main"' do
+ lambda { delete :destroy, :id => @personal_repository.id, :platform_id => @personal_repository.platform.id}
+ .should change{ Repository.count }.by(-1)
+ response.should redirect_to(platform_repositories_path(@personal_repository.platform))
+ end
+
+ it_should_behave_like 'user with change projects in repository rights'
end
describe Platforms::RepositoriesController do
before(:each) do
stub_symlink_methods
+ stub_redis
@platform = FactoryGirl.create(:platform)
@repository = FactoryGirl.create(:repository, :platform => @platform)
@@ -194,6 +255,7 @@ describe Platforms::RepositoriesController do
let(:redirect_path) { new_user_session_path }
it_should_behave_like 'registered user or guest'
it_should_behave_like 'user without change projects in repository rights'
+ it_should_behave_like 'user without rights of add/remove sync_lock_file to repository'
it "should not be able to perform show action", :anonymous_access => false do
get :show, :id => @repository
@@ -218,6 +280,7 @@ describe Platforms::RepositoriesController do
let(:redirect_path) { forbidden_path }
it_should_behave_like 'registered user or guest'
it_should_behave_like 'user without change projects in repository rights'
+ it_should_behave_like 'user without rights of add/remove sync_lock_file to repository'
end
context 'for admin' do
@@ -233,6 +296,10 @@ describe Platforms::RepositoriesController do
context 'for platform owner user' do
before(:each) do
@user = @repository.platform.owner
+ platform = @personal_repository.platform
+ platform.owner = @user
+ # Owner of personal platform can't be changed
+ platform.save(:validate => false)
set_session_for(@user)
end
@@ -241,7 +308,9 @@ describe Platforms::RepositoriesController do
context 'for platform member user' do
before(:each) do
- @platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
+ [@repository, @personal_repository].each do |repo|
+ repo.platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
+ end
end
it_should_behave_like 'platform admin user'
@@ -249,7 +318,9 @@ describe Platforms::RepositoriesController do
context 'for repository member user' do
before(:each) do
- @repository.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
+ [@repository, @personal_repository].each do |repo|
+ repo.add_member @user
+ end
end
it_should_behave_like 'registered user'
@@ -257,6 +328,21 @@ describe Platforms::RepositoriesController do
let(:redirect_path) { forbidden_path }
it_should_behave_like 'registered user or guest'
it_should_behave_like 'user with change projects in repository rights'
+ it_should_behave_like 'user without rights of add/remove sync_lock_file to repository'
+
+ context 'for hidden platform' do
+ before do
+ @platform.update_column(:visibility, 'hidden')
+ @personal_repository.platform.update_column(:visibility, 'hidden')
+ end
+ it_should_behave_like 'registered user'
+
+ let(:redirect_path) { forbidden_path }
+ it_should_behave_like 'registered user or guest'
+ it_should_behave_like 'user with change projects in repository rights'
+ it_should_behave_like 'user without rights of add/remove sync_lock_file to repository'
+ end
+
end
end
diff --git a/spec/controllers/platforms/tokens_controller_spec.rb b/spec/controllers/platforms/tokens_controller_spec.rb
new file mode 100644
index 000000000..5e27049d9
--- /dev/null
+++ b/spec/controllers/platforms/tokens_controller_spec.rb
@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+def create_key_pair(repository, user)
+ @key_pair = FactoryGirl.create(:key_pair, :repository => repository, :user => user)
+end
+
+shared_examples_for 'token of platform for owner' do
+ [:index, :new].each do |action|
+ it "should be able to perform #{action} action" do
+ get action, :platform_id => @platform
+ response.should render_template(action)
+ end
+ end
+
+ it 'should not be able to perform show action' do
+ get :show, :platform_id => @platform, :id => @platform_token
+ response.should render_template(:show)
+ end
+
+ it 'should be able to perform create action' do
+ post :create, @create_params
+ response.should redirect_to(platform_tokens_path(@platform))
+ end
+
+ it 'should create key pair into db on create action' do
+ lambda { post :create, @create_params }.should change{Token.count}.by(1)
+ end
+end
+
+shared_examples_for 'token of platform for simple user or guest' do
+ [:index, :new].each do |action|
+ it "should not be able to perform #{ action } action" do
+ get action, :platform_id => @platform
+ response.should redirect_to(redirected_url)
+ end
+ end
+
+ it 'should not be able to perform show action' do
+ get :show, :platform_id => @platform, :id => @platform_token
+ response.should redirect_to(redirected_url)
+ end
+
+ it 'should not be able to perform show action' do
+ post :create, @create_params
+ response.should redirect_to(redirected_url)
+ end
+
+ it 'should not change objects count on create success' do
+ lambda { post :create, @create_params }.should change{ Token.count }.by(0)
+ end
+end
+
+describe Platforms::TokensController do
+ before do
+ stub_symlink_methods
+
+ @platform = FactoryGirl.create(:platform)
+ @user = FactoryGirl.create(:user)
+ @platform_token = FactoryGirl.create(:platform_token, :subject => @platform)
+ @create_params = {
+ :platform_id => @platform,
+ :tokens => {
+ :description => 'description'
+ }
+ }
+ end
+
+ it_should_behave_like 'token of platform for simple user or guest' do
+ let(:redirected_url) { new_user_session_path }
+ end
+
+ context 'for global admin' do
+ before(:each) do
+ @admin = FactoryGirl.create(:admin)
+ @user = FactoryGirl.create(:user)
+ set_session_for(@admin)
+ end
+
+ it_should_behave_like 'token of platform for owner'
+ end
+
+ context 'for owner user' do
+ before(:each) do
+ @user = FactoryGirl.create(:user)
+ set_session_for(@user)
+
+ @platform.owner = @user
+ @platform.save
+ end
+
+ it_should_behave_like 'token of platform for owner'
+ end
+
+ context 'for admin user' do
+ before(:each) do
+ @user = FactoryGirl.create(:user)
+ set_session_for(@user)
+ @platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'admin')
+ end
+
+ it_should_behave_like 'token of platform for owner'
+ end
+
+ context 'for reader user' do
+ before do
+ @user = FactoryGirl.create(:user)
+ set_session_for(@user)
+ @platform.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ end
+
+ it_should_behave_like 'token of platform for simple user or guest' do
+ let(:redirected_url) { forbidden_url }
+ end
+ end
+
+ context 'for simple user' do
+ before do
+ @user = FactoryGirl.create(:user)
+ set_session_for(@user)
+ end
+
+ it_should_behave_like 'token of platform for simple user or guest' do
+ let(:redirected_url) { forbidden_url }
+ end
+ end
+
+end
diff --git a/spec/controllers/projects/build_lists_controller_spec.rb b/spec/controllers/projects/build_lists_controller_spec.rb
index 27af17e06..efc6ef466 100644
--- a/spec/controllers/projects/build_lists_controller_spec.rb
+++ b/spec/controllers/projects/build_lists_controller_spec.rb
@@ -14,34 +14,6 @@ describe Projects::BuildListsController do
end
end
- shared_examples_for 'show extra_repos_and_builds actions' do
- it 'shows data when perform autocomplete_to_extra_repos_and_builds action' do
- @build_list.update_column(:container_status, BuildList::BUILD_PUBLISHED)
- get :autocomplete_to_extra_repos_and_builds, {:term => @build_list.id, :platform_id => @build_list.save_to_platform_id}
- response.body.should_not == '[]'
- end
-
- it 'shows data when perform update_extra_repos_and_builds action' do
- @build_list.update_column(:container_status, BuildList::BUILD_PUBLISHED)
- get :update_extra_repos_and_builds, {:build_list => {:save_to_repository_id => @build_list.save_to_repository_id, :extra_build_lists => [@build_list.id]}, :extra_repo => ''}
- response.body.should_not == ' '
- end
- end
-
- shared_examples_for 'not show extra_repos_and_builds actions' do
- it 'no data when perform autocomplete_to_extra_repos_and_builds action' do
- @build_list.update_column(:container_status, BuildList::BUILD_PUBLISHED)
- get :autocomplete_to_extra_repos_and_builds, {:term => @build_list.id, :platform_id => @build_list.save_to_platform_id}
- response.body.should == '[]'
- end
-
- it 'no data when perform update_extra_repos_and_builds action' do
- @build_list.update_column(:container_status, BuildList::BUILD_PUBLISHED)
- get :update_extra_repos_and_builds, {:build_list => {:save_to_repository_id => @build_list.save_to_repository_id, :extra_build_lists => [@build_list.id]}, :extra_repo => ''}
- response.body.should == ' '
- end
- end
-
shared_examples_for 'not show build list' do
it 'should not be able to perform show action' do
get :show, @show_params
@@ -89,7 +61,7 @@ describe Projects::BuildListsController do
end
end
- shared_examples_for 'not create build list' do
+ shared_examples_for 'not create build list' do |skip_new = false|
before {
@project.update_attribute(:repositories, @platform.repositories)
}
@@ -97,13 +69,12 @@ describe Projects::BuildListsController do
it 'should not be able to perform new action' do
get :new, :owner_name => @project.owner.uname, :project_name => @project.name
response.should redirect_to(forbidden_url)
- end
+ end unless skip_new
it 'should not be able to perform create action' do
post :create, {:owner_name => @project.owner.uname, :project_name => @project.name}.merge(@create_params)
response.should redirect_to(forbidden_url)
end
-
end
before { stub_symlink_methods }
@@ -136,17 +107,12 @@ describe Projects::BuildListsController do
response.should redirect_to(new_user_session_path)
end
- [:autocomplete_to_extra_repos_and_builds, :update_extra_repos_and_builds].each do |action|
- it "should not be able to perform #{action} action" do
- get action
- response.should redirect_to(new_user_session_path)
- end
- end
end
context 'for user' do
before(:each) do
- @build_list = FactoryGirl.create(:build_list_core)
+ any_instance_of(BuildList, :current_duration => 100)
+ @build_list = FactoryGirl.create(:build_list)
@project = @build_list.project
@owner_user = @project.owner
@member_user = FactoryGirl.create(:user)
@@ -156,19 +122,115 @@ describe Projects::BuildListsController do
@user = FactoryGirl.create(:user)
set_session_for(@user)
@show_params = {:owner_name => @project.owner.uname, :project_name => @project.name, :id => @build_list.id}
+ @build_list.save_to_repository.update_column(:publish_without_qa, false)
+ @request.env['HTTP_REFERER'] = build_list_path(@build_list)
+ end
+
+ context "do reject_publish" do
+ before(:each) {@build_list.save_to_repository.update_column(:publish_without_qa, true)}
+
+ def do_reject_publish
+ put :reject_publish, :id => @build_list
+ end
+
+ context 'if user is project owner' do
+ before(:each) do
+ set_session_for(@owner_user)
+ @build_list.update_column(:status, BuildList::SUCCESS)
+ @build_list.save_to_platform.update_column(:released, true)
+ do_reject_publish
+ end
+
+ context "if it has :success status" do
+ it 'should return 302 response code' do
+ response.status.should == 302
+ end
+
+ it "should reject publish build list" do
+ @build_list.reload.status.should == BuildList::REJECTED_PUBLISH
+ end
+ end
+
+ context "if it has another status" do
+ before(:each) do
+ @build_list.update_column(:status, BuildList::BUILD_ERROR)
+ do_reject_publish
+ end
+
+ it "should not change status of build list" do
+ @build_list.reload.status.should == BuildList::BUILD_ERROR
+ end
+ end
+ end
+
+ context 'if user is not project owner' do
+ before(:each) do
+ @build_list.update_column(:status, BuildList::SUCCESS)
+ @build_list.save_to_platform.update_column(:released, true)
+ do_reject_publish
+ end
+
+ it "should redirect to forbidden page" do
+ response.should redirect_to(forbidden_url)
+ end
+
+ it "should not change status of build list" do
+ do_reject_publish
+ @build_list.reload.status.should == BuildList::SUCCESS
+ end
+ end
+
+ context 'if user is project reader' do
+ before(:each) do
+ @another_user = FactoryGirl.create(:user)
+ @build_list.update_column(:status, BuildList::SUCCESS)
+ @build_list.save_to_repository.update_column(:publish_without_qa, true)
+ @build_list.project.collaborators.create(:actor_type => 'User', :actor_id => @another_user.id, :role => 'reader')
+ set_session_for(@another_user)
+ do_reject_publish
+ end
+
+ it "should redirect to forbidden page" do
+ response.should redirect_to(forbidden_url)
+ end
+
+ it "should not change status of build list" do
+ do_reject_publish
+ @build_list.reload.status.should == BuildList::SUCCESS
+ end
+ end
+
+ context 'if user is project writer' do
+ before(:each) do
+ @writer_user = FactoryGirl.create(:user)
+ @build_list.update_column(:status, BuildList::SUCCESS)
+ @build_list.save_to_repository.update_column(:publish_without_qa, true)
+ @build_list.project.relations.create!(:actor_type => 'User', :actor_id => @writer_user.id, :role => 'writer')
+ set_session_for(@writer_user)
+ do_reject_publish
+ end
+
+ it 'should return 302 response code' do
+ response.status.should == 302
+ end
+
+ it "should reject publish build list" do
+ @build_list.reload.status.should == BuildList::REJECTED_PUBLISH
+ end
+ end
end
context 'for all build lists' do
before(:each) do
- @build_list1 = FactoryGirl.create(:build_list_core)
+ @build_list1 = FactoryGirl.create(:build_list)
- @build_list2 = FactoryGirl.create(:build_list_core)
+ @build_list2 = FactoryGirl.create(:build_list)
@build_list2.project.update_column(:visibility, 'hidden')
project = FactoryGirl.create(:project_with_commit, :visibility => 'hidden', :owner => @user)
- @build_list3 = FactoryGirl.create(:build_list_core_with_attaching_project, :project => project)
+ @build_list3 = FactoryGirl.create(:build_list_with_attaching_project, :project => project)
- @build_list4 = FactoryGirl.create(:build_list_core)
+ @build_list4 = FactoryGirl.create(:build_list)
@build_list4.project.update_column(:visibility, 'hidden')
@build_list4.project.relations.create! :role => 'reader', :actor_id => @user.id, :actor_type => 'User'
end
@@ -190,13 +252,23 @@ describe Projects::BuildListsController do
context 'for open project' do
it_should_behave_like 'show build list'
it_should_behave_like 'not create build list'
- it_should_behave_like 'show extra_repos_and_builds actions'
context 'if user is project owner' do
before(:each) {set_session_for(@owner_user)}
it_should_behave_like 'show build list'
it_should_behave_like 'create build list'
+ context 'no ability to read build_for_platform' do
+ before do
+ repository = FactoryGirl.create(:repository)
+ repository.platform.change_visibility
+ Platform.where(:id => @platform.id).update_all(:platform_type => 'personal')
+ @create_params[:build_list].merge!({:include_repos => [repository.id]})
+ @create_params[:build_for_platforms] = [repository.platform_id]
+ end
+ it_should_behave_like 'not create build list', true
+ end
+
end
context 'if user is project read member' do
@@ -214,21 +286,17 @@ describe Projects::BuildListsController do
it_should_behave_like 'not show build list'
it_should_behave_like 'not create build list'
- it_should_behave_like 'not show extra_repos_and_builds actions'
context 'if user is project owner' do
before(:each) {set_session_for(@owner_user)}
it_should_behave_like 'show build list'
it_should_behave_like 'create build list'
- it_should_behave_like 'show extra_repos_and_builds actions'
end
context 'if user is project read member' do
before(:each) {set_session_for(@member_user)}
it_should_behave_like 'show build list'
it_should_behave_like 'not create build list'
- it_should_behave_like 'show extra_repos_and_builds actions'
-
end
end
end
@@ -254,15 +322,15 @@ describe Projects::BuildListsController do
context 'for all build lists' do
before(:each) do
- @build_list1 = FactoryGirl.create(:build_list_core)
+ @build_list1 = FactoryGirl.create(:build_list)
- @build_list2 = FactoryGirl.create(:build_list_core)
+ @build_list2 = FactoryGirl.create(:build_list)
@build_list2.project.update_column(:visibility, 'hidden')
project = FactoryGirl.create(:project_with_commit, :visibility => 'hidden', :owner => @user)
- @build_list3 = FactoryGirl.create(:build_list_core_with_attaching_project, :project => project)
+ @build_list3 = FactoryGirl.create(:build_list_with_attaching_project, :project => project)
- @build_list4 = FactoryGirl.create(:build_list_core)
+ @build_list4 = FactoryGirl.create(:build_list)
@build_list4.project.update_column(:visibility, 'hidden')
@build_list4.project.relations.create! :role => 'reader', :actor_id => @user.id, :actor_type => 'User'
end
@@ -284,7 +352,6 @@ describe Projects::BuildListsController do
context 'for open project' do
it_should_behave_like 'show build list'
it_should_behave_like 'not create build list'
- it_should_behave_like 'show extra_repos_and_builds actions'
context 'if user is group owner' do
before(:each) {set_session_for(@owner_user)}
@@ -307,20 +374,17 @@ describe Projects::BuildListsController do
it_should_behave_like 'not show build list'
it_should_behave_like 'not create build list'
- it_should_behave_like 'not show extra_repos_and_builds actions'
context 'if user is group owner' do
before(:each) {set_session_for(@owner_user)}
it_should_behave_like 'show build list'
it_should_behave_like 'create build list'
- it_should_behave_like 'show extra_repos_and_builds actions'
end
context 'if user is group read member' do
before(:each) {set_session_for(@member_user)}
it_should_behave_like 'show build list'
it_should_behave_like 'not create build list'
- it_should_behave_like 'show extra_repos_and_builds actions'
end
end
@@ -332,16 +396,16 @@ describe Projects::BuildListsController do
before(:each) do
set_session_for FactoryGirl.create(:admin)
- @build_list1 = FactoryGirl.create(:build_list_core)
- @build_list2 = FactoryGirl.create(:build_list_core)
- @build_list3 = FactoryGirl.create(:build_list_core)
- @build_list4 = FactoryGirl.create(:build_list_core, :updated_at => (Time.now - 1.day),
+ @build_list1 = FactoryGirl.create(:build_list)
+ @build_list2 = FactoryGirl.create(:build_list)
+ @build_list3 = FactoryGirl.create(:build_list)
+ @build_list4 = FactoryGirl.create(:build_list, :updated_at => (Time.now - 1.day),
:project => @build_list3.project, :save_to_platform => @build_list3.save_to_platform,
:arch => @build_list3.arch)
end
- it 'should filter by bs_id' do
- get :index, :filter => {:bs_id => @build_list1.bs_id, :project_name => 'fdsfdf', :any_other_field => 'do not matter'}
+ it 'should filter by id' do
+ get :index, :filter => {:id => @build_list1.id, :project_name => 'fdsfdf', :any_other_field => 'do not matter'}, :format => :json
assigns[:build_lists].should include(@build_list1)
assigns[:build_lists].should_not include(@build_list2)
assigns[:build_lists].should_not include(@build_list3)
@@ -349,7 +413,7 @@ describe Projects::BuildListsController do
it 'should filter by project_name' do
# Project.where(:id => build_list2.project.id).update_all(:name => 'project_name')
- get :index, :filter => {:project_name => @build_list2.project.name, :ownership => 'everything'}
+ get :index, :filter => {:project_name => @build_list2.project.name, :ownership => 'everything'}, :format => :json
assigns[:build_lists].should_not include(@build_list1)
assigns[:build_lists].should include(@build_list2)
assigns[:build_lists].should_not include(@build_list3)
@@ -357,7 +421,7 @@ describe Projects::BuildListsController do
it 'should filter by project_name and update_date' do
get :index, :filter => {:project_name => @build_list3.project.name, :ownership => 'everything',
- "updated_at_start" => @build_list3.updated_at.strftime('%d/%m/%Y')}
+ "updated_at_start" => @build_list3.updated_at.strftime('%d/%m/%Y')}, :format => :json
assigns[:build_lists].should_not include(@build_list1)
assigns[:build_lists].should_not include(@build_list2)
assigns[:build_lists].should include(@build_list3)
diff --git a/spec/controllers/projects/git/git_trees_controller_spec.rb b/spec/controllers/projects/git/git_trees_controller_spec.rb
index 48684360d..ddf639f70 100644
--- a/spec/controllers/projects/git/git_trees_controller_spec.rb
+++ b/spec/controllers/projects/git/git_trees_controller_spec.rb
@@ -6,7 +6,6 @@ describe Projects::Git::TreesController do
stub_symlink_methods
@project = FactoryGirl.create(:project)
- @another_user = FactoryGirl.create(:user)
@params = { :owner_name => @project.owner.uname,
:project_name => @project.name,
:treeish => "#{@project.name}-master"}
@@ -36,6 +35,22 @@ describe Projects::Git::TreesController do
get :archive, @params.merge(:format => 'tar.gz')
response.code.should == '401'
end
+
+ it 'should not be able to perform destroy action' do
+ delete :destroy, @params.merge(:treeish => 'master')
+ response.should_not be_success
+ end
+
+ it 'should not be able to perform restore_branch action' do
+ put :restore_branch, @params.merge(:treeish => 'master')
+ response.should_not be_success
+ end
+
+ it 'should not be able to perform create action' do
+ post :create, @params.merge(:treeish => '', :from_ref => 'master', :new_ref => 'master-1')
+ response.should_not be_success
+ end
+
end
context 'for other user' do
@@ -59,6 +74,21 @@ describe Projects::Git::TreesController do
response.should be_success
end
+ it 'should not be able to perform destroy action' do
+ delete :destroy, @params.merge(:treeish => 'master')
+ response.should_not be_success
+ end
+
+ it 'should not be able to perform restore_branch action' do
+ put :restore_branch, @params.merge(:treeish => 'master')
+ response.should_not be_success
+ end
+
+ it 'should not be able to perform create action' do
+ post :create, @params.merge(:treeish => '', :from_ref => 'master', :new_ref => 'master-1')
+ response.should_not be_success
+ end
+
[:tags, :branches].each do |action|
it "should be able to perform #{action} action" do
get action, @params.merge(:treeish => 'master')
@@ -67,5 +97,33 @@ describe Projects::Git::TreesController do
end
end
+ context 'for writer user' do
+ before(:each) do
+ user = FactoryGirl.create(:user)
+ @project.relations.create!(:actor_type => 'User', :actor_id => user.id, :role => 'writer')
+ set_session_for user
+ end
+
+ it 'should be able to perform destroy action' do
+ delete :destroy, @params.merge(:treeish => 'conflicts')
+ response.should be_success
+ end
+
+ it 'should not be able to perform destroy action for master branch' do
+ delete :destroy, @params.merge(:treeish => 'master')
+ response.should_not be_success
+ end
+
+ it 'should be able to perform restore_branch action' do
+ put :restore_branch, @params.merge(:treeish => 'master-1', :sha => 'master')
+ response.should be_success
+ end
+
+ it 'should be able to perform create action' do
+ post :create, @params.merge(:treeish => '', :from_ref => 'master', :new_ref => 'master-1')
+ response.should be_success
+ end
+ end
+
after(:all) {clean_projects_dir}
end
diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb
new file mode 100644
index 000000000..36e299ef5
--- /dev/null
+++ b/spec/controllers/projects/hooks_controller_spec.rb
@@ -0,0 +1,205 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+shared_examples_for 'hooks user with project admin rights' do
+ it 'should be able to perform index action' do
+ get :index, {:owner_name => @project.owner.uname, :project_name => @project.name}
+ response.should be_success
+ end
+
+ it 'should be able to perform new action' do
+ get :new, {:owner_name => @project.owner.uname, :project_name => @project.name, :hook => {:name => 'web'}}
+ response.should be_success
+ end
+
+ it 'should be able to perform edit action' do
+ get :new, {:owner_name => @project.owner.uname, :project_name => @project.name, :id => @hook.id}
+ response.should be_success
+ end
+
+ it 'should be able to perform update action' do
+ put :update, {:owner_name => @project.owner.uname, :project_name => @project.name, :id => @hook.id}.merge(@update_params)
+ response.should redirect_to(project_hooks_path(@project, :name => 'web'))
+ end
+
+ it 'should be able to perform create action' do
+ post :create, {:owner_name => @project.owner.uname, :project_name => @project.name}.merge(@create_params)
+ response.should redirect_to(project_hooks_path(@project, :name => 'web'))
+ end
+end
+
+shared_examples_for 'hooks user without project admin rights' do
+ it 'should not be able to perform index action' do
+ get :index, {:owner_name => @project.owner.uname, :project_name => @project.name}
+ response.should redirect_to(forbidden_path)
+ end
+
+ it 'should not be able to perform new action' do
+ get :new, {:owner_name => @project.owner.uname, :project_name => @project.name, :hook => {:name => 'web'}}
+ response.should redirect_to(forbidden_path)
+ end
+
+ it 'should not be able to perform edit action' do
+ get :new, {:owner_name => @project.owner.uname, :project_name => @project.name, :id => @hook.id}
+ response.should redirect_to(forbidden_path)
+ end
+
+ it 'should not be able to perform update action' do
+ put :update, {:owner_name => @project.owner.uname, :project_name => @project.name, :id => @hook.id}.merge(@update_params)
+ response.should redirect_to(forbidden_path)
+ end
+
+ it 'should not be able to perform create action' do
+ post :create, {:owner_name => @project.owner.uname, :project_name => @project.name}.merge(@create_params)
+ response.should redirect_to(forbidden_path)
+ end
+end
+
+describe Projects::HooksController do
+
+ before(:each) do
+ stub_symlink_methods
+
+ @project = FactoryGirl.create(:project)
+ @hook = FactoryGirl.create(:hook, :project => @project)
+
+ @create_params = {:hook => {:name => 'web', :data => {:url => 'create'}}}
+ @update_params = {:hook => {:data => {:url => 'update'}}}
+
+ @user = FactoryGirl.create(:user)
+ set_session_for(@user)
+ end
+
+ context 'registered user' do
+ it_should_behave_like 'hooks user without project admin rights'
+ end # context 'registered user'
+
+ context 'for project members' do
+
+ context 'for global admin' do
+ before do
+ @user.role = "admin"
+ @user.save
+ end
+
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+
+ context 'for owner user' do
+ before do
+ @user = @project.owner
+ set_session_for(@user) # owner should be user
+ end
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+
+ context 'for reader user' do
+ before do
+ @project.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ end
+ it_should_behave_like 'hooks user without project admin rights'
+ end
+
+ context 'for writer user' do
+ before do
+ @project.relations.create!(:actor_type => 'User', :actor_id => @user.id, :role => 'writer')
+ end
+ it_should_behave_like 'hooks user without project admin rights'
+ end
+
+ end # context 'for project members'
+
+ context 'for group' do
+ before do
+ @group = FactoryGirl.create(:group)
+ end
+
+ context 'group is owner of the project' do
+ before do
+ @project = FactoryGirl.create(:project, :owner => @group)
+ @hook = FactoryGirl.create(:hook, :project => @project)
+ end
+
+ context 'group member user with reader role' do
+ before do
+ @group.actors.create(:actor_id => @user.id, :actor_type => 'User', :role => 'reader')
+ end
+
+ it_should_behave_like 'hooks user without project admin rights'
+
+ context 'user should has best role' do
+ before do
+ @project.relations.create :actor_id => @user.id, :actor_type => @user.class.to_s, :role => 'admin'
+ end
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+ end
+
+ context 'group member user with admin role' do
+ before do
+ @group.actors.create(:actor_id => @user.id, :actor_type => 'User', :role => 'admin')
+ end
+
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+ end
+
+ context 'group is member of the project' do
+ context 'with admin rights' do
+ before do
+ @project.relations.create :actor_id => @group.id, :actor_type => @group.class.to_s, :role => 'admin'
+ end
+
+ context 'group member user with reader role' do
+ before do
+ @group.actors.create(:actor_id => @user.id, :actor_type => 'User', :role => 'reader')
+ end
+
+ it_should_behave_like 'hooks user with project admin rights'
+
+ context 'user should has best role' do
+ before do
+ @project.relations.create :actor_id => @user.id, :actor_type => @user.class.to_s, :role => 'reader'
+ end
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+ end
+
+ context 'group member user with admin role' do
+ before do
+ @group.actors.create(:actor_id => @user.id, :actor_type => 'User', :role => 'admin')
+ end
+
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+ end
+
+ context 'with reader rights' do
+ before do
+ @project.relations.create :actor_id => @group.id, :actor_type => @group.class.to_s, :role => 'reader'
+ end
+
+ context 'group member user with reader role' do
+ before do
+ @group.actors.create(:actor_id => @user.id, :actor_type => 'User', :role => 'reader')
+ end
+ it_should_behave_like 'hooks user without project admin rights'
+
+ context 'user should has best role' do
+ before do
+ @project.relations.create :actor_id => @user.id, :actor_type => @user.class.to_s, :role => 'admin'
+ end
+ it_should_behave_like 'hooks user with project admin rights'
+ end
+ end
+
+ context 'group member user with admin role' do
+ before do
+ @group.actors.create(:actor_id => @user.id, :actor_type => 'User', :role => 'admin')
+ end
+ it_should_behave_like 'hooks user without project admin rights'
+ end
+ end
+ end
+ end
+end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 8785910f3..a541faecd 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -1,13 +1,14 @@
require 'spec_helper'
shared_context "issues controller" do
- before(:each) do
+ before do
stub_symlink_methods
- @project = FactoryGirl.create(:project)
+ @project = FactoryGirl.create(:project_with_commit)
@issue_user = FactoryGirl.create(:user)
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id)
+ @label = FactoryGirl.create(:label, :project_id => @project.id)
@project_with_turned_off_issues = FactoryGirl.create(:project, :has_issues => false)
@turned_of_issue = FactoryGirl.create(:issue, :project_id => @project_with_turned_off_issues.id, :assignee_id => @issue_user.id)
@@ -19,10 +20,10 @@ shared_context "issues controller" do
:owner_name => @project.owner.uname, :project_name => @project.name,
:issue => {
:title => "issue1",
- :body => "issue body"
- },
- :assignee_id => @issue_user.id,
- :assignee_uname => @issue_user.uname
+ :body => "issue body",
+ :labelings_attributes => { @label.id => {:label_id => @label.id}},
+ :assignee_id => @issue_user.id
+ }
}
@update_params = {
@@ -32,6 +33,11 @@ shared_context "issues controller" do
}
}
+ @pull = @project.pull_requests.new :issue_attributes => {:title => 'test', :body => 'testing'}
+ @pull.issue.user, @pull.issue.project = @project.owner, @pull.to_project
+ @pull.to_ref = 'master'
+ @pull.from_project, @pull.from_ref = @project, 'non_conflicts'
+ @pull.save
end
end
@@ -55,9 +61,7 @@ shared_examples_for 'issue user with project reader rights' do
get :index, :owner_name => @project.owner.uname, :project_name => @project.name
response.should render_template(:index)
end
-end
-shared_examples_for 'issue user with project writer rights' do
it 'should be able to perform create action' do
post :create, @create_params
response.should redirect_to(project_issues_path(@project))
@@ -68,6 +72,30 @@ shared_examples_for 'issue user with project writer rights' do
end
end
+shared_examples_for 'issue user with project writer rights' do
+ it 'should be able to perform index action on hidden project' do
+ @project.update_attributes(:visibility => 'hidden')
+ get :index, :owner_name => @project.owner.uname, :project_name => @project.name
+ response.should render_template(:index)
+ end
+
+ it 'should create issue object into db' do
+ lambda{ post :create, @create_params }.should change{ Issue.count }.by(1)
+ end
+
+ context 'perform create action' do
+ before { post :create, @create_params }
+
+ it 'user should be assigned to issue' do
+ @project.issues.last.assignee_id.should_not be_nil
+ end
+
+ it 'label should be attached to issue' do
+ @project.issues.last.labels.should have(1).item
+ end
+ end
+end
+
shared_examples_for 'user with issue update rights' do
it 'should be able to perform update action' do
put :update, {:id => @issue.serial_id}.merge(@update_params)
@@ -105,12 +133,12 @@ end
shared_examples_for 'project with issues turned off' do
it 'should not be able to perform index action' do
- get :index, :project_id => @project_with_turned_off_issues.id
+ get :index, :owner_name => @project_with_turned_off_issues.owner.uname, :project_name => @project_with_turned_off_issues.name
response.should redirect_to(forbidden_path)
end
it 'should not be able to perform show action' do
- get :show, :project_id => @project_with_turned_off_issues.id, :id => @turned_of_issue.serial_id
+ get :show, :owner_name => @project_with_turned_off_issues.owner.uname, :project_name => @project_with_turned_off_issues.name, :id => @turned_of_issue.serial_id
response.should redirect_to(forbidden_path)
end
end
@@ -166,11 +194,22 @@ describe Projects::IssuesController do
it_should_behave_like 'issue user with project guest rights'
it_should_behave_like 'issue user with project reader rights'
- it_should_behave_like 'issue user with project writer rights'
it_should_behave_like 'user without issue update rights'
it_should_behave_like 'project with issues turned off'
it_should_behave_like 'user without issue destroy rights'
+ context 'perform create action' do
+ before { post :create, @create_params }
+
+ it 'user should not be assigned to issue' do
+ @project.issues.last.assignee_id.should be_nil
+ end
+
+ it 'label should not be attached to issue' do
+ @project.issues.last.labels.should have(:no).items
+ end
+ end
+
# it 'should not be able to perform create action on project' do
# post :create, @create_params
# response.should redirect_to(forbidden_path)
@@ -179,6 +218,16 @@ describe Projects::IssuesController do
# it 'should not create issue object into db' do
# lambda{ post :create, @create_params }.should change{ Issue.count }.by(0)
# end
+
+ it 'should return 404' do
+ get :show, :owner_name => @project.owner.uname, :project_name => @project.name, :id => 999999
+ render_template(:file => "#{Rails.root}/public/404.html")
+ end
+
+ it 'should redirect to pull request page' do
+ get :show, :owner_name => @project.owner.uname, :project_name => @project.name, :id => @pull.serial_id
+ response.should redirect_to(project_pull_request_path(@project, @pull))
+ end
end
context 'for project writer user' do
diff --git a/spec/controllers/projects/projects_controller_spec.rb b/spec/controllers/projects/projects_controller_spec.rb
index 8fa430e6c..b1a5868e5 100644
--- a/spec/controllers/projects/projects_controller_spec.rb
+++ b/spec/controllers/projects/projects_controller_spec.rb
@@ -20,11 +20,10 @@ shared_examples_for 'projects user with reader rights' do
:group => group.id}.should change{ Project.count }.by(1)
end
- # it 'should be able to view project' do
- # get :show, :owner_name => @project.owner.uname, :project_name => @project.name
- # assigns(:project).should eq @project
- # end
-
+ it 'should be able to fork project with different name' do
+ post :fork, :owner_name => @project.owner.uname, :project_name => @project.name, :fork_name => 'another_name'
+ response.should redirect_to(project_path(Project.where(:name => 'another_name').last))
+ end
end
shared_examples_for 'projects user with project admin rights' do
@@ -60,6 +59,32 @@ shared_examples_for 'projects user without project admin rights' do
@project.reload.has_issues.should == has_issues
response.should redirect_to(forbidden_path)
end
+
+ it 'writer group should be able to fork project to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'writer')
+ lambda {post :fork, :owner_name => @project.owner.uname, :project_name => @project.name,
+ :group => group.id}.should change{ Project.count }.by(1)
+ end
+
+ it 'reader group should not be able to fork project to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ lambda {post :fork, :owner_name => @project.owner.uname, :project_name => @project.name,
+ :group => group.id}.should change{ Project.count }.by(0)
+ end
+
+ it 'writer group should be able to create project to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'writer')
+ lambda {post :create, @create_params.merge(:who_owns => 'group', :owner_id => group.id)}.should change{ Project.count }.by(1)
+ end
+
+ it 'reader group should not be able to create project to their group' do
+ group = FactoryGirl.create(:group)
+ group.actors.create(:actor_type => 'User', :actor_id => @user.id, :role => 'reader')
+ lambda {post :create, @create_params.merge(:who_owns => 'group', :owner_id => group.id)}.should change{ Project.count }.by(0)
+ end
end
describe Projects::ProjectsController do
@@ -76,7 +101,7 @@ describe Projects::ProjectsController do
set_session_for(@user)
end
- context 'for system users' do
+ context 'for users' do
context 'guest' do
@@ -137,11 +162,10 @@ describe Projects::ProjectsController do
group = FactoryGirl.create(:group, :owner => @user)
lambda { post :create, @create_params.merge({:who_owns => 'group', :owner_id => group.id})}.should change{ Project.count }.by(1)
end
-
end
end # context 'registered user'
- end # context 'for system users'
+ end # context 'for users'
context 'for project members' do
diff --git a/spec/controllers/projects/pull_requests_controller_spec.rb b/spec/controllers/projects/pull_requests_controller_spec.rb
index dfe2cea7f..526a6c33f 100644
--- a/spec/controllers/projects/pull_requests_controller_spec.rb
+++ b/spec/controllers/projects/pull_requests_controller_spec.rb
@@ -30,6 +30,8 @@ shared_context "pull request controller" do
@user = FactoryGirl.create(:user)
set_session_for(@user)
+
+ @issue = FactoryGirl.create(:issue, :project => @project)
end
end
@@ -93,12 +95,13 @@ end
shared_examples_for 'user with pull request update rights' do
it 'should be able to perform update action' do
put :update, @update_params
- response.should redirect_to(project_pull_request_path(@pull.to_project, @pull))
+ response.should be_success
end
it 'should be able to perform merge action' do
+ @pull.check
put :merge, @update_params
- response.should redirect_to(project_pull_request_path(@pull.to_project, @pull))
+ response.should be_success
end
let(:pull) { @project.pull_requests.find(@pull) }
@@ -134,11 +137,6 @@ shared_examples_for 'user without pull request update rights' do
response.should redirect_to(controller.current_user ? forbidden_path : new_user_session_path)
end
- it 'should not be able to perform merge action' do
- put :merge, @update_params
- response.should redirect_to(controller.current_user ? forbidden_path : new_user_session_path)
- end
-
let(:pull) { @project.pull_requests.find(@pull) }
it 'should not update pull request status' do
put :update, @update_params
@@ -153,12 +151,19 @@ shared_examples_for 'user without pull request update rights' do
put :update, @wrong_update_params
pull.issue.body.should_not =='updating'
end
+
+ it 'should be able to perform merge action' do
+ @pull.check
+ put :merge, @update_params
+ response.should_not be_success
+ end
+
end
shared_examples_for 'pull request when project with issues turned off' do
before { @project.update_attributes(:has_issues => false) }
it 'should be able to perform index action' do
- get :index, :project_id => @project.id
+ get :index, :owner_name => @project.owner.uname, :project_name => @project.name
response.should render_template(:index)
end
@@ -216,6 +221,16 @@ describe Projects::PullRequestsController do
it_should_behave_like 'pull request user with project reader rights'
it_should_behave_like 'user without pull request update rights'
it_should_behave_like 'pull request when project with issues turned off'
+
+ it 'should return 404' do
+ get :show, :owner_name => @project.owner.uname, :project_name => @project.name, :id => 999999
+ render_template(:file => "#{Rails.root}/public/404.html")
+ end
+
+ it 'should redirect to issue page' do
+ get :show, :owner_name => @project.owner.uname, :project_name => @project.name, :id => @issue.serial_id
+ response.should redirect_to(project_issue_path(@project, @issue))
+ end
end
context 'for project writer user' do
@@ -281,4 +296,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
diff --git a/spec/factories/build_lists.rb b/spec/factories/build_lists.rb
index 9f706d461..7ff38250d 100644
--- a/spec/factories/build_lists.rb
+++ b/spec/factories/build_lists.rb
@@ -21,15 +21,7 @@ FactoryGirl.define do
before(:create) { |bl| attach_project_to_build_list bl }
end
- factory :build_list_core, :parent => :build_list do
- bs_id { FactoryGirl.generate(:integer) }
- end
-
- factory :build_list_core_with_attaching_project, :parent => :build_list_core do
- before(:create) { |bl| attach_project_to_build_list bl }
- end
-
- factory :build_list_by_group_project, :parent => :build_list_core do
+ factory :build_list_by_group_project, :parent => :build_list do
project { |bl|
pr = FactoryGirl.create(:group_project_with_commit)
bl.save_to_platform.repositories.first.projects << pr
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
index 5de44fa25..ee85deacc 100644
--- a/spec/factories/comments.rb
+++ b/spec/factories/comments.rb
@@ -3,5 +3,7 @@ FactoryGirl.define do
body { FactoryGirl.generate(:string) }
association :user, :factory => :user
association :commentable, :factory => :issue
+ project { |c| c.commentable.project }
+ after(:create) { |c| c.send(:new_comment_notifications) }
end
end
diff --git a/spec/factories/hook.rb b/spec/factories/hook.rb
new file mode 100644
index 000000000..d7fa39637
--- /dev/null
+++ b/spec/factories/hook.rb
@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+FactoryGirl.define do
+ factory :hook do
+ name 'web'
+ association :project, :factory => :project
+ data { |hook| hook.data = {:url => 'url'} }
+ end
+end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index a0b075b09..66340557c 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -6,5 +6,9 @@ FactoryGirl.define do
association :user, :factory => :user
association :assignee, :factory => :user
status "open"
+ # Hooks for #after_commit
+ after(:create) { |i| i.send(:new_issue_notifications) }
+ after(:create) { |i| i.send(:send_assign_notifications) }
+ after(:create) { |i| i.send(:send_hooks) }
end
end
diff --git a/spec/factories/label.rb b/spec/factories/label.rb
new file mode 100644
index 000000000..b985a2d98
--- /dev/null
+++ b/spec/factories/label.rb
@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+FactoryGirl.define do
+ factory :label do
+ name { FactoryGirl.generate(:string) }
+ color 'FFF'
+ association :project, :factory => :project
+ end
+end
\ No newline at end of file
diff --git a/spec/factories/labeling.rb b/spec/factories/labeling.rb
new file mode 100644
index 000000000..51d1f6d70
--- /dev/null
+++ b/spec/factories/labeling.rb
@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+FactoryGirl.define do
+ factory :labeling do
+ association :project, :factory => :project
+ association :label, :factory => :label
+ end
+end
\ No newline at end of file
diff --git a/spec/factories/mass_build.rb b/spec/factories/mass_build.rb
index b73409fe0..dc6a08972 100644
--- a/spec/factories/mass_build.rb
+++ b/spec/factories/mass_build.rb
@@ -1,10 +1,9 @@
FactoryGirl.define do
factory :mass_build do
- association :platform
- #name FactoryGirl.generate(:name)
+ association :save_to_platform, :factory => :platform
association :user
projects_list "first"
- arches { [ Arch.first.id ] }
+ arches { [ Arch.find_or_create_by_name('x86_64').id ] }
auto_publish true
stop_build false
end
diff --git a/spec/factories/project_statistic.rb b/spec/factories/project_statistic.rb
new file mode 100644
index 000000000..ec381ef09
--- /dev/null
+++ b/spec/factories/project_statistic.rb
@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+FactoryGirl.define do
+ factory :project_statistic do
+ association :project, :factory => :project
+ association :arch, :factory => :arch
+ end
+end
diff --git a/spec/factories/token.rb b/spec/factories/token.rb
new file mode 100644
index 000000000..cee8561b5
--- /dev/null
+++ b/spec/factories/token.rb
@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+FactoryGirl.define do
+ factory :token do
+ association :creator, :factory => :user
+ end
+
+ factory :platform_token, :parent => :token do
+ association :subject, :factory => :platform
+ end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 2fe9899a1..4d06ab4f3 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -6,6 +6,7 @@ FactoryGirl.define do
password '123456'
password_confirmation {|u| u.password}
confirmed_at { Time.now.utc }
+ after(:create) { |u| u.send(:new_user_notification) }
end
factory :admin, :parent => :user do
diff --git a/spec/helpers/activity_feeds_helper_spec.rb b/spec/helpers/activity_feeds_helper_spec.rb
deleted file mode 100644
index 623c526ec..000000000
--- a/spec/helpers/activity_feeds_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the ActivityFeedsHelper. For example:
-#
-# describe ActivityFeedsHelper do
-# describe "string concat" do
-# it "concats two strings with spaces" do
-# helper.concat_strings("this","that").should == "this that"
-# end
-# end
-# end
-describe ActivityFeedsHelper do
- pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/integration/api_defender_spec.rb b/spec/integration/api_defender_spec.rb
index c369942af..ecc8e71ae 100644
--- a/spec/integration/api_defender_spec.rb
+++ b/spec/integration/api_defender_spec.rb
@@ -119,4 +119,18 @@ describe ApiDefender do
response.status.should == 200
end
end
+
+ context 'for allowed addresses' do
+ let(:remote_addr) { APP_CONFIG['allowed_addresses'].first }
+ it 'should not return the limit usage for allowed address' do
+ get "/api/v1/users/#{@user.id}.json", {}, {'REMOTE_ADDR' => remote_addr }
+ response.headers['X-RateLimit-Limit'].should_not == @rate_limit.to_s
+ end
+
+ it 'should not forbidden allowed address' do
+ (@rate_limit+1).times { get "/api/v1/users/#{@user.id}.json", {}, {'REMOTE_ADDR' => remote_addr } }
+ response.status.should == 200
+ end
+ end
+
end
diff --git a/spec/lib/abf-worker/build_lists_publish_task_manager_spec.rb b/spec/lib/abf-worker/build_lists_publish_task_manager_spec.rb
index dc95cea49..4a64ea82c 100644
--- a/spec/lib/abf-worker/build_lists_publish_task_manager_spec.rb
+++ b/spec/lib/abf-worker/build_lists_publish_task_manager_spec.rb
@@ -7,193 +7,172 @@ describe AbfWorker::BuildListsPublishTaskManager do
end
before do
- init_test_root
+ stub_redis
stub_symlink_methods
- FactoryGirl.create(:build_list_core, :new_core => true)
+ FactoryGirl.create(:build_list)
end
subject { AbfWorker::BuildListsPublishTaskManager }
- let(:build_list) { FactoryGirl.create(:build_list_core, :new_core => true) }
+ let(:build_list) { FactoryGirl.create(:build_list) }
- describe 'when no items for publishing' do
- before do
- stub_redis
- subject.new.run
- end
+ context 'when no items for publishing' do
+ before { subject.new.run }
- %w(RESIGN_REPOSITORIES
- PROJECTS_FOR_CLEANUP
+ %w(PROJECTS_FOR_CLEANUP
LOCKED_PROJECTS_FOR_CLEANUP
- LOCKED_REPOSITORIES
- LOCKED_REP_AND_PLATFORMS
LOCKED_BUILD_LISTS).each do |kind|
- it "ensure that no '#{kind.downcase.gsub('_', ' ')}'" do
+ it "ensures that no '#{kind.downcase.gsub('_', ' ')}'" do
@redis_instance.lrange(subject.const_get(kind), 0, -1).should be_empty
end
end
%w(publish_worker_default publish_worker).each do |kind|
- it "ensure that no tasks in '#{kind}' queue" do
+ it "ensures that no tasks in '#{kind}' queue" do
@redis_instance.lrange(kind, 0, -1).should be_empty
end
end
end
- describe 'when one build_list for publishing' do
+ context 'when one build_list for publishing' do
before do
- stub_redis
build_list.update_column(:status, BuildList::BUILD_PUBLISH)
2.times{ subject.new.run }
end
- %w(RESIGN_REPOSITORIES
- PROJECTS_FOR_CLEANUP
- LOCKED_PROJECTS_FOR_CLEANUP
- LOCKED_REPOSITORIES).each do |kind|
-
+ %w(PROJECTS_FOR_CLEANUP LOCKED_PROJECTS_FOR_CLEANUP).each do |kind|
it "ensure that no '#{kind.downcase.gsub('_', ' ')}'" do
@redis_instance.lrange(subject.const_get(kind), 0, -1).should be_empty
end
end
- it "ensure that 'locked rep and platforms' has only one item" do
- queue = @redis_instance.lrange(subject::LOCKED_REP_AND_PLATFORMS, 0, -1)
- queue.should have(1).item
- queue.should include("#{build_list.save_to_repository_id}-#{build_list.build_for_platform_id}")
+ it "ensures that repository_status has status publish" do
+ build_list.save_to_repository.repository_statuses.
+ find_by_platform_id(build_list.build_for_platform_id).publish?.
+ should be_true
end
- it "ensure that 'locked build lists' has only one item" do
+ it "ensures that 'locked build lists' has only one item" do
queue = @redis_instance.lrange(subject::LOCKED_BUILD_LISTS, 0, -1)
queue.should have(1).item
queue.should include(build_list.id.to_s)
end
- it "ensure that new task for publishing has been created" do
+ it "ensures that new task for publishing has been created" do
@redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(1).item
end
end
- describe 'grouping build lists for publishing into same repository' do
- let(:build_list2) { FactoryGirl.create(:build_list_core,
+ context 'grouping build lists for publishing into same repository' do
+ let(:build_list2) { FactoryGirl.create(:build_list,
:new_core => true,
:save_to_platform => build_list.save_to_platform,
:save_to_repository => build_list.save_to_repository,
:build_for_platform => build_list.build_for_platform
) }
before do
- stub_redis
build_list.update_column(:status, BuildList::BUILD_PUBLISH)
build_list2.update_column(:status, BuildList::BUILD_PUBLISH)
2.times{ subject.new.run }
end
- %w(RESIGN_REPOSITORIES
- PROJECTS_FOR_CLEANUP
- LOCKED_PROJECTS_FOR_CLEANUP
- LOCKED_REPOSITORIES).each do |kind|
-
- it "ensure that no '#{kind.downcase.gsub('_', ' ')}'" do
+ %w(PROJECTS_FOR_CLEANUP LOCKED_PROJECTS_FOR_CLEANUP).each do |kind|
+ it "ensures that no '#{kind.downcase.gsub('_', ' ')}'" do
@redis_instance.lrange(subject.const_get(kind), 0, -1).should be_empty
end
end
- it "ensure that 'locked rep and platforms' has only one item" do
- queue = @redis_instance.lrange(subject::LOCKED_REP_AND_PLATFORMS, 0, -1)
- queue.should have(1).item
- queue.should include("#{build_list.save_to_repository_id}-#{build_list.build_for_platform_id}")
+ it "ensures that only one repository_status has status publish" do
+ RepositoryStatus.where(:status => RepositoryStatus::PUBLISH).should have(1).item
end
- it "ensure that 'locked build lists' has 2 items" do
+ it "ensures that 'locked build lists' has 2 items" do
queue = @redis_instance.lrange(subject::LOCKED_BUILD_LISTS, 0, -1)
queue.should have(2).item
queue.should include(build_list.id.to_s, build_list2.id.to_s)
end
- it "ensure that new task for publishing has been created" do
+ it "ensures that new task for publishing has been created" do
@redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(1).item
end
end
- describe 'creates not more than 4 tasks for publishing' do
+ context 'creates not more than 4 tasks for publishing' do
before do
- stub_redis
build_list.update_column(:status, BuildList::BUILD_PUBLISH)
4.times {
- bl = FactoryGirl.create(:build_list_core, :new_core => true)
+ bl = FactoryGirl.create(:build_list, :new_core => true)
bl.update_column(:status, BuildList::BUILD_PUBLISH)
}
2.times{ subject.new.run }
end
- it "ensure that 'locked rep and platforms' has 4 items" do
- @redis_instance.lrange(subject::LOCKED_REP_AND_PLATFORMS, 0, -1).should have(4).items
+ it "ensures that 4 repository_statuses have status publish" do
+ RepositoryStatus.where(:status => RepositoryStatus::PUBLISH).should have(4).items
end
- it "ensure that 'locked build lists' has 4 items" do
+ it "ensures that 'locked build lists' has 4 items" do
@redis_instance.lrange(subject::LOCKED_BUILD_LISTS, 0, -1).should have(4).items
end
- it "ensure that new tasks for publishing has been created" do
+ it "ensures that new tasks for publishing has been created" do
@redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(4).items
end
end
- describe 'creates task for removing project from repository' do
+ context 'creates task for removing project from repository' do
before do
- stub_redis
build_list.update_column(:status, BuildList::BUILD_PUBLISHED)
FactoryGirl.create(:build_list_package, :build_list => build_list)
ProjectToRepository.where(:project_id => build_list.project_id, :repository_id => build_list.save_to_repository_id).destroy_all
2.times{ subject.new.run }
end
- %w(RESIGN_REPOSITORIES
- PROJECTS_FOR_CLEANUP
- LOCKED_REPOSITORIES
- LOCKED_BUILD_LISTS).each do |kind|
-
- it "ensure that no '#{kind.downcase.gsub('_', ' ')}'" do
+ %w(LOCKED_BUILD_LISTS).each do |kind|
+ it "ensures that no '#{kind.downcase.gsub('_', ' ')}'" do
@redis_instance.lrange(subject.const_get(kind), 0, -1).should be_empty
end
end
- it "ensure that 'locked rep and platforms' has only one item" do
- queue = @redis_instance.lrange(subject::LOCKED_REP_AND_PLATFORMS, 0, -1)
+ it "ensures that has only 'projects for cleanup' for testing subrepo" do
+ queue = @redis_instance.lrange(subject::PROJECTS_FOR_CLEANUP, 0, -1)
queue.should have(1).item
- queue.should include("#{build_list.save_to_repository_id}-#{build_list.build_for_platform_id}")
+ queue.should include("testing-#{build_list.project_id}-#{build_list.save_to_repository_id}-#{build_list.build_for_platform_id}")
end
- it "ensure that 'locked projects for cleanup' has only one item" do
+ it "ensures that only one repository_status has status publish" do
+ RepositoryStatus.where(:status => RepositoryStatus::PUBLISH).should have(1).item
+ end
+
+ it "ensures that 'locked projects for cleanup' has only one item" do
queue = @redis_instance.lrange(subject::LOCKED_PROJECTS_FOR_CLEANUP, 0, -1)
queue.should have(1).item
queue.should include("#{build_list.project_id}-#{build_list.save_to_repository_id}-#{build_list.build_for_platform_id}")
end
- it "ensure that new task for publishing has been created" do
+ it "ensures that new task for publishing has been created" do
@redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(1).item
end
end
- describe 'grouping build lists for publishing and tasks for removing project from repository' do
- let(:build_list2) { FactoryGirl.create(:build_list_core,
+ context 'grouping build lists for publishing and tasks for removing project from repository' do
+ let(:build_list2) { FactoryGirl.create(:build_list,
:new_core => true,
:save_to_platform => build_list.save_to_platform,
:save_to_repository => build_list.save_to_repository,
:build_for_platform => build_list.build_for_platform
) }
- let(:build_list3) { FactoryGirl.create(:build_list_core,
+ let(:build_list3) { FactoryGirl.create(:build_list,
:new_core => true,
:save_to_platform => build_list.save_to_platform,
:save_to_repository => build_list.save_to_repository,
:build_for_platform => build_list.build_for_platform
) }
before do
- stub_redis
build_list.update_column(:status, BuildList::BUILD_PUBLISH)
build_list2.update_column(:status, BuildList::BUILD_PUBLISHED)
build_list3.update_column(:status, BuildList::BUILD_PUBLISHED)
@@ -201,61 +180,48 @@ describe AbfWorker::BuildListsPublishTaskManager do
2.times{ subject.new.run }
end
- %w(RESIGN_REPOSITORIES
- PROJECTS_FOR_CLEANUP
- LOCKED_REPOSITORIES).each do |kind|
-
- it "ensure that no '#{kind.downcase.gsub('_', ' ')}'" do
- @redis_instance.lrange(subject.const_get(kind), 0, -1).should be_empty
- end
- end
-
- it "ensure that 'locked rep and platforms' has only one item" do
- queue = @redis_instance.lrange(subject::LOCKED_REP_AND_PLATFORMS, 0, -1)
+ it "ensures that no 'projects for cleanup' for main repo" do
+ queue = @redis_instance.lrange(subject::PROJECTS_FOR_CLEANUP, 0, -1)
queue.should have(1).item
- queue.should include("#{build_list.save_to_repository_id}-#{build_list.build_for_platform_id}")
+ queue.should include("testing-#{build_list3.project_id}-#{build_list3.save_to_repository_id}-#{build_list3.build_for_platform_id}")
end
- it "ensure that 'locked projects for cleanup' has only one item" do
+ it "ensures that only one repository_status has status publish" do
+ RepositoryStatus.where(:status => RepositoryStatus::PUBLISH).should have(1).item
+ end
+
+ it "ensures that 'locked projects for cleanup' has only one item" do
queue = @redis_instance.lrange(subject::LOCKED_PROJECTS_FOR_CLEANUP, 0, -1)
queue.should have(1).item
queue.should include("#{build_list3.project_id}-#{build_list3.save_to_repository_id}-#{build_list3.build_for_platform_id}")
end
- it "ensure that new task for publishing has been created" do
+ it "ensures that new task for publishing has been created" do
@redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(1).item
end
- it "ensure that 'locked build lists' has only one item" do
+ it "ensures that 'locked build lists' has only one item" do
queue = @redis_instance.lrange(subject::LOCKED_BUILD_LISTS, 0, -1)
queue.should have(1).item
queue.should include(build_list.id.to_s)
end
end
- describe 'resign packages in repository' do
+ context 'resign packages in repository' do
before do
- stub_redis
build_list.update_column(:status, BuildList::BUILD_PUBLISH)
FactoryGirl.create(:key_pair, :repository => build_list.save_to_repository)
2.times{ subject.new.run }
end
- %w(RESIGN_REPOSITORIES
- PROJECTS_FOR_CLEANUP
- LOCKED_PROJECTS_FOR_CLEANUP
- LOCKED_REP_AND_PLATFORMS
- LOCKED_BUILD_LISTS).each do |kind|
-
+ %w(PROJECTS_FOR_CLEANUP LOCKED_PROJECTS_FOR_CLEANUP LOCKED_BUILD_LISTS).each do |kind|
it "ensure that no '#{kind.downcase.gsub('_', ' ')}'" do
@redis_instance.lrange(subject.const_get(kind), 0, -1).should be_empty
end
end
- it "ensure that 'locked repositories' has only one item" do
- queue = @redis_instance.lrange(subject::LOCKED_REPOSITORIES, 0, -1)
- queue.should have(1).item
- queue.should include(build_list.save_to_repository_id.to_s)
+ it "ensures that only one repository_status has status resign" do
+ RepositoryStatus.where(:status => RepositoryStatus::RESIGN).should have(1).item
end
it "ensure that new task for resign has been created" do
@@ -264,6 +230,41 @@ describe AbfWorker::BuildListsPublishTaskManager do
end
+ context 'regenerate metadata' do
+ context 'for repository of main platform' do
+ let(:repository) { FactoryGirl.create(:repository) }
+ before do
+ repository.regenerate
+ subject.new.run
+ end
+
+ it "ensures that only one repository_status has status regenerating" do
+ RepositoryStatus.where(:status => RepositoryStatus::REGENERATING).should have(1).item
+ end
+
+ it 'ensures that new task has been created' do
+ @redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(1).item
+ end
+ end
+
+ context 'for repository of personal platform' do
+ let(:main_platform) { FactoryGirl.create(:platform) }
+ let(:repository) { FactoryGirl.create(:personal_repository) }
+ before do
+ repository.regenerate main_platform.id
+ subject.new.run
+ end
+
+ it "ensures that only one repository_status has status regenerating" do
+ RepositoryStatus.where(:status => RepositoryStatus::REGENERATING).should have(1).item
+ end
+
+ it 'ensures that new task has been created' do
+ @redis_instance.lrange('queue:publish_worker_default', 0, -1).should have(1).item
+ end
+ end
+
+ end
after(:all) do
APP_CONFIG['abf_worker']['publish_workers_count'] = @publish_workers_count
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 7183cced0..b0167e089 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -1,7 +1,6 @@
require "spec_helper"
describe UserMailer do
- pending "add some examples to (or delete) #{__FILE__}"
context 'On Issue create' do
before(:each) do
@@ -13,7 +12,7 @@ describe UserMailer do
any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user)
- @email = UserMailer.new_issue_notification(@issue, @issue_user).deliver
+ @email = UserMailer.new_issue_notification(@issue, @issue_user).deliver!
end
it 'should have correct subject' do
@@ -48,7 +47,7 @@ describe UserMailer do
any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user)
- @email = UserMailer.issue_assign_notification(@issue, @user).deliver
+ @email = UserMailer.issue_assign_notification(@issue, @user).deliver!
end
it 'should have correct subject' do
@@ -63,10 +62,6 @@ describe UserMailer do
@email.from.should == [APP_CONFIG['do-not-reply-email']]
end
- it 'should assign user name' do
- @email.body.encoded.should match(@user.name)
- end
-
it 'should assign issue title' do
@email.body.encoded.should match(@issue.title)
end
@@ -85,7 +80,7 @@ describe UserMailer do
@issue = FactoryGirl.create(:issue, :project_id => @project.id, :assignee_id => @issue_user.id, :user => @issue_user)
@comment = FactoryGirl.create(:comment, :commentable => @issue, :user_id => @user.id, :project => @project)
- @email = UserMailer.new_comment_notification(@comment, @issue_user).deliver
+ @email = UserMailer.new_comment_notification(@comment, @issue_user).deliver!
end
it 'should have correct subject' do
diff --git a/spec/models/advisory_spec.rb b/spec/models/advisory_spec.rb
index abbb38c8e..2f2e6f8ce 100644
--- a/spec/models/advisory_spec.rb
+++ b/spec/models/advisory_spec.rb
@@ -1,5 +1,47 @@
require 'spec_helper'
-describe Advisory do
- pending "add some examples to (or delete) #{__FILE__}"
+shared_examples_for 'attach advisory to build_list' do
+
+ it 'ensure that advisory has been attached to build_list' do
+ build_list.reload.advisory.should == advisory
+ end
+
+ it 'ensure that save_to_platform of build_list has been attached to advisory' do
+ build_list.save_to_platform.advisories.should include(advisory)
+ end
+
+ it 'ensure that projects of build_list has been attached to advisory' do
+ build_list.project.advisories.should include(advisory)
+ end
+
+end
+
+describe Advisory do
+ before { stub_symlink_methods }
+ context 'attach_build_list' do
+ let(:build_list) { FactoryGirl.create(:build_list) }
+
+ context 'attach new advisory to build_list' do
+ let(:advisory) { FactoryGirl.build(:advisory) }
+ before do
+ advisory.attach_build_list(build_list)
+ end
+
+ it_should_behave_like 'attach advisory to build_list'
+
+ it 'ensure that advisory has been created' do
+ Advisory.should have(1).item
+ end
+ end
+
+ context 'attach old advisory to build_list' do
+ let(:advisory) { FactoryGirl.create(:advisory) }
+ before do
+ advisory.attach_build_list(build_list)
+ end
+
+ it_should_behave_like 'attach advisory to build_list'
+ end
+
+ end
end
diff --git a/spec/models/build_list/package_spec.rb b/spec/models/build_list/package_spec.rb
new file mode 100644
index 000000000..3ed6e1c8c
--- /dev/null
+++ b/spec/models/build_list/package_spec.rb
@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe BuildList::Package do
+ before { stub_symlink_methods }
+
+ it 'is valid' do
+ FactoryGirl.create(:build_list_package).should be_persisted
+ end
+
+ context '#set_epoch' do
+ let(:package) { FactoryGirl.build(:build_list_package) }
+
+ ['', '(none)'].each do |epoch|
+ it "ensures that epoch is set to nil when epoch is '#{epoch}'" do
+ package.epoch = epoch
+ package.save
+ package.epoch.should be_nil
+ end
+
+ end
+
+ it "ensures that valid epoch has been setted" do
+ package.epoch = '55'
+ package.save
+ package.epoch.should == 55
+ end
+
+ end
+
+end
diff --git a/spec/models/build_list_spec.rb b/spec/models/build_list_spec.rb
index 7dd4dfbdc..6817f481b 100644
--- a/spec/models/build_list_spec.rb
+++ b/spec/models/build_list_spec.rb
@@ -1,6 +1,7 @@
require 'spec_helper'
describe BuildList do
+ before { stub_symlink_methods }
context 'validates that repository contains project' do
it 'when repository contains project' do
@@ -15,9 +16,8 @@ describe BuildList do
end
context "#notify_users" do
- before { stub_symlink_methods }
let!(:user) { FactoryGirl.create(:user) }
- let!(:build_list) { FactoryGirl.create(:build_list_core,
+ let!(:build_list) { FactoryGirl.create(:build_list,
:user => user,
:auto_publish => false) }
let!(:build_list_package) { FactoryGirl.create(:build_list_package,
@@ -140,7 +140,7 @@ describe BuildList do
it "doesn't get 2 notification by email when user associated to project and created task" do
project = FactoryGirl.create(:project_with_commit, :owner => user)
- bl = FactoryGirl.create(:build_list_core_with_attaching_project,
+ bl = FactoryGirl.create(:build_list_with_attaching_project,
:user => user,
:auto_publish => true,
:project => project
@@ -154,4 +154,83 @@ describe BuildList do
end # notify_users
+ context '#has_new_packages?' do
+ let!(:build_list) { FactoryGirl.create( :build_list,
+ :status => BuildList::SUCCESS,
+ :auto_publish => true) }
+ let!(:build_list_package) { FactoryGirl.create( :build_list_package,
+ :build_list => build_list,
+ :version => '3.1.12',
+ :release => 6,
+ :platform => build_list.save_to_platform,
+ :project => build_list.project) }
+ let!(:published_build_list) { FactoryGirl.create( :build_list,
+ :project => build_list.project,
+ :status => BuildList::BUILD_PUBLISHED,
+ :save_to_platform => build_list.save_to_platform,
+ :arch => build_list.arch) }
+ let!(:published_build_list_package) { FactoryGirl.create( :build_list_package,
+ :build_list => published_build_list,
+ :platform => published_build_list.save_to_platform,
+ :actual => true,
+ :version => '3.1.12',
+ :release => 6,
+ :project => published_build_list.project) }
+
+ it 'ensures that return false if version of packages are same and platform is released' do
+ build_list.save_to_platform.update_attributes(:released => true)
+ build_list.has_new_packages?.should be_false
+ end
+
+ it 'ensures that return true if version of packages are same and platform is not released' do
+ build_list.has_new_packages?.should be_true
+ end
+
+ context 'ensures that return false if version of published package >' do
+
+ it 'published: 3.1.13, new: 3.1.12' do
+ published_build_list_package.update_attributes(:version => '3.1.13')
+ build_list.has_new_packages?.should be_false
+ end
+
+ it 'published: 3.1.12, new: 3.0.999' do
+ build_list_package.update_attributes(:version => '3.0.999')
+ build_list.has_new_packages?.should be_false
+ end
+
+ it 'published: 3.0.0, new: 3.0.rc1' do
+ published_build_list_package.update_attributes(:version => '3.0.0')
+ build_list_package.update_attributes(:version => '3.0.rc1')
+ build_list.has_new_packages?.should be_false
+ end
+
+ end
+
+ context 'ensures that return true if version of published package <' do
+
+ it 'published: 3.1.11, new: 3.1.12' do
+ published_build_list_package.update_attributes(:version => '3.1.11')
+ build_list.has_new_packages?.should be_true
+ end
+
+ it 'published: 3.0.999, new: 3.1.12' do
+ published_build_list_package.update_attributes(:version => '3.0.999')
+ build_list.has_new_packages?.should be_true
+ end
+
+ it 'published: 3.0.rc1, new: 3.0.0' do
+ published_build_list_package.update_attributes(:version => '3.0.rc1')
+ build_list_package.update_attributes(:version => '3.0.0')
+ build_list.has_new_packages?.should be_true
+ end
+
+ end
+
+ it 'ensures that return true if release of published package <' do
+ published_build_list_package.update_attributes(:release => 5)
+ build_list.has_new_packages?.should be_true
+ end
+
+ end
+
end
diff --git a/spec/models/cancan_spec.rb b/spec/models/cancan_spec.rb
index 8cdc804da..8474e9697 100644
--- a/spec/models/cancan_spec.rb
+++ b/spec/models/cancan_spec.rb
@@ -2,12 +2,12 @@ require 'spec_helper'
require "cancan/matchers"
def admin_create
- @admin = FactoryGirl.create(:admin)
+ @admin = FactoryGirl.create(:admin)
@ability = Ability.new(@admin)
end
def user_create
- @user = FactoryGirl.create(:user)
+ @user = FactoryGirl.create(:user)
@ability = Ability.new(@user)
end
@@ -16,47 +16,46 @@ def guest_create
end
describe CanCan do
-
- let(:personal_platform) { FactoryGirl.create(:platform, :platform_type => 'personal') }
- let(:personal_repository) { FactoryGirl.create(:personal_repository) }
- let(:open_platform) { FactoryGirl.create(:platform, :visibility => 'open') }
- let(:hidden_platform) { FactoryGirl.create(:platform, :visibility => 'hidden') }
- let(:register_request) { FactoryGirl.create(:register_request) }
+ let(:open_platform) { FactoryGirl.create(:platform, :visibility => 'open') }
before(:each) do
stub_symlink_methods
end
- context 'Site admin' do
- before(:each) do
- admin_create
- end
-
- it 'should manage all' do
- #(@ability.can? :manage, :all).should be_true
- @ability.should be_able_to(:manage, :all)
- end
-
- it 'should not be able to destroy personal platforms' do
- @ability.should_not be_able_to(:destroy, personal_platform)
- end
-
- it 'should not be able to destroy personal repositories' do
- @ability.should_not be_able_to(:destroy, personal_repository)
- end
- end
-
- context 'Site guest' do
- before(:each) do
- guest_create
- end
-
- it 'should not be able to read open platform' do
- @ability.should_not be_able_to(:read, open_platform)
+ context 'Site admin' do
+ let(:personal_platform) { FactoryGirl.create(:platform, :platform_type => 'personal') }
+ let(:personal_repository_main) { FactoryGirl.create(:personal_repository, :name => 'main') }
+ let(:personal_repository) { FactoryGirl.create(:personal_repository) }
+ before(:each) do
+ admin_create
end
- it 'should not be able to read hidden platform' do
- @ability.should_not be_able_to(:read, hidden_platform)
+ it 'should manage all' do
+ #(@ability.can? :manage, :all).should be_true
+ @ability.should be_able_to(:manage, :all)
+ end
+
+ it 'should not be able to destroy personal platforms' do
+ @ability.should_not be_able_to(:destroy, personal_platform)
+ end
+
+ it 'should not be able to destroy personal repositories with name "main"' do
+ @ability.should_not be_able_to(:destroy, personal_repository_main)
+ end
+ it 'should be able to destroy personal repositories with name not "main"' do
+ @ability.should be_able_to(:destroy, personal_repository)
+ end
+ end
+
+ context 'Site guest' do
+ let(:register_request) { FactoryGirl.create(:register_request) }
+
+ before(:each) do
+ guest_create
+ end
+
+ it 'should not be able to read open platform' do
+ @ability.should_not be_able_to(:read, open_platform)
end
[:publish, :cancel, :reject_publish, :create_container].each do |action|
@@ -65,6 +64,12 @@ describe CanCan do
end
end
+ [:mass_import, :run_mass_import].each do |action|
+ it "should not be able to #{ action } project" do
+ @ability.should_not be_able_to(action, Project)
+ end
+ end
+
it 'should not be able to update register request' do
@ability.should_not be_able_to(:update, register_request)
end
@@ -77,10 +82,10 @@ describe CanCan do
@ability.should_not be_able_to(:destroy, register_request)
end
- pending 'should be able to register new user' do # while self registration is closed
- @ability.should be_able_to(:create, User)
- end
- end
+ pending 'should be able to register new user' do # while self registration is closed
+ @ability.should be_able_to(:create, User)
+ end
+ end
context 'Site user' do
before(:each) do
@@ -88,11 +93,17 @@ describe CanCan do
end
[Platform, Repository].each do |model_name|
- it "should not be able to read #{model_name}" do
+ it "should be able to read #{model_name}" do
@ability.should be_able_to(:read, model_name)
end
end
+ [:mass_import, :run_mass_import].each do |action|
+ it "should not be able to #{ action } project" do
+ @ability.should_not be_able_to(action, Project)
+ end
+ end
+
it "shoud be able to show user profile" do
@ability.should be_able_to(:show, User)
end
@@ -228,6 +239,27 @@ describe CanCan do
end
end
+ context 'through group-member' do
+ before(:each) do
+ @group_member = FactoryGirl.create(:group)
+ @project.relations.create!(:actor_id => @group_member.id, :actor_type => 'Group', :role => 'reader')
+ @group_member_ability = Ability.new(@group_member.owner)
+ end
+
+ it 'should be able to read open project' do
+ @group_member_ability.should be_able_to(:read, @project)
+ end
+
+ it 'should be able to read closed project' do
+ @project.update_attribute :visibility, 'hidden'
+ @group_member_ability.should be_able_to(:read, @project)
+ end
+
+ it 'should include hidden project in list' do
+ @project.update_attribute :visibility, 'hidden'
+ Project.accessible_by(@group_member_ability, :show).where(:projects => {:id => @project.id}).count.should == 1
+ end
+ end
end
context 'platform relations' do
@@ -239,9 +271,16 @@ describe CanCan do
before(:each) do
@platform.owner = @user
@platform.save
+ @ability = Ability.new(@user)
end
- [:read, :update, :destroy].each do |action|
+ [:mass_import, :run_mass_import].each do |action|
+ it "should be able to #{ action } project" do
+ @ability.should be_able_to(action, Project)
+ end
+ end
+
+ [:read, :update, :destroy, :change_visibility].each do |action|
it "should be able to #{action} platform" do
@ability.should be_able_to(action, @platform)
end
@@ -251,6 +290,13 @@ describe CanCan do
context 'with read rights' do
before(:each) do
@platform.relations.create!(:actor_id => @user.id, :actor_type => 'User', :role => 'reader')
+ @ability = Ability.new(@user)
+ end
+
+ [:mass_import, :run_mass_import].each do |action|
+ it "should not be able to #{ action } project" do
+ @ability.should_not be_able_to(action, Project)
+ end
end
it "should be able to read platform" do
@@ -270,7 +316,7 @@ describe CanCan do
@repository.platform.save
end
- [:read, :create, :update, :destroy, :add_project, :remove_project, :change_visibility, :settings].each do |action|
+ [:read, :create, :update, :destroy, :add_project, :remove_project, :settings].each do |action|
it "should be able to #{action} repository" do
@ability.should be_able_to(action, @repository)
end
diff --git a/spec/models/comment_for_commit_spec.rb b/spec/models/comment_for_commit_spec.rb
index 417995b8f..9ebc36b1f 100644
--- a/spec/models/comment_for_commit_spec.rb
+++ b/spec/models/comment_for_commit_spec.rb
@@ -5,6 +5,10 @@ def create_comment user
FactoryGirl.create(:comment, :user => user, :commentable => @commit, :project => @project)
end
+def create_comment_in_commit commit, project, body
+ FactoryGirl.create(:comment, :user => @user, :commentable => commit, :project => project, :body => body)
+end
+
def set_comments_data_for_commit
@ability = Ability.new(@user)
@@ -262,5 +266,63 @@ describe Comment do
should_not_send_email(commentor: @user)
end
end
+
+ context 'automatic issue linking' do
+ before(:each) do
+ @same_name_project = FactoryGirl.create(:project, :name => @project.name)
+ @issue_in_same_name_project = FactoryGirl.create(:issue, :project => @same_name_project, :user => @same_name_project.owner)
+ @another_project = FactoryGirl.create(:project, :owner => @user)
+ @other_user_project = FactoryGirl.create(:project)
+ @issue = FactoryGirl.create(:issue, :project => @project, :user => @user)
+ @second_issue = FactoryGirl.create(:issue, :project => @project, :user => @user)
+ @issue_in_another_project = FactoryGirl.create(:issue, :project => @another_project, :user => @user)
+ @issue_in_other_user_project = FactoryGirl.create(:issue, :project => @other_user_project, :user => @other_user_project.owner)
+ end
+
+ it 'should create automatic comment' do
+ create_comment_in_commit(@commit, @project, "test link to ##{@issue.serial_id}; [##{@second_issue.serial_id}]")
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @second_issue.id,
+ :created_from_commit_hash => @commit.id.hex).count.should == 1
+ end
+
+ it 'should create automatic comment in the another project issue' do
+ body = "[#{@another_project.name_with_owner}##{@issue_in_another_project.serial_id}]"
+ create_comment_in_commit(@commit, @project, body)
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @issue_in_another_project.id,
+ :created_from_commit_hash => @commit.id.hex).count.should == 1
+ end
+
+ it 'should create automatic comment in the same name project issue' do
+ body = "[#{@same_name_project.owner.uname}##{@issue_in_same_name_project.serial_id}]"
+ create_comment_in_commit(@commit, @project, body)
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @issue_in_same_name_project.id,
+ :created_from_commit_hash => @commit.id.hex).count.should == 1
+ end
+
+ it 'should not create duplicate automatic comment' do
+ create_comment_in_commit(@commit, @project, "test link to [##{@second_issue.serial_id}]")
+ create_comment_in_commit(@commit, @project, "test duplicate link to [##{@second_issue.serial_id}]")
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @second_issue.id,
+ :created_from_commit_hash => @commit.id.hex).count.should == 1
+ end
+
+ it 'should not create duplicate automatic comment from one' do
+ create_comment_in_commit(@commit, @project, "test link to [##{@second_issue.serial_id}]; ##{@second_issue.serial_id}")
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @second_issue.id,
+ :created_from_commit_hash => @commit.id.hex).count.should == 1
+ end
+ it 'should create two automatic comment' do
+ body = "test ##{@second_issue.serial_id}" +
+ " && [#{@another_project.name_with_owner}##{@issue_in_another_project.serial_id}]"
+ create_comment_in_commit(@commit, @project, body)
+ Comment.where(:automatic => true,
+ :created_from_commit_hash => @commit.id.hex).count.should == 2
+ end
+ end
end
end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 47e8db74e..713bb6497 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -13,6 +13,10 @@ def set_commentable_data
any_instance_of(Project, :versions => ['v1.0', 'v2.0'])
end
+def create_comment_in_issue issue, body
+ FactoryGirl.create(:comment, :user => issue.user, :commentable => issue, :project => issue.project, :body => body)
+end
+
describe Comment do
before { stub_symlink_methods }
context 'for global admin user' do
@@ -99,5 +103,95 @@ describe Comment do
@comment.should_not allow_mass_assignment_of :project_id
end
end
+
+ context 'automatic issue linking' do
+ before(:each) do
+ @same_name_project = FactoryGirl.create(:project, :name => @project.name)
+ @issue_in_same_name_project = FactoryGirl.create(:issue, :project => @same_name_project, :user => @same_name_project.owner)
+ @another_project = FactoryGirl.create(:project, :owner => @user)
+ @other_user_project = FactoryGirl.create(:project)
+ @issue = FactoryGirl.create(:issue, :project => @project, :user => @user)
+ @second_issue = FactoryGirl.create(:issue, :project => @project, :user => @user)
+ @issue_in_another_project = FactoryGirl.create(:issue, :project => @another_project, :user => @user)
+ @issue_in_other_user_project = FactoryGirl.create(:issue, :project => @other_user_project, :user => @other_user_project.owner)
+ end
+
+ it 'should create automatic comment' do
+ create_comment_in_issue(@issue, "test link to ##{@issue.serial_id}; [##{@second_issue.serial_id}]")
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @second_issue.id,
+ :created_from_issue_id => @issue.id).count.should == 1
+ end
+
+ it 'should not create automatic comment to the same issue' do
+ create_comment_in_issue(@issue, "test link to ##{@issue.serial_id}; [##{@second_issue.serial_id}]")
+ Comment.where(:automatic => true,
+ :created_from_issue_id => @issue.id).count.should == 1
+ end
+
+ it 'should create automatic comment in the another project issue' do
+ body = "[#{@another_project.name_with_owner}##{@issue_in_another_project.serial_id}]"
+ create_comment_in_issue(@issue, body)
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @issue_in_another_project.id,
+ :created_from_issue_id => @issue.id).count.should == 1
+ end
+
+ it 'should create automatic comment in the same name project issue' do
+ body = "[#{@same_name_project.owner.uname}##{@issue_in_same_name_project.serial_id}]"
+ create_comment_in_issue(@issue, body)
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @issue_in_same_name_project.id,
+ :created_from_issue_id => @issue.id).count.should == 1
+ end
+
+ it 'should not create duplicate automatic comment' do
+ create_comment_in_issue(@issue, "test link to [##{@second_issue.serial_id}]")
+ create_comment_in_issue(@issue, "test duplicate link to [##{@second_issue.serial_id}]")
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @second_issue.id,
+ :created_from_issue_id => @issue.id).count.should == 1
+ end
+
+ it 'should not create duplicate automatic comment from one' do
+ create_comment_in_issue(@issue, "test link to [##{@second_issue.serial_id}]; ##{@second_issue.serial_id}")
+ Comment.where(:automatic => true, :commentable_type => 'Issue',
+ :commentable_id => @second_issue.id,
+ :created_from_issue_id => @issue.id).count.should == 1
+ end
+
+ it 'should create two automatic comment' do
+ body = "test ##{@second_issue.serial_id}" +
+ " && [#{@another_project.name_with_owner}##{@issue_in_another_project.serial_id}]"
+ create_comment_in_issue(@issue, body)
+ Comment.where(:automatic => true,
+ :created_from_issue_id => @issue.id).count.should == 2
+ end
+
+ it 'should create automatic comment by issue title' do
+ issue = FactoryGirl.create(:issue, :project => @project, :user => @user,
+ :title => "link to ##{@issue.serial_id}")
+ Comment.where(:automatic => true,
+ :created_from_issue_id => issue.id).count.should == 1
+ end
+
+ it 'should create automatic comment from issue body' do
+ issue = FactoryGirl.create(:issue, :project => @project, :user => @user,
+ :body => "link to ##{@issue.serial_id}")
+ Comment.where(:automatic => true,
+ :created_from_issue_id => issue.id).count.should == 1
+ end
+
+ it 'should create only one automatic comment from issue title and body' do
+ issue = FactoryGirl.create(:issue, :project => @project, :user => @user,
+ :title => "link to ##{@issue.serial_id} in title",
+ :body => "link to ##{@issue.serial_id} in body")
+ Comment.where(:automatic => true,
+ :created_from_issue_id => issue.id).count.should == 1
+ end
+
+
+
+ end
end
end
diff --git a/spec/models/activity_feed_observer_spec.rb b/spec/models/hook_spec.rb
similarity index 71%
rename from spec/models/activity_feed_observer_spec.rb
rename to spec/models/hook_spec.rb
index 378ee2377..42515cea0 100644
--- a/spec/models/activity_feed_observer_spec.rb
+++ b/spec/models/hook_spec.rb
@@ -1,5 +1,5 @@
require 'spec_helper'
-describe ActivityFeedObserver do
+describe Hook do
pending "add some examples to (or delete) #{__FILE__}"
end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index ba688a33d..2ea3e032c 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -32,6 +32,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
@@ -40,8 +65,8 @@ describe Issue do
@project = FactoryGirl.create(:project, :owner => @user)
@group = FactoryGirl.create(:group)
- reader = FactoryGirl.create :user
- @group.actors.create(:actor_type => 'User', :actor_id => reader.id, :role => 'reader')
+ @reader = FactoryGirl.create :user
+ @group.actors.create(:actor_type => 'User', :actor_id => @reader.id, :role => 'reader')
end
it 'should send an e-mail to all members of the admin group' do
@@ -64,6 +89,32 @@ describe Issue do
create_issue(@stranger)
ActionMailer::Base.deliveries.count.should == 1 # 1 project owner
end
+
+ it 'should reset issue assignee after remove him from group' do
+ @project.relations.create!(:actor_type => 'Group', :actor_id => @group.id, :role => 'reader')
+ create_issue(@group.owner)
+ @issue.update_column :assignee_id, @reader.id
+ @group.remove_member @reader
+ @issue.reload.assignee_id.should == nil
+ end
+
+ it 'should not reset issue assignee' do
+ @project.relations.create!(:actor_type => 'Group', :actor_id => @group.id, :role => 'reader')
+ @project.relations.create!(:actor_type => 'User', :actor_id => @reader.id, :role => 'reader')
+ create_issue(@group.owner)
+ @issue.update_column :assignee_id, @reader.id
+ @group.remove_member @reader
+ @issue.reload.assignee_id.should == @reader.id
+ end
+
+ it 'should reset issue assignee after remove him from project' do
+ @project.relations.create!(:actor_type => 'User', :actor_id => @reader.id, :role => 'reader')
+ create_issue(@reader)
+ @issue.update_column :assignee_id, @reader.id
+ @project.remove_member @reader # via api
+ @issue.reload.assignee_id.should == nil
+ end
+
end
context 'Group project' do
diff --git a/spec/models/mass_build_spec.rb b/spec/models/mass_build_spec.rb
index e7bb6c4d2..3e213af38 100644
--- a/spec/models/mass_build_spec.rb
+++ b/spec/models/mass_build_spec.rb
@@ -1,5 +1,41 @@
require 'spec_helper'
describe MassBuild do
- pending "add some examples to (or delete) #{__FILE__}"
+ before { stub_symlink_methods }
+
+ context 'ensures that validations and associations exist' do
+ before do
+ # Need for validate_uniqueness_of check
+ FactoryGirl.create(:mass_build)
+ end
+
+ it { should belong_to(:build_for_platform) }
+ it { should belong_to(:save_to_platform) }
+ it { should belong_to(:user) }
+ it { should have_many(:build_lists)}
+
+ it { should validate_presence_of(:save_to_platform_id)}
+ it { should validate_presence_of(:build_for_platform_id)}
+ it { should validate_presence_of(:user_id)}
+ it { should validate_presence_of(:arch_names)}
+ it { should validate_presence_of(:name)}
+
+ it { should validate_presence_of(:projects_list)}
+ it { should ensure_length_of(:projects_list).is_at_most(500_000) }
+
+
+ it { should_not allow_mass_assignment_of(:name) }
+ it { should_not allow_mass_assignment_of(:arch_names) }
+ end
+
+ it 'ensures that projects_list contains unique projects' do
+ projects_list = %(at
+ at
+ ab
+ )
+ mass_build = FactoryGirl.create(:mass_build, :projects_list => projects_list)
+ list = mass_build.projects_list.split(/[\r]*\n/)
+ list.should have(2).items
+ list.should include('at', 'ab')
+ end
end
diff --git a/spec/models/platform_content.rb b/spec/models/platform_content.rb
new file mode 100644
index 000000000..1edb31e8f
--- /dev/null
+++ b/spec/models/platform_content.rb
@@ -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
diff --git a/spec/models/platform_spec.rb b/spec/models/platform_spec.rb
index 6eabc8798..0a7b5eb3c 100644
--- a/spec/models/platform_spec.rb
+++ b/spec/models/platform_spec.rb
@@ -1,48 +1,70 @@
require 'spec_helper'
describe Platform do
- before(:all) do
- stub_symlink_methods
- Platform.delete_all
- User.delete_all
- init_test_root
- # Need for validate_uniqueness_of check
- FactoryGirl.create(:platform)
+ before { stub_symlink_methods }
+
+ context 'ensures that validations and associations exist' do
+ before do
+ # Need for validate_uniqueness_of check
+ FactoryGirl.create(:platform)
+ end
+
+ it { should belong_to(:owner) }
+ it { should have_many(:members)}
+ it { should have_many(:repositories)}
+ it { should have_many(:products)}
+
+ it { should validate_presence_of(:name)}
+ it { should validate_uniqueness_of(:name).case_insensitive }
+ it { should allow_value('Basic_platform-name-1234').for(:name) }
+ it { should_not allow_value('.!').for(:name) }
+ it { should validate_presence_of(:description) }
+ it { should validate_presence_of(:distrib_type) }
+ it { should validate_presence_of(:visibility) }
+
+ Platform::VISIBILITIES.each do |value|
+ it {should allow_value(value).for(:visibility)}
+ end
+ it {should_not allow_value('custom_status').for(:visibility)}
+
+ it { should have_readonly_attribute(:name) }
+ it { should have_readonly_attribute(:distrib_type) }
+ it { should have_readonly_attribute(:parent_platform_id) }
+ it { should have_readonly_attribute(:platform_type) }
+
+ it { should_not allow_mass_assignment_of(:repositories) }
+ it { should_not allow_mass_assignment_of(:products) }
+ it { should_not allow_mass_assignment_of(:members) }
+ it { should_not allow_mass_assignment_of(:parent) }
+
+ it {should_not allow_value("How do you do...\nmy_platform").for(:name)}
end
- it { should belong_to(:owner) }
- it { should have_many(:members)}
- it { should have_many(:repositories)}
- it { should have_many(:products)}
-
- it { should validate_presence_of(:name)}
- it { should validate_uniqueness_of(:name).case_insensitive }
- it { should validate_format_of(:name).with('Basic_platform-name-1234') }
- it { should validate_format_of(:name).not_with('.!') }
- it { should validate_presence_of(:description) }
- it { should validate_presence_of(:distrib_type) }
- it { should validate_presence_of(:visibility) }
-
- Platform::VISIBILITIES.each do |value|
- it {should allow_value(value).for(:visibility)}
+ it 'ensures that folder of platform will be removed after destroy' do
+ platform = FactoryGirl.create :platform
+ FileUtils.mkdir_p platform.path
+ platform.destroy
+ Dir.exists?(platform.path).should be_false
end
- it {should_not allow_value('custom_status').for(:visibility)}
- it { should have_readonly_attribute(:name) }
- it { should have_readonly_attribute(:distrib_type) }
- it { should have_readonly_attribute(:parent_platform_id) }
- it { should have_readonly_attribute(:platform_type) }
-
- it { should_not allow_mass_assignment_of(:repositories) }
- it { should_not allow_mass_assignment_of(:products) }
- it { should_not allow_mass_assignment_of(:members) }
- it { should_not allow_mass_assignment_of(:parent) }
-
- it {should_not allow_value("How do you do...\nmy_platform").for(:name)}
-
- after(:all) do
- Platform.delete_all
- User.delete_all
- clear_test_root
+ it 'ensures that owner of personal platform can not be changed' do
+ platform = FactoryGirl.create :personal_platform
+ owner = platform.owner
+ platform.owner = FactoryGirl.create :user
+ platform.save.should be_false
end
+
+ it 'ensures that owner of platform of group can not be changed' do
+ group = FactoryGirl.create :group
+ platform = FactoryGirl.create :personal_platform, :owner => group
+ platform.owner = FactoryGirl.create :user
+ platform.save.should be_false
+ end
+
+ it 'ensures that owner of main platform can be changed' do
+ platform = FactoryGirl.create :platform
+ platform.owner = FactoryGirl.create :user
+ platform.save.should be_true
+ end
+
end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 31bd3b874..8aec0a4e3 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1,11 +1,16 @@
require 'spec_helper'
describe Project do
- before do
- stub_symlink_methods
- @root_project = FactoryGirl.create(:project)
- @child_project = @root_project.fork(FactoryGirl.create(:user))
- @child_child_project = @child_project.fork(FactoryGirl.create(:user))
+ before { stub_symlink_methods }
+
+ context 'creation' do
+ let(:root_project) { FactoryGirl.create(:project) }
+ let(:child_project) { root_project.fork(FactoryGirl.create(:user)) }
+ let(:child_child_project) { child_project.fork(FactoryGirl.create(:user)) }
+
+ it { root_project }
+ it { child_project }
+ it { child_child_project }
end
context 'for destroy' do
@@ -85,4 +90,95 @@ describe Project do
lambda {FactoryGirl.create(:project, :name => "...\nbeatiful_name\n for project")}.should raise_error(ActiveRecord::RecordInvalid)
end
end
+
+ it 'ensures that path to git repository has been changed after rename of project' do
+ project = FactoryGirl.create(:project_with_commit)
+ project.update_attributes(:name => "#{project.name}-new")
+ Dir.exists?(project.path).should be_true
+ end
+
+ context 'manage branches' do
+ let!(:project) { FactoryGirl.create(:project_with_commit) }
+ let(:branch) { project.repo.branches.detect{|b| b.name == 'conflicts'} }
+ let(:master) { project.repo.branches.detect{|b| b.name == 'master'} }
+ let(:user) { FactoryGirl.create(:user) }
+ before { stub_redis }
+
+ context '#delete_branch' do
+ it 'ensures that returns true on success' do
+ project.delete_branch(branch, user).should be_true
+ end
+
+ it 'ensures that branch has been deleted' do
+ lambda { project.delete_branch(branch, user) }.should change{ project.repo.branches.count }.by(-1)
+ end
+
+ it 'ensures that returns false on delete master' do
+ project.delete_branch(master, user).should be_false
+ end
+
+ it 'ensures that master has not been deleted' do
+ lambda { project.delete_branch(master, user) }.should change{ project.repo.branches.count }.by(0)
+ end
+
+ it 'ensures that returns false on delete wrong branch' do
+ project.delete_branch(branch, user)
+ project.delete_branch(branch, user).should be_false
+ end
+ end
+
+ context '#create_branch' do
+ before do
+ project.delete_branch(branch, user)
+ end
+
+ it 'ensures that returns true on success' do
+ project.create_branch(branch.name, branch.commit.id, user).should be_true
+ end
+
+ it 'ensures that branch has been created' do
+ lambda { project.create_branch(branch.name, branch.commit.id, user) }.should change{ project.repo.branches.count }.by(1)
+ end
+
+ it 'ensures that returns false on create wrong branch' do
+ project.create_branch(branch.name, GitHook::ZERO, user).should be_false
+ end
+ end
+
+ end
+
+ context '#replace_release_tag' do
+
+ [
+ ['Release: %mkrel 4mdk', 'Release: 5mdk'],
+ ['Release: 4', 'Release: 5'],
+ ['Release: 4.1', 'Release: 4.2'],
+ ['Release: 5.4.2', 'Release: 5.4.3'],
+ ['Release: 5.4.2mdk', 'Release: 5.4.3mdk'],
+ ['Release: %mkrel 5.4.31mdk', 'Release: 5.4.32mdk'],
+ ['%define release %mkrel 4mdk', '%define release 5mdk'],
+ ['%define release 4', '%define release 5'],
+ ['%define release 4.1', '%define release 4.2'],
+ ['%define release 5.4.2', '%define release 5.4.3'],
+ ['%define release 5.4.31mdk', '%define release 5.4.32mdk']
+ ].each do |items|
+ it "ensures that replace '#{items[0]}' => '#{items[1]}'" do
+ Project.replace_release_tag(items[0]).should == items[1]
+ end
+ end
+ end
+
+ it '#run_mass_import' do
+ owner = FactoryGirl.create(:user)
+ repository = FactoryGirl.create(:repository)
+ url = 'http://abf-downloads.rosalinux.ru/abf_personal/repository/test-mass-import'
+ visibility = 'open'
+
+ Project.run_mass_import(url, "abf-worker-service-1-3.src.rpm\nredir-2.2.1-7.res6.src.rpm\n", visibility, owner, repository.id)
+
+ Project.count.should == 2
+ repository.projects.should have(2).items
+ owner.projects.should have(2).items
+ end
+
end
diff --git a/spec/models/project_statistic_spec.rb b/spec/models/project_statistic_spec.rb
new file mode 100644
index 000000000..e13a0ec20
--- /dev/null
+++ b/spec/models/project_statistic_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe ProjectStatistic do
+
+ context 'ensures that validations and associations exist' do
+ it { should belong_to(:project) }
+ it { should belong_to(:arch) }
+
+ it { should validate_presence_of(:project_id) }
+ it { should validate_presence_of(:arch_id) }
+ it { should validate_presence_of(:average_build_time) }
+ it { should validate_presence_of(:build_count) }
+
+ it { should_not allow_mass_assignment_of(:project_id) }
+ it { should_not allow_mass_assignment_of(:arch_id) }
+
+ it 'uniqueness of project_id and arch_id' do
+ FactoryGirl.create(:project_statistic)
+ should validate_uniqueness_of(:project_id).scoped_to(:arch_id)
+ end
+
+ end
+
+end
diff --git a/spec/models/project_to_repository_spec.rb b/spec/models/project_to_repository_spec.rb
index fd595d3b1..437ca789e 100644
--- a/spec/models/project_to_repository_spec.rb
+++ b/spec/models/project_to_repository_spec.rb
@@ -20,7 +20,8 @@ describe ProjectToRepository do
stub_redis
@first_repo.project_to_repositories.destroy_all
queue = @redis_instance.lrange(AbfWorker::BuildListsPublishTaskManager::PROJECTS_FOR_CLEANUP, 0, -1)
- queue.should have(1).item
- queue.should include("#{@project.id}-#{@first_repo.id}-#{@platform.id}")
+ queue.should have(2).item
+ key = "#{@project.id}-#{@first_repo.id}-#{@platform.id}"
+ queue.should include(key, "testing-#{key}")
end
end
diff --git a/spec/models/pull_request_spec.rb b/spec/models/pull_request_spec.rb
index 40b234c7f..634b9531f 100644
--- a/spec/models/pull_request_spec.rb
+++ b/spec/models/pull_request_spec.rb
@@ -14,7 +14,6 @@ def set_data_for_pull
end
describe PullRequest do
-
context 'for owner user' do
before do
stub_symlink_methods
@@ -33,6 +32,13 @@ describe PullRequest do
@other_pull.save
end
+ it 'ensures that path to pull_request repository has been changed after rename of project' do
+ @pull.check
+ @project.update_attributes(:name => "#{@project.name}-new")
+ @pull.reload
+ Dir.exists?(@pull.path).should be_true
+ end
+
it 'master should merge with non_conflicts branch' do
@pull.check
@pull.status.should == 'ready'
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 5de451ad8..006cbbb2c 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1,10 +1,74 @@
require 'spec_helper'
describe Repository do
+ before { stub_symlink_methods }
+
+ context 'ensures that validations and associations exist' do
+ before do
+ # Need for validate_uniqueness_of check
+ FactoryGirl.create(:repository)
+ end
+
+ it { should belong_to(:platform) }
+ it { should have_many(:project_to_repositories).validate(true) }
+ it { should have_many(:projects).through(:project_to_repositories) }
+
+ it { should validate_presence_of(:name) }
+ it { should validate_uniqueness_of(:name).case_insensitive.scoped_to(:platform_id) }
+ it { should allow_value('basic_repository-name-1234').for(:name) }
+ it { should_not allow_value('.!').for(:name) }
+ it { should_not allow_value('Main').for(:name) }
+ it { should_not allow_value("!!\nbang_bang\n!!").for(:name) }
+ it { should validate_presence_of(:description) }
+
+ it { should have_readonly_attribute(:name) }
+ it { should have_readonly_attribute(:platform_id) }
+
+ it { should_not allow_mass_assignment_of(:platform) }
+ it { should_not allow_mass_assignment_of(:platform_id) }
+
+ end
+
+ context '#sync_lock_file_exists?, #add_sync_lock_file, #remove_sync_lock_file, #add_repo_lock_file, #remove_repo_lock_file' do
+ let(:repository) { FactoryGirl.create(:repository) }
+ let(:path) { "#{repository.platform.path}/repository/SRPMS/#{repository.name}" }
+ before { FileUtils.mkdir_p path }
+
+ it 'ensures that #sync_lock_file_exists? returns false if .sync.lock file does not exist' do
+ repository.sync_lock_file_exists?.should be_false
+ end
+
+ it 'ensures that #sync_lock_file_exists? returns true if .sync.lock file does exist' do
+ FileUtils.touch "#{path}/.sync.lock"
+ repository.sync_lock_file_exists?.should be_true
+ end
+
+ it 'ensures that #add_sync_lock_file creates .sync.lock file' do
+ repository.add_sync_lock_file
+ File.exist?("#{path}/.sync.lock").should be_true
+ end
+
+ it 'ensures that #remove_sync_lock_file removes .sync.lock file' do
+ FileUtils.touch "#{path}/.sync.lock"
+ repository.remove_sync_lock_file
+ File.exist?("#{path}/.sync.lock").should be_false
+ end
+
+ it 'ensures that #add_repo_lock_file creates .repo.lock file' do
+ repository.add_repo_lock_file
+ File.exist?("#{path}/.repo.lock").should be_true
+ end
+
+ it 'ensures that #remove_repo_lock_file removes .repo.lock file' do
+ FileUtils.touch "#{path}/.repo.lock"
+ repository.remove_repo_lock_file
+ File.exist?("#{path}/.repo.lock").should be_false
+ end
+
+ end
context 'when create with same owner that platform' do
- before (:each) do
- stub_symlink_methods
+ before do
@platform = FactoryGirl.create(:platform)
@params = {:name => 'tst_platform', :description => 'test platform'}
end
@@ -15,39 +79,57 @@ describe Repository do
end
end
- before(:all) do
- stub_symlink_methods
- Platform.delete_all
- User.delete_all
- Repository.delete_all
- init_test_root
- # Need for validate_uniqueness_of check
- FactoryGirl.create(:repository)
+ context 'ensures that folder of repository will be removed after destroy' do
+ let(:arch) { FactoryGirl.create(:arch) }
+ let(:types) { ['SRPM', arch.name] }
+
+ it "repository of main platform" do
+ FactoryGirl.create(:arch)
+ r = FactoryGirl.create(:repository)
+ paths = types.
+ map{ |type| "#{r.platform.path}/repository/#{type}/#{r.name}" }.
+ each{ |path| FileUtils.mkdir_p path }
+ r.destroy
+ paths.each{ |path| Dir.exists?(path).should be_false }
+ end
+
+ it "repository of personal platform" do
+ FactoryGirl.create(:arch)
+ main_platform = FactoryGirl.create(:platform)
+ r = FactoryGirl.create(:personal_repository)
+ paths = types.
+ map{ |type| "#{r.platform.path}/repository/#{main_platform.name}/#{type}/#{r.name}" }.
+ each{ |path| FileUtils.mkdir_p path }
+ r.destroy
+ paths.each{ |path| Dir.exists?(path).should be_false }
+ end
+
end
- it { should belong_to(:platform) }
- it { should have_many(:project_to_repositories).validate(true) }
- it { should have_many(:projects).through(:project_to_repositories) }
+ context '#add_projects' do
+ it 'user has ability to read of adding project' do
+ repository = FactoryGirl.create(:repository)
+ project = FactoryGirl.create(:project)
+ repository.add_projects("#{project.owner.uname}/#{project.name}", FactoryGirl.create(:user))
+ repository.projects.should have(1).item
+ end
- it { should validate_presence_of(:name) }
- it { should validate_uniqueness_of(:name).case_insensitive.scoped_to(:platform_id) }
- it { should validate_format_of(:name).with('basic_repository-name-1234') }
- it { should validate_format_of(:name).not_with('.!') }
- it { should validate_format_of(:name).not_with('Main') }
- it { should validate_format_of(:name).not_with("!!\nbang_bang\n!!") }
- it { should validate_presence_of(:description) }
+ it 'user has no ability to read of adding project' do
+ repository = FactoryGirl.create(:repository)
+ project = FactoryGirl.create(:project, :visibility => 'hidden')
+ repository.add_projects("#{project.owner.uname}/#{project.name}", FactoryGirl.create(:user))
+ repository.projects.should have(:no).items
+ end
+ end
- it { should have_readonly_attribute(:name) }
- it { should have_readonly_attribute(:platform_id) }
-
- it { should_not allow_mass_assignment_of(:platform) }
- it { should_not allow_mass_assignment_of(:platform_id) }
-
- after(:all) do
- Platform.delete_all
- User.delete_all
- Repository.delete_all
- clear_test_root
+ it '#remove_projects' do
+ stub_redis
+ repository = FactoryGirl.create(:repository)
+ project = FactoryGirl.create(:project)
+ repository.projects << project
+ repository.remove_projects(project.name)
+ repository.reload
+ repository.projects.should have(:no).items
end
end
diff --git a/spec/models/token_spec.rb b/spec/models/token_spec.rb
new file mode 100644
index 000000000..8c3092028
--- /dev/null
+++ b/spec/models/token_spec.rb
@@ -0,0 +1,32 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe Token do
+ before { stub_symlink_methods }
+
+ describe 'platform token' do
+ let!(:platform_token) { FactoryGirl.create(:platform_token) }
+
+ context 'ensures that validations and associations exist' do
+ it { should belong_to(:subject) }
+ it { should belong_to(:creator) }
+
+ it { should validate_presence_of(:creator_id) }
+ it { should validate_presence_of(:subject_id) }
+ it { should validate_presence_of(:subject_type) }
+
+ it { should_not allow_mass_assignment_of(:authentication_token) }
+ it { should_not allow_mass_assignment_of(:creator_id) }
+ it { should_not allow_mass_assignment_of(:subject_id) }
+ it { should_not allow_mass_assignment_of(:subject_type) }
+
+ it 'ensures that authentication_token unique' do
+ token = FactoryGirl.create(:platform_token)
+ token.authentication_token = platform_token.authentication_token
+ token.valid?.should be_false
+ end
+ end
+ end
+
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 333f6c315..3203da2d8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,6 +27,8 @@ RSpec.configure do |config|
config.filter_run_excluding :anonymous_access => !(APP_CONFIG['anonymous_access'])
+ config.before(:all) { init_test_root }
+ config.after(:all) { clear_test_root }
end
def set_session_for(user=nil)
@@ -35,9 +37,10 @@ def set_session_for(user=nil)
sign_in current_user
end
-def http_login(user=nil)
+def http_login(user=nil, password = '123456')
# FIXME: password constant is a bad choice...
- request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(user.email,'123456')
+ email = user.is_a?(String) ? user : user.try(:email)
+ request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(email, password)
end
def stub_symlink_methods
@@ -46,8 +49,9 @@ def stub_symlink_methods
end
Resque.inline = true
-APP_CONFIG['root_path'] = "#{Rails.root}/tmp/test_root"
-APP_CONFIG['git_path'] = "#{Rails.root}/tmp/test_root"
+APP_CONFIG['root_path'] = "#{Rails.root}/tmp/test_root"
+APP_CONFIG['git_path'] = "#{Rails.root}/tmp/test_root"
+APP_CONFIG['tmpfs_path'] = "#{Rails.root}/tmp/test_root"
def init_test_root
clear_test_root
@@ -64,8 +68,6 @@ def stub_redis
stub(Resque).redis { @redis_instance }
end
-init_test_root
-
def fill_project project
%x(mkdir -p #{project.path} && cp -Rf #{Rails.root}/spec/tests.git/* #{project.path}) # maybe FIXME ?
end
diff --git a/travis.sh b/travis.sh
new file mode 100755
index 000000000..663004ebf
--- /dev/null
+++ b/travis.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+rspec="bundle exec rspec"
+
+if [ $SPEC_GROUP = 'controllers' ]
+then
+ $rspec spec/controllers/*_spec.rb spec/controllers/admin/ spec/controllers/groups/ spec/controllers/projects/ spec/controllers/users/
+elif [ $SPEC_GROUP = 'platform_controllers' ]
+then
+ $rspec spec/controllers/platforms/
+elif [ $SPEC_GROUP = 'api' ]
+then
+ $rspec spec/controllers/api/
+elif [ $SPEC_GROUP = 'models' ]
+then
+ $rspec spec/models/
+elif [ $SPEC_GROUP = 'others' ]
+then
+ $rspec spec/helpers/ spec/integration/ spec/lib/ spec/mailers/ spec/mailers/ spec/routing/
+fi
diff --git a/vendor/assets/audios/garbage_shattering.wav b/vendor/assets/audios/garbage_shattering.wav
new file mode 100644
index 000000000..9953752ad
Binary files /dev/null and b/vendor/assets/audios/garbage_shattering.wav differ
diff --git a/vendor/assets/javascripts/moment/ru.js b/vendor/assets/javascripts/moment/ru.js
new file mode 100644
index 000000000..ce93b6375
--- /dev/null
+++ b/vendor/assets/javascripts/moment/ru.js
@@ -0,0 +1,125 @@
+// moment.js language configuration
+// language : russian (ru)
+// author : Viktorminator : https://github.com/Viktorminator
+// Author : Menelion Elensúle : https://github.com/Oire
+
+function plural(word, num) {
+ var forms = word.split('_');
+ return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+}
+
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+ var format = {
+ 'mm': 'минута_минуты_минут',
+ 'hh': 'час_часа_часов',
+ 'dd': 'день_дня_дней',
+ 'MM': 'месяц_месяца_месяцев',
+ 'yy': 'год_года_лет'
+ };
+ if (key === 'm') {
+ return withoutSuffix ? 'минута' : 'минуту';
+ }
+ else {
+ return number + ' ' + plural(format[key], +number);
+ }
+}
+
+function monthsCaseReplace(m, format) {
+ var months = {
+ 'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+ 'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+ },
+
+ nounCase = (/D[oD]? *MMMM?/).test(format) ?
+ 'accusative' :
+ 'nominative';
+
+ return months[nounCase][m.month()];
+}
+
+function weekdaysCaseReplace(m, format) {
+ var weekdays = {
+ 'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+ 'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
+ },
+
+ nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую)? ?\] ?dddd/).test(format) ?
+ 'accusative' :
+ 'nominative';
+
+ return weekdays[nounCase][m.day()];
+}
+
+moment.lang('ru', {
+ months : monthsCaseReplace,
+ monthsShort : "янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),
+ weekdays : weekdaysCaseReplace,
+ weekdaysShort : "вск_пнд_втр_срд_чтв_птн_сбт".split("_"),
+ weekdaysMin : "вс_пн_вт_ср_чт_пт_сб".split("_"),
+ longDateFormat : {
+ LT : "HH:mm",
+ L : "DD.MM.YYYY",
+ LL : "D MMMM YYYY г.",
+ LLL : "D MMMM YYYY г., LT",
+ LLLL : "dddd, D MMMM YYYY г., LT"
+ },
+ calendar : {
+ sameDay: '[Сегодня в] LT',
+ nextDay: '[Завтра в] LT',
+ lastDay: '[Вчера в] LT',
+ nextWeek: function () {
+ return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+ },
+ lastWeek: function () {
+ switch (this.day()) {
+ case 0:
+ return '[В прошлое] dddd [в] LT';
+ case 1:
+ case 2:
+ case 4:
+ return '[В прошлый] dddd [в] LT';
+ case 3:
+ case 5:
+ case 6:
+ return '[В прошлую] dddd [в] LT';
+ }
+ },
+ sameElse: 'L'
+ },
+ relativeTime : {
+ future : "через %s",
+ past : "%s назад",
+ s : "несколько секунд",
+ m : relativeTimeWithPlural,
+ mm : relativeTimeWithPlural,
+ h : "час",
+ hh : relativeTimeWithPlural,
+ d : "день",
+ dd : relativeTimeWithPlural,
+ M : "месяц",
+ MM : relativeTimeWithPlural,
+ y : "год",
+ yy : relativeTimeWithPlural
+ },
+
+ ordinal: function (number, period) {
+ switch (period) {
+ case 'M':
+ case 'd':
+ case 'DDD':
+ return number + '-й';
+ case 'D':
+ return number + '-го';
+ case 'w':
+ case 'W':
+ return number + '-я';
+ default:
+ return number;
+ }
+ },
+
+ week : {
+ dow : 1, // Monday is the first day of the week.
+ doy : 7 // The week that contains Jan 1st is the first week of the year.
+ }
+});
diff --git a/vendor/assets/stylesheets/bootstrap.css b/vendor/assets/stylesheets/bootstrap.css
index 27a4aa4bf..2a171d492 100644
--- a/vendor/assets/stylesheets/bootstrap.css
+++ b/vendor/assets/stylesheets/bootstrap.css
@@ -840,4 +840,297 @@ a.badge:hover {
}
.icon-remove-circle {
background-position: -168px -96px;
-}
\ No newline at end of file
+}
+.hide-text {
+ font: 0/0 a;
+ color: transparent;
+ text-shadow: none;
+ background-color: transparent;
+ border: 0;
+}
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 30px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.row {
+ margin-left: -20px;
+ *zoom: 1;
+}
+.row:before,
+.row:after {
+ display: table;
+ content: "";
+ line-height: 0;
+}
+.row:after {
+ clear: both;
+}
+[class*="span"] {
+ float: left;
+ min-height: 1px;
+ margin-left: 20px;
+}
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ width: 940px;
+}
+.span12 {
+ width: 940px;
+}
+.span11 {
+ width: 860px;
+}
+.span10 {
+ width: 780px;
+}
+.span9 {
+ width: 700px;
+}
+.span8 {
+ width: 620px;
+}
+.span7 {
+ width: 540px;
+}
+.span6 {
+ width: 460px;
+}
+.span5 {
+ width: 380px;
+}
+.span4 {
+ width: 300px;
+}
+.span3 {
+ width: 220px;
+}
+.span2 {
+ width: 140px;
+}
+.span1 {
+ width: 60px;
+}
+.offset12 {
+ margin-left: 980px;
+}
+.offset11 {
+ margin-left: 900px;
+}
+.offset10 {
+ margin-left: 820px;
+}
+.offset9 {
+ margin-left: 740px;
+}
+.offset8 {
+ margin-left: 660px;
+}
+.offset7 {
+ margin-left: 580px;
+}
+.offset6 {
+ margin-left: 500px;
+}
+.offset5 {
+ margin-left: 420px;
+}
+.offset4 {
+ margin-left: 340px;
+}
+.offset3 {
+ margin-left: 260px;
+}
+.offset2 {
+ margin-left: 180px;
+}
+.offset1 {
+ margin-left: 100px;
+}
+.row-fluid {
+ width: 100%;
+ *zoom: 1;
+}
+.row-fluid:before,
+.row-fluid:after {
+ display: table;
+ content: "";
+ line-height: 0;
+}
+.row-fluid:after {
+ clear: both;
+}
+.row-fluid [class*="span"] {
+ display: block;
+ width: 100%;
+ min-height: 30px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ float: left;
+ margin-left: 2.127659574468085%;
+ *margin-left: 2.074468085106383%;
+}
+.row-fluid [class*="span"]:first-child {
+ margin-left: 0;
+}
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.127659574468085%;
+}
+.row-fluid .span12 {
+ width: 100%;
+ *width: 99.94680851063829%;
+}
+.row-fluid .span11 {
+ width: 91.48936170212765%;
+ *width: 91.43617021276594%;
+}
+.row-fluid .span10 {
+ width: 82.97872340425532%;
+ *width: 82.92553191489361%;
+}
+.row-fluid .span9 {
+ width: 74.46808510638297%;
+ *width: 74.41489361702126%;
+}
+.row-fluid .span8 {
+ width: 65.95744680851064%;
+ *width: 65.90425531914893%;
+}
+.row-fluid .span7 {
+ width: 57.44680851063829%;
+ *width: 57.39361702127659%;
+}
+.row-fluid .span6 {
+ width: 48.93617021276595%;
+ *width: 48.88297872340425%;
+}
+.row-fluid .span5 {
+ width: 40.42553191489362%;
+ *width: 40.37234042553192%;
+}
+.row-fluid .span4 {
+ width: 31.914893617021278%;
+ *width: 31.861702127659576%;
+}
+.row-fluid .span3 {
+ width: 23.404255319148934%;
+ *width: 23.351063829787233%;
+}
+.row-fluid .span2 {
+ width: 14.893617021276595%;
+ *width: 14.840425531914894%;
+}
+.row-fluid .span1 {
+ width: 6.382978723404255%;
+ *width: 6.329787234042553%;
+}
+.row-fluid .offset12 {
+ margin-left: 104.25531914893617%;
+ *margin-left: 104.14893617021275%;
+}
+.row-fluid .offset12:first-child {
+ margin-left: 102.12765957446808%;
+ *margin-left: 102.02127659574467%;
+}
+.row-fluid .offset11 {
+ margin-left: 95.74468085106382%;
+ *margin-left: 95.6382978723404%;
+}
+.row-fluid .offset11:first-child {
+ margin-left: 93.61702127659574%;
+ *margin-left: 93.51063829787232%;
+}
+.row-fluid .offset10 {
+ margin-left: 87.23404255319149%;
+ *margin-left: 87.12765957446807%;
+}
+.row-fluid .offset10:first-child {
+ margin-left: 85.1063829787234%;
+ *margin-left: 84.99999999999999%;
+}
+.row-fluid .offset9 {
+ margin-left: 78.72340425531914%;
+ *margin-left: 78.61702127659572%;
+}
+.row-fluid .offset9:first-child {
+ margin-left: 76.59574468085106%;
+ *margin-left: 76.48936170212764%;
+}
+.row-fluid .offset8 {
+ margin-left: 70.2127659574468%;
+ *margin-left: 70.10638297872339%;
+}
+.row-fluid .offset8:first-child {
+ margin-left: 68.08510638297872%;
+ *margin-left: 67.9787234042553%;
+}
+.row-fluid .offset7 {
+ margin-left: 61.70212765957446%;
+ *margin-left: 61.59574468085106%;
+}
+.row-fluid .offset7:first-child {
+ margin-left: 59.574468085106375%;
+ *margin-left: 59.46808510638297%;
+}
+.row-fluid .offset6 {
+ margin-left: 53.191489361702125%;
+ *margin-left: 53.085106382978715%;
+}
+.row-fluid .offset6:first-child {
+ margin-left: 51.063829787234035%;
+ *margin-left: 50.95744680851063%;
+}
+.row-fluid .offset5 {
+ margin-left: 44.68085106382979%;
+ *margin-left: 44.57446808510638%;
+}
+.row-fluid .offset5:first-child {
+ margin-left: 42.5531914893617%;
+ *margin-left: 42.4468085106383%;
+}
+.row-fluid .offset4 {
+ margin-left: 36.170212765957444%;
+ *margin-left: 36.06382978723405%;
+}
+.row-fluid .offset4:first-child {
+ margin-left: 34.04255319148936%;
+ *margin-left: 33.93617021276596%;
+}
+.row-fluid .offset3 {
+ margin-left: 27.659574468085104%;
+ *margin-left: 27.5531914893617%;
+}
+.row-fluid .offset3:first-child {
+ margin-left: 25.53191489361702%;
+ *margin-left: 25.425531914893618%;
+}
+.row-fluid .offset2 {
+ margin-left: 19.148936170212764%;
+ *margin-left: 19.04255319148936%;
+}
+.row-fluid .offset2:first-child {
+ margin-left: 17.02127659574468%;
+ *margin-left: 16.914893617021278%;
+}
+.row-fluid .offset1 {
+ margin-left: 10.638297872340425%;
+ *margin-left: 10.53191489361702%;
+}
+.row-fluid .offset1:first-child {
+ margin-left: 8.51063829787234%;
+ *margin-left: 8.404255319148938%;
+}
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+ display: none;
+}
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+ float: right;
+}
#{code}