Refactor the code in accordance with adjusted Rubocop rules

Author: ikapelyukhin

.rubocop_todo.yml

@@ -1,94 +1,23 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-28 17:33:15 +0200 using RuboCop version 0.49.1.
+# on 2017-07-31 15:28:00 +0200 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundExceptionHandlingKeywords:
-  Exclude:
-    - 'app/controllers/services_controller.rb'
-
-# Offense count: 19
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'bin/spring'
-    - 'config/spring.rb'
-    - 'lib/rmt/downloader.rb'
-    - 'lib/rmt/rpm/base_parser.rb'
-    - 'lib/tasks/potato.rake'
-    - 'spec/factories/products.rb'
-    - 'spec/factories/repositories.rb'
-    - 'spec/factories/systems.rb'
-    - 'spec/rails_helper.rb'
-    - 'spec/requests/services_controller_spec.rb'
-
-# Offense count: 3
-RSpec/EmptyLineAfterFinalLet:
-  Exclude:
-    - 'spec/lib/rmt/rpm/deltainfo_xml_parser_spec.rb'
-    - 'spec/lib/rmt/rpm/repomd_xml_parser_spec.rb'
-    - 'spec/models/activation_spec.rb'
-
-# Offense count: 16
-RSpec/EmptyLineAfterSubject:
-  Exclude:
-    - 'spec/models/siebel/activity_spec.rb'
-    - 'spec/models/repository_spec.rb'
-    - 'spec/requests/api/connect/v3/subscriptions/systems_controller_spec.rb'
-    - 'spec/requests/api/connect/v3/systems/products_controller_spec.rb'
-    - 'spec/requests/api/connect/v3/systems/systems_controller_spec.rb'
-    - 'spec/requests/api/connect/v4/systems/products_controller_spec.rb'
-    - 'spec/support/shared_examples/product_checks.rb'
-
-# Offense count: 2
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Exclude:
     - 'spec/features/**/*'
-    - 'spec/lib/rmt/rpm/primary_xml_parser_spec.rb'
     - 'spec/lib/rmt/rpm/repomd_xml_parser_spec.rb'
 
-# Offense count: 29
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: is_expected, should
-RSpec/ImplicitExpect:
-  Exclude:
-    - 'spec/models/activation_spec.rb'
-    - 'spec/models/product_spec.rb'
-    - 'spec/models/repository_spec.rb'
-    - 'spec/models/service_spec.rb'
-    - 'spec/models/system_spec.rb'
-
 # Offense count: 1
 RSpec/IteratedExpectation:
   Exclude:
     - 'spec/requests/api/connect/v3/systems/activations_controller_spec.rb'
 
-# Offense count: 11
-RSpec/LeadingSubject:
-  Exclude:
-    - 'spec/models/activation_spec.rb'
-    - 'spec/models/product_spec.rb'
-    - 'spec/models/service_spec.rb'
-    - 'spec/models/system_spec.rb'
-    - 'spec/requests/api/connect/v3/systems/products_controller_spec.rb'
-    - 'spec/requests/api/connect/v4/systems/products_controller_spec.rb'
-    - 'spec/requests/services_controller_spec.rb'
-    - 'spec/support/shared_examples/product_checks.rb'
-
-# Offense count: 1
-RSpec/NamedSubject:
-  Exclude:
-    - 'spec/lib/rmt/downloader_spec.rb'
-
 # Offense count: 19
 # Configuration parameters: Max.
 RSpec/NestedGroups:
@@ -100,95 +29,3 @@ RSpec/NestedGroups:
     - 'spec/requests/api/connect/v3/systems/systems_controller_spec.rb'
     - 'spec/requests/api/connect/v4/systems/products_controller_spec.rb'
     - 'spec/requests/services_controller_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: not_to, to_not
