[ci] Enable the Style/ExtraSpacing Rubocop cop

This cop checks for extra/unnecessary whitespace.

src/api/.rubocop.yml

@@ -57,6 +57,10 @@ Style/EachWithObject:
 # Avoid empty else statements.
 Style/EmptyElse:
   EnforcedStyle: both
+
+# Checks for extra/unnecessary whitespace
+Style/ExtraSpacing:
+  Enabled: true
 
 # Checks hash literal syntax
 Style/HashSyntax:

src/api/.rubocop_todo.yml

@@ -432,12 +432,6 @@ Style/DotPosition:
 Style/EmptyLiteral:
   Enabled: false
 
-# Offense count: 85
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
-  Enabled: false
-
 # Offense count: 22
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.

src/api/app/controllers/search_controller.rb

@@ -92,7 +92,7 @@ def owner
 
   def predicate_from_match_parameter(p)
     pred = case p
-      when  /^\(\[(.*)\]\)$/
+      when /^\(\[(.*)\]\)$/
            $1
       when /^\[(.*)\]$/
            $1

src/api/app/controllers/source_controller.rb

@@ -767,7 +767,7 @@ def check_permissions_for_file
     if @package_name == '_project' || @package_name == '_pattern'
       @allowed = permissions.project_change? @prj
 
-      if @file == '_attribute' &&  @package_name == '_project'
+      if @file == '_attribute' && @package_name == '_project'
         raise WrongRouteForAttribute.new "Attributes need to be changed through #{change_attribute_path(project: params[:project])}"
       end
     else

src/api/app/controllers/tag_controller.rb

@@ -22,7 +22,7 @@ def get_tagged_projects_by_user
       project = Project.find(tagging.taggable_id)
       tag = Tag.find(tagging.tag_id)
       @projects_tags[project] = [] if @projects_tags[project].nil?
-      @projects_tags[project] <<  tag
+      @projects_tags[project] << tag
     end
     @projects_tags.keys.each do |key|
       @projects_tags[key].sort!{ |a, b| a.name.downcase <=> b.name.downcase }
@@ -39,7 +39,7 @@ def get_tagged_packages_by_user
       package = Package.find(tagging.taggable_id)
       tag = Tag.find(tagging.tag_id)
       @packages_tags[package] = [] if @packages_tags[package].nil?
-      @packages_tags[package] <<  tag
+      @packages_tags[package] << tag
     end
     @packages_tags.keys.each do |key|
       @packages_tags[key].sort!{ |a, b| a.name.downcase <=> b.name.downcase }
@@ -137,7 +137,7 @@ def get_tags_by_user_and_project( do_render = true )
     end
   end
 
-  def get_tags_by_user_and_package( do_render = true  )
+  def get_tags_by_user_and_package( do_render = true )
     user = User.find_by_login!(params[:user])
     @type = "package"
 
@@ -197,7 +197,7 @@ def project_tags
 
       # update_tags_by_project_and_user(request_data)
 
-      @tags =  taglistXML_to_tags(request_data)
+      @tags = taglistXML_to_tags(request_data)
 
       save_tags(@project, @tagCreator, @tags)
 
@@ -238,7 +238,7 @@ def package_tags
       # taglistXML = "<the whole xml/>"
       @taglistXML = request_data
 
-      @tags =  taglistXML_to_tags(request_data)
+      @tags = taglistXML_to_tags(request_data)
 
       save_tags(@package, @tagCreator, @tags)
 
@@ -303,7 +303,7 @@ def taglistXML_to_tags(taglistXML)
 
     xml = Xmlhash.parse(taglistXML)
 
-    xml.elements("tag") do  |tag|
+    xml.elements("tag") do |tag|
       taglist << tag["name"]
     end
 

src/api/app/controllers/webui/package_controller.rb

@@ -49,7 +49,7 @@ def show
       params.delete(:srcmd5)
     end
 
-    @srcmd5   = params[:srcmd5]
+    @srcmd5 = params[:srcmd5]
     @revision_parameter = params[:rev]
 
     @bugowners_mail = (@package.bugowner_emails + @project.api_obj.bugowner_emails).uniq
@@ -373,7 +373,7 @@ def package_files( rev = nil, expand = nil )
     @serviceinfo = dir.find_first(:serviceinfo)
     dir.each(:entry) do |entry|
       file = Hash[*[:name, :size, :mtime, :md5].map {|x| [x, entry.value(x.to_s)]}.flatten]
