diff --git a/README.md b/README.md index 7588f5e..91db9f0 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,16 @@ ln -s /usr/local/share/q-tools/rc /etc/cron.weekly/q-tools The last step ensures weekly updates -## Separate tools +## Python modules -The Markslider slide viewer can be installed with: -``` -pip2 install https://bitbucket.org/MoonQ/q-tools/raw/HEAD/reporting/markslider.tar.gz -``` +Markslider is a terminal slide presentation with markdown backend: +- `pipx install https://bitbucket.org/MoonQ/q-tools/raw/HEAD/py-packages/markslider.tgz` +TSVFilter: a TSV (or CSV) filtering with simple syntax. Limit printed rows by matching header names and operators, ex. "Column1>0.5,Column2==10" + +- `pipx install https://bitbucket.org/MoonQ/q-tools/raw/HEAD/py-packages/TSVFilter.tgz` + +SimpleWepPage: An HTML file index generator + +- `pipx install https://bitbucket.org/MoonQ/q-tools/raw/HEAD/py-packages/SimpleWebPage.tgz` diff --git a/bin/ansi-codes b/bin/ansi-codes index 985b1fd..50f91b8 100755 --- a/bin/ansi-codes +++ b/bin/ansi-codes @@ -2,6 +2,6 @@ import sys,os sys.path.append(os.path.realpath(os.path.join(os.path.dirname(__file__), - "..","reporting"))) + "..","py-packages","markslider","markslider"))) import ansicodes print(ansicodes.demo()) diff --git a/bin/markslider b/bin/markslider index 30722c1..b699080 120000 --- a/bin/markslider +++ b/bin/markslider @@ -1 +1 @@ -../reporting/markslider.py \ No newline at end of file +../py-packages/markslider/markslider/markslider.py \ No newline at end of file diff --git a/bin/md-color b/bin/md-color index 8700fce..2d0786a 120000 --- a/bin/md-color +++ b/bin/md-color @@ -1 +1 @@ -../reporting/md_color.py \ No newline at end of file +../py-packages/markslider/markslider/md_color.py \ No newline at end of file diff --git a/py-packages/Makefile b/py-packages/Makefile index 25da4a7..e85dbc1 100644 --- a/py-packages/Makefile +++ b/py-packages/Makefile @@ -14,12 +14,13 @@ help: ## *:・゚✧*:・゚✧ This help *:・゚✧*:・゚✧ ' clean: ## Clean build and .egg folder in py modules - rm -vr */build/ */*.egg-info - + find . -depth -type d -name __pycache__ -exec rm -vr \{\} \; + find . -depth -type d -name build -exec rm -vr \{\} \; + find . -depth -type d -name '*.egg-info' -exec rm -vr \{\} \; pipx: ## Install all packages with pipx - for module in *; do if [[ -f $module/setup.py ]]; then pipx install $module; fi; done + for module in *; do if [ -f $$module/setup.py ]; then pipx install $$module; fi; done -foo: - pass +package: clean ## Create packages for every module + for module in *; do if [ -f $$module/setup.py ]; then tar czf $$module.tgz $$module; fi; done diff --git a/py-packages/SimpleWebPage.tgz b/py-packages/SimpleWebPage.tgz new file mode 100644 index 0000000..a1f2c0b Binary files /dev/null and b/py-packages/SimpleWebPage.tgz differ diff --git a/py-packages/TSVFilter.tgz b/py-packages/TSVFilter.tgz new file mode 100644 index 0000000..8444b8e Binary files /dev/null and b/py-packages/TSVFilter.tgz differ diff --git a/py-packages/markslider.tgz b/py-packages/markslider.tgz new file mode 100644 index 0000000..05fcd0b Binary files /dev/null and b/py-packages/markslider.tgz differ diff --git a/reporting/ansicodes.py b/py-packages/markslider/markslider/ansicodes.py similarity index 100% rename from reporting/ansicodes.py rename to py-packages/markslider/markslider/ansicodes.py diff --git a/reporting/markslider.py b/py-packages/markslider/markslider/markslider.py similarity index 100% rename from reporting/markslider.py rename to py-packages/markslider/markslider/markslider.py diff --git a/reporting/md_color.py b/py-packages/markslider/markslider/md_color.py similarity index 100% rename from reporting/md_color.py rename to py-packages/markslider/markslider/md_color.py diff --git a/py-packages/markslider/setup.py b/py-packages/markslider/setup.py new file mode 100644 index 0000000..bbdaf3c --- /dev/null +++ b/py-packages/markslider/setup.py @@ -0,0 +1,23 @@ +from distutils.core import setup + + +def version_reader(path): + for line in open(path, "rt").read(1024).split("\n"): + if line.startswith("__version__"): + return line.split("=")[1].strip().replace('"', "") + + +version = version_reader(os.path.join("markslider", "markslider.py")) +setup( + name="markslider", + packages=["markslider"], + version=version, + description="View markdown files as slides in terminal", + author="Ville Rantanen", + author_email="ville.q.rantanen@gmail.com", + keywords=["Markdown", "Slideshow"], + entry_points = {'console_scripts': 'markslider = markslider.markslider:main'}, + install_requires = [ + 'pygments' + ] +) diff --git a/reporting/markslider.packager.sh b/reporting/markslider.packager.sh deleted file mode 100644 index e7413c6..0000000 --- a/reporting/markslider.packager.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -set -e -set -x - -rm -rf markslider -mkdir -p markslider/markslider -cp -v ansicodes.py md_color.py markslider.py markslider/markslider/ - -echo 'from markslider import *' > markslider/markslider/__init__.py - -echo 'Markdown slideshow. Display your markdown file directly in the terminal!' > markslider/README.md -echo '[metadata] -description-file = README.md' > markslider/setup.cfg - -echo "from distutils.core import setup -setup( - name = 'markslider', - packages = ['markslider'], - entry_points = {'console_scripts': 'markslider = markslider.markslider:main'}, - version = '$( ./markslider.py -v 2>&1 )', - description = 'Markdown viewer as slides', - author = 'Ville Rantanen', - author_email = 'ville.q.rantanen@gmail.com', - url = 'https://bitbucket.org/MoonQ/tools', - download_url = 'https://bitbucket.org/MoonQ/tools/raw/tip/reporting/markslider.tar.gz', - keywords = ['markdown', 'console'], - classifiers = [], - license = 'MIT', -)" > markslider/setup.py - -tar czf markslider.tar.gz markslider -rm -rf markslider - diff --git a/reporting/markslider.tar.gz b/reporting/markslider.tar.gz deleted file mode 100644 index b3ccc18..0000000 Binary files a/reporting/markslider.tar.gz and /dev/null differ