Address RuboCop offenses for version 0.85.0

- Lint/MixedRegexpCaptureTypes
- Style/RedundantRegexpEscape
- Style/RedundantRegexpCharacterClass

contrib/git-diff-to-deploy

@@ -21,7 +21,7 @@ def available_revision(api_url)
   result = Net::HTTP.get(uri)
   doc = Nokogiri::XML(result)
   obs_api_filename = doc.xpath('//binary[starts-with(@filename, "obs-api")]/@filename').to_s
-  obs_api_filename.match(/obs-api-2\.11~alpha\.\w*\.(?<git>\w*)-(\w*.)*/)[:git]
+  obs_api_filename.match(/obs-api-2\.11~alpha\.\w*\.(?<git>\w*)-(?<release>\w*.)*/)[:git]
 end
 
 def deployed_revision(api_url)

dist/clouduploader.rb

@@ -70,7 +70,7 @@ def upload
         end
         while line = stdout_stderr.gets
           STDOUT.write(line)
-          write_result($1) if line =~ /^Created\simage:\s+(ami-[\w]+)$/
+          write_result($1) if line =~ /^Created\simage:\s+(ami-\w+)$/
         end
         status = wait_thr.value
         abort unless status.success?

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

@@ -24,7 +24,7 @@ def index
         end
       end
       workers_list.each do |bid, barch|
-        hostname, subid = bid.gsub(%r{[:]}, '/').split('/')
+        hostname, subid = bid.gsub(%r{:}, '/').split('/')
         id = bid.gsub(%r{[:./]}, '_')
         workers[hostname] ||= {}
         workers[hostname]['_arch'] = barch

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

@@ -563,7 +563,7 @@ def find_maintenance_infos
   end
 
   def valid_target_name?(name)
-    name =~ /^\w[-\.\w&]*$/
+    name =~ /^\w[-.\w&]*$/
   end
 
   def monitor_set_filter(defaults)

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

@@ -78,7 +78,7 @@ class MissingParameterError < RuntimeError; end
 
   def valid_xml_id(rawid)
     rawid = "_#{rawid}" if rawid !~ /^[A-Za-z_]/ # xs:ID elements have to start with character or '_'
