omdev 0.0.0.dev385__tar.gz → 0.0.0.dev386__tar.gz

{omdev-0.0.0.dev385/omdev.egg-info → omdev-0.0.0.dev386}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev385
+Version: 0.0.0.dev386
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev385
+Requires-Dist: omlish==0.0.0.dev386
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/home/paths.py

@@ -7,16 +7,18 @@ TODO:
 import os.path
 import typing as ta
 
+from omlish.os.environ import EnvVar
+
 
 ##
 
 
-HOME_DIR_ENV_VAR = 'OMLISH_HOME'
+HOME_DIR_ENV_VAR = EnvVar('OMLISH_HOME')
 DEFAULT_HOME_DIR = '~/.omlish'
 
 
 def get_home_dir() -> str:
-    return os.path.expanduser(os.getenv(HOME_DIR_ENV_VAR, DEFAULT_HOME_DIR))
+    return os.path.expanduser(HOME_DIR_ENV_VAR.get(DEFAULT_HOME_DIR))
 
 
 #

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/home/secrets.py

@@ -2,6 +2,7 @@ import os.path
 import typing as ta
 
 from omlish import lang
+from omlish.os.environ import EnvVar
 from omlish.secrets import all as sec
 
 from .paths import get_home_paths
@@ -16,16 +17,13 @@ else:
 ##
 
 
-SECRETS_FILE_ENV_VAR = 'OMLISH_SECRETS'
+SECRETS_FILE_ENV_VAR = EnvVar('OMLISH_SECRETS')
 DEFAULT_SECRETS_FILE_NAME = 'secrets.yml'
 
 
 def get_secrets_file() -> str:
     return os.path.expanduser(
-        os.getenv(
-            SECRETS_FILE_ENV_VAR,
-            os.path.join(get_home_paths().config_dir, DEFAULT_SECRETS_FILE_NAME),
-        ),
+        SECRETS_FILE_ENV_VAR.get(lambda: os.path.join(get_home_paths().config_dir, DEFAULT_SECRETS_FILE_NAME)),
     )
 
 

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/ptk/confirm.py

@@ -47,7 +47,7 @@ def _m_strict_confirm(message: str = 'Confirm?', suffix: str = ' (y/n) ') -> lan
 
     while True:
         session = create_strict_confirm_session(message, suffix)
-        ret = (yield lang.maysync_op(session.prompt, session.prompt_async))
+        ret = yield from lang.maysync_yield(session.prompt, session.prompt_async)()
 
         if isinstance(ret, str):
             check.empty(ret)

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/tokens/all.py