-      file[:viewable] = !Package.is_binary_file?(file[:name]) && file[:size].to_i < 2**20  # max. 1 MB
+      file[:viewable] = !Package.is_binary_file?(file[:name]) && file[:size].to_i < 2**20 # max. 1 MB
       file[:editable] = file[:viewable] && !file[:name].match(/^_service[_:]/)
       file[:srcmd5] = dir.value(:srcmd5)
       files << file
@@ -1079,7 +1079,7 @@ def file_available? url, max_redirects = 5
       http = Net::HTTP.new(uri.host, uri.port)
       http.open_timeout = 15
       http.read_timeout = 15
-      response =  http.head uri.path
+      response = http.head uri.path
       if response.code.to_i == 302 && response['location'] && max_redirects > 0
         return file_available? response['location'], (max_redirects - 1)
       end

src/api/app/controllers/webui/project_controller.rb

@@ -568,9 +568,9 @@ def save_meta
         end
       end
 
-    rescue Suse::ValidationError  => exception
+    rescue Suse::ValidationError => exception
       errors << exception.message
-    rescue Project::UnknownObjectError  => exception
+    rescue Project::UnknownObjectError => exception
       errors << "Project with name '#{exception.message}' not found"
     end
 
@@ -589,7 +589,7 @@ def prjconf
 
     @content = @project.config.to_s(sliced_params.to_h)
     unless @content
-      flash[:error] =  @project.config.errors.full_messages.to_sentence
+      flash[:error] = @project.config.errors.full_messages.to_sentence
       redirect_to controller: 'project', nextstatus: 404
       return
     end
@@ -856,7 +856,7 @@ def call_diststats(bdep, jobs)
     f=File.open(outdir + '/longest.xml')
     longest = Xmlhash.parse(f.read)
     longest['timings'].elements('package') do |p|
-      @timings[p['name']] = [p['buildtime'], p['finished']    ]
+      @timings[p['name']] = [p['buildtime'], p['finished'] ]
     end
     @rebuildtime = Integer(longest['rebuildtime'])
     f.close

src/api/app/helpers/webui/patchinfo_helper.rb

@@ -15,7 +15,7 @@ def issue_link( issue )
     if issue[0] == "CVE"
       content_tag(:li, link_to("#{issue[1]}", issue[2]) + ": #{issue[3]}")
     else
-      content_tag(:li, link_to("#{issue[0]}##{issue[1]}", issue[2]) +  ": #{issue[3]}")
+      content_tag(:li, link_to("#{issue[0]}##{issue[1]}", issue[2]) + ": #{issue[3]}")
     end
   end
 end

src/api/app/models/attrib.rb

@@ -65,14 +65,14 @@ def project
   end
 
   def values_editable?
-    !attrib_type.value_count ||  # If unlimited values
-      (attrib_type.value_count && attrib_type.value_count > 0) ||  # If value_count > 0
-      attrib_type.issue_list  # If issue_list true
+    !attrib_type.value_count || # If unlimited values
+      (attrib_type.value_count && attrib_type.value_count > 0) || # If value_count > 0
+      attrib_type.issue_list # If issue_list true
   end
 
   def values_removeable?
-    !attrib_type.value_count ||  # If unlimited values
-      (attrib_type.value_count && (attrib_type.value_count != values.length))  # If value_count != values.length
+    !attrib_type.value_count || # If unlimited values
+      (attrib_type.value_count && (attrib_type.value_count != values.length)) # If value_count != values.length
   end
 
   def cachekey

src/api/app/models/bs_request.rb

@@ -417,7 +417,7 @@ def permission_check_change_state!(opts)
 
   def changestate_accepted(opts)
     # all maintenance_incident actions go into the same incident project
-    incident_project = nil  # .where(type: 'maintenance_incident')
+    incident_project = nil # .where(type: 'maintenance_incident')
     bs_request_actions.each do |action|
       source_project = Project.find_by_name(action.source_project)
       if action.source_project && action.is_maintenance_release?

src/api/app/models/bs_request_action.rb

@@ -8,7 +8,7 @@ class BsRequestAction < ApplicationRecord
   VALID_SOURCEUPDATE_OPTIONS = ['update', 'noupdate', 'cleanup']
 
   #### Self config
-  class DiffError < APIException; setup 404; end  # a diff error can have many reasons, but most likely something within us
+  class DiffError < APIException; setup 404; end # a diff error can have many reasons, but most likely something within us
   class RemoteSource < APIException; end
   class RemoteTarget < APIException; end
   class InvalidReleaseTarget < APIException; end

src/api/app/models/flag.rb

@@ -62,7 +62,7 @@ def compute_status(variant)
         arch_flag = main_object.project.flags.find_by("flag = ? AND repo IS NULL AND architecture_id = ?", flag, architecture_id) unless
           all_flag || arch_flag
         all_flag = main_object.project.flags.find_by("flag = ? AND repo IS NULL AND architecture_id IS NULL", flag) unless all_flag
-      elsif  variant == 'default'
+      elsif variant == 'default'
         same_flag = main_object.project.flags.find_by("flag = ? AND repo = ? AND architecture_id = ?", flag, repo, architecture_id) unless same_flag
         repo_flag = main_object.project.flags.find_by("flag = ? AND repo = ? AND architecture_id IS NULL", flag, repo) unless repo_flag
         arch_flag = main_object.project.flags.find_by("flag = ? AND repo IS NULL AND architecture_id = ?", flag, architecture_id) unless arch_flag
@@ -75,7 +75,7 @@ def compute_status(variant)
       return repo_flag.status if repo_flag
       return arch_flag.status if arch_flag
       return all_flag.status if all_flag
-    elsif  variant == 'default'
+    elsif variant == 'default'
       if same_flag
         return repo_flag.status if repo_flag
         return arch_flag.status if arch_flag

src/api/app/models/issue.rb

@@ -99,12 +99,12 @@ def render_body(node, change = nil)
     p[:change] = change if change
     node.issue(p) do |issue|
       issue.created_at(created_at)
-      issue.updated_at(updated_at)   if updated_at
+      issue.updated_at(updated_at) if updated_at
       issue.name(name)
       issue.tracker(issue_tracker.name)
       issue.label(label)
       issue.url(url)
-      issue.state(state)             if state
+      issue.state(state) if state
       issue.summary(summary) if summary
 
       if owner_id

src/api/app/models/owner.rb

@@ -29,7 +29,7 @@ def self.search(params, obj)
     params[:attribute] ||= "OBS:OwnerRootProject"
     at = AttribType.find_by_name!(params[:attribute])
 
-    limit  = params[:limit] || 1
+    limit = params[:limit] || 1
 
     projects = []
     if obj.is_a? Project

src/api/app/models/package.rb

@@ -602,7 +602,7 @@ def update_product_list
   end
 
   def self.detect_package_kinds(directory)
-    raise ArgumentError.new 'neh!' if  directory.has_key? 'time'
+    raise ArgumentError.new 'neh!' if directory.has_key? 'time'
     ret = []
     directory.elements('entry') do |e|
       %w{patchinfo aggregate link channel}.each do |kind|

src/api/app/models/repository.rb

@@ -104,7 +104,7 @@ def cleanup_before_destroy
   end
 
   def project_name
-    return project.name  if project
+    return project.name if project
     remote_project_name
   end
 

src/api/app/models/user.rb

@@ -609,7 +609,7 @@ def can_create_attribute_definition?(object)
       raise ArgumentError, "illegal parameter type to User#can_change?: #{object.class.name}"
     end
 
-    return true  if is_admin?
+    return true if is_admin?
 
     abies = object.attrib_namespace_modifiable_bies.includes([:user, :group])
     abies.each do |mod_rule|

src/api/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run OBSApi::Application

src/api/config/deploy.rb

@@ -6,7 +6,7 @@
 
 # git settings
 set :scm, :git
-set :repository,  "git://github.com/openSUSE/open-build-service.git"
+set :repository, "git://github.com/openSUSE/open-build-service.git"
 set :branch, "2.3"
 set :deploy_via, :remote_cache
 set :git_enable_submodules, 1

src/api/config/environments/stage.rb

@@ -10,7 +10,7 @@
 
 # Full error reports are disabled and caching is turned on
 config.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
+config.action_controller.perform_caching = true
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"

src/api/config/routes.rb

@@ -60,7 +60,7 @@ def self.public_or_about_path?(request)
       collection do
         get ':project(/:package)/new' => :new, constraints: cons, as: 'new'
         get ':project(/:package)/:attribute/edit' => :edit, constraints: cons, as: 'edit'
-        get ':project(/:package)' => :index, constraints: cons,  as: 'index'
+        get ':project(/:package)' => :index, constraints: cons, as: 'index'
       end
     end
 

src/api/db/migrate/20121120124300_add_owner_root_project_attrib_type.rb

@@ -1,4 +1,4 @@
-class AddOwnerRootProjectAttribType  < ActiveRecord::Migration
+class AddOwnerRootProjectAttribType < ActiveRecord::Migration
   def self.up
     p={}
     p[:role] = Role.find_by_title("Admin")

src/api/db/migrate/20130220160000_make_obs_rejectrequests_configurable.rb