-    CGI.escapeHTML(rawid.gsub(/[+&: .\/\~\(\)@#]/, '_'))
+    CGI.escapeHTML(rawid.gsub(/[+&: .\/~()@#]/, '_'))
   end
 
   def home

src/api/app/helpers/maintenance_helper.rb

@@ -120,7 +120,7 @@ def release_package_relink(link, action, target_package_name, target_project, tp
   end
 
   def release_package_create_main_package(request, source_package, target_package_name, target_project)
-    base_package_name = target_package_name.gsub(/\.[^\.]*$/, '')
+    base_package_name = target_package_name.gsub(/\.[^.]*$/, '')
 
     # only if package does not contain a _patchinfo file
     lpkg = nil
@@ -169,7 +169,7 @@ def release_package_copy_sources(action, source_package, target_package_name, ta
     if target_project.is_maintenance_release? && source_package.is_link?
       # no permission check here on purpose
       if source_package.linkinfo['project'] == target_project.name &&
-         source_package.linkinfo['package'] == target_package_name.gsub(/\.[^\.]*$/, '')
+         source_package.linkinfo['package'] == target_package_name.gsub(/\.[^.]*$/, '')
         # link target is equal to release target. So we freeze our link.
         cp_params[:freezelink] = 1
       end
@@ -332,7 +332,7 @@ def instantiate_container(project, opackage, opts = {})
     pkg_name = opkg_name = opkg.name
     if opkg.is_a?(Package) && opkg.project.is_maintenance_release?
       # strip incident suffix
-      pkg_name = opkg.name.gsub(/\.[^\.]*$/, '')
+      pkg_name = opkg.name.gsub(/\.[^.]*$/, '')
     end
 
     # target packages must not exist yet
@@ -345,7 +345,7 @@ def instantiate_container(project, opackage, opts = {})
       lpkg_name = p.name
       if opkg_name != pkg_name && p.is_a?(Package) && p.project.is_maintenance_release?
         # strip incident suffix
-        lpkg_name = p.name.gsub(/\.[^\.]*$/, '')
+        lpkg_name = p.name.gsub(/\.[^.]*$/, '')
         # skip the base links
         next if lpkg_name == p.name
       end

src/api/app/models/branch_package.rb

@@ -384,7 +384,7 @@ def extend_packages_to_link(p)
       ap = innerp.first if innerp.length == 1
 
       target_package = ap.name
-      target_package += '.' + p[:target_package].gsub(/^[^\.]*\./, '') if @extend_names
+      target_package += '.' + p[:target_package].gsub(/^[^.]*\./, '') if @extend_names
       release_name = ap.name if @extend_names
 
       # avoid double entries and therefore endless loops

src/api/app/models/bs_request_action.rb

@@ -288,9 +288,9 @@ def default_reviewers
         # use orignal/stripped name and also GA projects for maintenance packages.
         # But do not follow project links, if we have a branch target project, like in Evergreen case
         if tprj.find_attribute('OBS', 'BranchTarget')
-          tpkg = tprj.packages.find_by_name(target_package.gsub(/\.[^\.]*$/, ''))
+          tpkg = tprj.packages.find_by_name(target_package.gsub(/\.[^.]*$/, ''))
         else
-          tpkg = tprj.find_package(target_package.gsub(/\.[^\.]*$/, ''))
+          tpkg = tprj.find_package(target_package.gsub(/\.[^.]*$/, ''))
         end
       elsif action_type.in?([:set_bugowner, :add_role, :change_devel, :delete])
         # target must exists

src/api/app/models/bs_request_action/differ/query_builder.rb

@@ -17,7 +17,7 @@ def build
         # maintenance release targets will have a base link
         tprj = Project.get_by_name(target_project)
         if tprj && tprj.is_maintenance_release?
-          tpkg = tprj.find_package(target_package.gsub(/\.[^\.]*$/, ''))
+          tpkg = tprj.find_package(target_package.gsub(/\.[^.]*$/, ''))
           if tpkg
             if tpkg.project.is_maintenance_release? && tpkg.is_local_link?
               # use package container from former incident update

src/api/app/models/bs_request_action_maintenance_release.rb

@@ -79,7 +79,7 @@ def check_permissions!
     if xml.elements["/directory/entry/@name='_patchinfo'"]
       rel = rel.where(bs_request_actions: { target_package: target_package })
     else
-      tpkgprefix = target_package.gsub(/\.[^\.]*$/, '')
+      tpkgprefix = target_package.gsub(/\.[^.]*$/, '')
       rel = rel.where('bs_request_actions.target_package = ? or bs_request_actions.target_package like ?', target_package, "#{tpkgprefix}.%")
     end
 
@@ -100,7 +100,7 @@ def check_permissions!
   def set_acceptinfo(ai)
     # packages in maintenance_release projects are expanded copies, so we can not use
     # the link information. We need to patch the "old" part
-    base_package_name = target_package.gsub(/\.[^\.]*$/, '')
+    base_package_name = target_package.gsub(/\.[^.]*$/, '')
     pkg = Package.find_by_project_and_name(target_project, base_package_name)
     if pkg
       opkg = pkg.origin_container

src/api/app/models/cloud/azure/params.rb

@@ -7,14 +7,14 @@ class Params
       attr_accessor :image_name, :application_id, :application_key, :subscription, :container, :storage_account, :resource_group
 
       validates :image_name, presence: true, length: { minimum: 2, maximum: 63 },
-                             format: { with: /\A[[:alnum:]]([\w\.-]*\w)?\z/, message: 'not a valid format' }
+                             format: { with: /\A[[:alnum:]]([\w.-]*\w)?\z/, message: 'not a valid format' }
       validates :subscription, presence: true, length: { minimum: 3 }
       validates :container, presence: true, length: { minimum: 3, maximum: 63 },
                             format: { with: /\A[-a-z0-9]+\z/, message: 'not a valid format' }
       validates :storage_account, presence: true, length: { minimum: 3, maximum: 24 },
                                   format: { with: /\A[a-z0-9]+\z/, message: 'not a valid format' }
       validates :resource_group, presence: true, length: { minimum: 1, maximum: 90 },
-                                 format: { with: /\A[-\w\.]*[-\w]\z/, message: 'not a valid format' }
+                                 format: { with: /\A[-\w.]*[-\w]\z/, message: 'not a valid format' }
 
       def self.build(params)
         new(params.slice(:image_name, :application_id, :application_key, :subscription, :container, :storage_account, :resource_group))

src/api/app/models/cloud/ec2/configuration.rb

@@ -25,7 +25,7 @@ class Configuration < ApplicationRecord
       validates :external_id, uniqueness: true
       validates :arn, uniqueness: true, allow_nil: true
       # http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html
-      validates :arn, format: { with: /\Aarn:([\w\/:* +=,\.@\-_])+\z/, message: 'not a valid format', allow_blank: true }
+      validates :arn, format: { with: /\Aarn:([\w\/:* +=,.@\-_])+\z/, message: 'not a valid format', allow_blank: true }
 
       def self.table_name_prefix
         'cloud_ec2_'

src/api/app/models/comment.rb

@@ -70,7 +70,7 @@ def involved_users
       # take the one making the comment
       users << comment.user.login
       # check if users are mentioned (regexp borrowed from user model - with whitespace removed)
-      comment.body.scan(%r{@([\w\^\-\.#\*\+&'"]*)}).each do |user_login|
+      comment.body.scan(%r{@([\w\^\-.#*+&'"]*)}).each do |user_login|
         users_mentioned << user_login.first
       end
     end

src/api/app/models/group.rb

@@ -18,7 +18,7 @@ class Group < ApplicationRecord
   has_many :notifications, -> { order(created_at: :desc) }, as: :subscriber, dependent: :destroy
 
   validates :title,
-            format: { with: %r{\A[\w\.\-]*\z},
+            format: { with: %r{\A[\w.\-]*\z},
                       message: 'must not contain invalid characters' }
   validates :title,
             length: { in: 2..100,

src/api/app/models/owner_search/assignee.rb

@@ -91,7 +91,7 @@ def parse_binary_info(b, prj)
       return false if b['project'] != prj.name || b['package'].blank?
 
       package_name = b['package']
-      package_name.gsub!(/\.[^\.]*$/, '') if prj.is_maintenance_release?
+      package_name.gsub!(/\.[^.]*$/, '') if prj.is_maintenance_release?
       pkg = prj.packages.find_by_name(package_name)
 
       return false if pkg.nil? || pkg.is_patchinfo?

src/api/app/models/owner_search/missing.rb

@@ -75,7 +75,7 @@ def defined_packages
 
     def all_packages
       ret = Package.where(project_id: @projects).pluck(:name)
-      ret.reject { |p| p =~ /\A_product:\w[-+\w\.]*\z/ }
+      ret.reject { |p| p =~ /\A_product:\w[-+\w.]*\z/ }
     end
   end
 end

src/api/app/models/package.rb

@@ -312,7 +312,7 @@ def master_product_object
   end
 
   def belongs_to_product?
-    /\A_product:\w[-+\w\.]*\z/.match?(name) && project.packages.with_product_name.exists?
+    /\A_product:\w[-+\w.]*\z/.match?(name) && project.packages.with_product_name.exists?
   end
 
   def can_be_modified_by?(user, ignore_lock = nil)
@@ -918,7 +918,7 @@ def add_containers(opts = {})
     container_list.keys.each do |container|
       container_name = container.name.dup
       container_update_project = container.project.update_instance
-      container_name.gsub!(/\.[^\.]*$/, '') if container_update_project.is_maintenance_release? && !container.is_link?
+      container_name.gsub!(/\.[^.]*$/, '') if container_update_project.is_maintenance_release? && !container.is_link?
       container_name << '.' << container_update_project.name.tr(':', '_') if opts[:extend_package_names]
       next if project.packages.exists?(name: container_name)
       target_package = Package.new(name: container_name, title: container.title, description: container.description)
@@ -955,7 +955,7 @@ def add_channels(mode = :add_disabled)
     name = opkg.name.dup
     # strip incident suffix in update release projects
     # but beware of packages where the name has already a dot
-    name.gsub!(/\.[^\.]*$/, '') if opkg.project.is_maintenance_release? && !opkg.is_link?
+    name.gsub!(/\.[^.]*$/, '') if opkg.project.is_maintenance_release? && !opkg.is_link?
     ChannelBinary.find_by_project_and_package(project_name, name).each do |cb|
       _add_channel(mode, cb, "Listed in #{project_name} #{name}")
     end
@@ -974,7 +974,7 @@ def add_channels(mode = :add_disabled)
     opkg.find_project_local_linking_packages.each do |p|
       name = p.name
       # strip incident suffix in update release projects
-      name.gsub!(/\.[^\.]*$/, '') if opkg.project.is_maintenance_release?
+      name.gsub!(/\.[^.]*$/, '') if opkg.project.is_maintenance_release?
       ChannelBinary.find_by_project_and_package(project_name, name).each do |cb|
         _add_channel(mode, cb, "Listed in #{project_name} #{name}")
       end
@@ -1007,7 +1007,7 @@ def self.valid_name?(name, allow_multibuild = false)
     return false if name == '0'
     return true if ['_product', '_pattern', '_project', '_patchinfo'].include?(name)
     # _patchinfo: is obsolete, just for backward compatibility
-    allowed_characters = /[-+\w\.#{allow_multibuild ? ':' : ''}]/
+    allowed_characters = /[-+\w.#{allow_multibuild ? ':' : ''}]/
     reg_exp = /\A([a-zA-Z0-9]|(_product:|_patchinfo:)\w)#{allowed_characters}*\z/
     reg_exp.match?(name)
   end

src/api/app/models/project.rb

@@ -140,7 +140,7 @@ def valid_name?(name)
       return false if name =~ /:[:\._]/
       return false if name =~ /\A[:\._]/
       return false if name.end_with?(':')
-      return true  if name =~ /\A[-+\w\.:]{1,200}\z/
+      return true  if name =~ /\A[-+\w.:]{1,200}\z/
       false
     end
 

src/api/app/models/service.rb

@@ -18,9 +18,9 @@ def document
   def self.valid_name?(name)
     return false unless name.is_a?(String)
     return false if name.length > 200 || name.blank?
-    return false if name =~ %r{^[_\.]}
+    return false if name =~ %r{^[_.]}
     return false if name =~ %r{::}
-    return true if name =~ /\A\w[-+\w\.:]*\z/
+    return true if name =~ /\A\w[-+\w.:]*\z/
     false
   end
 

src/api/app/models/user.rb

@@ -96,7 +96,7 @@ class User < ApplicationRecord
             uniqueness: { message: 'is the name of an already existing user' }
 
   validates :login,
-            format: { with: %r{\A[\w \$\^\-\.#\*\+&'"]*\z},
+            format: { with: %r{\A[\w $\^\-.#*+&'"]*\z},
                       message: 'must not contain invalid characters' }
   validates :login,
             length: { in: 2..100, allow_nil: true,
@@ -113,7 +113,7 @@ class User < ApplicationRecord
   # However, this is not *so* bad since users have to answer on their email
   # to confirm their registration.
   validates :email,
-            format: { with: %r{\A([\w\-\.\#\$%&!?*\'\+=(){}|~]+)@([0-9a-zA-Z\-\.\#\$%&!?*\'=(){}|~]+)+\z},
+            format: { with: %r{\A([\w\-.\#$%&!?*'+=(){}|~]+)@([0-9a-zA-Z\-.\#$%&!?*'=(){}|~]+)+\z},
                       message: 'must be a valid email address',
                       allow_blank: true }
 

src/api/app/services/package_service/file_verifier.rb

@@ -27,7 +27,7 @@ def content_readable(content)
     end
 
     def file_name_invalid?
-      @file_name.blank? || @file_name !~ /^[^\.\/][^\/]+$/
+      @file_name.blank? || @file_name !~ /^[^.\/][^\/]+$/
     end
 
     def service?

src/api/config/routes/routes_helper.rb

@@ -1,24 +1,24 @@
 module RoutesConstraints
   CONS = {
-    arch: %r{[^\/]*},
-    binary: %r{[^\/]*},
-    filename: %r{[^\/]*},
+    arch: %r{[^/]*},
+    binary: %r{[^/]*},
+    filename: %r{[^/]*},
     id: %r{\d*},
-    login: %r{[^\/]*},
-    package: %r{[^\/]*},
-    package_name: %r{[^\/]*},
-    project: %r{[^\/]*},
-    project_name: %r{[^\/]*},
-    maintained_project: %r{[^\/]*},
-    repository: %r{[^\/]*},
-    repository_name: %r{[^\/]*},
-    service: %r{\w[^\/]*},
-    title: %r{[^\/]*},
-    user: %r{[^\/]*},
-    repository_publish_build_id: %r{[^\/]*},
-    workflow_project: %r{[^\/]*},
-    staging_project_name: %r{[^\/]*},
-    staging_project_copy_name: %r{[^\/]*}
+    login: %r{[^/]*},
+    package: %r{[^/]*},
+    package_name: %r{[^/]*},
+    project: %r{[^/]*},
+    project_name: %r{[^/]*},
+    maintained_project: %r{[^/]*},
+    repository: %r{[^/]*},
+    repository_name: %r{[^/]*},
+    service: %r{\w[^/]*},
+    title: %r{[^/]*},
+    user: %r{[^/]*},
+    repository_publish_build_id: %r{[^/]*},
+    workflow_project: %r{[^/]*},
+    staging_project_name: %r{[^/]*},
+    staging_project_copy_name: %r{[^/]*}
   }.freeze
 end
 

src/api/lib/tasks/databases.rake

@@ -60,7 +60,7 @@ namespace :db do
       constraints = []
       added_comma = false
       structure.each_line do |line|
-        if /[ ]*CONSTRAINT/.match?(line)
+        if / *CONSTRAINT/.match?(line)
           unless line.end_with?(",\n")
             added_comma = true
             line = line[0..-2] + ",\n"

src/api/lib/tasks/statistics/github/pull_requests.rake

@@ -60,7 +60,7 @@ namespace :statistics do
     end
 
     def on_last_page?(links)
-      link_rel = links.first.match(/.*rel=\"(\w*)\"/).captures.first
+      link_rel = links.first.match(/.*rel="(\w*)"/).captures.first
       link_rel == 'first'
     end
 

src/api/spec/helpers/webui/package_helper_spec.rb

@@ -113,7 +113,7 @@
     RSpec.shared_examples 'file with extension' do |extension, extension_class|
       it 'returns correct extension' do
         property_of do
-          sized(1) { string(/[\w+\-:]/) } + sized(range(0, 190)) { string(/[\w+\-:\.]/) } + '.' + extension
+          sized(1) { string(/[\w+\-:]/) } + sized(range(0, 190)) { string(/[\w+\-:.]/) } + '.' + extension
         end.check(3) do |filename|
           expect(guess_code_class(filename)).to eq(extension_class)
         end

src/api/spec/helpers/webui/webui_helper_spec.rb

@@ -213,7 +213,7 @@
     end
 
     context 'with a big text' do
-      it { expect(toggle_sliced_text(big_text)).to match(/(.+)#{sliced_text}(.+)\[\+\](.+)#{big_text}(.+)\[\-\](.+)/) }
+      it { expect(toggle_sliced_text(big_text)).to match(/(.+)#{sliced_text}(.+)\[\+\](.+)#{big_text}(.+)\[-\](.+)/) }
     end
   end