cli: Add --conan-arg and --conan-setting options to exec and shell commands

Author: cassava

cli/cloe_launch/__main__.py

@@ -114,11 +114,25 @@ def deny_profile_and_path(profile: str, profile_path: str) -> None:
 @click.option("-E", "--preserve-env", is_flag=True, help="Preserve user environment.")
 @click.option(
     "-o",
+    "--conan-arg",
+    type=click.STRING,
+    multiple=True,
+    help="Arguments to pass to Conan for virtualrunenv generation",
+)
+@click.option(
+    "-o:o",
     "--conan-option",
     type=click.STRING,
     multiple=True,
     help="Options to pass to Conan for virtualrunenv generation",
 )
+@click.option(
+    "-o:s",
+    "--conan-setting",
+    type=click.STRING,
+    multiple=True,
+    help="Settings to pass to Conan for virtualrunenv generation",
+)
 @click.option(
     "-e",
     "--override-env",
@@ -134,7 +148,9 @@ def cli_exec(
     profile_path: str,
     preserve_env: bool,
     override_env: List[str],
+    conan_arg: List[str],
     conan_option: List[str],
+    conan_setting: List[str],
     cache: bool,
     debug: bool,
 ) -> None:
@@ -146,7 +162,9 @@ def cli_exec(
     conf = Configuration(profile)
     engine = Engine(conf, conanfile=profile_path)
     engine.preserve_env = preserve_env
+    engine.conan_args = conan_arg
     engine.conan_options = conan_option
+    engine.conan_settings = conan_setting
 
     # Prepare environment overrides:
     overrides = {}
@@ -175,11 +193,25 @@ def cli_exec(
 @click.option("-E", "--preserve-env", is_flag=True, help="Preserve user environment.")
 @click.option(
     "-o",
+    "--conan-arg",
+    type=click.STRING,
+    multiple=True,
+    help="Arguments to pass to Conan for virtualrunenv generation",
+)
+@click.option(
+    "-o:o",
     "--conan-option",
     type=click.STRING,
     multiple=True,
     help="Options to pass to Conan for virtualrunenv generation",
 )
+@click.option(
+    "-o:s",
+    "--conan-setting",
+    type=click.STRING,
+    multiple=True,
+    help="Settings to pass to Conan for virtualrunenv generation",
+)
 @click.argument("shell_args", nargs=-1)
 @click.pass_obj
 def cli_shell(
@@ -188,15 +220,19 @@ def cli_shell(
     profile: str,
     profile_path: str,
     preserve_env: bool,
+    conan_arg: List[str],
     conan_option: List[str],
+    conan_setting: List[str],
     cache: bool,
 ) -> None:
     """Launch shell with the correct environment from a profile."""
     deny_profile_and_path(profile, profile_path)
     conf = Configuration(profile)
     engine = Engine(conf, conanfile=profile_path)
     engine.preserve_env = preserve_env
+    engine.conan_args = conan_arg
     engine.conan_options = conan_option
+    engine.conan_settings = conan_setting
 
     # Replace process with shell.
     engine.shell(shell_args, use_cache=cache)

cli/cloe_launch/exec.py

@@ -357,7 +357,9 @@ def __init__(self, conf, conanfile=None):
         self.engine_pre_args = conf._conf["engine"]["pre_arguments"]
         self.engine_post_args = conf._conf["engine"]["post_arguments"]
         self.preserve_env = False
+        self.conan_args = []
         self.conan_options = []
+        self.conan_settings = []
 
         logging.info(f"Profile name: {self.profile}")
         logging.info("Configuration:")
@@ -402,13 +404,21 @@ def _prepare_virtualenv(self) -> None:
                 "-g",
                 generator,
             ]
+            for arg in self.conan_args:
+                conan_cmd.append(arg)
             for option in self.conan_options:
                 conan_cmd.append("-o")
                 conan_cmd.append(option)
+            for setting in self.conan_settings:
+                conan_cmd.append("-s")
+                conan_cmd.append(setting)
             conan_cmd.append(self.profile_path)
             self._run_cmd(conan_cmd, must_succeed=True)
 
     def _read_conan_env(self) -> Environment:
+        # The order of the items in env_paths is important because variables
+        # will be overwritten.
+        # TODO: Should be replaced by merging in the future.
         env_paths = [
             os.path.join(self.runtime_dir, "activate_run.sh"),
             os.path.join(self.runtime_dir, "activate.sh"),

tests/setup_bats.bash

@@ -38,7 +38,7 @@ cloe_engine() {
         cloe_launch_args+=(--override-env=${var})
     done
     if [[ "${WITH_VTD}" -eq "1" ]]; then
-        cloe_launch_args+=(-o)
+        cloe_launch_args+=(-o:o)
         cloe_launch_args+=("with_vtd=True")
     fi
     for var in ${CLOE_LAUNCH_ARGS[@]}; do
@@ -83,7 +83,7 @@ cloe_shell() {
         cloe_launch_args+=(--override-env=${var})
     done
     if [[ "${WITH_VTD}" -eq "1" ]]; then
-        cloe_launch_args+=(-o)
+        cloe_launch_args+=(-o:o)
         cloe_launch_args+=("with_vtd=True")
     fi
     for var in ${CLOE_LAUNCH_ARGS[@]}; do