Mac compability

examples/MacCalc/.integrity.json

@@ -0,0 +1 @@
+{"maccalc": "bdee4331072ce68954b7aa6d090165bc638474bf9515114a72d5baf86fa415af"}

examples/MacCalc/maccalc

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+open -a calculator && cat

examples/test_local.py

@@ -25,6 +25,19 @@
             iquail.builder.CmdIntegrity(solution_path)
         )
     )
+if iquail.helper.OS_OSX:
+    solution_path = ['Allum1']
+    iquail.run(
+        iquail.SolutionLocal(['Allum1']),
+        iquail.Installer(
+                name='Allum1',
+                publisher='alies',
+                icon='icon.jpeg',
+                binary='allum1',
+                console=True,
+        ),
+        iquail.builder.Builder(iquail.builder.CmdIntegrity(solution_path))
+    )
 if iquail.helper.OS_WINDOWS:
     solution_path = ['OpenHardwareMonitor']
     iquail.run(

examples/test_osx.py

@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+
+import os
+import os.path
+import iquail
+import platform
+
+if iquail.helper.OS_OSX:
+    solution_path = ['MacCalc']
+    iquail.run(
+        iquail.SolutionLocal(['MacCalc']),
+        iquail.Installer(
+                name='MacCalc',
+                publisher='test',
+                icon='icon.jpeg',
+                binary='maccalc',
+                console=True,
+        ),
+        iquail.builder.Builder(iquail.builder.CmdIntegrity(solution_path))
+    )

iquail/controller/__init__.py

@@ -1,3 +1,6 @@
 from .controller_base import ControllerBase
-from .controller_tkinter import ControllerTkinter
+try:
+    from .controller_tkinter import ControllerTkinter
+except:
+    print("No display found or tkinter missing, console mode enabled !")
 from .controller_console import ControllerConsole

iquail/helper/__init__.py

@@ -2,3 +2,4 @@
 from .file_ignore import FileIgnore, accept_path
 from .integrity_verifier import IntegrityVerifier, checksum_file
 from .configuration import Configuration, ConfVar
+from .osx import BundleTemplate, PlistTemplate

iquail/helper/misc.py

@@ -11,6 +11,7 @@
 
 OS_LINUX = platform.system() == 'Linux'
 OS_WINDOWS = platform.system() == 'Windows'
+OS_OSX = platform.system() == 'Darwin'
 
 
 def cache_result(func):

iquail/helper/osx/__init__.py

@@ -0,0 +1,2 @@
+from .bundle_template import BundleTemplate
+from .plist_template import PlistTemplate

iquail/helper/osx/bundle_template.py

@@ -0,0 +1,14 @@
+import os
+
+class BundleTemplate():
+
+    def __init__(self, CFBundleName):
+        self.bundle_name = CFBundleName
+        #TODO refactor name
+        self.base_dir = "/Applications/"
+        self.full_path = self.base_dir + self.bundle_name + ".app"
+        self.names = [self.full_path, self.full_path + "/Contents", self.full_path + "/Contents/MacOS"]
+
+    def make(self):
+        for path in self.names:
+            os.mkdir(path)

iquail/helper/osx/plist_creator.py

@@ -0,0 +1,33 @@
+import xml.etree.ElementTree as ET
+
+class PlistCreator:
+    def __init__(self, bundle_name: str, plistDict: dict):
+        self.__file = open("/applications/" + bundle_name + ".app/contents/info.plist", "a+")
+        self.__
+        self.__plist_dict = {
+            "CFBundleGetInfoString": bundle_name,
+            "CFBundleExecutable": 'launcher',
+            "CFBundleIdentifier": bundle_name,
+            "CFBundleName": bundle_name
+        }
+        self.__plist_header = """
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        """
+        self.__plist_dict.update(plistDict)
+
+    def __del__(self):
+        self.__file.close()
+
+    @property
+    def plist_dict(self):
+        return self.__plist_dict
+
+    def write_file(self):
+        self.__create_header()
+
+    def __create_header(self):
+        self.__file.write(self.__plist_header)
+
+

iquail/helper/osx/plist_template.py

@@ -0,0 +1,42 @@
+import os
+
+#TODO : add full PATH to spotlight env to access python3
+class PlistTemplate():
+    def __init__(self, CFBundleName, plistDict):
+        self.file = open("/Applications/" + CFBundleName + ".app/Contents/Info.plist", "a+")
+        self.plist_dict = dict(
+            CFBundleGetInfoString=CFBundleName,
+            CFBundleExecutable='launcher',
+            CFBundleIdentifier=CFBundleName,
+            CFBundleName=CFBundleName
+        )
+        self.plist_dict.update(plistDict)
+
+    def make(self):
+        self._createHeader()
+        for key, value in self.plist_dict.items():
+            self._writeProperty(key, value, "string")
+        self._createFooter()
+
+    def getInfoPlist(self):
+        return self.plist_dict
+
+    def _createHeader(self):
+        self.plist_header = """
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+        <dict>
+        """
+        self.file.write(self.plist_header)
+
+    def _createFooter(self):
+        self.plist_footer = """
+            </dict>
+            </plist>
+        """
+        self.file.write(self.plist_footer)
+
+    def _writeProperty(self, key, value, typeValue):
+        self.file.write("  <key>" + key + "</key>\n")
+        self.file.write("  <" + typeValue + ">" + value + "</" + typeValue + ">\n")

iquail/installer/installer.py

@@ -8,4 +8,6 @@
     from .installer_windows import InstallerWindows
     Installer = InstallerWindows
 else:
-    raise NotImplementedError
+    from .installer_osx import InstallerOsx
+    Installer = InstallerOsx
+

iquail/installer/installer_osx.py

@@ -0,0 +1,52 @@
+from .installer_base import InstallerBase
+import os
+import stat
+import shutil
+import pathlib
+from ..helper import BundleTemplate, PlistTemplate
+
+class InstallerOsx(InstallerBase):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._bundle_install_path = '/Applications/' + self.name + '.app'
+
+    """ We need to put a syslink into /usr/local/bin or into a local folder inside the user's home directory"""
+    def _register(self):
+        bundle = BundleTemplate(self._name)
+        bundle.make()
+        plist = PlistTemplate(self._binary_name, {})
+        plist.make()
+        self._build_launcher()
+        #self.__add_to_path(self.binary, self._binary_name)
+
+    def _unregister(self):
+        self.__remove_from_path(self.binary)
+
+    def _registered(self):
+        if not os.path.exists(self.build_symlink_path(self.binary)):
+            return False
+
+    def __add_to_path(self, binary, name):
+        os.symlink(binary, self.build_symlink_path(name))
+
+    def __remove_from_path(self, name):
+        shutil.rmtree(self._bundle_install_path)
+
+    def build_symlink_path(self, name):
+        if self.install_systemwide:
+            #TODO setup local installation
+            #final_folder = '/Applications'
+            final_folder = os.path.join(str(pathlib.Path.home()), '/Applications/' + self._name + '.app/Contents/MacOS/')
+        else:
+            final_folder = os.path.join(str(pathlib.Path.home()), '/Applications/' + self._name + '.app/Contents/MacOS/')
+        return os.path.join(final_folder, name)
+
+    def _build_launcher(self):
+        with open(self._bundle_install_path + '/Contents/MacOS/launcher', 'w') as f:
+            content = '/usr/local/bin/python3 ~/.iquail/' + self.uid + '/iquail_launcher.py'
+            shebang = '#!/bin/bash\n'
+            f.write(shebang)
+            f.write(content)
+        st = os.stat(self._bundle_install_path + '/Contents/MacOS/launcher')
+        os.chmod(self._bundle_install_path + '/Contents/MacOS/launcher', st.st_mode | stat.S_IEXEC)