0.11 changes

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ruyi"
-version = "0.11.0-alpha.20240512"
+version = "0.11.0-alpha.20240527"
 description = "Package manager for RuyiSDK"
 keywords = ["ruyi", "ruyisdk"]
 # license = { file = "LICENSE-Apache.txt" }

ruyi/cli/user_input.py

@@ -8,7 +8,8 @@ def ask_for_yesno_confirmation(prompt: str, default: bool = False) -> bool:
 
     while True:
         try:
-            user_input = input(f"{prompt} {choices_help} ")
+            log.stdout(f"{prompt} {choices_help} ", end='')
+            user_input = input()
         except EOFError:
             yesno = "YES" if default else "NO"
             log.W(f"EOF while reading user input, assuming the default choice {yesno}")

ruyi/config/__init__.py

@@ -123,7 +123,7 @@ def global_blob_install_root(self, slug: str) -> str:
 
     def lookup_binary_install_dir(self, host: str, slug: str) -> PathLike[Any] | None:
         host_path = get_host_path_fragment_for_binary_install_dir(host)
-        for data_dir in self._dirs.data_dirs:
+        for data_dir in self._dirs.app_data_dirs:
             p = data_dir / "binaries" / host_path / slug
             if p.exists():
                 return p

ruyi/utils/xdg_basedir.py

@@ -69,10 +69,12 @@ def app_state(self) -> pathlib.Path:
     def app_config_dirs(self) -> Iterable[pathlib.Path]:
         # from highest precedence to lowest
         yield self.app_config
-        yield from self.config_dirs
+        for p in self.config_dirs:
+            yield p / self.app_name
 
     @property
     def app_data_dirs(self) -> Iterable[pathlib.Path]:
         # from highest precedence to lowest
         yield self.app_data
-        yield from self.data_dirs
+        for p in self.data_dirs:
+            yield p / self.app_name