Merge pull request #48 from dschep/zipapp

Package ntfy as a PEP441 style zipapp

.gitignore

@@ -1,7 +1,7 @@
 *.py[co]
 *.egg-info
-build
-dist
+/build
+/dist
 *travis.log
 .eggs
 htmlcov

__main__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/python2
+import sys
+
+from ntfy.cli import main
+
+if __name__ == '__main__':
+    sys.exit(main())

ntfy/backends/linux.py

@@ -1,9 +1,9 @@
 from os import path
 
-DEFAULT_ICON = path.join(path.split(path.split(__file__)[0])[0], 'icon.png')
+from ..data import icon
 
 
-def notify(title, message, icon=DEFAULT_ICON, **kwargs):
+def notify(title, message, icon=icon.png, **kwargs):
     try:
         import dbus
     except ImportError:

ntfy/backends/win32.py

@@ -4,11 +4,10 @@
 import struct
 import time
 
-DEFAULT_ICON = os.path.join(
-    os.path.split(os.path.split(__file__)[0])[0], 'icon.ico')
+from ..data import icon
 
 
-def notify(title, message, icon=DEFAULT_ICON, **kwargs):
+def notify(title, message, icon=icon.ico, **kwargs):
     """
     Optional parameters:
         * ``icon`` - path to an ICO file to display instead of the ntfy icon

ntfy/cli.py

@@ -20,6 +20,7 @@
 
 from . import __version__, notify
 from .config import load_config, DEFAULT_CONFIG, OLD_DEFAULT_CONFIG
+from .data import scripts
 
 
 def run_cmd(args):
@@ -67,12 +68,11 @@ def watch_pid(args):
 
 
 def auto_done(args):
-    shell_path = path.join(path.split(__file__)[0], 'shell_integration')
     if emojize is not None and not args.no_emoji:
         print('export AUTO_NTFY_DONE_EMOJI=true')
     if args.shell == 'bash':
-        print('source {}/bash-preexec.sh'.format(shell_path))
-    print('source {}/auto-ntfy-done.sh'.format(shell_path))
+        print('source {}'.format(scripts['bash-preexec.sh']))
+    print('source {}'.format(scripts['auto-ntfy-done.sh']))
     print("# To use ntfy's shell integration, run "
           "this and and it to your shell's rc file:")
     print('# eval "$(ntfy shell-integration)"')

ntfy/data.py

@@ -0,0 +1,28 @@
+from os import path, makedirs
+from pkgutil import get_data
+
+from appdirs import user_data_dir
+
+ntfy_data_dir = user_data_dir('ntfy', 'dschep')
+if not path.isdir(ntfy_data_dir):
+    makedirs(ntfy_data_dir)
+
+
+class icon(object):
+    png = None
+    ico = None
+for fmt in ['png', 'ico']:
+    icon_path = path.abspath(path.join(ntfy_data_dir, 'icon.' + fmt))
+    setattr(icon, fmt, icon_path)
+    if not path.isfile(icon_path):
+        with open(icon_path, 'wb') as icon_file:
+            icon_file.write(get_data('ntfy', 'icon.' + fmt))
+
+scripts = {}
+for script in ['auto-ntfy-done.sh', 'bash-preexec.sh']:
+    script_path = path.abspath(path.join(ntfy_data_dir, script))
+    scripts[script] = script_path
+    if not path.isfile(script_path):
+        with open(script_path, 'wb') as script_file:
+            script_file.write(get_data('ntfy', path.join('shell_integration',
+                                                         script)))

requirements.txt

@@ -0,0 +1,4 @@
+PyYAML==3.11
+appdirs==1.4.0
+emoji==0.3.9
+requests==2.9.1

zipapp.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -rf build/zipapp
+mkdir -p build/zipapp dist
+cp __main__.py build/zipapp
+pip install --target=build/zipapp -r requirements.txt .
+type -P python3.5 &> /dev/null && \
+	python3 -m zipapp -o dist/ntfy --python /usr/bin/python2.7 build/zipapp