Merge pull request #77 from staadecker/fix_switch_version

Fix switch --version

Author: pesap

switch_model/__main__.py

@@ -39,12 +39,11 @@ def main():
         del sys.argv[1]
         if cmd == "--version":
             print("Switch model version " + switch_model.__version__)
-            try:
-                from switch_model.utilities import get_git_branch
+            from switch_model.utilities import get_git_branch
 
-                print(f"Switch git branch {get_git_branch()}")
-            except:
-                pass
+            branch = get_git_branch()
+            if branch is not None:
+                print(f"Switch Git branch: {branch}")
             return 0
         if cmd == "solve":
             from switch_model.solve import main

switch_model/utilities/__init__.py

@@ -6,6 +6,7 @@
 """
 from __future__ import print_function
 
+import functools
 import os, types, sys, argparse, time, datetime, traceback, subprocess, platform
 import warnings
 
@@ -952,6 +953,26 @@ def query_yes_no(question, default="yes"):
             sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
 
 
+def catch_exceptions(warning_msg=None, should_catch=True):
+    """Decorator that catches exceptions."""
+
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            if not should_catch:
+                return func(*args, **kwargs)
+
+            try:
+                return func(*args, **kwargs)
+            except:
+                if warning_msg is not None:
+                    warnings.warn(warning_msg)
+
+        return wrapper
+
+    return decorator
+
+
 def run_command(command):
     return (
         subprocess.check_output(command.split(" "), cwd=os.path.dirname(__file__))
@@ -960,14 +981,23 @@ def run_command(command):
     )
 
 
+@catch_exceptions("Failed to get Git Branch.")
+def get_git_branch():
+    return run_command("git rev-parse --abbrev-ref HEAD")
+
+
+@catch_exceptions("Failed to get Git Commit Hash.")
+def get_git_commit():
+    return run_command("git rev-parse HEAD")
+
+
 def add_git_info():
-    try:
-        commit_num = run_command("git rev-parse HEAD")
-        branch = run_command("git rev-parse --abbrev-ref HEAD")
+    commit_num = get_git_commit()
+    branch = get_git_branch()
+    if commit_num is not None:
         add_info("Git Commit", commit_num, section=ResultsInfoSection.GENERAL)
+    if branch is not None:
         add_info("Git Branch", branch, section=ResultsInfoSection.GENERAL)
-    except:
-        warnings.warn("Failed to get Git Branch or Commit Hash for info.txt.")
 
 
 def get_module_list(args=None, include_solve_module=True):