-RSpec/NotToNot:
-  Exclude:
-    - 'spec/models/service_spec.rb'
-
-# Offense count: 4
-RSpec/ScatteredLet:
-  Exclude:
-    - 'spec/models/service_spec.rb'
-    - 'spec/models/system_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
-Rails/Blank:
-  Exclude:
-    - 'spec/factories/systems.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Whitelist.
-# Whitelist: find_by_sql
-Rails/DynamicFindBy:
-  Exclude:
-    - 'app/models/system.rb'
-
-# Offense count: 2
-Rails/FilePath:
-  Exclude:
-    - 'config/environments/development.rb'
-    - 'spec/rails_helper.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank.
-Rails/Present:
-  Exclude:
-    - 'app/controllers/api/connect/v3/systems/products_controller.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: always, conditionals
-Style/AndOr:
-  Exclude:
-    - 'bin/rmt-mirror'
-    - 'lib/rmt/downloader.rb'
-    - 'lib/rmt/rpm/deltainfo_xml_parser.rb'
-    - 'lib/rmt/rpm/primary_xml_parser.rb'
-    - 'lib/suse/connect/api.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: InverseMethods, InverseBlocks.
-Style/InverseMethods:
-  Exclude:
-    - 'lib/tasks/potato.rake'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/rmt/rpm/deltainfo_xml_parser.rb'
-    - 'lib/rmt/rpm/primary_xml_parser.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'config/initializers/fast_gettext.rb'
-    - 'config/spring.rb'
-    - 'lib/rmt/downloader.rb'
-    - 'lib/rmt/rpm/primary_xml_parser.rb'
-    - 'lib/suse/connect/api.rb'
-    - 'spec/lib/rmt/downloader_spec.rb'
-    - 'spec/requests/api/connect/v3/subscriptions/systems_controller_spec.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinSize, SupportedStyles.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  Exclude:
-    - 'Gemfile'
-    - 'app/controllers/api/connect/v3/systems/products_controller.rb'
-    - 'db/migrate/20170619104044_create_products_and_repositories.rb'
-    - 'lib/tasks/potato.rake'
-    - 'spec/factories/activations.rb'

Gemfile

@@ -34,7 +34,7 @@ gem 'rails', '~> 5.1'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'rspec-rails', '~> 3.5'
   gem 'scc-codestyle'
   gem 'factory_girl_rails'
@@ -58,7 +58,7 @@ end
 gem 'simplecov', require: false, group: :test
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
 gem 'versionist'
 gem 'responders'

app/controllers/api/connect/v3/systems/products_controller.rb

@@ -1,8 +1,8 @@
 class Api::Connect::V3::Systems::ProductsController < Api::Connect::BaseController
 
   before_action :authenticate_system
-  before_action :require_product, only: [:show, :activate, :destroy]
-  before_action :check_base_product_dependencies, only: [:activate, :upgrade, :show]
+  before_action :require_product, only: %i[show activate destroy]
+  before_action :check_base_product_dependencies, only: %i[activate upgrade show]
 
   def activate
     create_product_activation
@@ -24,7 +24,7 @@ def show
   protected
 
   def require_product
-    require_params([:identifier, :version, :arch])
+    require_params(%i[identifier version arch])
 
     @product = Product.where(identifier: params[:identifier], version: params[:version], arch: params[:arch]).first
 
@@ -49,7 +49,7 @@ def check_base_product_dependencies
     # TODO: For APIv5 and future. We skip this check for second level extensions. E.g. HA-GEO
     # To fix bnc#951189 specifically the rollback part of it.
     return if @product.bases.any?(&:extension?)
