cici-tools 0.18.0__py3-none-any.whl → 0.18.2__py3-none-any.whl

cici/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.18.0'
-__version_tuple__ = version_tuple = (0, 18, 0)
+__version__ = version = '0.18.2'
+__version_tuple__ = version_tuple = (0, 18, 2)
 
-__commit_id__ = commit_id = 'g36384f791'
+__commit_id__ = commit_id = 'g683345939'

cici/providers/gitlab/yaml_style.py

@@ -46,13 +46,21 @@ def make_scalar_string(line: str, quote: bool = False):
 
     # fix extra - >- between lines accidentally created with echo commands
     if unindented.startswith("echo "):
-        # inline if short and simple
-        if len(unindented) < 100 and not any(
-            sym in unindented for sym in ("&&", ";", "\\", "|")
+        stripped = unindented.strip()
+
+        if len(stripped) < 100 and not any(
+            sym in stripped for sym in ("&&", ";", "\\", "|")
         ):
-            return unindented
+            return stripped
 
-        return FoldedScalarString(wrap_if_long(unindented))
+        folded_scalar = FoldedScalarString(stripped)
+
+        # If its piping "echo... | docker login ...", fold at the pipe for correct display
+        if " | " in stripped:
+            pipe_position = stripped.index(" | ")
+            folded_scalar.fold_pos = [pipe_position]  # type: ignore[attr-defined]
+
+        return folded_scalar
 
     # Folding long lines logic (like a script that is super long so that it does not do anything weird in the folding process)
     if unindented.startswith(("docker ", "helm ", "tar ", "curl ")):

{cici_tools-0.18.0.dist-info → cici_tools-0.18.2.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.18.0
+Version: 0.18.2
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0
 Project-URL: Home, https://gitlab.com/saferatday0/cici
 Project-URL: Issues, https://gitlab.com/saferatday0/cici/-/issues
-Keywords: ci,pipeline,python
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
@@ -28,6 +27,12 @@ Requires-Dist: msgspec
 Requires-Dist: python-decouple
 Requires-Dist: ruamel.yaml
 Requires-Dist: termcolor
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Provides-Extra: keywords
+Requires-Dist: ci; extra == "keywords"
+Requires-Dist: pipeline; extra == "keywords"
+Requires-Dist: python; extra == "keywords"
 Dynamic: license-file
 
 # saferatday0 cici

{cici_tools-0.18.0.dist-info → cici_tools-0.18.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cici/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
 cici/__main__.py,sha256=TWDBrcS5vXSclLWLm0Iu3uUXOkDw0PzcJ8a0zd7_ClU,150
-cici/_version.py,sha256=PTW5ceeoiZ30PZOYQdG23n16b6duopk5WpCV1sEAxcY,714
+cici/_version.py,sha256=t0gWKvmyeGXPXryCGjU3gEoAkpnzLZQF0MmaO3fuVX0,714
 cici/constants.py,sha256=ydShHTAbuanWWXeg9tJZ5GLm65M41AKmIibUheKV5nw,913
 cici/exceptions.py,sha256=JMpcD5YjYwKdn65D0iOEchXiAgIVsKApAyngCTwVgI4,139
 cici/main.py,sha256=ceH9s7i2XdB-mpUtDWuzLVn9TZHiwmsq-daZOgB9oRI,748
@@ -24,7 +24,7 @@ cici/providers/gitlab/models.py,sha256=zPOLSfb811yVYgkKNirAEhcAPkoBwE-r_fmxMfxn8
 cici/providers/gitlab/normalizers.py,sha256=EFQiJzRDkoahes0zwIMahuVC3DOy9A97eZDhMXdamno,4762
 cici/providers/gitlab/serializers.py,sha256=heczGlwcmKesugYX8PhwIhVIw8kExsfXKsC52sAwLrc,11533
 cici/providers/gitlab/utils.py,sha256=NUZ25rAosSWQyWh7m3xhiHRotqVl1krckZL58yR0LKQ,651
-cici/providers/gitlab/yaml_style.py,sha256=8IAkk5Hv3KfqAp6eJymsG8RXs8MBsnYUeonokivfx40,13827
+cici/providers/gitlab/yaml_style.py,sha256=emgrHqjhMmAWhlgtYJ8NgIYRntSaXQC8T5QDehSbOCM,14101
 cici/schema/LICENSE.gitlab,sha256=0N7FHuinuoGBqZE6aUlD84yw3CGylx8lyfzertgmtY0,2001
 cici/schema/__init__.py,sha256=wdYYpZKxK2omc_mRJgPj86Ec-QwoB4noZzlk71sBjnk,87
 cici/schema/gitlab-ci.json,sha256=BCymn2i9JOrUGS2SsvpoXCH8JcofQz9Rhux46zEnS_8,70638
@@ -39,10 +39,10 @@ cici/templates/target-table.md.j2,sha256=NYspLbP3ap1706WnehZRtu6a2uxL_mKf7zfm3y0
 cici/templates/targets.md.j2,sha256=k-lkfReFJMCu9t2SjuD5YJ-Q_KECJxdY7v-0TWDTaCM,116
 cici/templates/variable-list.md.j2,sha256=M9r3j7d8H171okQNj8j4pc92kMdeWSRoeZQ5QB3NUTQ,613
 cici/templates/variables.md.j2,sha256=2DquXagNupqBkD95_3ZI4guJOK-eG_igaaMdRIUDrcE,84
-cici_tools-0.18.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cici_tools-0.18.0.dist-info/licenses/NOTICE,sha256=dIBr-7sfvnoYXYvgHIozlRJTLD4EHORRtRJtIe4znW8,55
-cici_tools-0.18.0.dist-info/METADATA,sha256=T2W5kElsMmBy2N-UF8AYulOr0DTpcyAqU9hTBNHM0fw,4178
-cici_tools-0.18.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cici_tools-0.18.0.dist-info/entry_points.txt,sha256=CuBAwYG3z7qOKm4IYARjZzdX5fytMLKyr59HLLJx_Is,44
-cici_tools-0.18.0.dist-info/top_level.txt,sha256=sv8xIjFuuqtyBMoyzueczNvZo_--q12r64Zc0lGKKF8,5
-cici_tools-0.18.0.dist-info/RECORD,,
+cici_tools-0.18.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cici_tools-0.18.2.dist-info/licenses/NOTICE,sha256=dIBr-7sfvnoYXYvgHIozlRJTLD4EHORRtRJtIe4znW8,55
+cici_tools-0.18.2.dist-info/METADATA,sha256=yDcvhKVE_HuF9LRbyVMh_E4BljErZeCfBbfzDr-1Qxs,4361
+cici_tools-0.18.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cici_tools-0.18.2.dist-info/entry_points.txt,sha256=CuBAwYG3z7qOKm4IYARjZzdX5fytMLKyr59HLLJx_Is,44
+cici_tools-0.18.2.dist-info/top_level.txt,sha256=sv8xIjFuuqtyBMoyzueczNvZo_--q12r64Zc0lGKKF8,5
+cici_tools-0.18.2.dist-info/RECORD,,