adds support for arduino-cli 0.30.0

Author: Renaud11232

.github/workflows/build.yml

@@ -53,9 +53,9 @@ jobs:
           python-version: ${{ matrix.python }}
       - name: Download arduino-cli
         run: |
-          wget https://github.com/arduino/arduino-cli/releases/download/0.29.0/arduino-cli_0.29.0_Linux_64bit.tar.gz
-          tar xzf arduino-cli_0.29.0_Linux_64bit.tar.gz
-          rm arduino-cli_0.29.0_Linux_64bit.tar.gz
+          wget https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_64bit.tar.gz
+          tar xzf arduino-cli_0.30.0_Linux_64bit.tar.gz
+          rm arduino-cli_0.30.0_Linux_64bit.tar.gz
       - name: Install test dependencies
         run: |
           pip install pytest

pyduinocli/commands/board.py

@@ -57,9 +57,9 @@ def details(self, fqbn, full=None, list_programmers=None, board_options=None):
         :param full: Show full board details
         :type full: bool or NoneTYpe
         :param list_programmers: Show list of available programmers
-        :type list_programmers: bool or NoneTYpe
+        :type list_programmers: bool or NoneType
         :param board_options: Board options
-        :type board_options: dict or NoneTYpe
+        :type board_options: dict or NoneType
         :return: The output of the related command
         :rtype: dict
         """
@@ -74,14 +74,18 @@ def details(self, fqbn, full=None, list_programmers=None, board_options=None):
                 args.extend([flags.BOARD_OPTIONS, option])
         return self._exec(args)
 
-    def list(self, discovery_timeout=None, watch=None):
+    def list(self, discovery_timeout=None, watch=None, board_options=None, fqbn=None):
         """
         Calls the :code:`board list` command.
 
         :param discovery_timeout: Max time to wait for port discovery, e.g.: 30s, 1m (default 1s)
         :type discovery_timeout: str or NoneType
         :param watch: Command keeps running and prints list of connected boards whenever there is a change. Added to pyduinocli for completion but won't actually return, use a loop instead
         :type watch: bool or NoneTYpe
+        :param fqbn: Fully Qualified Board Name, e.g.: arduino:avr:uno
+        :type fqbn: str or NoneType
+        :param board_options: Dict of board options (option_name:value)
+        :type board_options: dict or NoneType
         :return: The output of the related command
         :rtype: dict
         """
@@ -90,6 +94,12 @@ def list(self, discovery_timeout=None, watch=None):
             args.extend([flags.DISCOVERY_TIMEOUT, CommandBase._strip_arg(discovery_timeout)])
         if watch is True:
             args.append(flags.WATCH)
+        if fqbn is not None:
+            args.extend([flags.FQBN, CommandBase._strip_arg(fqbn)])
+        if board_options:
+            for option_name, option_value in board_options.items():
+                option = "%s=%s" % (CommandBase._strip_arg(option_name), CommandBase._strip_arg(option_value))
+                args.extend([flags.BOARD_OPTIONS, option])
         return self._exec(args)
 
     def listall(self, boardname=None, show_hidden=None):

pyduinocli/commands/daemon.py

@@ -12,7 +12,7 @@ def __init__(self, base_args):
         CommandBase.__init__(self, base_args)
         self._base_args.append(commands.DAEMON)
 
-    def __call__(self, daemonize=None, port=None, debug=None, debug_filter=None, ip=None, debug_file=None):
+    def __call__(self, daemonize=None, port=None, debug=None, debug_filter=None, debug_file=None):
         """
         Calls the :code:`daemon` command
 
@@ -24,8 +24,6 @@ def __call__(self, daemonize=None, port=None, debug=None, debug_filter=None, ip=
         :type debug: bool or NoneType
         :param debug_filter: Display only the provided gRPC calls
         :type debug_filter: str or NoneType
-        :param ip: The IP address the daemon will listen to (default "127.0.0.1")
-        :type ip: str or NoneType
         :param debug_file: Append debug logging to the specified file
         :type debug_file: str or NoneType
         :return: The output of the related command

pyduinocli/commands/sketch.py

@@ -12,18 +12,23 @@ def __init__(self, base_args):
         CommandBase.__init__(self, base_args)
         self._base_args.append(commands.SKETCH)
 
-    def new(self, name):
+    def new(self, name, overwrite=None):
         """
         Calls the :code:`sketch new` command
 
         :param name: The name of the sketch to create
         :type name: str
+        :param overwrite: Overwrites an existing .ino sketch.
+        :type overwrite: bool or NoneType
         :return: The output of the related command
         :rtype: dict
         """
-        return self._exec([commands.NEW, CommandBase._strip_arg(name)])
+        args = [commands.NEW, CommandBase._strip_arg(name)]
+        if overwrite is True:
+            args.append(flags.OVERWRITE)
+        return self._exec(args)
 
-    def archive(self, sketch_path=".", archive_path=None, include_build_dir=None):
+    def archive(self, sketch_path=".", archive_path=None, include_build_dir=None, overwrite=None):
         """
         Calls the :code:`sketch archive` command
 
@@ -33,6 +38,8 @@ def archive(self, sketch_path=".", archive_path=None, include_build_dir=None):
         :type archive_path: str or NoneType
         :param include_build_dir: Includes the build directory in the archive
         :type include_build_dir: bool or NoneType
+        :param overwrite: Overwrites an already existing archive
+        :type overwrite: bool or NoneType
         :return: The output of the related command
         :rtype: dict
         """
@@ -41,4 +48,6 @@ def archive(self, sketch_path=".", archive_path=None, include_build_dir=None):
             args.append(CommandBase._strip_arg(archive_path))
         if include_build_dir is True:
             args.append(flags.INCLUDE_BUILD_DIR)
+        if overwrite is True:
+            args.append(flags.OVERWRITE)
         return self._exec(args)

setup.py

@@ -8,7 +8,7 @@ def get_long_description():
 
 setuptools.setup(
     name="pyduinocli",
-    version="0.25.0",
+    version="0.30.0",
     author="Renaud Gaspard",
     author_email="gaspardrenaud@hotmail.com",
     description="Wrapper library around arduino-cli",