@@ -1,4 +1,4 @@
-class MakeObsRejectrequestsConfigurable  < ActiveRecord::Migration
+class MakeObsRejectrequestsConfigurable < ActiveRecord::Migration
   def self.up
     a = AttribType.find_by_id(AttribType.find_by_name("OBS:RejectRequests"))
     a.value_count = nil

src/api/db/migrate/20130301100000_add_release_target_constraints.rb

@@ -1,4 +1,4 @@
-class AddReleaseTargetConstraints  < ActiveRecord::Migration
+class AddReleaseTargetConstraints < ActiveRecord::Migration
   def self.up
     sql =<<-END_SQL
 alter table release_targets add FOREIGN KEY (repository_id) references repositories (id);

src/api/db/migrate/20130626160000_attribute_issue_marker.rb

@@ -1,8 +1,8 @@
-class AttributeIssueMarker  < ActiveRecord::Migration
+class AttributeIssueMarker < ActiveRecord::Migration
   def self.up
     ans = AttribNamespace.find_by_name "OBS"
 
-    at=AttribType.create( attrib_namespace: ans, name: "Issues",  value_count: 0 )
+    at=AttribType.create( attrib_namespace: ans, name: "Issues", value_count: 0 )
     p={}
     p[:bs_role_id] = Role.find_by_title("maintainer").id
     at.attrib_type_modifiable_bies.create(p)

src/api/db/migrate/20131023063641_add_obs_branch_repositories_attribute.rb

@@ -1,4 +1,4 @@
-class AddObsBranchRepositoriesAttribute  < ActiveRecord::Migration
+class AddObsBranchRepositoriesAttribute < ActiveRecord::Migration
   class AttribTypeModifiableBy < ActiveRecord::Base; end
 
   def self.up

src/api/db/migrate/20140123063641_auto_cleanup_attribute.rb

@@ -1,4 +1,4 @@
-class AutoCleanupAttribute  < ActiveRecord::Migration
+class AutoCleanupAttribute < ActiveRecord::Migration
   class AttribTypeModifiableBy < ActiveRecord::Base; end
 
   def self.up

src/api/db/migrate/20140624101042_add_package_tracking.rb

@@ -1,13 +1,13 @@
 class AddPackageTracking < ActiveRecord::Migration
   def up
     create_table :binary_releases do |t|
-      t.references :repository, null: false  # this destroys the entry when it gets removed
+      t.references :repository, null: false # this destroys the entry when it gets removed
       t.integer :operation, null: false
-      t.datetime :obsolete_time            # set when binary gets deleted or modified later
+      t.datetime :obsolete_time # set when binary gets deleted or modified later
 
       t.integer :release_package_id
 
-      t.string :binary_name,        null: false
+      t.string :binary_name, null: false
       t.string :binary_epoch,                    limit: 64
       t.string :binary_version,     null: false, limit: 64
       t.string :binary_release,     null: false, limit: 64

src/api/db/migrate/20140903125426_add_generic_operation_history.rb

@@ -2,11 +2,11 @@ class AddGenericOperationHistory < ActiveRecord::Migration
   def self.up
     create_table :history_elements do |t|
       t.string :type, null: false
-      t.integer :op_object_id, null: false      # id of request/project/...
+      t.integer :op_object_id, null: false # id of request/project/...
       t.datetime :created_at, null: false
       t.references :user, null: false
-      t.string :description_extension       # by code
-      t.text :comment                     # by user
+      t.string :description_extension # by code
+      t.text :comment # by user
     end
 
     add_index :history_elements, :created_at

src/api/db/migrate/20140916135426_project_maintains.rb

@@ -1,4 +1,4 @@
-class ProjectMaintains  < ActiveRecord::Migration
+class ProjectMaintains < ActiveRecord::Migration
   class OldProject < ActiveRecord::Base
      self.table_name = 'projects'
   end

src/api/db/migrate/20140930135426_track_product_media_archs.rb

@@ -1,4 +1,4 @@
-class TrackProductMediaArchs  < ActiveRecord::Migration
+class TrackProductMediaArchs < ActiveRecord::Migration
   def self.up
     add_column :product_media, :arch_filter_id, :integer
     add_column :product_update_repositories, :arch_filter_id, :integer

src/api/db/migrate/20141001135426_group_subscriptions.rb

@@ -1,4 +1,4 @@
-class GroupSubscriptions  < ActiveRecord::Migration
+class GroupSubscriptions < ActiveRecord::Migration
   def self.up
     add_column :event_subscriptions, :group_id, :integer
     add_index :event_subscriptions, :group_id