pyalamake 2.2.2__tar.gz → 2.3.0__tar.gz

{pyalamake-2.2.2/src/pyalamake.egg-info → pyalamake-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.2.2
+Version: 2.3.0
 Summary: python module to generate Makefiles for arduino, GTest, C/C++, etc.
 Author-email: "J. Arrizza" <cppgent0@gmail.com>
 Maintainer-email: "J. Arrizza" <cppgent0@gmail.com>

{pyalamake-2.2.2 → pyalamake-2.3.0}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
 
 # common values
 name = 'pyalamake'
-version = '2.2.2'
+version = '2.3.0'
 requires-python = '>=3.9'
 authors = [{ name = 'J. Arrizza', email = 'cppgent0@gmail.com' }]
 maintainers = [

{pyalamake-2.2.2 → pyalamake-2.3.0}/src/pyalamake/constants_version.py

@@ -6,4 +6,4 @@ from dataclasses import dataclass
 @dataclass
 class ConstantsVersion:
     ## current App version
-    version = '2.2.2'
+    version = '2.3.0'

{pyalamake-2.2.2 → pyalamake-2.3.0}/src/pyalamake/osal.py

@@ -338,3 +338,18 @@ class Osal:
 
         # do not fix_path()
         return libs
+
+    # --------------------
+    ## run a command
+    # @param cmd    (list)  the command to run
+    # @return rc, output lines
+    @classmethod
+    def run_cmd(cls, cmd):
+        result = subprocess.run(
+            cmd,
+            capture_output=True,  # Capture stdout and stderr
+            text=True,  # Decode output as string
+            check=True,
+        )  # Raise error for non-zero exit codes
+        # print(f'@@@ osal.run_cmd rc={result.returncode} stdout: {result.stdout.strip()}')
+        return result.returncode, result.stdout.strip()

{pyalamake-2.2.2 → pyalamake-2.3.0}/src/pyalamake/package_cpip.py

@@ -15,12 +15,15 @@ class PackageCpip:
         pkgname = pkgname.replace('cpip.', '')
         svc.log.line(f'finding cpip package: {pkgname}')
 
-        if not svc.osal.isdir(os.path.join('tools', 'xplat_utils')):  # pragma: no cover ; defence only
+        if not svc.osal.isdir(os.path.join('tools', 'xplat_utils')):  # pragma: no cover ; for defense only
             svc.abort('xplat_utils is not installed, aborting')
 
-        from tools.xplat_utils import main
+        from tools.xplat_utils.zpm_utils import ZpmUtils
 
-        pkginfo = main.svc.utils.cpip_get(pkgname)
+        utils = ZpmUtils()
+        utils.load_svc('do_cpip')
+
+        pkginfo = utils.cpip_get(pkgname)
         if pkginfo is None:
             svc.abort(f'could not find info for cpip package: {pkgname}')
 

{pyalamake-2.2.2 → pyalamake-2.3.0}/src/pyalamake/target_arduino.py

@@ -1,3 +1,5 @@
+import os
+
 from .path_handle import PathHandle
 from .svc import svc
 from .target_base import TargetBase
@@ -79,12 +81,40 @@ class TargetArduino(TargetBase):
         if lib == 'Servo':
             svc.log.line(f'adding arduino library: {lib}')
             path = PathHandle(f'{self._shared.library_root}/Servo/src')
+            self._check_library_installed(path, lib)
             self.add_sources(f'{path.fixed}/avr/Servo.cpp')  # pylint: disable=E1101
             self.add_include_directories(path.fixed)  # pylint: disable=E1101
             self.add_compile_options('-DARDUINO_ARCH_AVR')  # pylint: disable=E1101
         else:
             svc.abort(f'{self.target} target_arduino: unknown arduino library: {lib}')
 
+    # --------------------
+    ## check if an arduino library is installed
+    #
+    # @param exp_path  the expected path to the library
+    # @param lib       the library to check
+    # @return None
+    def _check_library_installed(self, exp_path, lib):
+        # svc.log.dbg(f'@@@@ path:{path.fixed} isdir:{os.path.isdir(path.fixed)}')
+        if os.path.isdir(exp_path.fixed):
+            return
+
+        svc.log.highlight(f'arduino library: "{lib}" installing...')
+        rc, lines = svc.osal.run_cmd(['arduino-cli', 'lib', 'update-index'])
+        if rc != 0:
+            svc.log.output(lines)
+            svc.abort(f'arduino-cli update-index failed for "{lib}, rc={rc}')
+
+        rc, lines = svc.osal.run_cmd(['arduino-cli', 'lib', 'install', lib])
+        if rc != 0:
+            svc.log.output(lines)
+            svc.abort(f'arduino-cli install failed for "{lib}", rc={rc}')
+
+        if not os.path.isdir(exp_path.fixed):
+            svc.abort(f'arduino library install failed: "{lib}"')
+
+        svc.log.ok(f'arduino library: "{lib}" installed')
+
     # --------------------
     ## check various aspects of parameters
     #

{pyalamake-2.2.2 → pyalamake-2.3.0/src/pyalamake.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.2.2
+Version: 2.3.0
 Summary: python module to generate Makefiles for arduino, GTest, C/C++, etc.
 Author-email: "J. Arrizza" <cppgent0@gmail.com>
 Maintainer-email: "J. Arrizza" <cppgent0@gmail.com>