Commit 2fee8337 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'file_exists_deprecated' into 'master'

Use `File::exist?` instead of `File::exists?`

Each `File::exists?` replaced to `File::exist?`.

Since version ruby-2.2.0, method `File::exists?` is deprecated.

See merge request !5747
parents 9d27e8f0 96ebc8c4
...@@ -98,6 +98,7 @@ v 8.11.0 (unreleased) ...@@ -98,6 +98,7 @@ v 8.11.0 (unreleased)
- Avoid to show the original password field when password is automatically set. !5712 (duduribeiro) - Avoid to show the original password field when password is automatically set. !5712 (duduribeiro)
- Fix importing GitLab projects with an invalid MR source project - Fix importing GitLab projects with an invalid MR source project
- Sort folders with submodules in Files view !5521 - Sort folders with submodules in Files view !5521
- Each `File::exists?` replaced to `File::exist?` because of deprecate since ruby version 2.2.0
v 8.10.5 v 8.10.5
- Add a data migration to fix some missing timestamps in the members table. !5670 - Add a data migration to fix some missing timestamps in the members table. !5670
......
...@@ -27,7 +27,7 @@ module Backup ...@@ -27,7 +27,7 @@ module Backup
def backup_existing_files_dir def backup_existing_files_dir
timestamped_files_path = File.join(files_parent_dir, "#{name}.#{Time.now.to_i}") timestamped_files_path = File.join(files_parent_dir, "#{name}.#{Time.now.to_i}")
if File.exists?(app_files_dir) if File.exist?(app_files_dir)
FileUtils.mv(app_files_dir, File.expand_path(timestamped_files_path)) FileUtils.mv(app_files_dir, File.expand_path(timestamped_files_path))
end end
end end
......
...@@ -114,7 +114,7 @@ module Backup ...@@ -114,7 +114,7 @@ module Backup
tar_file = ENV["BACKUP"].nil? ? File.join("#{file_list.first}_gitlab_backup.tar") : File.join(ENV["BACKUP"] + "_gitlab_backup.tar") tar_file = ENV["BACKUP"].nil? ? File.join("#{file_list.first}_gitlab_backup.tar") : File.join(ENV["BACKUP"] + "_gitlab_backup.tar")
unless File.exists?(tar_file) unless File.exist?(tar_file)
puts "The specified backup doesn't exist!" puts "The specified backup doesn't exist!"
exit 1 exit 1
end end
......
...@@ -28,7 +28,7 @@ module Backup ...@@ -28,7 +28,7 @@ module Backup
wiki = ProjectWiki.new(project) wiki = ProjectWiki.new(project)
if File.exists?(path_to_repo(wiki)) if File.exist?(path_to_repo(wiki))
$progress.print " * #{wiki.path_with_namespace} ... " $progress.print " * #{wiki.path_with_namespace} ... "
if wiki.repository.empty? if wiki.repository.empty?
$progress.puts " [SKIPPED]".color(:cyan) $progress.puts " [SKIPPED]".color(:cyan)
...@@ -49,7 +49,7 @@ module Backup ...@@ -49,7 +49,7 @@ module Backup
def restore def restore
Gitlab.config.repositories.storages.each do |name, path| Gitlab.config.repositories.storages.each do |name, path|
next unless File.exists?(path) next unless File.exist?(path)
# Move repos dir to 'repositories.old' dir # Move repos dir to 'repositories.old' dir
bk_repos_path = File.join(path, '..', 'repositories.old.' + Time.now.to_i.to_s) bk_repos_path = File.join(path, '..', 'repositories.old.' + Time.now.to_i.to_s)
...@@ -63,7 +63,7 @@ module Backup ...@@ -63,7 +63,7 @@ module Backup
project.ensure_dir_exist project.ensure_dir_exist
if File.exists?(path_to_bundle(project)) if File.exist?(path_to_bundle(project))
FileUtils.mkdir_p(path_to_repo(project)) FileUtils.mkdir_p(path_to_repo(project))
cmd = %W(tar -xf #{path_to_bundle(project)} -C #{path_to_repo(project)}) cmd = %W(tar -xf #{path_to_bundle(project)} -C #{path_to_repo(project)})
else else
...@@ -80,7 +80,7 @@ module Backup ...@@ -80,7 +80,7 @@ module Backup
wiki = ProjectWiki.new(project) wiki = ProjectWiki.new(project)
if File.exists?(path_to_bundle(wiki)) if File.exist?(path_to_bundle(wiki))
$progress.print " * #{wiki.path_with_namespace} ... " $progress.print " * #{wiki.path_with_namespace} ... "
# If a wiki bundle exists, first remove the empty repo # If a wiki bundle exists, first remove the empty repo
......
...@@ -64,7 +64,7 @@ namespace :gitlab do ...@@ -64,7 +64,7 @@ namespace :gitlab do
for_more_information( for_more_information(
see_installation_guide_section "GitLab" see_installation_guide_section "GitLab"
) )
end end
end end
end end
...@@ -73,7 +73,7 @@ namespace :gitlab do ...@@ -73,7 +73,7 @@ namespace :gitlab do
database_config_file = Rails.root.join("config", "database.yml") database_config_file = Rails.root.join("config", "database.yml")
if File.exists?(database_config_file) if File.exist?(database_config_file)
puts "yes".color(:green) puts "yes".color(:green)
else else
puts "no".color(:red) puts "no".color(:red)
...@@ -94,7 +94,7 @@ namespace :gitlab do ...@@ -94,7 +94,7 @@ namespace :gitlab do
gitlab_config_file = Rails.root.join("config", "gitlab.yml") gitlab_config_file = Rails.root.join("config", "gitlab.yml")
if File.exists?(gitlab_config_file) if File.exist?(gitlab_config_file)
puts "yes".color(:green) puts "yes".color(:green)
else else
puts "no".color(:red) puts "no".color(:red)
...@@ -113,7 +113,7 @@ namespace :gitlab do ...@@ -113,7 +113,7 @@ namespace :gitlab do
print "GitLab config outdated? ... " print "GitLab config outdated? ... "
gitlab_config_file = Rails.root.join("config", "gitlab.yml") gitlab_config_file = Rails.root.join("config", "gitlab.yml")
unless File.exists?(gitlab_config_file) unless File.exist?(gitlab_config_file)
puts "can't check because of previous errors".color(:magenta) puts "can't check because of previous errors".color(:magenta)
end end
...@@ -144,7 +144,7 @@ namespace :gitlab do ...@@ -144,7 +144,7 @@ namespace :gitlab do
script_path = "/etc/init.d/gitlab" script_path = "/etc/init.d/gitlab"
if File.exists?(script_path) if File.exist?(script_path)
puts "yes".color(:green) puts "yes".color(:green)
else else
puts "no".color(:red) puts "no".color(:red)
...@@ -169,7 +169,7 @@ namespace :gitlab do ...@@ -169,7 +169,7 @@ namespace :gitlab do
recipe_path = Rails.root.join("lib/support/init.d/", "gitlab") recipe_path = Rails.root.join("lib/support/init.d/", "gitlab")
script_path = "/etc/init.d/gitlab" script_path = "/etc/init.d/gitlab"
unless File.exists?(script_path) unless File.exist?(script_path)
puts "can't check because of previous errors".color(:magenta) puts "can't check because of previous errors".color(:magenta)
return return
end end
...@@ -361,7 +361,7 @@ namespace :gitlab do ...@@ -361,7 +361,7 @@ namespace :gitlab do
Gitlab.config.repositories.storages.each do |name, repo_base_path| Gitlab.config.repositories.storages.each do |name, repo_base_path|
print "#{name}... " print "#{name}... "
if File.exists?(repo_base_path) if File.exist?(repo_base_path)
puts "yes".color(:green) puts "yes".color(:green)
else else
puts "no".color(:red) puts "no".color(:red)
...@@ -385,7 +385,7 @@ namespace :gitlab do ...@@ -385,7 +385,7 @@ namespace :gitlab do
Gitlab.config.repositories.storages.each do |name, repo_base_path| Gitlab.config.repositories.storages.each do |name, repo_base_path|
print "#{name}... " print "#{name}... "
unless File.exists?(repo_base_path) unless File.exist?(repo_base_path)
puts "can't check because of previous errors".color(:magenta) puts "can't check because of previous errors".color(:magenta)
return return
end end
...@@ -408,7 +408,7 @@ namespace :gitlab do ...@@ -408,7 +408,7 @@ namespace :gitlab do
Gitlab.config.repositories.storages.each do |name, repo_base_path| Gitlab.config.repositories.storages.each do |name, repo_base_path|
print "#{name}... " print "#{name}... "
unless File.exists?(repo_base_path) unless File.exist?(repo_base_path)
puts "can't check because of previous errors".color(:magenta) puts "can't check because of previous errors".color(:magenta)
return return
end end
...@@ -438,7 +438,7 @@ namespace :gitlab do ...@@ -438,7 +438,7 @@ namespace :gitlab do
Gitlab.config.repositories.storages.each do |name, repo_base_path| Gitlab.config.repositories.storages.each do |name, repo_base_path|
print "#{name}... " print "#{name}... "
unless File.exists?(repo_base_path) unless File.exist?(repo_base_path)
puts "can't check because of previous errors".color(:magenta) puts "can't check because of previous errors".color(:magenta)
return return
end end
......
...@@ -90,7 +90,7 @@ namespace :gitlab do ...@@ -90,7 +90,7 @@ namespace :gitlab do
task build_missing_projects: :environment do task build_missing_projects: :environment do
Project.find_each(batch_size: 1000) do |project| Project.find_each(batch_size: 1000) do |project|
path_to_repo = project.repository.path_to_repo path_to_repo = project.repository.path_to_repo
if File.exists?(path_to_repo) if File.exist?(path_to_repo)
print '-' print '-'
else else
if Gitlab::Shell.new.add_repository(project.repository_storage_path, if Gitlab::Shell.new.add_repository(project.repository_storage_path,
......
...@@ -46,7 +46,7 @@ def run_spinach_tests(tags) ...@@ -46,7 +46,7 @@ def run_spinach_tests(tags)
success = run_spinach_command(%W(--tags #{tags})) success = run_spinach_command(%W(--tags #{tags}))
3.times do |_| 3.times do |_|
break if success break if success
break unless File.exists?('tmp/spinach-rerun.txt') break unless File.exist?('tmp/spinach-rerun.txt')
tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp) tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp)
puts '' puts ''
......
...@@ -42,7 +42,7 @@ describe 'gitlab:app namespace rake task' do ...@@ -42,7 +42,7 @@ describe 'gitlab:app namespace rake task' do
before do before do
allow(Dir).to receive(:glob).and_return([]) allow(Dir).to receive(:glob).and_return([])
allow(Dir).to receive(:chdir) allow(Dir).to receive(:chdir)
allow(File).to receive(:exists?).and_return(true) allow(File).to receive(:exist?).and_return(true)
allow(Kernel).to receive(:system).and_return(true) allow(Kernel).to receive(:system).and_return(true)
allow(FileUtils).to receive(:cp_r).and_return(true) allow(FileUtils).to receive(:cp_r).and_return(true)
allow(FileUtils).to receive(:mv).and_return(true) allow(FileUtils).to receive(:mv).and_return(true)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment