airship/spyglass-plugin-xls
Code Issues Proposed changes

Various fixes for plugin separation

Browse Source 
There were a few missing changes from the repo that this project was
imported from. This change is meant to get the XLS plugin up to date
with any changes that were merged into Spyglass before the separation.

Relates to https://review.opendev.org/#/c/653555/

Change-Id: Ib2f75878b1a29e835cb8e2323aebe9d431c479e7
This commit is contained in:
Ian H. Pittwood 2019-05-14 11:23:03 -05:00
parent 471f47a711
commit 387de658dc
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spyglass_plugin_xls/cli.py
View File

@ -69,7 +69,7 @@ SITE_CONFIGURATION_FILE_OPTION = click.option(
help='Path to site specific configuration details YAML file.')
INTERMEDIARY_DIR_OPTION = click.option(
'-idir',
'-d',
'--intermediary-dir',
'intermediary_dir',
type=click.Path(exists=True, file_okay=False, writable=True),
@ -85,7 +85,7 @@ SITE_NAME_CONFIGURATION_OPTION = click.option(
help='Name of the site for which the intermediary is being generated.')
TEMPLATE_DIR_OPTION = click.option(
'-tdir',
'-t',
'--template-dir',
'template_dir',
type=click.Path(exists=True, readable=True, file_okay=False),
@ -93,7 +93,7 @@ TEMPLATE_DIR_OPTION = click.option(
help='Path to the directory containing manifest J2 templates.')
MANIFEST_DIR_OPTION = click.option(
'-mdir',
'-m',
'--manifest-dir',
'manifest_dir',
type=click.Path(exists=True, writable=True, file_okay=False),
@ -101,7 +101,7 @@ MANIFEST_DIR_OPTION = click.option(
help='Path to place created manifest files.')
@excel.command('g',
@excel.command('intermediary',
short_help='generate intermediary',
help='Generates an intermediary file from passed excel data.')
@EXCEL_FILE_OPTION
@ -111,17 +111,17 @@ MANIFEST_DIR_OPTION = click.option(
@SITE_NAME_CONFIGURATION_OPTION
def generate_intermediary(*args, **kwargs):
process_input_ob = \
spyglass.cli.intermediary_processor('spyglass-plugin-xls', **kwargs)
spyglass.cli.intermediary_processor('excel', **kwargs)
LOG.info("Generate intermediary yaml")
process_input_ob.generate_intermediary_yaml()
process_input_ob.dump_intermediary_file(kwargs['intermediary_dir'])
@excel.command('m',
short_help='generates manifest and intermediary',
help='Generates manifest and intermediary files.')
@excel.command('documents',
short_help='generates manifest documents and intermediary',
help='Generates manifest documents and intermediary file.')
@click.option(
'-g',
'-i',
'--generate-intermediary',
'generate_intermediary',
is_flag=True,
@ -137,7 +137,7 @@ def generate_intermediary(*args, **kwargs):
@MANIFEST_DIR_OPTION
def generate_manifests_and_intermediary(*args, **kwargs):
process_input_ob = \
spyglass.cli.intermediary_processor('spyglass-plugin-xls', **kwargs)
spyglass.cli.intermediary_processor('excel', **kwargs)
LOG.info("Generate intermediary yaml")
intermediary_yaml = process_input_ob.generate_intermediary_yaml()
if generate_intermediary: