Modularize formatter

Author: schedutron

script/formatting/formatter.py

@@ -14,7 +14,8 @@
 import subprocess
 
 from functools import reduce
-from script.helpers import CLANG_FORMAT, PELOTON_DIR, CLANG_FORMAT_FILE, LOG
+from script.helpers import CLANG_FORMAT, PELOTON_DIR, CLANG_FORMAT_FILE, LOG,\
+clang_format
 
 ## ==============================================
 ## CONFIGURATION
@@ -98,13 +99,9 @@ def format_file(file_path, update_header, clang_format_code):
             file.write(file_data)
 
         elif clang_format_code:
-            if CLANG_FORMAT is None:
+            if clang_format(file_path) is None:
                 LOG.error("clang-format seems not installed")
-                exit("clang-format seems not installed")
-
-            formatting_command = CLANG_FORMAT + " -style=file -i " + file_path
-            LOG.info(formatting_command)
-            subprocess.call([CLANG_FORMAT, "-style=file", "-i", file_path])
+                exit()
 
     #END WITH
 #END FORMAT__FILE(FILE_NAME)

script/helpers.py

@@ -42,7 +42,7 @@ def find_clangformat():
     return path
 
 CLANG_FORMAT = find_clangformat()
-
+CLANG_COMMAND_PREFIX = [CLANG_FORMAT, "-style=file"]
 
 def clang_check(file_path):
     """Checks and reports bad code formatting."""
@@ -57,7 +57,7 @@ def clang_check(file_path):
     if CLANG_FORMAT is None:
         LOG.error("clang-format seems not installed")
         exit()
-    clang_format_cmd = [CLANG_FORMAT, "-style=file", file_path]
+    clang_format_cmd = CLANG_COMMAND_PREFIX + [file_path]
     formatted_src = subprocess.check_output(clang_format_cmd).splitlines(True)
 
     # For Python 3, the above command gives a list of binary sequences, each
@@ -84,3 +84,13 @@ def clang_check(file_path):
                 file_status = False
 
         return file_status
+
+
+def clang_format(file_path):
+    """Formats the file at file_path"""
+    if CLANG_FORMAT is None:
+        return False
+    formatting_command = CLANG_COMMAND_PREFIX + ["-i", file_path]
+    LOG.info(' '.join(formatting_command))
+    subprocess.call(formatting_command)
+    return True

src/main/peloton/peloton.cpp

@@ -34,8 +34,7 @@ int main(int argc, char *argv[]) {
 
   // Print settings
   if (peloton::settings::SettingsManager::GetBool(
-          peloton::settings::SettingId::display_settings)) {
-    auto &settings = peloton::settings::SettingsManager::GetInstance();
+          peloton::settings::SettingId::display_settings)) {auto &settings = peloton::settings::SettingsManager::GetInstance();
     settings.ShowInfo();
   }