omdev 0.0.0.dev544__tar.gz → 0.0.0.dev546__tar.gz

{omdev-0.0.0.dev544/omdev.egg-info → omdev-0.0.0.dev546}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev544
+Version: 0.0.0.dev546
 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.dev544
+Requires-Dist: omlish==0.0.0.dev546
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/.omlish-manifests.json

@@ -536,7 +536,7 @@
     "module": ".tools.shadow",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shadow.py",
-    "line": 92,
+    "line": 99,
     "value": {
       "!.cli.types.CliModule": {
         "name": "shadow",

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/dataclasses/_dumping.py

@@ -38,7 +38,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -783,6 +783,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/dockerdev/cli.py

@@ -9,7 +9,12 @@ TODO:
  - all of the below stuff
  - launch / manage compose services
  - more cache dirs
- - --mount=type=bind,src=/host/dir,dst=/container/dir,readonly (git)
+ - --mount=type=bind,src="$(pwd)",dst=/omlish/pwd
+   - --mount=type=bind,src=/host/dir,dst=/container/dir,readonly (git)
+ - build --no-cache / cache bust
+   - build args
+ - auto go/zig vers
+ - `run --pull=never`, `build --pull=false`
 
 ====
 
@@ -124,8 +129,10 @@ class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
 
+        ap.arg('--mount', action='append'),
         ap.arg('-C', '--mount-caches', action='store_true'),
         ap.arg('-D', '--mount-docker-sock', action='store_true'),
+
         ap.arg('-P', '--privileged', action='store_true'),
 
         ap.arg('--no-host-platform', action='store_true'),
@@ -160,6 +167,9 @@ class Cli(ap.Cli):
         if self.args.privileged:
             run_args.append('--privileged')
 
+        if self.args.mount:
+            run_args.extend([f'--mount={m}' for m in self.args.mount])
+
         if self.args.mount_docker_sock:
             run_args.append('--mount=type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock')
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/dockerdev/config.py

@@ -24,6 +24,8 @@ class Config:
 
     nvm_versions: ta.Sequence[str] | None = None
 
+    rbenv_versions: ta.Sequence[str] | None = None
+
     uv_python_versions: ta.Sequence[str] | None = None
 
     pyenv_version_keys: ta.Sequence[str] | None = None

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/dockerdev/config.toml

@@ -21,6 +21,10 @@ nvm_versions = [
     '25',
 ]
 
+rbenv_versions = [
+    '3.4',
+]
+
 uv_python_versions = [
     '3.13',
     '3.14',

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/dockerdev/gen.py

@@ -94,6 +94,12 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
             static_env={'NVM_VERSIONS': cfg.nvm_versions},
         ))
 
+    if cfg.rbenv_versions:
+        ops.append(fragment_section(
+            'rbenv',
+            static_env={'RBENV_VERSIONS': cfg.rbenv_versions},
+        ))
+
     ops.append(fragment_section(
         'uv',
         static_env={'UV_PYTHON_VERSIONS': cfg.uv_python_versions or []},

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/dockerdev/resources/depsets/system.toml

@@ -26,6 +26,7 @@ deps = [
   'wget',
 
   # build essentials & compilers
+  'autoconf',
   'build-essential',
   'clang',
   'cmake',
@@ -61,9 +62,11 @@ deps = [
 
   # data formats
   'jq',
+  'libyaml-dev',
 
   # databases
   'libdb-dev',
+  'libgdbm6',
   'libpq-dev',
   'postgresql-client',
 

omdev-0.0.0.dev546/omdev/dockerdev/resources/fragments/rbenv.sh

@@ -0,0 +1,7 @@
+set -ex ;
+
+curl -fsSL https://rbenv.org/install.sh | bash ;
+
+for RV in ${RBENV_VERSIONS}; do
+  bash -c 'eval "$(~/.rbenv/bin/rbenv init - --no-rehash bash)" && rbenv install -L | grep -F "$1." | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$" | sort -V | tail -n1 | xargs rbenv install' bash "$RV" ;
+done ;

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/home/shadow.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - <hostname>/ subdir?
+"""
 from omlish.configs.shadow import FileShadowConfigs
 from omlish.configs.shadow import FileShadowConfigsImpl
 from omlish.configs.shadow import ShadowConfigs

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/manifests/_dumping.py

@@ -39,7 +39,7 @@ def __omlish_amalg__():  # noqa
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -899,6 +899,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/pyproject/pkg.py

@@ -390,7 +390,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         epd = dict(st.pop('exclude_package_data', {}))
 
         cpd = self._collect_pkg_data()
-        for pdk, pdv in cpd.items():
+        for pdk, pdv in sorted(cpd.items(), key=lambda kv: kv[0]):
             pdl = TomlWriter.Literal(f"'{pdk}'")
             if pdv.inc:
                 pd.setdefault(pdl, []).extend(sorted(set(pdv.inc)))

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/ci.py

@@ -101,7 +101,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/contextmanagers.py', sha1='993f5ed96d3410f739a20363f55670d5e5267fa3'),
             dict(path='../../omlish/lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
@@ -1873,6 +1873,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/interp.py

@@ -56,7 +56,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../packaging/versions.py', sha1='71627ad600b3529b829b0e227b0952f2c63c7271'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -1398,6 +1398,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/lib/formats/goyaml.py

@@ -35,7 +35,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../../lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../../lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../../lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
             dict(path='errors.py', sha1='8fa73c90292f56f8faaedebb2f478ff6a3b95460'),
             dict(path='tokens.py', sha1='d52876a2a525bc99eb554fe28c3d27e7e01f43a9'),
@@ -785,6 +785,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/lib/inject.py

@@ -32,7 +32,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
             dict(path='inject.py', sha1='6f097e3170019a34ff6834d36fcc9cbeed3a7ab4'),
@@ -783,6 +783,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/lib/io/pipelines.py

@@ -37,14 +37,15 @@ def __omlish_amalg__():  # noqa
         src_files=[
             dict(path='errors.py', sha1='2d8ee419a407c58dff224316695c9d90fe50f727'),
             dict(path='../streams/errors.py', sha1='67ca85fd8741b5bfefe76c872ce1c30c18fab06f'),
+            dict(path='../types.py', sha1='16da767fb3119e0886e821a1ef5f1c79ac4111e6'),
             dict(path='../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
-            dict(path='../../lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
             dict(path='../../logs/levels.py', sha1='91405563d082a5eba874da82aac89d83ce7b6152'),
             dict(path='../../logs/warnings.py', sha1='c4eb694b24773351107fcc058f3620f1dbfb6799'),
             dict(path='core.py', sha1='3dabd48ce0e19fd974a89ea7b4dd2b6c4118d36b'),
-            dict(path='../streams/types.py', sha1='8959d244de95eaf9f118cc3fd2d713d85e55ff36'),
+            dict(path='../streams/types.py', sha1='7145fd554b5065e18afeb23aa51f93f5b69777e7'),
             dict(path='../../logs/infos.py', sha1='4dd104bd468a8c438601dd0bbda619b47d2f1620'),
             dict(path='../../logs/metrics/base.py', sha1='95120732c745ceec5333f81553761ab6ff4bb3fb'),
             dict(path='../../logs/protocols.py', sha1='05ca4d1d7feb50c4e3b9f22ee371aa7bf4b3dbd1'),
@@ -57,16 +58,16 @@ def __omlish_amalg__():  # noqa
             dict(path='sched/types.py', sha1='854b3f0f8ed5da2132a516f787b9019f5cb4eef5'),
             dict(path='../streams/base.py', sha1='bdeaff419684dec34fd0dc59808a9686131992bc'),
             dict(path='../streams/framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
-            dict(path='../streams/utils.py', sha1='eb08fa1d56284b078f973eea6796747b9bbdffdf'),
+            dict(path='../streams/utils.py', sha1='9fad1972d9d71412d81c1643261edcfbe02e9b71'),
             dict(path='../../logs/contexts.py', sha1='1000a6d5ddfb642865ca532e34b1d50759781cf0'),
             dict(path='../../logs/utils.py', sha1='9b879044cbdc3172fd7282c7f2a4880b81261cdd'),
             dict(path='bytes/queues.py', sha1='ea3b53a155622376836ba9e3499b85220f37b1fd'),
             dict(path='handlers/flatmap.py', sha1='118478ac94449a9a0b5ba44f5f3e8a5d69bb6f65'),
-            dict(path='../streams/direct.py', sha1='b01937212493e9a41644ac4e366e4cbab10332ce'),
-            dict(path='../streams/scanning.py', sha1='00522802dff772689be66151430754d4f9706dbc'),
+            dict(path='../streams/direct.py', sha1='f3a90045bd7c7bddc139eaa95d30db2ef24a78c6'),
+            dict(path='../streams/scanning.py', sha1='9c8d60b56cd9fcd2eaef550b4f1459a93c48dbe9'),
             dict(path='../../logs/base.py', sha1='eaa2ce213235815e2f86c50df6c41cfe26a43ba2'),
             dict(path='../../logs/std/records.py', sha1='67e552537d9268d4df6939b8a92be885fda35238'),
-            dict(path='../streams/segmented.py', sha1='025cdf30e582a5a2b923e1859fbb4d3f367b811c'),
+            dict(path='../streams/segmented.py', sha1='8d112d08e066f69527091486f8817af0db586333'),
             dict(path='../../logs/asyncs.py', sha1='8376df395029a9d0957e2338adede895a9364215'),
             dict(path='../../logs/std/loggers.py', sha1='dbdfc66188e6accb75d03454e43221d3fba0f011'),
             dict(path='bytes/decoders.py', sha1='6f6d8bc1adc6a5277543389814bc26ef63e34561'),
@@ -80,6 +81,9 @@ def __omlish_amalg__():  # noqa
 ########################################
 
 
+# ../types.py
+BytesLike = ta.Union[bytes, bytearray, memoryview]  # ta.TypeAlias
+
 # ../../lite/abstract.py
 T = ta.TypeVar('T')
 
@@ -101,9 +105,6 @@ IoPipelineHandlerT = ta.TypeVar('IoPipelineHandlerT', bound='IoPipelineHandler')
 ShareableIoPipelineHandlerT = ta.TypeVar('ShareableIoPipelineHandlerT', bound='ShareableIoPipelineHandler')  # noqa
 IoPipelineMetadataT = ta.TypeVar('IoPipelineMetadataT', bound='IoPipelineMetadata')
 
-# ../streams/types.py
-BytesLike = ta.Union[bytes, bytearray, memoryview]  # ta.TypeAlias
-
 # ../../logs/infos.py
 LoggingMsgFn = ta.Callable[[], ta.Union[str, tuple]]  # ta.TypeAlias
 LoggingExcInfoTuple = ta.Tuple[ta.Type[BaseException], BaseException, ta.Optional[types.TracebackType]]  # ta.TypeAlias
@@ -317,6 +318,13 @@ class NoOutstandingReserveByteStreamBufferError(StateByteStreamBufferError):
     """commit() was called without a preceding reserve()."""
 
 
+########################################
+# ../../types.py
+
+
+##
+
+
 ########################################
 # ../../../lite/abstract.py
 
@@ -1180,6 +1188,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/lib/io/streams.py

@@ -23,18 +23,19 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='errors.py', sha1='67ca85fd8741b5bfefe76c872ce1c30c18fab06f'),
+            dict(path='../types.py', sha1='16da767fb3119e0886e821a1ef5f1c79ac4111e6'),
             dict(path='../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
-            dict(path='types.py', sha1='8959d244de95eaf9f118cc3fd2d713d85e55ff36'),
+            dict(path='types.py', sha1='7145fd554b5065e18afeb23aa51f93f5b69777e7'),
             dict(path='base.py', sha1='bdeaff419684dec34fd0dc59808a9686131992bc'),
             dict(path='framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
             dict(path='reading.py', sha1='7631635c46ab4b40bcaeb7c506cf15cb2d529a40'),
-            dict(path='utils.py', sha1='eb08fa1d56284b078f973eea6796747b9bbdffdf'),
-            dict(path='direct.py', sha1='b01937212493e9a41644ac4e366e4cbab10332ce'),
-            dict(path='scanning.py', sha1='00522802dff772689be66151430754d4f9706dbc'),
-            dict(path='adapters.py', sha1='c86a3999392fbc2ed76c0c319277b3f903b31e4c'),
-            dict(path='linear.py', sha1='82d8d806abd708e8d471f32cb49813be150bcf6a'),
-            dict(path='segmented.py', sha1='025cdf30e582a5a2b923e1859fbb4d3f367b811c'),
+            dict(path='utils.py', sha1='9fad1972d9d71412d81c1643261edcfbe02e9b71'),
+            dict(path='direct.py', sha1='f3a90045bd7c7bddc139eaa95d30db2ef24a78c6'),
+            dict(path='scanning.py', sha1='9c8d60b56cd9fcd2eaef550b4f1459a93c48dbe9'),
+            dict(path='adapters.py', sha1='8692c9fdebae45867179ca55f02f53805c2b2b63'),
+            dict(path='linear.py', sha1='94c28f36a07625a9ee97dff9229dc868e094bf06'),
+            dict(path='segmented.py', sha1='8d112d08e066f69527091486f8817af0db586333'),
             dict(path='_amalg.py', sha1='9c88a055447d7b37da1b356e6a1e00b7c4a9a3cb'),
         ],
     )
@@ -43,12 +44,12 @@ def __omlish_amalg__():  # noqa
 ########################################
 
 
+# ../types.py
+BytesLike = ta.Union[bytes, bytearray, memoryview]  # ta.TypeAlias
+
 # ../../lite/abstract.py
 T = ta.TypeVar('T')
 
-# types.py
-BytesLike = ta.Union[bytes, bytearray, memoryview]  # ta.TypeAlias
-
 # utils.py
 CanByteStreamBuffer = ta.Union[BytesLike, 'ByteStreamBufferLike']  # ta.TypeAlias
 
@@ -123,6 +124,13 @@ class NoOutstandingReserveByteStreamBufferError(StateByteStreamBufferError):
     """commit() was called without a preceding reserve()."""
 
 
+########################################
+# ../../types.py
+
+
+##
+
+
 ########################################
 # ../../../lite/abstract.py
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/lib/marshal.py

@@ -41,7 +41,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -784,6 +784,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/scripts/pyproject.py

@@ -96,7 +96,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -148,7 +148,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/providers/system.py', sha1='9638a154475ca98775159d27739563ac7fb2eb16'),
             dict(path='../interp/pyenv/install.py', sha1='4a10a19717364b4ba9f3b8bf1d12621cf21ba8b8'),
             dict(path='../interp/uv/provider.py', sha1='3c3980878ad2b9fd2cd02172f9424954759c7f06'),
-            dict(path='pkg.py', sha1='2f0b5dc8cb359ee4d499f5a52a62b790b5557a3b'),
+            dict(path='pkg.py', sha1='58989527dd7c6f20372792bbb54232f925a93a6c'),
             dict(path='../interp/providers/inject.py', sha1='7cc9ebf58cf2ec09545321456bd9da9f9a3a79fb'),
             dict(path='../interp/pyenv/provider.py', sha1='377542ce01a35849e2a5b4a4dbafedc26882f983'),
             dict(path='../interp/uv/inject.py', sha1='e95d058c2340baa5a3155ec3440f311d1daa10a8'),
@@ -3018,6 +3018,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 
@@ -12034,7 +12044,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         epd = dict(st.pop('exclude_package_data', {}))
 
         cpd = self._collect_pkg_data()
-        for pdk, pdv in cpd.items():
+        for pdk, pdv in sorted(cpd.items(), key=lambda kv: kv[0]):
             pdl = TomlWriter.Literal(f"'{pdk}'")
             if pdv.inc:
                 pd.setdefault(pdl, []).extend(sorted(set(pdv.inc)))

{omdev-0.0.0.dev544 → omdev-0.0.0.dev546}/omdev/tools/shadow.py

@@ -14,12 +14,21 @@ from omlish.subprocesses.editor import get_user_text_editor
 
 from ..cli.types import CliModule
 from ..home.shadow import get_file_shadow_configs
+from ..home.shadow import get_shadow_paths
 
 
 ##
 
 
 class ShadowCli(ap.Cli):
+    @ap.cmd(
+        ap.arg('-p', '--path'),
+    )
+    def pwd(self) -> None:
+        print(get_shadow_paths().get_shadow_path(self._args.path or os.getcwd()))
+
+    #
+
     def _get_shadow_file(
             self,
             name: str,
@@ -33,8 +42,6 @@ class ShadowCli(ap.Cli):
             preferred_ext=preferred_ext,
         )
 
-    #
-
     @ap.cmd(
         ap.arg('name'),
         ap.arg('-p', '--path'),

omdev-0.0.0.dev546/omdev/tui/apps/jtree/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Oleksis Fraga Menéndez
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE 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.

omdev-0.0.0.dev546/omdev/tui/apps/jtree/__main__.py

@@ -0,0 +1,4 @@
+if __name__ == '__main__':
+    from .cli import _main
+
+    _main()

omdev-0.0.0.dev546/omdev/tui/apps/jtree/app.py

@@ -0,0 +1,64 @@
+import io
+import json
+import sys
+import typing as ta
+
+from omlish import lang
+
+from ... import textual as tx
+from .utils import clean_string_values
+from .widgets import JsonDocument
+from .widgets import JsonDocumentView
+from .widgets import JsonTree
+from .widgets import TreeView
+
+
+##
+
+
+@lang.cached_function
+def read_app_css() -> str:
+    return lang.get_relative_resources('styles', globals=globals())['layout.tcss'].read_text()
+
+
+class JsonTreeApp(tx.App):
+    CSS: ta.ClassVar[str] = read_app_css()
+
+    BINDINGS = [  # noqa
+        ('ctrl+s', 'app.screenshot()', 'Screenshot'),
+        ('ctrl+t', 'toggle_root', 'Toggle root'),
+        tx.Binding('ctrl+q', 'app.quit', 'Quit'),
+    ]
+
+    def __init__(self, json_file: io.TextIOWrapper) -> None:
+        super().__init__()
+
+        self.json_data: str = ''
+
+        if json_file is sys.stdin:
+            self.json_data = ''.join(sys.stdin.readlines())
+        else:
+            self.json_data = json_file.read()
+            json_file.close()
+
+    def compose(self) -> tx.ComposeResult:
+        yield tx.Header()
+        yield tx.Container(
+            TreeView(id='tree-view'),
+            JsonDocumentView(id='json-docview'),
+            id='app-grid',
+        )
+        yield tx.Footer()
+
+    def on_mount(self) -> None:
+        tree = self.query_one(JsonTree)
+        root_name = 'Json'
+        json_node = tree.root.add(root_name)
+        json_data = clean_string_values(json.loads(self.json_data))
+        tree.add_node(root_name, json_node, json_data)
+        json_doc = self.query_one(JsonDocument)
+        json_doc.load(json.dumps(json_data, indent=4))
+
+    def action_toggle_root(self) -> None:
+        tree = self.query_one(JsonTree)
+        tree.show_root = not tree.show_root