-    return if @product.base? || !(@system.products & @product.bases).blank?
+    return if @product.base? || (@system.products & @product.bases).present?
 
     logger.info("Tried to activate/upgrade to '#{@product.friendly_name}' with unmet base product dependency")
     raise ActionController::TranslatedError.new(

app/controllers/services_controller.rb

@@ -11,7 +11,6 @@ def show
     @base_url   = request.base_url
 
     render :xml, template: 'services/show.xml.builder'
-
   rescue ActiveRecord::RecordNotFound
     untranslated = N_('Requested service not found')
     render(xml: { error: untranslated, localized_error: _(untranslated) }, status: 404) and return

app/models/system.rb

@@ -17,7 +17,7 @@ def init
   def self.generate_secure_login
     generated_login = nil
     # Generate a new login as long as it is not in use.
-    while !generated_login || System.find_by_login(generated_login)
+    while !generated_login || System.find_by(login: generated_login)
       # The login credentials has to have the prefix "SCC_" in order to recognize SCC authentication
       generated_login = "SCC_#{build_secure_token}"
     end

bin/rmt-mirror

@@ -10,7 +10,7 @@ require 'rmt/config'
 repository_url = ARGV[0]
 local_path = ARGV[1]
 
-unless (repository_url and local_path)
+unless (repository_url && local_path)
   STDERR.puts 'Usage: rmt-mirror [repository_url] [local_path]'
   exit 1
 end

bin/spring

@@ -8,7 +8,7 @@ unless defined?(Spring)
   require 'bundler'
 
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect {|spec| spec.name == 'spring' }
+  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
   if spring
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
     gem 'spring', spring.version

config/environments/development.rb

@@ -13,7 +13,7 @@
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store

config/initializers/fast_gettext.rb

@@ -1,5 +1,5 @@
 # Configure fast_gettext for i18n.
 FastGettext.add_text_domain('glue', path: 'locale', type: :po, ignore_fuzzy: true, report_warning: false)
 FastGettext.default_locale = I18n.default_locale
-FastGettext.default_available_locales = %w(en de fr ja es pt_BR zh_CN)
+FastGettext.default_available_locales = %w[en de fr ja es pt_BR zh_CN]
 FastGettext.default_text_domain = 'glue'

config/spring.rb

@@ -1,6 +1,6 @@
-%w(
+%w[
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-).each {|path| Spring.watch(path) }
+].each { |path| Spring.watch(path) }

db/migrate/20170619104044_create_products_and_repositories.rb

@@ -63,8 +63,8 @@ def change # rubocop:disable Metrics/MethodLength
       t.integer :extension_id, null: false
     end
 
-    add_index :repositories, [:name, :distro_target], unique: true
-    add_index :repositories_services, [:service_id, :repository_id], unique: true
+    add_index :repositories, %i[name distro_target], unique: true
+    add_index :repositories_services, %i[service_id repository_id], unique: true
     add_index :services, :product_id, unique: true
 
     add_foreign_key :activations, :systems, on_delete: :cascade

lib/rmt/downloader.rb

@@ -9,7 +9,7 @@ class RMT::Downloader
   class Exception < RuntimeError
   end
 
-  KNOWN_HASH_FUNCTIONS = %i(MD5 SHA1 SHA256 SHA384 SHA512).freeze
+  KNOWN_HASH_FUNCTIONS = %i[MD5 SHA1 SHA256 SHA384 SHA512].freeze
 
   attr_accessor :repository_url, :local_path, :concurrency, :logger
 
@@ -84,7 +84,7 @@ def make_request(remote_file, local_file, request_fiber, checksum_type = nil, ch
     downloaded_file = Tempfile.new('rmt')
 
     request = RMT::HttpRequest.new(uri.to_s, followlocation: true)
-    request.on_headers {|response| request_fiber.resume(response) }
+    request.on_headers { |response| request_fiber.resume(response) }
     request.on_body do |chunk|
       next :abort if downloaded_file.closed?
       downloaded_file.write(chunk)
@@ -96,18 +96,18 @@ def make_request(remote_file, local_file, request_fiber, checksum_type = nil, ch
     response = Fiber.yield(request) # yields headers
 
     begin
-      if (URI(uri).scheme != 'file' and response.code != 200)
+      if (URI(uri).scheme != 'file' && response.code != 200)
         raise RMT::Downloader::Exception.new("#{remote_file} - HTTP request failed with code #{response.code}")
       end
 
       response = Fiber.yield # yields when the request is complete
-      if (response.return_code and response.return_code != :ok)
+      if (response.return_code && response.return_code != :ok)
         raise RMT::Downloader::Exception.new("#{remote_file} - return code #{response.return_code}")
       end
 
       downloaded_file.close
 
-      verify_checksum(downloaded_file.path, checksum_type, checksum_value) if (checksum_type and checksum_value)
+      verify_checksum(downloaded_file.path, checksum_type, checksum_value) if (checksum_type && checksum_value)
     rescue StandardError => e
       downloaded_file.unlink
       raise e

lib/rmt/rpm/base_parser.rb

@@ -24,7 +24,7 @@ def parse
   protected
 
   def get_attribute(attributes, name)
-    attributes.select {|e| e[0] == name }.first[1]
+    attributes.select { |e| e[0] == name }.first[1]
   end
 
 end

lib/rmt/rpm/deltainfo_xml_parser.rb

@@ -31,12 +31,14 @@ def characters(string)
 
   def end_element(name)
     if (name == 'delta')
-      @referenced_files << RMT::Rpm::FileEntry.new(
-        @delta[:location],
-        @delta[:checksum_type],
-        @delta[:checksum],
-        :drpm
-      ) unless (@package[:arch] == 'src' and !@mirror_src)
+      unless (@package[:arch] == 'src' && !@mirror_src)
+        @referenced_files << RMT::Rpm::FileEntry.new(
+          @delta[:location],
+          @delta[:checksum_type],
+          @delta[:checksum],
+          :drpm
+        )
+      end
     end
   end