rubocop linting #681

Gemfile

@@ -2,112 +2,112 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "aasm", "~> 5.0", ">= 5.0.1"
+gem "active_model_serializers", "~> 0.10.0"
+gem "apollo-federation", "1.1.3"
+gem "audited", "~> 4.8"
+gem "aws-sdk-s3", require: false
+gem "aws-sdk-sqs", "~> 1.3"
+gem "base32-url", "~> 0.3"
+gem "batch-loader", "~> 1.4", ">= 1.4.1"
+gem "bcrypt", "~> 3.1.7"
+gem "bergamasco", "~> 0.3.10"
+gem "bolognese", "~> 1.8"
 gem "bootsnap", "~> 1.4", ">= 1.4.4", require: false
-gem 'mysql2', '~> 0.5.3'
-gem 'ddtrace', '~> 0.32.0'
+gem "cancancan", "~> 2.0"
+gem "commonmarker", "~> 0.17.9"
+gem "countries", "~> 2.1", ">= 2.1.2"
+gem "country_select", "~> 3.1"
+gem "crawler_detect"
+gem "dalli", "~> 2.7", ">= 2.7.6"
+gem "ddtrace", "~> 0.32.0"
+gem "departure", "~> 6.2"
+gem "diffy", "~> 3.2", ">= 3.2.1"
 gem "dotenv"
-gem "rake", "~> 12.0"
-gem "oj", ">= 2.8.3"
-gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
-gem "jsonlint", "~> 0.3.0"
+gem "elasticsearch", "7.5"
+gem "elasticsearch-model", "~> 7.1", ">= 7.1.1", require: "elasticsearch/model"
+gem "elasticsearch-rails", "~> 7.1", ">= 7.1.1"
+gem "elasticsearch-transport", "7.5"
 gem "equivalent-xml", "~> 0.6.0"
-gem "nokogiri", ">= 1.10.4"
-gem "diffy", "~> 3.2", ">= 3.2.1"
-gem "commonmarker", "~> 0.17.9"
+gem "facets", require: false
+gem "faraday", "~> 0.17.3"
+gem "faraday_middleware-aws-sigv4", "~> 0.3.0"
+gem "fast_jsonapi", "~> 1.3"
+gem "flipper", "~> 0.17.0"
+gem "flipper-active_support_cache_store"
+gem "gender_detector", "~> 0.1.2"
+gem "git", "~> 1.5"
+gem "google-protobuf", "3.10.0.rc.1"
+gem "graphql", "1.11.4"
+gem "graphql-batch", "~> 0.4.1"
+gem "graphql-cache", "~> 0.6.0"
+gem "graphql-errors", "~> 0.4.0"
+gem "iso-639", "~> 0.3.5"
 gem "iso8601", "~> 0.9.0"
-gem "maremma", "~> 4.7.2"
-gem 'sparql', '~> 3.1', '>= 3.1.2'
-gem 'bolognese', '~> 1.8'
-gem "dalli", "~> 2.7", ">= 2.7.6"
+gem "jsonlint", "~> 0.3.0"
+gem "jwt"
+gem "kaminari", "~> 1.2"
+gem "kt-paperclip", "~> 6.2", ">= 6.2.2"
 gem "lograge", "~> 0.11.2"
 gem "logstash-event", "~> 1.2", ">= 1.2.02"
 gem "logstash-logger", "~> 0.26.1"
-gem "sentry-raven", "~> 2.9"
-gem "gender_detector", "~> 0.1.2"
-gem "active_model_serializers", "~> 0.10.0"
-gem "fast_jsonapi", "~> 1.3"
-gem "jwt"
-gem "bcrypt", "~> 3.1.7"
-gem "pwqgen.rb", "~> 0.1.0"
-gem "string_pattern"
-gem "simple_command"
-gem "cancancan", "~> 2.0"
-gem "country_select", "~> 3.1"
-gem "countries", "~> 2.1", ">= 2.1.2"
-gem "aasm", "~> 5.0", ">= 5.0.1"
-gem "facets", require: false
-gem "shoryuken", "~> 4.0"
-gem "aws-sdk-s3", require: false
-gem "aws-sdk-sqs", "~> 1.3"
-gem "bergamasco", "~> 0.3.10"
-gem "base32-url", "~> 0.3"
 gem "mailgun-ruby", "~> 1.1", ">= 1.1.8"
+gem "maremma", "~> 4.7.2"
+gem "mini_magick", "~> 4.8"
+gem "mysql2", "~> 0.5.3"
+gem "nokogiri", ">= 1.10.4"
+gem "oj", ">= 2.8.3"
+gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
 gem "premailer", "~> 1.11", ">= 1.11.1"
-gem "flipper", "~> 0.17.0"
-gem "flipper-active_support_cache_store"
+gem "pwqgen.rb", "~> 0.1.0"
 gem "rack-cors", "~> 1.0", require: "rack/cors"
-gem "strip_attributes", "~> 1.8"
-gem "slack-notifier", "~> 2.1"
-gem "mini_magick", "~> 4.8"
-gem "elasticsearch", "7.5"
-gem 'elasticsearch-transport', '7.5'
-gem 'elasticsearch-model', '~> 7.1', '>= 7.1.1', require: "elasticsearch/model"
-gem 'elasticsearch-rails', '~> 7.1', '>= 7.1.1'
-gem "faraday", "~> 0.17.3"
-gem "faraday_middleware-aws-sigv4", "~> 0.3.0"
 gem "rack-utf8_sanitizer", "~> 1.6"
