Merge ~barryprice/junk/+git/snap-juju-parse-status:master into ~barryprice/junk/+git/snap-juju-parse-status:main

[Barry Price]

Hacky classic snap - this will pull & patch juju-parse-status from the latest Mojo release and make it work as a standalone utility

Unmerged commits

1af1f43... by Barry Price on 2021-01-30

Hacky classic snap - this will pull & patch juju-parse-status from the latest Mojo release and make it work as a standalone utility

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d294450
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.snap
diff --git a/patches/debuglogs.patch b/patches/debuglogs.patch
new file mode 100644
index 0000000..4600a2b
--- /dev/null
+++ b/patches/debuglogs.patch
@@ -0,0 +1,13 @@
+--- juju/debuglogs.py	2021-01-30 16:07:22.268049483 +0700
++++ juju/debuglogs.py	2021-01-30 16:07:28.016097437 +0700
+@@ -6,8 +6,8 @@
+
+ from .status import Status
+
+-from ..exceptions import ConfigNotFoundException
+-from ..shutil_which import get_command
++from exceptions import ConfigNotFoundException
++from shutil_which import get_command
+
+ DEFAULT_DEBUG_LOG_CONFIG = {}
+
diff --git a/patches/status.patch b/patches/status.patch
new file mode 100644
index 0000000..c223741
--- /dev/null
+++ b/patches/status.patch
@@ -0,0 +1,11 @@
+--- juju/status.py	2021-01-30 16:07:31.652127771 +0700
++++ juju/status.py	2021-01-30 16:07:36.456167850 +0700
+@@ -9,7 +9,7 @@
+ from collections import Counter
+
+ from .wait import wait, JujuWaitException
+-from ..shutil_which import get_command
++from shutil_which import get_command
+
+ # We can't use the implementation in .utils due to a circular import
+ juju_path, _ = get_command("juju")
diff --git a/setup/setup.py b/setup/setup.py
new file mode 100644
index 0000000..c5b57c8
--- /dev/null
+++ b/setup/setup.py
@@ -0,0 +1,18 @@
+try:
+    from setuptools import setup, find_packages
+except ImportError:
+    from distutils.core import setup, find_packages
+
+
+setup(
+    name='juju-parse-status',
+    version='0.1',
+    install_requires=["PyYAML"],
+    py_modules=['exceptions', 'shutil_which'],
+    packages=find_packages(),
+    entry_points={
+        "console_scripts": [
+            "juju-parse-status = juju.parse_status:main",
+        ]
+    },
+)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 0000000..c511897
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,55 @@
+name: juju-parse-status
+title: Juju Parse Status
+summary: Juju command to extract information from Juju status
+description: >
+  Juju command to extract information from Juju status
+
+version: "0.1"
+
+base: core20
+confinement: classic
+grade: stable
+
+apps:
+  juju-parse-status:
+    command: bin/juju-parse-status
+    environment:
+      PYTHONPATH: $SNAP/lib/python3.8/site-packages/
+parts:
+  juju-parse-status:
+    plugin: python
+    python-packages:
+      - wheel
+    override-pull: |
+      set -eux
+      cp $SNAPCRAFT_STAGE/mojo/exceptions.py .
+      cp $SNAPCRAFT_STAGE/mojo/shutil_which.py .
+      cp -r $SNAPCRAFT_STAGE/mojo/juju .
+      cp $SNAPCRAFT_STAGE/setup.py .
+      patch -p0 < $SNAPCRAFT_STAGE/debuglogs.patch
+      patch -p0 < $SNAPCRAFT_STAGE/status.patch
+    after:
+      - mojo
+  mojo:
+    plugin: dump
+    source: lp:mojo
+    stage:
+      - -setup.py
+    prime:
+      - -*
+    after:
+      - patches
+  patches:
+    source: ./patches
+    source-type: local
+    plugin: dump
+    prime:
+      - -*
+    after:
+      - setup
+  setup:
+    source: ./setup
+    source-type: local
+    plugin: dump
+    prime:
+      - setup.py