Merge pull request #7 from toabctl/main-improv

Main improv
toabctl · Jul 21, 2023 · dae8ab1 · dae8ab1
2 parents a4e068a + 7e08041
commit dae8ab1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/jenviz/__init__.py b/jenviz/__init__.py
@@ -116,11 +116,21 @@ def _get_profile(args):
 
 
 def _parser():
+    # snaps do set $HOME to something like
+    # /home/$USER/snap/jenkins-tool/$SNAP_VERSION
+    # the real home (usually /home/$USERNAME) is stored in $SNAP_REAL_HOME
+    # see https://snapcraft.io/docs/environment-variables
+    SNAP_REAL_HOME = os.getenv('SNAP_REAL_HOME')
+    if SNAP_REAL_HOME:
+        conf_default = os.path.join(os.path.join(SNAP_REAL_HOME, '.config', 'jenviz.ini'))
+    else:
+        conf_default = os.path.join(os.path.expanduser('~'), '.config', 'jenviz.ini')
+
     parser = argparse.ArgumentParser(
         description='Visualize Jenkins jobs')
     jenkins_group = parser.add_argument_group(title='Jenkins')
     jenkins_group.add_argument('--jenviz-config-file', '-c',
-                               default=os.path.join(os.path.expanduser('~'), '.config', 'jenviz.ini'),
+                               default=conf_default,
                                help='Path to the jenviz configuration file. Default: %(default)s')
     jenkins_group.add_argument('--jenviz-config-profile', '-p',
                                help='The profile (section) to use in the jenviz-config-file')

diff --git a/setup.cfg b/setup.cfg
@@ -17,6 +17,7 @@ packages = find:
 install_requires =
   python-jenkins
   graphviz
+  urllib3 < 2
 setup_requires =
   setuptools_scm
 

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -15,15 +15,13 @@ description: |
          --output-view
 
 grade: stable
-confinement: classic
+confinement: strict
 
-apps:
-  jenviz:
-    command: bin/jenviz
-    environment:
-       LC_ALL: C.UTF-8
-       PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$SNAP/lib/python3.8/site-packages/
-       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/
+plugs:
+  dot-config-jenviz:
+    interface: personal-files
+    read:
+    - $HOME/.config/jenviz.ini
 
 parts:
   jenviz:
@@ -39,3 +37,15 @@ parts:
     stage-packages:
       - graphviz
       - libgvc6
+
+apps:
+  jenviz:
+    command: bin/jenviz
+    environment:
+       LC_ALL: C.UTF-8
+       PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$SNAP/lib/python3.8/site-packages/
+       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/
+    plugs:
+      - home
+      - network
+      - dot-config-jenviz