-gem "turnout", "~> 2.5"
-gem "audited", "~> 4.8"
-gem "git", "~> 1.5"
-gem 'graphql', '1.11.4'
-gem "graphql-errors", "~> 0.4.0"
-gem "graphql-batch", "~> 0.4.1"
-gem "batch-loader", "~> 1.4", ">= 1.4.1"
-gem 'graphql-cache', '~> 0.6.0'
-gem 'apollo-federation', '1.1.3'
-gem "google-protobuf", "3.10.0.rc.1"
+gem "rails", "~> 5.2.0"
+gem "rake", "~> 12.0"
+gem "sentry-raven", "~> 2.9"
+gem "shoryuken", "~> 4.0"
+gem "simple_command"
+gem "slack-notifier", "~> 2.1"
+gem "sparql", "~> 3.1", ">= 3.1.2"
 gem "sprockets", "~> 3.7", ">= 3.7.2"
-gem 'uuid', '~> 2.3', '>= 2.3.9'
-gem 'departure', '~> 6.2'
-gem 'crawler_detect'
-gem 'kt-paperclip', '~> 6.2', '>= 6.2.2'
-gem 'kaminari', '~> 1.2'
-gem 'iso-639', '~> 0.3.5'
+gem "string_pattern"
+gem "strip_attributes", "~> 1.8"
+gem "turnout", "~> 2.5"
+gem "uuid", "~> 2.3", ">= 2.3.9"
 
 group :development, :test do
-  gem "rspec-rails", "~> 3.8", ">= 3.8.2"
+  gem "better_errors"
+  gem "binding_of_caller"
+  gem "bullet", "~> 6.1"
+  gem "byebug", platforms: %i[mri mingw x64_mingw]
+  gem "prettier", "~> 0.13.0"
   gem "rspec-benchmark", "~> 0.4.0"
   gem "rspec-graphql_matchers", "~> 1.1"
+  gem "rspec-rails", "~> 3.8", ">= 3.8.2"
   gem "rubocop", "~> 0.77.0"
-  gem 'rubocop-performance', '~> 1.5', '>= 1.5.1'
+  gem "rubocop-performance", "~> 1.5", ">= 1.5.1"
   gem "rubocop-rails", "~> 2.4"
-  gem 'prettier', '~> 0.13.0'
-  gem "better_errors"
-  gem "binding_of_caller"
-  gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
-  gem 'bullet', '~> 6.1'
 end
 
 group :development do
   gem "listen", ">= 3.0.5", "< 3.2"
+  gem "seedbank"
   gem "spring"
-  gem "spring-watcher-listen", "~> 2.0.0"
   gem "spring-commands-rspec"
-  gem "seedbank"
+  gem "spring-watcher-listen", "~> 2.0.0"
   # gem "httplog", "~> 1.0"
 end
 
 group :test do
   gem "capybara"
-  gem "webmock", "~> 3.1"
-  gem "hashdiff", [">= 1.0.0.beta1", "< 2.0.0"]
-  gem 'vcr', '~> 5.1'
-  gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
-  gem "shoulda-matchers", "~> 4.1", ">= 4.1.2"
-  gem "faker", "~> 1.9"
   gem "database_cleaner"
   gem "elasticsearch-extensions", "~> 0.0.29"
-  gem 'test-prof', '~> 0.10.2'
-  gem 'simplecov', '~> 0.17.1'
+  gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
+  gem "faker", "~> 1.9"
+  gem "hashdiff", [">= 1.0.0.beta1", "< 2.0.0"]
+  gem "shoulda-matchers", "~> 4.1", ">= 4.1.2"
+  gem "simplecov", "~> 0.17.1"
+  gem "test-prof", "~> 0.10.2"
+  gem "vcr", "~> 5.1"
+  gem "webmock", "~> 3.1"
 end

Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require_relative 'config/application'
+require_relative "config/application"
 
 Rails.application.load_tasks

bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+load Gem.bin_path("bundler", "bundle")

bin/rails

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path('../spring', __FILE__)
+  load File.expand_path("spring", __dir__)
 rescue LoadError => e
-  raise unless e.message.include?('spring')
+  raise unless e.message.include?("spring")
 end
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

bin/rake

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path('../spring', __FILE__)
+  load File.expand_path("spring", __dir__)
 rescue LoadError => e
-  raise unless e.message.include?('spring')
+  raise unless e.message.include?("spring")
 end
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run

bin/rspec

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path('../spring', __FILE__)
+  load File.expand_path("spring", __dir__)
 rescue LoadError => e
-  raise unless e.message.include?('spring')
+  raise unless e.message.include?("spring")
 end
-require 'bundler/setup'
-load Gem.bin_path('rspec-core', 'rspec')
+require "bundler/setup"
+load Gem.bin_path("rspec-core", "rspec")

bin/setup

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
+require "pathname"
+require "fileutils"
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -14,22 +14,21 @@ chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:setup'
+  system! "bin/rails db:setup"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

bin/spring

@@ -4,14 +4,14 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
+  require "rubygems"
+  require "bundler"
 
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
   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
-    require 'spring/binstub'
+    gem "spring", spring.version
+    require "spring/binstub"
   end
 end

bin/update

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
+require "pathname"
+require "fileutils"
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -14,16 +14,16 @@ chdir APP_ROOT do
   # This script is a way to update your development environment automatically.
   # Add necessary update steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   puts "\n== Updating database =="
-  system! 'bin/rails db:migrate'
+  system! "bin/rails db:migrate"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

config.ru

@@ -1,5 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
-require_relative 'config/environment'
+require_relative "config/environment"
 
 run Rails.application