From 0082367870f70be9d3a66bfe6ec46bbe0dbbc318 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Fri, 21 Oct 2016 09:09:40 +0200
Subject: [PATCH] File.exists? is obsolete

---
 app/controllers/dmsf_controller.rb         | 2 +-
 app/helpers/dmsf_helper.rb                 | 2 +-
 app/models/dmsf_file.rb                    | 2 +-
 app/models/dmsf_file_revision.rb           | 2 +-
 app/views/settings/_dmsf_settings.html.erb | 6 +++---
 extra/xapian_indexer.rb                    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index a5d5d39b..83d2cbe5 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -415,7 +415,7 @@ class DmsfController < ApplicationController
     if selected_files && selected_files.is_a?(Array)
       selected_files.each do |selected_file_id|
         file = DmsfFile.visible.find_by_id selected_file_id
-        unless file && file.last_revision && File.exists?(file.last_revision.disk_file)
+        unless file && file.last_revision && File.exist?(file.last_revision.disk_file)
           raise FileNotFound
         end
         unless (file.project == @project) || User.current.allowed_to?(:view_dmsf_files, file.project)
diff --git a/app/helpers/dmsf_helper.rb b/app/helpers/dmsf_helper.rb
index 4570f6f5..7fd503e3 100644
--- a/app/helpers/dmsf_helper.rb
+++ b/app/helpers/dmsf_helper.rb
@@ -56,7 +56,7 @@ module DmsfHelper
   def self.filetype_css(filename)
     extension = File.extname(filename)
     extension = extension[1, extension.length-1]
-    if File.exists?("#{File.dirname(__FILE__)}/../../assets/images/filetypes/#{extension}.png")
+    if File.exist?("#{File.dirname(__FILE__)}/../../assets/images/filetypes/#{extension}.png")
       "filetype-#{extension}";
     else
       Redmine::MimeType.css_class_of(filename)
diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index f126943c..057a762d 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -106,7 +106,7 @@ class DmsfFile < ActiveRecord::Base
   # better interact from test-cases etc
   def self.storage_path=(path)
     begin
-      FileUtils.mkdir_p(path) unless File.exists?(path)
+      FileUtils.mkdir_p(path) unless File.exist?(path)
     rescue Exception => e
       Rails.logger.error e.message
     end
diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index 2b27bcef..f0963513 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -137,7 +137,7 @@ class DmsfFileRevision < ActiveRecord::Base
       project_base = project.identifier.gsub(/[^\w\.\-]/,'_')
       storage_base << "/p_#{project_base}"
     end
-    FileUtils.mkdir_p(storage_base) unless File.exists?(storage_base)
+    FileUtils.mkdir_p(storage_base) unless File.exist?(storage_base)
     "#{storage_base}/#{self.disk_filename}"
   end
 
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index ef21e279..469afc8a 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -61,7 +61,7 @@
     <%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf" %>
   </em>
 </p>
-<% unless File.exists?(storage_dir) %>
+<% unless File.exist?(storage_dir) %>
   <% begin %>
      <% Dir.mkdir(storage_dir) %>
   <% rescue %>
@@ -69,14 +69,14 @@
   <% end %>
 <% end %>
 <% testfilename = "#{storage_dir}/test.test" %>
-<% if File.exists?(storage_dir) %>
+<% if File.exist?(storage_dir) %>
   <%	begin %>
     <% File.open(testfilename, 'wb') do |file| %>
     <% end %>
   <% rescue %>
     <p class="warning"><%= l(:error_file_can_not_be_created) %></p>
   <%	ensure %>
-    <% File.delete(testfilename) if File.exists?(testfilename) %>
+    <% File.delete(testfilename) if File.exist?(testfilename) %>
   <% end %>
 <% end %>
 
diff --git a/extra/xapian_indexer.rb b/extra/xapian_indexer.rb
index a9ddea41..d83d55f8 100644
--- a/extra/xapian_indexer.rb
+++ b/extra/xapian_indexer.rb
@@ -335,7 +335,7 @@ def generate_uri(project, repository, identifier, path)
 
 def convert_to_text(fpath, type)
   text = nil
-  return text if !File.exists?(FORMAT_HANDLERS[type].split(' ').first)
+  return text if !File.exist?(FORMAT_HANDLERS[type].split(' ').first)
   case type
     when 'pdf'    
       text = "#{FORMAT_HANDLERS[type]} #{fpath} -"
@@ -377,7 +377,7 @@ def add_or_update_index(databasepath, indexconf, project, repository, identifier
     File.open( "#{$tempdir}/#{fname}", 'wb+') do | bs |
       bs.write(bstr)
     end
-    text = convert_to_text("#{$tempdir}/#{fname}", type) if File.exists?("#{$tempdir}/#{fname}") and !bstr.nil?
+    text = convert_to_text("#{$tempdir}/#{fname}", type) if File.exist?("#{$tempdir}/#{fname}") and !bstr.nil?
     File.unlink("#{$tempdir}/#{fname}")
   end  
   log "generated uri: #{uri}"