Skip to content

Commit

Permalink
[frontend] Fix Style/LineEndConcatenation offenses
Browse files Browse the repository at this point in the history
  • Loading branch information
David Kang committed Dec 22, 2017
1 parent b767182 commit f3df58f
Show file tree
Hide file tree
Showing 28 changed files with 83 additions and 89 deletions.
5 changes: 0 additions & 5 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,6 @@ Style/InverseMethods:
- 'src/api/test/functional/request_events_test.rb'
- 'src/api/test/unit/event_mailer_test.rb'

# Offense count: 80
# Cop supports --auto-correct.
Style/LineEndConcatenation:
Enabled: false

# Offense count: 2
Style/MethodMissing:
Exclude:
Expand Down
9 changes: 4 additions & 5 deletions src/api/app/controllers/source_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,8 @@ class NoMatchingReleaseTarget < APIException
def verify_can_modify_target_package!
return if User.current.can_modify_package?(@package)

raise CmdExecutionNoPermission, "no permission to execute command '#{params[:cmd]}' " +
'for unspecified package' unless @package.class == Package
raise CmdExecutionNoPermission, "no permission to execute command '#{params[:cmd]}' " +
raise CmdExecutionNoPermission, "no permission to execute command '#{params[:cmd]}' for unspecified package" unless @package.class == Package
raise CmdExecutionNoPermission, "no permission to execute command '#{params[:cmd]}' " \
"for package #{@package.name} in project #{@package.project.name}"
end

Expand Down Expand Up @@ -612,7 +611,7 @@ def delete_project_pubkey
if User.current.is_admin?
pass_to_backend path
else
raise DeleteProjectPubkeyNoPermission, "No permission to delete public key for project '#{params[:project]}'. " +
raise DeleteProjectPubkeyNoPermission, "No permission to delete public key for project '#{params[:project]}'. " \
'Either maintainer permissions by upper project or admin permissions is needed.'
end
end
Expand Down Expand Up @@ -1014,7 +1013,7 @@ def verify_repos_match!(pro)
raise CmdExecutionNoPermission, "no permission to write in project #{releasetarget.target_repository.project.name}"
end
unless releasetarget.trigger == 'manual'
raise CmdExecutionNoPermission, 'Trigger is not set to manual in repository' +
raise CmdExecutionNoPermission, 'Trigger is not set to manual in repository' \
" #{releasetarget.repository.project.name}/#{releasetarget.repository.name}"
end
repo_matches = true
Expand Down
5 changes: 3 additions & 2 deletions src/api/app/controllers/statistics_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ def highest_rated
# set automatic action_cache expiry time limit
# response.time_to_live = 10.minutes

ratings = Rating.select('db_object_id, db_object_type, count(score) as count,' +
'sum(score)/count(score) as score_calculated').group('db_object_id, db_object_type').order('score_calculated DESC')
ratings = Rating.select('db_object_id, db_object_type, count(score) as count, sum(score)/count(score) as score_calculated')
.group('db_object_id, db_object_type')
.order('score_calculated DESC')
ratings = ratings.to_a.delete_if { |r| r.count.to_i < min_votes_for_rating }
if @limit
@ratings = ratings[0..@limit - 1]
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/controllers/webui/package_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ def check_build_log_access
follow_project_links: true)
rescue Package::UnknownObjectError
redirect_to project_show_path(@project.to_param),
error: "Couldn't find package '#{params[:package]}' in " +
error: "Couldn't find package '#{params[:package]}' in " \
"project '#{@project.to_param}'. Are you sure it exists?"
return false
end
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/controllers/webui/patchinfo_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def new_tracker
end
end
unless invalid_format.empty?
error += "#{invalid_format} has no valid format. (Correct formats are e.g. " +
error += "#{invalid_format} has no valid format. (Correct formats are e.g. " \
'boo#123456, CVE-1234-5678 and the string has to be a comma-separated list)'
end
render json: { error: error, issues: issue_collection }
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/controllers/webui/project_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def new_release_request

req.save!
end
flash[:success] = 'Created maintenance release request ' +
flash[:success] = 'Created maintenance release request ' \
"<a href='#{url_for(controller: 'request', action: 'show', number: req.number)}'>#{req.number}</a>"
rescue Patchinfo::IncompletePatchinfo,
BsRequestActionMaintenanceRelease::ArchitectureOrderMissmatch,
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/branch_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def lookup_incident_pkg(p)
data.elements.each('collection/package') do |e|
ipkg = Package.find_by_project_and_name(e.attributes['project'], e.attributes['name'])
if ipkg.nil?
logger.error 'read permission or data inconsistency, backend delivered package ' +
logger.error 'read permission or data inconsistency, backend delivered package ' \
"as linked package where no database object exists: #{e.attributes['project']} / #{e.attributes['name']}"
elsif ipkg.project.is_maintenance_incident? && ipkg.project.is_unreleased? # is incident ?
# is a newer incident ?
Expand Down Expand Up @@ -459,7 +459,7 @@ def extend_packages_to_link(p)
found = true if ep[:package] == ap
end
unless found
logger.debug "found local linked package in project #{p[:package].project.name}/#{ap.name}, " +
logger.debug "found local linked package in project #{p[:package].project.name}/#{ap.name}, " \
"adding it as well, pointing it to #{p[:package].name} for #{target_package}"
@packages.push(base_project: p[:base_project],
link_target_project: p[:link_target_project],
Expand Down Expand Up @@ -546,7 +546,7 @@ def find_packages_to_branch
ltprj = lprj
pkg2 = lprj.find_package(params[:package])
unless pkg2.nil? || @packages.map { |p| p[:package] }.include?(pkg2) # avoid double instances
logger.info "Found package instance via project link in #{pkg2.project.name}/#{pkg2.name}" +
logger.info "Found package instance via project link in #{pkg2.project.name}/#{pkg2.name}" \
"for attribute #{at.name} and given package name #{params[:package]}"
if ltprj.find_attribute('OBS', 'BranchTarget').nil?
ltprj = pkg2.project
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/bs_request/find_for/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def extend_relation(source_or_target, requests, roles, package, subprojects, pro
inner_or << "(bs_request_actions.#{source_or_target}_project like #{quote(project + ':%')})"
end
else
inner_or << "(bs_request_actions.#{source_or_target}_project=#{quote(project)} and " +
inner_or << "(bs_request_actions.#{source_or_target}_project=#{quote(project)} and " \
"bs_request_actions.#{source_or_target}_package=#{quote(package)})"
end
end
Expand Down
14 changes: 7 additions & 7 deletions src/api/app/models/bs_request_action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -566,15 +566,15 @@ def create_expand_package(packages, opts = {})
repo = result.attributes['repository']
arch = result.attributes['arch']
if result.attributes['dirty']
raise BuildNotFinished, "The repository '#{pkg.project.name}' / '#{repo}' / #{arch} " +
raise BuildNotFinished, "The repository '#{pkg.project.name}' / '#{repo}' / #{arch} " \
'needs recalculation by the schedulers'
end
if result.attributes['state'].in?(['finished', 'publishing'])
raise BuildNotFinished, "The repository '#{pkg.project.name}' / '#{repo}' / #{arch}" +
raise BuildNotFinished, "The repository '#{pkg.project.name}' / '#{repo}' / #{arch}" \
'did not finish the publish yet'
end
unless result.attributes['state'].in?(['published', 'unpublished'])
raise BuildNotFinished, "The repository '#{pkg.project.name}' / '#{repo}' / #{arch} " +
raise BuildNotFinished, "The repository '#{pkg.project.name}' / '#{repo}' / #{arch} " \
'did not finish the build yet'
end

Expand Down Expand Up @@ -670,8 +670,8 @@ def create_expand_package(packages, opts = {})
else # non-channel package
next if ReleaseTarget.where(repository: pkg.project.repositories, target_repository: tprj.repositories, trigger: 'maintenance').empty?
unless pkg.project.can_be_released_to_project?(tprj)
raise WrongLinkedPackageSource, 'According to the source link of package ' +
"#{pkg.project.name}/#{pkg.name} it would go to project" +
raise WrongLinkedPackageSource, 'According to the source link of package ' \
"#{pkg.project.name}/#{pkg.name} it would go to project" \
"#{tprj.name} which is not specified as release target."
end
end
Expand Down Expand Up @@ -826,7 +826,7 @@ def check_action_permission_target!
tprj = Project.get_by_name target_project
if tprj.is_a? Project
if tprj.is_maintenance_release? && action_type == :submit
raise SubmitRequestRejected, "The target project #{target_project} is a maintenance release project, " +
raise SubmitRequestRejected, "The target project #{target_project} is a maintenance release project, " \
'a submit self is not possible, please use the maintenance workflow instead.'
end
a = tprj.find_attribute('OBS', 'RejectRequests')
Expand All @@ -844,7 +844,7 @@ def check_action_permission_target!
a = tpkg.find_attribute('OBS', 'RejectRequests') if defined?(tpkg) && tpkg
if defined?(a) && a && a.values.first
if a.values.length < 2 || a.values.find_by_value(action_type)
raise RequestRejected, "The target package #{target_project} / #{target_package} is not accepting " +
raise RequestRejected, "The target package #{target_project} / #{target_package} is not accepting " \
"requests because: #{a.values.first.value}"
end
end
Expand Down
8 changes: 4 additions & 4 deletions src/api/app/models/bs_request_action_maintenance_incident.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ def get_releaseproject(pkg, tprj)

releaseproject = target_releaseproject ? Project.get_by_name(target_releaseproject) : tprj
if releaseproject.try(:name).blank?
raise NoMaintenanceReleaseTarget, 'Maintenance incident request contains no defined release' +
raise NoMaintenanceReleaseTarget, 'Maintenance incident request contains no defined release' \
" target project for package #{pkg.name}"
end

# Automatically switch to update project
releaseproject = releaseproject.update_instance
unless releaseproject.is_maintenance_release?
raise NoMaintenanceReleaseTarget, 'Maintenance incident request contains release target ' +
"project #{releaseproject.name} with invalid project " +
"kind \"#{releaseproject.kind}\" (should be " +
raise NoMaintenanceReleaseTarget, 'Maintenance incident request contains release target ' \
"project #{releaseproject.name} with invalid project " \
"kind \"#{releaseproject.kind}\" (should be " \
"\"maintenance_release\") for package #{pkg.name}"
end
releaseproject
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/bs_request_action_maintenance_release.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ def sanity_check!
end
repo.release_targets.each do |rt|
unless repo.architectures.size == rt.target_repository.architectures.size
raise ArchitectureOrderMissmatch, "Repository '#{repo.name}' and releasetarget " +
raise ArchitectureOrderMissmatch, "Repository '#{repo.name}' and releasetarget " \
"'#{rt.target_repository.name}' have different architectures"
end
for i in 1..(repo.architectures.size)
unless repo.architectures[i - 1] == rt.target_repository.architectures[i - 1]
raise ArchitectureOrderMissmatch, "Repository and releasetarget don't have the same architecture " +
raise ArchitectureOrderMissmatch, "Repository and releasetarget don't have the same architecture " \
"on position #{i}: #{prj.name} / #{repo.name}"
end
end
Expand Down
8 changes: 4 additions & 4 deletions src/api/app/models/bs_request_permission_check.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def check_accepted_action(action)
originpkg = Package.get_by_project_and_name action.target_project, action.target_package
return if User.current.can_modify_package?(originpkg, true)

raise PostRequestNoPermission, 'Package target can not get initialized using makeoriginolder.' +
raise PostRequestNoPermission, 'Package target can not get initialized using makeoriginolder.' \
"No permission in project #{originpkg.project.name}"
end

Expand All @@ -104,7 +104,7 @@ def check_maintenance_release_accept(action)
c = Backend::Api::Sources::Package.files(action.source_project, action.source_package, expand: 1)
data = REXML::Document.new(c)
unless action.source_rev == data.elements['directory'].attributes['srcmd5']
raise SourceChanged, "The current source revision in #{action.source_project}/#{action.source_package}" +
raise SourceChanged, "The current source revision in #{action.source_project}/#{action.source_package}" \
"are not on revision #{action.source_rev} anymore."
end
end
Expand Down Expand Up @@ -287,7 +287,7 @@ def cmd_changereviewstate_permissions(opts)
raise ReviewChangeStateNoPermission, "review state change for group #{by_group.title} is not permitted for #{User.current.login}"
end
if by_package && !User.current.can_modify_package?(by_package, true)
raise ReviewChangeStateNoPermission, "review state change for package #{opts[:by_project]}/#{opts[:by_package]} " +
raise ReviewChangeStateNoPermission, "review state change for package #{opts[:by_project]}/#{opts[:by_package]} " \
"is not permitted for #{User.current.login}"
end

Expand Down Expand Up @@ -353,7 +353,7 @@ def cmd_changestate_permissions(opts)
# abort immediatly if we want to write and can't
if opts[:newstate] == 'accepted' && !@write_permission_in_this_action
msg = ''
msg = 'No permission to modify target of request ' +
msg = 'No permission to modify target of request ' \
"#{action.bs_request.number} (type #{action.action_type}): project #{action.target_project}" unless action.bs_request.new_record?
msg += ", package #{action.target_package}" if action.target_package
raise PostRequestNoPermission, msg
Expand Down
10 changes: 5 additions & 5 deletions src/api/app/models/buildresult.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ class Buildresult < ActiveXML::Node

STATUS_DESCRIPTION = {
succeeded: 'Package has built successfully and can be used to build further packages.',
failed: 'The package does not build successfully. No packages have been created. Packages ' +
failed: 'The package does not build successfully. No packages have been created. Packages ' \
'that depend on this package will be built using any previously created packages, if they exist.',
unresolvable: 'The build can not begin, because required packages are either missing or not explicitly defined.',
broken: 'The sources either contain no build description (e.g. specfile), automatic source processing failed or a ' +
broken: 'The sources either contain no build description (e.g. specfile), automatic source processing failed or a ' \
'merge conflict does exist.',
blocked: 'This package waits for other packages to be built. These can be in the same or other projects.',
scheduled: 'A package has been marked for building, but the build has not started yet.',
dispatching: 'A package is being copied to a build host. This is an intermediate state before building.',
building: 'The package is currently being built.',
signing: 'The package has been built successfully and is assigned to get signed.',
finished: 'The package has been built and signed, but has not yet been picked up by the scheduler. This is an ' +
finished: 'The package has been built and signed, but has not yet been picked up by the scheduler. This is an ' \
"intermediate state prior to 'succeeded' or 'failed'.",
disabled: 'The package has been disabled from building in project or package metadata. ' +
disabled: 'The package has been disabled from building in project or package metadata. ' \
'Packages that depend on this package will be built using any previously created packages, if they still exist.',
excluded: 'The package build has been disabled in package build description (for example in the .spec file) or ' +
excluded: 'The package build has been disabled in package build description (for example in the .spec file) or ' \
'does not provide a matching build description for the target.',
locked: 'The package is frozen',
unknown: 'The scheduler has not yet evaluated this package. Should be a short intermediate state for new packages.'
Expand Down
9 changes: 4 additions & 5 deletions src/api/app/models/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ def find_linking_packages(project_local = nil)
data.elements.each('collection/package') do |e|
p = Package.find_by_project_and_name(e.attributes['project'], e.attributes['name'])
if p.nil?
logger.error 'read permission or data inconsistency, backend delivered package as linked package ' +
logger.error 'read permission or data inconsistency, backend delivered package as linked package ' \
"where no database object exists: #{e.attributes['project']} / #{e.attributes['name']}"
else
result << p
Expand Down Expand Up @@ -863,8 +863,8 @@ def self.activity_algorithm
# this is the algorithm (sql) we use for calculating activity of packages
# NOTE: We use Time.now.to_i instead of UNIX_TIMESTAMP() so we can test with frozen ruby time in the old tests suite,
# change it when removing the tests
'( packages.activity_index * ' +
"POWER( 2.3276, (UNIX_TIMESTAMP(packages.updated_at) - #{Time.now.to_i})/10000000 ) " +
'(packages.activity_index * ' \
"POWER(2.3276, (UNIX_TIMESTAMP(packages.updated_at) - #{Time.now.to_i})/10000000) " \
') as activity_value'
end

Expand All @@ -874,8 +874,7 @@ def self.activity_algorithm
end

def activity
package = Package.find_by_sql("SELECT packages.*, #{Package.activity_algorithm} " +
"FROM `packages` WHERE id = #{id} LIMIT 1")
package = Package.find_by_sql("SELECT packages.*, #{Package.activity_algorithm} FROM `packages` WHERE id = #{id} LIMIT 1")
package.shift.activity_value.to_f
end

Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/patchinfo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def check_releasetarget!(rt)
return if is_repository_matching?(prt.target_repository, rt)
end
end
raise ReleasetargetNotFound, "Release target '#{rt['project']}/#{rt['repository']}' is not defined " +
raise ReleasetargetNotFound, "Release target '#{rt['project']}/#{rt['repository']}' is not defined " \
"in this project '#{@project.name}'. Please ask your OBS administrator to add it."
end

Expand Down Expand Up @@ -174,10 +174,10 @@ def require_package_for_patchinfo(project, pkg_name, force)
@pkg = Package.get_by_project_and_name project, pkg_name
return if force
if @pkg.is_patchinfo?
raise PatchinfoFileExists, "createpatchinfo command: the patchinfo #{pkg_name} exists already. " +
raise PatchinfoFileExists, "createpatchinfo command: the patchinfo #{pkg_name} exists already. " \
'Either use force=1 re-create the _patchinfo or use updatepatchinfo for updating.'
else
raise PackageAlreadyExists, "createpatchinfo command: the package #{pkg_name} exists already, " +
raise PackageAlreadyExists, "createpatchinfo command: the package #{pkg_name} exists already, " \
'but is no patchinfo. Please create a new package instead.'
end
end
Expand Down
Loading

0 comments on commit f3df58f

Please sign in to comment.