Merge branch 'align-completely-to-fire-cli' into 'master'

Align completely to fire cli

See merge request icaotix/linux-tools!16

AbstractModule.py

@@ -1,12 +0,0 @@
-from abc import ABC, abstractmethod
-
-
-class AbstractModule(ABC):
-    """docstring for Module."""
-
-    def __init__(self):
-        super(AbstractModule, self).__init__()
-
-    @abstractmethod
-    def run(self):
-        pass

lnxtools.sh

@@ -10,7 +10,7 @@ then
     pip3 install setuptools wheel regex
     cd $DIR
     pip3 install -r requirements.txt
-    python3 main.py helloworld run
+    python3 main.py helloworld
 else
     cd $DIR
     python3 main.py "$@"

main.py

@@ -1,20 +1,17 @@
-import importlib
-import os
 import fire
 
+from modules.helloworld.HelloWorld import HelloWorld
+from modules.install.ToolsInstaller import ToolsInstaller
+from modules.swap.SwapModule import SwapModule
+from modules.systemupdate.Systemupdate import Systemupdate
+from modules.vim.VimModule import VimModule
 
-def load_modules():
-    print("Loading modules")
-    loaded_modules = {}
-    for folder in os.listdir("./modules"):
-        try:
-            curr_module = importlib.import_module('.' + folder, package="modules")
-            loaded_modules[folder] = curr_module.get_module()
-        except AttributeError:
-            pass
-    print("Modules loaded successfully.\n")
-    return loaded_modules
+modules = {
+    "helloworld": HelloWorld().run,
+    "install": ToolsInstaller,
+    "swap": SwapModule().run,
+    "update": Systemupdate().run,
+    "vim": VimModule().run
+}
 
-
-modules = load_modules()
 fire.Fire(modules)

modules/helloworld/HelloWorld.py

@@ -1,12 +1,6 @@
-from AbstractModule import AbstractModule
-
-
-class HelloWorld(AbstractModule):
+class HelloWorld:
     """docstring for SampleModule."""
 
-    def __init__(self):
-        super(HelloWorld, self).__init__()
-
     def run(self):
         print("This shows that your installation is working correctly.")
         print("You can now start using the tool.")

modules/helloworld/__init__.py

@@ -1,5 +0,0 @@
-from .helloWorld import HelloWorld
-
-
-def get_module():
-    return HelloWorld()

modules/install/ToolsInstaller.py

@@ -1,17 +1,14 @@
 import json
 import subprocess
 
-from AbstractModule import AbstractModule
 
-
-class CmdToolsModule(AbstractModule):
+class ToolsInstaller:
 
     def __init__(self):
-        super().__init__()
-        with open("modules/program-installer/programs.json") as config_file:
+        with open("modules/install/programs.json") as config_file:
             self.programs_json = json.load(config_file)
 
-    def run(self):
+    def basic_tools(self):
         """Install the most basic tools!"""
         print("Try to install basic Command-line tools")
 

modules/program-installer/__init__.py

@@ -1,5 +0,0 @@
-from .module import CmdToolsModule
-
-
-def get_module():
-    return CmdToolsModule()

modules/swap/SwapModule.py

@@ -1,7 +1,6 @@
 import subprocess
 from typing import List
 
-from AbstractModule import AbstractModule
 from PyInquirer import prompt
 
 
@@ -9,10 +8,7 @@ def _run_shell_command(cmd: List[str]) -> str:
     return subprocess.check_output(cmd).decode("UTF-8").strip()
 
 
-class SwapModule(AbstractModule):
-
-    def __init__(self):
-        super().__init__()
+class SwapModule:
 
     def run(self):
         actions = {

modules/swap/__init__.py

@@ -1,5 +0,0 @@
-from .module import SwapModule
-
-
-def get_module():
-    return SwapModule()

modules/systemupdate/Systemupdate.py

@@ -1,9 +1,7 @@
 import subprocess
 
-from AbstractModule import AbstractModule
 
-
-class Systemupdate(AbstractModule):
+class Systemupdate:
 
     def run(self):
         print("Running update")

modules/systemupdate/__init__.py

@@ -1,5 +0,0 @@
-from .systemupdate import Systemupdate
-
-
-def get_module():
-    return Systemupdate()

modules/vim/VimModule.py

@@ -5,10 +5,8 @@ from pathlib import Path
 
 from PyInquirer import prompt
 
-from AbstractModule import AbstractModule
 
-
-class VimModule(AbstractModule):
+class VimModule:
     def __init__(self):
         super().__init__()
         self._debugFlag = False

modules/vim/__init__.py

@@ -1,5 +0,0 @@
-from .module import VimModule
-
-
-def get_module():
-    return VimModule()