@@ -8,10 +8,12 @@ from .tokenizert import (  # noqa
 
 from .utils import (  # noqa
     Tokens,
+    TokensIterable,
 
     WS_NAMES,
     is_ws,
     ignore_ws,
+    ignore_ws_,
 
     split_lines,
     split_lines_dense,

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/tokens/tokenizert.py

@@ -14,7 +14,7 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# https://github.com/asottile/tokenize-rt/blob/413692b7c1ad8a873caec39dd4f427d55ee538ea/tokenize_rt.py
+# https://github.com/asottile/tokenize-rt/blob/d3874b787677593fc34aedf7174a2934e2caa94b/tokenize_rt.py
 import argparse
 import io
 import keyword
@@ -123,7 +123,7 @@ class Tokenization:
 
             tok_name = tokenize.tok_name[tok_type]
 
-            if tok_name == 'FSTRING_MIDDLE':  # pragma: >=3.12 cover
+            if tok_name in {'FSTRING_MIDDLE', 'TSTRING_MIDDLE'}:  # pragma: >=3.12 cover
                 if '{' in tok_text or '}' in tok_text:
                     new_tok_text = cls.curly_escape(tok_text)
                     ecol += len(new_tok_text) - len(tok_text)

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/tokens/utils.py

@@ -5,6 +5,7 @@ from .tokenizert import Token
 
 
 Tokens: ta.TypeAlias = ta.Sequence[Token]
+TokensIterable: ta.TypeAlias = ta.Iterable[Token]
 
 
 ##
@@ -37,14 +38,25 @@ def ignore_ws(
     )
 
 
+def ignore_ws_(
+        toks: ta.Iterable[Token],
+        *,
+        keep: ta.Container[str] = (),
+) -> list[Token]:
+    return list(ignore_ws(
+        toks,
+        keep=keep,
+    ))
+
+
 ##
 
 
-def split_lines(ts: Tokens) -> list[Tokens]:
+def split_lines(ts: TokensIterable) -> list[Tokens]:
     return [list(it) for g, it in itertools.groupby(ts, lambda t: t.line)]
 
 
-def split_lines_dense(ts: Tokens) -> list[Tokens]:
+def split_lines_dense(ts: TokensIterable) -> list[Tokens]:
     lines: list[list[Token]] = []
     for t in ts:
         while len(lines) < (t.line or 0):
@@ -53,7 +65,7 @@ def split_lines_dense(ts: Tokens) -> list[Tokens]:
     return lines  # type: ignore[return-value]
 
 
-def join_toks(ts: Tokens) -> str:
+def join_toks(ts: TokensIterable) -> str:
     return ''.join(t.src for t in ts)
 
 
@@ -65,7 +77,7 @@ def join_lines(ls: ta.Iterable[Tokens]) -> str:
 
 
 def match_toks(
-        ts: ta.Iterable[Token],
+        ts: TokensIterable,
         pat: ta.Sequence[tuple[str | None, str | tuple[str, ...] | None]],
 ) -> bool:
     it = iter(ts)

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev/tools/git/cli.py

@@ -23,7 +23,8 @@ TODO:
 import dataclasses as dc
 import logging
 import os
-import re
+import shutil
+import tempfile
 import typing as ta
 import urllib.parse
 
@@ -42,6 +43,9 @@ from ...git.status import get_git_status
 from ...home.paths import get_home_paths
 from ...home.shadow import get_shadow_configs
 from . import consts
+from .cloning import GithubCloneTarget
+from .cloning import OtherCloneTarget
+from .cloning import parse_clone_target
 from .messages import GitMessageGenerator
 from .messages import TimestampGitMessageGenerator
 from .messages import load_message_generator_manifests
@@ -153,8 +157,6 @@ class Cli(ap.Cli):
 
     #
 
-    _GITHUB_PAT = re.compile(r'((http(s)?://)?(www\./)?github(\.com)?/)?(?P<user>[^/.]+)/(?P<repo>[^/.]+)(/.*)?')
-
     @ap.cmd(
         ap.arg('repo'),
         ap.arg('args', nargs=ap.REMAINDER),
@@ -166,25 +168,23 @@ class Cli(ap.Cli):
         # fails.
         out_dir = '.'
         try:
-            if (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
-                user = m.group('user')
-                repo = m.group('repo')
-
-                os.makedirs(user, 0o755, exist_ok=True)
+            ct = parse_clone_target(self.args.repo)
+            if isinstance(ct, GithubCloneTarget):
+                os.makedirs(ct.user, 0o755, exist_ok=True)
 
                 subprocesses.check_call(
                     'git',
                     'clone',
                     *self.unknown_args,
                     *self.args.args,
-                    f'git@github.com:{user}/{repo}.git',
-                    os.path.join(user, repo),
+                    ct.render(),
+                    os.path.join(ct.user, ct.repo),
                 )
 
-                out_dir = os.path.join(user, repo)
+                out_dir = os.path.join(ct.user, ct.repo)
 
-            else:
-                parsed = urllib.parse.urlparse(self.args.repo)
+            elif isinstance(ct, OtherCloneTarget):
+                parsed = urllib.parse.urlparse(ct.s)
                 out_dir = parsed.path.split('/')[-1]
 
                 subprocesses.check_call(
@@ -192,12 +192,17 @@ class Cli(ap.Cli):
                     'clone',
                     *self.unknown_args,
                     *self.args.args,
-                    self.args.repo,
+                    ct.render(),
                 )
 
+            else:
+                raise TypeError(ct)
+
         finally:
             print(out_dir)
 
+    #
+
     @ap.cmd(
         ap.arg('rev', nargs='?', default='HEAD'),
         ap.arg('-d', '--diff', action='store_true'),
@@ -466,6 +471,50 @@ class Cli(ap.Cli):
             *self.unknown_args,
         )
 
+    #
+
+    @ap.cmd(
+        ap.arg('repo'),
+        ap.arg('args', nargs=ap.REMAINDER),
+        accepts_unknown=True,
+    )
+    def anon_clone(self) -> None:
+        cwd = os.getcwd()
+
+        # As with the clone command, we always print a cd-able path to stdout, even on failure.
+        out_dir = '.'
+        try:
+            tmp_dir = tempfile.mkdtemp()
+            try:
+                ct = parse_clone_target(self.args.repo)
+
+                subprocesses.check_call(
+                    'git',
+                    'clone',
+                    *self.unknown_args,
+                    *self.args.args,
+                    ct.render(),
+                    cwd=tmp_dir,
+                )
+
+                repo_dir_name = check.single(os.listdir(tmp_dir))
+                repo_dir = os.path.join(tmp_dir, repo_dir_name)
+                check.state(os.path.isdir(repo_dir))
+
+                git_dir = os.path.join(repo_dir, '.git')
+                check.state(os.path.isdir(git_dir))
+                shutil.rmtree(git_dir)
+
+                shutil.move(repo_dir, cwd)
+
+                out_dir = repo_dir_name
+
+            finally:
+                shutil.rmtree(tmp_dir)
+
+        finally:
+            print(out_dir)
+
 
 ##
 

omdev-0.0.0.dev386/omdev/tools/git/cloning.py

@@ -0,0 +1,42 @@
+import abc
+import dataclasses as dc
+import re
+
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class CloneTarget(lang.Abstract, lang.Sealed):
+    @abc.abstractmethod
+    def render(self) -> str:
+        raise NotImplementedError
+
+
+@dc.dataclass(frozen=True)
+class GithubCloneTarget(CloneTarget, lang.Final):
+    user: str
+    repo: str
+
+    def render(self) -> str:
+        return f'git@github.com:{self.user}/{self.repo}.git'
+
+
+@dc.dataclass(frozen=True)
+class OtherCloneTarget(CloneTarget, lang.Final):
+    s: str
+
+    def render(self) -> str:
+        return self.s
+
+
+_GITHUB_PAT = re.compile(r'((http(s)?://)?(www\./)?github(\.com)?/)?(?P<user>[^/.]+)/(?P<repo>[^/.]+)(/.*)?')
+
+
+def parse_clone_target(s: str) -> CloneTarget:
+    if (m := _GITHUB_PAT.fullmatch(s)):
+        return GithubCloneTarget(m.group('user'), m.group('repo'))
+    else:
+        return OtherCloneTarget(s)

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev385
+Version: 0.0.0.dev386
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev385
+Requires-Dist: omlish==0.0.0.dev386
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev.egg-info/SOURCES.txt

@@ -306,6 +306,7 @@ omdev/tools/antlr/gen.py
 omdev/tools/git/__init__.py
 omdev/tools/git/__main__.py
 omdev/tools/git/cli.py
+omdev/tools/git/cloning.py
 omdev/tools/git/consts.py
 omdev/tools/git/messages.py
 omdev/tools/json/__init__.py

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev385
+omlish==0.0.0.dev386
 
 [all]
 black~=25.1

{omdev-0.0.0.dev385 → omdev-0.0.0.dev386}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev385'
+version = '0.0.0.dev386'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev385',
+    'omlish == 0.0.0.dev386',
 ]
 
 [project.optional-dependencies]