Start rewrite to config-file based cli

md_pdf/args.py

@@ -0,0 +1,7 @@
+import argparse
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-v", "--verbose", help="Display verbose output", action="store_true")
+    return parser.parse_args()

md_pdf/build/__init__.py

@@ -0,0 +1,14 @@
+from md_pdf.consts import WORKING_DIR
+from md_pdf.build.md import read_files
+from md_pdf.build.pandoc import build_document, output_html
+from md_pdf.build.cover import render_cover
+from md_pdf.build.pdf import export_pdf
+import os
+
+
+def build(args, config):
+    data = read_files(os.path.join(WORKING_DIR, '*.md'))
+    doc = build_document(data, os.path.join(WORKING_DIR, 'bib.yaml'))
+    output_html(doc, os.path.join(WORKING_DIR, 'out'))
+    render_cover()
+    export_pdf(doc, os.path.join(WORKING_DIR, 'out'))

md_pdf/build/cli.py

@@ -1,20 +0,0 @@
-import click
-from md_pdf.build.md import read_files
-from md_pdf.build.pandoc import build_document, output_html
-from md_pdf.build.cover import render_cover
-from md_pdf.build.pdf import export_pdf
-
-
-@click.command('build', short_help="Build document")
-@click.argument('in_files', type=click.Path(dir_okay=False, resolve_path=True, writable=True), nargs=-1)
-@click.option('--bibliography', '-b', type=click.Path(dir_okay=False, resolve_path=True, writable=True), default=None)
-@click.option('--output', '-o', type=click.Path(file_okay=False, resolve_path=True, writable=True), default='out/')
-def cli(in_files, bibliography, output):
-    data = read_files(in_files)
-    doc = build_document(data, bibliography)
-    output_html(doc, output)
-    render_cover()
-    export_pdf(doc, output)
-    return 0
-
-

md_pdf/build/cover.py

@@ -1,5 +1,5 @@
 from jinja2 import Template
-from md_pdf.utils import PROJECT_DIR
+from md_pdf.consts import PROJECT_DIR
 import os
 
 

md_pdf/build/md.py

@@ -6,5 +6,6 @@ def get_files_content(filenames):
             yield f.read()
 
 
-def read_files(filenames):
+def read_files(files_glob):
+    filenames = glob.iglob(files_glob)
     return '\n'.join(list(get_files_content(filenames)))

md_pdf/build/pandoc.py

@@ -1,7 +1,7 @@
 import pypandoc
 from bs4 import BeautifulSoup
 import os.path
-from md_pdf.utils import PROJECT_DIR
+from md_pdf.consts import PROJECT_DIR
 
 
 CSL_FILE = os.path.join(PROJECT_DIR, 'assets', 'harverd.csl')

md_pdf/build/pdf.py

@@ -1,5 +1,5 @@
 import pdfkit
-from md_pdf.utils import PROJECT_DIR
+from md_pdf.consts import PROJECT_DIR
 from md_pdf.build.cover import OUTPUT_COVER_FILE
 import os
 

md_pdf/cli.py

@@ -1,40 +1,22 @@
-import os.path
-import click
 import logging
+from md_pdf.args import parse_args
+from md_pdf.exceptions import PrematureExit
+from md_pdf.build import build
+from md_pdf.config.read import load_config
 
 
 FORMAT = "[%(levelname)s]: %(message)s"
 logging.basicConfig(format=FORMAT, level=logging.DEBUG)
-logging.getLogger("requests").setLevel(logging.WARNING)
 
 
-class MDPDFCLI(click.MultiCommand):
-
-    def list_commands(self, ctx):
-        return ['build']
-
-    def get_command(self, ctx, name):
-        ns = {}
-        if name not in self.list_commands(ctx):
-            return
-        try:
-            fn = os.path.join(os.path.dirname(__file__), name + '/cli.py')
-            with open(fn) as f:
-                code = compile(f.read(), fn, 'exec')
-                eval(code, ns, ns)
-            return ns['cli']
-        except Exception as e:
-            print("An Error Occured:s")
-            raise e
-
-
-cli = MDPDFCLI(help='This tool\'s subcommands are loaded from a plugin folder dynamically.')
-
-
-@click.command(cls=MDPDFCLI)
 def cli():
-    pass
-
-
-if __name__ == '__main__':
-    cli()
+    args = parse_args()
+    try:
+        config = load_config()
+        build(args, config)
+    except PrematureExit:
+        return 0
+    except Exception as e:
+        logging.error(str(e))
+        return 1
+    return 0

md_pdf/config/read.py

@@ -0,0 +1,8 @@
+import yaml
+import os
+from md_pdf.consts import CONFIG_FILE
+
+
+def load_config():
+    with open(os.path.join(CONFIG_FILE)) as f:
+        return yaml.load(f)

md_pdf/consts.py

@@ -0,0 +1,7 @@
+import os
+
+PROJECT_DIR = os.path.dirname(__file__)
+
+WORKING_DIR = os.getcwd()
+
+CONFIG_FILE = os.path.join(WORKING_DIR, 'mdp.yml')

md_pdf/exceptions.py

@@ -0,0 +1,2 @@
+class PrematureExit(Exception):
+    pass

md_pdf/utils.py

@@ -1,5 +0,0 @@
-import os
-
-PROJECT_DIR = os.path.dirname(__file__)
-
-WORKING_DIR = os.getcwd()

setup.py

@@ -6,10 +6,10 @@ setup(
     version="1.0",
     install_requires=[
         "beautifulsoup4==4.5.3",
-        "click==6.7.0",
         "jinja2==2.9.5",
         "pdfkit==0.6.1",
-        "pypandoc==1.3.3"
+        "pypandoc==1.3.3",
+        "PyYAML==3.12"
     ],
     entry_points="""
         [console_scripts]