code cleanup: rubocop: fix Lint/IneffectiveAccessModifier in lib/redmine/scm/adapters/abstract_adapter.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18777 e93f8b46-1217-0410-a6f0-8f06a7374b81

.rubocop_todo.yml

@@ -395,7 +395,6 @@ Lint/IneffectiveAccessModifier:
     - 'app/models/mail_handler.rb'
     - 'app/models/mailer.rb'
     - 'app/models/user.rb'
-    - 'lib/redmine/scm/adapters/abstract_adapter.rb'
 
 Lint/InterpolationCheck:
   Exclude:

lib/redmine/scm/adapters/abstract_adapter.rb

@@ -203,10 +203,6 @@ module Redmine
           self.class.shellout(cmd, options, &block)
         end
 
-        def self.logger
-          Rails.logger
-        end
-
         # Path to the file where scm stderr output is logged
         # Returns nil if the log file is not writable
         def self.stderr_log_file
@@ -234,32 +230,39 @@ module Redmine
         end
         private_class_method :stderr_log_file
 
-        def self.shellout(cmd, options = {}, &block)
+        # Singleton class method is public
-          if logger && logger.debug?
+        class << self
-            logger.debug "Shelling out: #{strip_credential(cmd)}"
+          def logger
-            # Capture stderr in a log file
+            Rails.logger
-            if stderr_log_file
-              cmd = "#{cmd} 2>>#{shell_quote(stderr_log_file)}"
-            end
           end
-          begin
+
-            mode = "r+"
+          def shellout(cmd, options = {}, &block)
-            IO.popen(cmd, mode) do |io|
+            if logger && logger.debug?
-              io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding)
+              logger.debug "Shelling out: #{strip_credential(cmd)}"
-              io.close_write unless options[:write_stdin]
+              # Capture stderr in a log file
-              block.call(io) if block_given?
+              if stderr_log_file
+                cmd = "#{cmd} 2>>#{shell_quote(stderr_log_file)}"
+              end
+            end
+            begin
+              mode = "r+"
+              IO.popen(cmd, mode) do |io|
+                io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding)
+                io.close_write unless options[:write_stdin]
+                block.call(io) if block_given?
+              end
+            rescue => e
+              msg = strip_credential(e.message)
+              # The command failed, log it and re-raise
+              logmsg = "SCM command failed, "
+              logmsg += "make sure that your SCM command (e.g. svn) is "
+              logmsg += "in PATH (#{ENV['PATH']})\n"
+              logmsg += "You can configure your scm commands in config/configuration.yml.\n"
+              logmsg += "#{strip_credential(cmd)}\n"
+              logmsg += "with: #{msg}"
+              logger.error(logmsg)
+              raise CommandFailed.new(msg)
             end
-          rescue => e
-            msg = strip_credential(e.message)
-            # The command failed, log it and re-raise
-            logmsg = "SCM command failed, "
-            logmsg += "make sure that your SCM command (e.g. svn) is "
-            logmsg += "in PATH (#{ENV['PATH']})\n"
-            logmsg += "You can configure your scm commands in config/configuration.yml.\n"
-            logmsg += "#{strip_credential(cmd)}\n"
-            logmsg += "with: #{msg}"
-            logger.error(logmsg)
-            raise CommandFailed.new(msg)
           end
         end