新增 expect_run

pyproject.toml

@@ -34,31 +34,3 @@ packages = [
 [project.urls]
 Source = "https://github.com/linuxdeepin/youqu"
 Documentation = "https://linuxdeepin.github.io/youqu"
-
-[tool.ruff.lint]
-select = [
-    "E",  # pycodestyle errors
-    "W",  # pycodestyle warnings
-    "F",  # pyflakes
-    "I",  # isort
-    "B",  # flake8-bugbear
-    "C4",  # flake8-comprehensions
-    "UP", # pyupgrade
-]
-ignore = [
-    "E501",  # line too long, handled by black
-    "B008",  # do not perform function calls in argument defaults
-    "C901",  # too complex
-    "W191", # indentation contains tabs
-    "E402",
-    "E711",
-    "E721",
-    "E722",
-    "E731",
-    "E712",
-    "F401",
-    "F403",
-    "F507",
-    "F541",
-    "F841",
-]

ruff.toml

@@ -0,0 +1,90 @@
+# Exclude a variety of commonly ignored directories.
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".ipynb_checkpoints",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pyenv",
+    ".pytest_cache",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    ".vscode",
+    ".idea",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "site-packages",
+    "venv",
+]
+
+# Same as Black.
+line-length = 100
+indent-width = 4
+
+# Assume Python 3.7
+target-version = "py37"
+
+[lint]
+# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
+# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
+# McCabe complexity (`C901`) by default.
+select = ["E4", "E7", "E9", "F"]
+ignore = [
+    "E402",
+    "E711",
+    "E721",
+    "E722",
+    "E731",
+    "E712",
+    "F401",
+    "F403",
+    "F507",
+    "F541",
+    "F841",
+]
+
+# Allow fix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[format]
+# Like Black, use double quotes for strings.
+quote-style = "double"
+
+# Like Black, indent with spaces, rather than tabs.
+indent-style = "space"
+
+# Like Black, respect magic trailing commas.
+skip-magic-trailing-comma = false
+
+# Like Black, automatically detect the appropriate line ending.
+line-ending = "auto"
+
+# Enable auto-formatting of code examples in docstrings. Markdown,
+# reStructuredText code/literal blocks and doctests are all supported.
+#
+# This is currently disabled by default, but it is planned for this
+# to be opt-out in the future.
+docstring-code-format = false
+
+# Set the line length limit used when formatting code snippets in
+# docstrings.
+#
+# This only has an effect when the `docstring-code-format` setting is
+# enabled.
+docstring-code-line-length = "dynamic"

src/cmdctl.py

@@ -269,3 +269,25 @@ class CmdCtl:
         os.system(
             f"process=$(ps -ef | grep {process} | {cmd}cut -c 9-15);echo '{conf.PASSWORD}' | sudo -S kill -9 $process > /dev/null 2>&1"
         )
+
+    @staticmethod
+    def expect_run(
+            cmd: str,
+            events: dict,
+            return_code=False,
+            timeout: int = 30
+    ):
+        """
+        expect_run(
+            "ssh username@machine_ip 'ls -l'",
+            events={'password':'secret\n'}
+        )
+        如果 return_code=True，返回 (stdout, return_code)
+        """
+        import pexpect
+        return pexpect.run(
+            cmd,
+            events=events,
+            withexitstatus=return_code,
+            timeout=timeout
+        )