diff --git a/Gemfile.lock b/Gemfile.lock index 702c00e..b110859 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,8 +117,8 @@ GEM nokogiri (1.8.2) mini_portile2 (~> 2.3.0) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.4) + ast (~> 2.4.0) power_assert (1.1.1) powerpack (0.1.1) pry (0.11.3) @@ -174,9 +174,9 @@ GEM request_store (1.4.0) rack (>= 1.4) require_all (1.5.0) - rubocop (0.52.1) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) diff --git a/bin/bundle b/bin/bundle index 58115ec..2dbb717 100755 --- a/bin/bundle +++ b/bin/bundle @@ -1,5 +1,5 @@ #!/usr/bin/env ruby # frozen_string_literal: true -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails index a365539..3504c3f 100755 --- a/bin/rails +++ b/bin/rails @@ -2,7 +2,7 @@ # frozen_string_literal: true begin - load File.expand_path('../spring', __FILE__) + load File.expand_path('spring', __dir__) rescue LoadError => e raise unless e.message.include?('spring') end diff --git a/bin/rake b/bin/rake index 169c939..1fe6cf0 100755 --- a/bin/rake +++ b/bin/rake @@ -2,7 +2,7 @@ # frozen_string_literal: true begin - load File.expand_path('../spring', __FILE__) + load File.expand_path('spring', __dir__) rescue LoadError => e raise unless e.message.include?('spring') end diff --git a/bin/setup b/bin/setup index f8712bf..9687cde 100755 --- a/bin/setup +++ b/bin/setup @@ -6,7 +6,7 @@ require 'fileutils' include FileUtils # rubocop:disable Style/MixinUsage # 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 ==") diff --git a/bin/update b/bin/update index 5a738a5..f18005a 100755 --- a/bin/update +++ b/bin/update @@ -6,7 +6,7 @@ require 'fileutils' include FileUtils # rubocop:disable Style/MixinUsage # 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 ==") diff --git a/test/test_helper.rb b/test/test_helper.rb index 093d1f4..adf67ab 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path('../../config/environment', __FILE__) +require File.expand_path('../config/environment', __dir__) require 'rails/test_help' module ActiveSupport