From 652da28f2494d1ee357cb3d6bc31b9009d0bb372 Mon Sep 17 00:00:00 2001 From: Mauricio Fuentes Date: Wed, 21 Feb 2024 23:45:18 -0300 Subject: [PATCH] Changed deprecated File.exists? to File.exist? that works on Ruby 3.2^. This fixes isue #95 --- .../copy_api_version_generator.rb | 24 +++++++++---------- .../new_controller_generator.rb | 2 +- .../new_presenter/new_presenter_generator.rb | 2 +- lib/generators/versionist/rspec_helper.rb | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/generators/versionist/copy_api_version/copy_api_version_generator.rb b/lib/generators/versionist/copy_api_version/copy_api_version_generator.rb index aecc652..9520c6b 100644 --- a/lib/generators/versionist/copy_api_version/copy_api_version_generator.rb +++ b/lib/generators/versionist/copy_api_version/copy_api_version_generator.rb @@ -38,7 +38,7 @@ def copy_routes def copy_controllers in_root do - if File.exists? "app/controllers/#{module_name_for_path(old_module_name)}" + if File.exist? "app/controllers/#{module_name_for_path(old_module_name)}" log "Copying all files from app/controllers/#{module_name_for_path(old_module_name)} to app/controllers/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "app/controllers/#{module_name_for_path(old_module_name)}", "app/controllers/#{module_name_for_path(new_module_name)}" Dir.glob("app/controllers/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -56,7 +56,7 @@ def copy_controller_tests in_root do case Versionist.configuration.configured_test_framework when :test_unit - if File.exists? "#{Versionist.test_path}/#{module_name_for_path(old_module_name)}" + if File.exist? "#{Versionist.test_path}/#{module_name_for_path(old_module_name)}" log "Copying all files from #{Versionist.test_path}/#{module_name_for_path(old_module_name)} to #{Versionist.test_path}/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "#{Versionist.test_path}/#{module_name_for_path(old_module_name)}", "#{Versionist.test_path}/#{module_name_for_path(new_module_name)}" Dir.glob("#{Versionist.test_path}/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -68,7 +68,7 @@ def copy_controller_tests end if Versionist.older_than_rails_5? - if File.exists? "test/integration/#{module_name_for_path(old_module_name)}" + if File.exist? "test/integration/#{module_name_for_path(old_module_name)}" log "Copying all files from test/integration/#{module_name_for_path(old_module_name)} to test/integration/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "test/integration/#{module_name_for_path(old_module_name)}", "test/integration/#{module_name_for_path(new_module_name)}" Dir.glob("test/integration/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -80,7 +80,7 @@ def copy_controller_tests end end when :rspec - if File.exists? "spec/controllers/#{module_name_for_path(old_module_name)}" + if File.exist? "spec/controllers/#{module_name_for_path(old_module_name)}" log "Copying all files from spec/controllers/#{module_name_for_path(old_module_name)} to spec/controllers/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "spec/controllers/#{module_name_for_path(old_module_name)}", "spec/controllers/#{module_name_for_path(new_module_name)}" Dir.glob("spec/controllers/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -91,7 +91,7 @@ def copy_controller_tests say "No controller specs found in spec/controllers for #{old_version}" end - if File.exists? "spec/requests/#{module_name_for_path(old_module_name)}" + if File.exist? "spec/requests/#{module_name_for_path(old_module_name)}" log "Copying all files from spec/requests/#{module_name_for_path(old_module_name)} to spec/requests/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "spec/requests/#{module_name_for_path(old_module_name)}", "spec/requests/#{module_name_for_path(new_module_name)}" Dir.glob("spec/requests/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -109,7 +109,7 @@ def copy_controller_tests def copy_presenters in_root do - if File.exists? "app/presenters/#{module_name_for_path(old_module_name)}" + if File.exist? "app/presenters/#{module_name_for_path(old_module_name)}" log "Copying all files from app/presenters/#{module_name_for_path(old_module_name)} to app/presenters/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "app/presenters/#{module_name_for_path(old_module_name)}", "app/presenters/#{module_name_for_path(new_module_name)}" Dir.glob("app/presenters/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -126,7 +126,7 @@ def copy_presenter_tests in_root do case Versionist.configuration.configured_test_framework when :test_unit - if File.exists? "test/presenters/#{module_name_for_path(old_module_name)}" + if File.exist? "test/presenters/#{module_name_for_path(old_module_name)}" log "Copying all files from test/presenters/#{module_name_for_path(old_module_name)} to test/presenters/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "test/presenters/#{module_name_for_path(old_module_name)}", "test/presenters/#{module_name_for_path(new_module_name)}" Dir.glob("test/presenters/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -137,7 +137,7 @@ def copy_presenter_tests say "No presenter tests found in test/presenters for #{old_version}" end when :rspec - if File.exists? "spec/presenters/#{module_name_for_path(old_module_name)}" + if File.exist? "spec/presenters/#{module_name_for_path(old_module_name)}" log "Copying all files from spec/presenters/#{module_name_for_path(old_module_name)} to spec/presenters/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "spec/presenters/#{module_name_for_path(old_module_name)}", "spec/presenters/#{module_name_for_path(new_module_name)}" Dir.glob("spec/presenters/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -155,7 +155,7 @@ def copy_presenter_tests def copy_helpers in_root do - if File.exists? "app/helpers/#{module_name_for_path(old_module_name)}" + if File.exist? "app/helpers/#{module_name_for_path(old_module_name)}" log "Copying all files from app/helpers/#{module_name_for_path(old_module_name)} to app/helpers/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "app/helpers/#{module_name_for_path(old_module_name)}", "app/helpers/#{module_name_for_path(new_module_name)}" Dir.glob("app/helpers/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -172,7 +172,7 @@ def copy_helper_tests in_root do case Versionist.configuration.configured_test_framework when :test_unit - if File.exists? "test/helpers/#{module_name_for_path(old_module_name)}" + if File.exist? "test/helpers/#{module_name_for_path(old_module_name)}" log "Copying all files from test/helpers/#{module_name_for_path(old_module_name)} to test/helpers/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "test/helpers/#{module_name_for_path(old_module_name)}", "test/helpers/#{module_name_for_path(new_module_name)}" Dir.glob("test/helpers/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -183,7 +183,7 @@ def copy_helper_tests say "No helper tests found in test/helpers for #{old_version}" end when :rspec - if File.exists? "spec/helpers/#{module_name_for_path(old_module_name)}" + if File.exist? "spec/helpers/#{module_name_for_path(old_module_name)}" log "Copying all files from spec/helpers/#{module_name_for_path(old_module_name)} to spec/helpers/#{module_name_for_path(new_module_name)}" FileUtils.cp_r "spec/helpers/#{module_name_for_path(old_module_name)}", "spec/helpers/#{module_name_for_path(new_module_name)}" Dir.glob("spec/helpers/#{module_name_for_path(new_module_name)}/*.rb").each do |f| @@ -201,7 +201,7 @@ def copy_helper_tests def copy_documentation in_root do - if File.exists? "public/docs/#{old_version}" + if File.exist? "public/docs/#{old_version}" log "Copying all files from public/docs/#{old_version} to public/docs/#{new_version}" FileUtils.cp_r "public/docs/#{old_version}/.", "public/docs/#{new_version}" else diff --git a/lib/generators/versionist/new_controller/new_controller_generator.rb b/lib/generators/versionist/new_controller/new_controller_generator.rb index 4fac2fd..c87b489 100644 --- a/lib/generators/versionist/new_controller/new_controller_generator.rb +++ b/lib/generators/versionist/new_controller/new_controller_generator.rb @@ -10,7 +10,7 @@ class NewControllerGenerator < Rails::Generators::NamedBase def new_controller in_root do - raise "API module namespace #{module_name} doesn't exist. Please run \'rails generate versionist:new_api_version\' generator first" if !File.exists?("app/controllers/#{module_name_for_path(module_name)}") + raise "API module namespace #{module_name} doesn't exist. Please run \'rails generate versionist:new_api_version\' generator first" if !File.exist?("app/controllers/#{module_name_for_path(module_name)}") template 'new_controller.rb', File.join("app", "controllers", "#{module_name_for_path(module_name)}", "#{file_name}_controller.rb") api_version_block = /api_version.*:?module\s*(=>|:)\s*("|')#{module_name_for_route(module_name)}("|')/ diff --git a/lib/generators/versionist/new_presenter/new_presenter_generator.rb b/lib/generators/versionist/new_presenter/new_presenter_generator.rb index 0104bb6..948af0d 100644 --- a/lib/generators/versionist/new_presenter/new_presenter_generator.rb +++ b/lib/generators/versionist/new_presenter/new_presenter_generator.rb @@ -10,7 +10,7 @@ class NewPresenterGenerator < Rails::Generators::NamedBase def new_presenter in_root do - raise "API module namespace #{module_name} doesn't exist. Please run \'rails generate versionist:new_api_version\' generator first" if !File.exists?("app/presenters/#{module_name_for_path(module_name)}") + raise "API module namespace #{module_name} doesn't exist. Please run \'rails generate versionist:new_api_version\' generator first" if !File.exist?("app/presenters/#{module_name_for_path(module_name)}") template 'new_presenter.rb', File.join("app", "presenters", "#{module_name_for_path(module_name)}", "#{file_name}_presenter.rb") end end diff --git a/lib/generators/versionist/rspec_helper.rb b/lib/generators/versionist/rspec_helper.rb index 92b360e..7555267 100644 --- a/lib/generators/versionist/rspec_helper.rb +++ b/lib/generators/versionist/rspec_helper.rb @@ -3,7 +3,7 @@ module RspecHelper # Gets the name of the helper file to require in spec files # Accounting for rspec-rails 2 vs rspec-rails 3 def rspec_helper_filename - if File.exists? "spec/rails_helper.rb" + if File.exist? "spec/rails_helper.rb" "rails_helper" else "spec_helper"