warn user if a file is not R/W and owned by another user

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/bundler/cli/doctor.rb b/lib/bundler/cli/doctor.rb
index 6fd9f177bb..3e0898ff8a 100644
--- a/lib/bundler/cli/doctor.rb
+++ b/lib/bundler/cli/doctor.rb
@@ -98,10 +98,15 @@ module Bundler
     def check_home_permissions
       require "find"
       files_not_readable_or_writable = []
+      files_not_rw_and_owned_by_different_user = []
       files_not_owned_by_current_user_but_still_rw = []
       Find.find(Bundler.home.to_s).each do |f|
         if !File.writable?(f) || !File.readable?(f)
-          files_not_readable_or_writable << f
+          if File.stat(f).uid != Process.uid
+            files_not_rw_and_owned_by_different_user << f
+          else
+            files_not_readable_or_writable << f
+          end
         elsif File.stat(f).uid != Process.uid
           files_not_owned_by_current_user_but_still_rw << f
         end
@@ -115,6 +120,13 @@ module Bundler
         ok = false
       end
 
+      if files_not_rw_and_owned_by_different_user.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, and are not readable/writable. These files are:\n - #{files_not_rw_and_owned_by_different_user.join("\n - ")}"
+
+        ok = false
+      end
+
       if files_not_readable_or_writable.any?
         Bundler.ui.warn "Files exist in the Bundler home that are not " \
           "readable/writable by the current user. These files are:\n - #{files_not_readable_or_writable.join("\n - ")}"