Revert "Merging develop to master"

evolved5g/cli.py

@@ -1,42 +1,67 @@
 """Console script for evolved5g."""
 import click
 from .utils import cookiecutter_generate
-from evolved5g.cli_helper import CLI_helper
+import os
+
+
+@click.command()
+def main(args=None):
+    """Console script for evolved5g."""
+    click.echo(
+        "The console script for Evolved5G, this messages comes from evolved5g.cli.main")
+    click.echo("See click documentation at https://click.palletsprojects.com/")
+    return 0
+
+# Creating Command group
 
 
 @click.group()
 @click.version_option()
-@click.pass_context
-def cli(ctx):
+def cli():
     """Console interface for EVOLVED-5G H2020 project"""
-    ctx.ensure_object(dict)
-    ctx.obj["helper"] = CLI_helper()
+    pass
 
 
-@cli.command()
+@click.command()
 @click.option('--no-input', type=bool, is_flag=True,
               help='Enables no prompt from the CLI during template generation', default=False)
 @click.option('-r', '--repo-name', type=str, help='Enter Repository name')
 @click.option('-p', '--package-name', type=str, help='Enter package name')
 @click.option('-t', '--template', type=str, help="Provide template location for custom package")
-@click.pass_context
-def generate(ctx,no_input, repo_name, package_name, template):
+def generate(no_input, repo_name, package_name, template):
     """Generate EVOLVED-5G compliant NetApp from template"""
-    ctx.obj["helper"].generate(no_input, repo_name, package_name, template) 
-
-@cli.command()
-@click.option('--mode',type=click.Choice(['build', 'deploy','destroy'], case_sensitive=False))
-@click.option('--repo',type=str, help='Enter repo name')
-@click.pass_context
-def run_pipeline(ctx, mode, repo):
-    """
-    """
-    ctx.obj["helper"].run_pipeline(mode,repo) 
-
-@cli.command()
-@click.option('--id',type=int, help='Enter pipeline id')
-@click.pass_context
-def check_pipeline(ctx, id):
-    """
-    """
-    ctx.obj["helper"].check_pipeline(id)
+    # __location__ = os.path.realpath(os.path.join(
+    #    os.getcwd(), os.path.dirname(__file__), ".."))
+    # location = (__location__ + '/cookiecutter_template/')
+    # click.echo(__location__)  # -- for debug
+    extra = {}
+    if repo_name:
+        extra['repoName'] = repo_name
+    if package_name:
+        extra['packageName'] = package_name
+    if template:
+        cookiecutter_generate(template,no_input=no_input,extra_context=extra)
+        return
+    location = "gh:EVOLVED-5G/template" # location to github package
+    # Create project from the github package template
+    cookiecutter_generate(location, no_input=no_input, extra_context=extra)
+
+
+# @click.command()
+# def connect():
+#     """Connect repository to CI/CD"""
+#     # Connect repository to CI/CD TODO
+#     click.echo("Connecting Repo to CI/CD")
+
+# @click.command()
+# @click.option('-r', '--repeat', type=int, help='times to repeat', default=1)
+# @click.option('-n', '--name', type=str, help='Name to greet', default='World')
+# def test(repeat, name):
+#     """For Testing purposes, TODO Delete"""
+#     for i in range(repeat):
+#         click.echo(f'Hello {name}. This is a test')
+
+#cli.add_command(test)
+# cli.add_command(connect)
+
+cli.add_command(generate)

evolved5g/utils.py

@@ -4,5 +4,5 @@
 def cookiecutter_generate(location, no_input=False, **kwargs):
     """ Create project from the cookiecutter template in location given
     with the appropriate arguments. """
-    # extra_context = kwargs['extra_context']
-    cookiecutter(location, no_input=no_input) #, extra_context=extra_context)
+    extra_context = kwargs['extra_context']
+    cookiecutter(location, no_input=no_input, extra_context=extra_context)

requirements.txt

@@ -5,8 +5,6 @@ coverage==4.5.4
 Click==8.0.1
 pytest==6.2.4
 cookiecutter==1.7.3
-invoke==1.6.0
-requests==2.26.0
 setuptools~=58.1.0
 six~=1.16.0
 certifi~=2021.10.8

requirements_dev.txt

@@ -12,5 +12,3 @@ twine
 Click==8.0.1
 pytest==6.2.4
 cookiecutter==1.7.3
-invoke==1.6.0
-requests==2.26.0

setup.py

@@ -3,16 +3,14 @@
 """The setup script."""
 
 from setuptools import setup, find_packages
-from pathlib import Path
 
 with open('README.rst') as readme_file:
     readme = readme_file.read()
 
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
-with Path('requirements.txt').open() as file:
-    INSTALL_REQUIERES = file.readlines()
+requirements = ['Click>=7.0', 'Cookiecutter', ]
 
 test_requirements = ['pytest>=3', ]
 
@@ -33,10 +31,9 @@
     entry_points={
         'console_scripts': [
             'evolved5g=evolved5g.cli:cli',
-            'cli_helper= evolved5g.cli:cli_helper',
         ],
     },
-    install_requires=INSTALL_REQUIERES,
+    install_requires=requirements,
     license="Apache Software License 2.0",
     long_description=readme + '\n\n' + history,
     include_package_data=True,