markslide moved, testing tgz installers

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:
+Markslider is a terminal slide presentation with markdown backend:
-```
-pip2 install https://bitbucket.org/MoonQ/q-tools/raw/HEAD/reporting/markslider.tar.gz
-```
 
+- `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`

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())

bin/markslider

@@ -1 +1 @@
-../reporting/markslider.py
+../py-packages/markslider/markslider/markslider.py

bin/md-color

@@ -1 +1 @@
-../reporting/md_color.py
+../py-packages/markslider/markslider/md_color.py

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:
+package: clean ## Create packages for every module
-	pass
+	for module in *; do if [ -f $$module/setup.py ]; then tar czf $$module.tgz $$module; fi; done

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'
+    ]
+)

reporting/markslider.packager.sh

@@ -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
-