From 133ae2de1840682ef58d0bd88cb94d7b0b8d8af3 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Jul 17 2017 11:22:37 +0000 Subject: Remove unnecessary files --- diff --git a/contrib/modtools.py b/contrib/modtools.py deleted file mode 100755 index 5b6f6fc..0000000 --- a/contrib/modtools.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/python3 - -import sys -import argparse - -from modularity.module_generator import ModuleGenerator -from modularity.oc_template import OpenShiftTemplateGenerator - - -class ModtoolsCLI(object): - """ Class for processing data from commandline """ - - @staticmethod - def build_parser(): - parser = argparse.ArgumentParser(description="Generates module related files") - subparsers = parser.add_subparsers(dest="cmd_name") - - parser_rpm2module = subparsers.add_parser( - 'rpm2module', help="Generates modulemd file", - description="Gets package info and dependencies and creates modulemd file." - ) - parser_rpm2module.add_argument( - "pkgs", - metavar='PKGS', - nargs='+', - help="Specify list of packages for module.", - ) - - parser_docker2openshift = subparsers.add_parser( - "docker2openshift", help="Generates openshift template from dockerfile", - description="Creates an OpenShift template YAML file.", - ) - - parser_docker2openshift.add_argument( - "image", - metavar='IMAGE', - help="docker image name (like NAME or docker.io/USER/NAME)", - ) - parser_docker2openshift.add_argument( - "--dockerfile", - help="Specify Dockerfile name. Default is Dockerfile." - ) - - return parser - - def __init__(self, args=None): - self.parser = ModtoolsCLI.build_parser() - self.args = self.parser.parse_args(args) - - def __getattr__(self, name): - try: - return getattr(self.args, name) - except AttributeError: - return object.__getattribute__(self, name) - - -class ModtoolsCLIHelper(object): - - @staticmethod - def run(): - try: - cli = ModtoolsCLI(sys.argv[1:]) - if cli.args.cmd_name == 'rpm2module': - mg = ModuleGenerator(cli.args.pkgs) - mg.run() - - if cli.args.cmd_name == 'docker2openshift': - otg = OpenShiftTemplateGenerator(cli.args) - otg.run() - except KeyboardInterrupt: - print('\nInterrupted by user') - except Exception as e: - print(e) - sys.exit(1) diff --git a/modularity/test_module_generator.py b/modularity/test_module_generator.py deleted file mode 100644 index e2bd225..0000000 --- a/modularity/test_module_generator.py +++ /dev/null @@ -1,52 +0,0 @@ -import unittest -import os -from module_generator import ModuleGenerator -from modularity.cli import CLIRpm2Module - - -class ModuleGeneratorTest(unittest.TestCase): - - def setUp(self): - cli = CLIRpm2Module(["test"]) - self.mg = ModuleGenerator(cli) - - def test_save_module_md(self): - self.mg.args.pkgs = 'package' - self.mg._save_module_md() - - assert os.path.exists('package.yaml') - - def test_get_pkg_info(self): - self.mg.args.pkgs = 'definitelynotavalidnameofapackage' - - with self.assertRaises(ValueError) as context: - self.mg._get_pkg_info() - - self.assertTrue('No package found in repo' in context.exception) - - self.mg.args.pkgs = 'bash' - self.mg._get_pkg_info() - - self.assertEqual(self.mg.pkg.summary, 'The GNU Bourne Again shell') - - def test_update_module_md(self): - self.mg.args.pkgs = 'bash' - self.mg._get_pkg_info() - - self.mg._update_module_md() - self.assertEqual(self.mg.mmd.summary, 'The GNU Bourne Again shell') - self.assertEqual(len(self.mg.mmd.module_licenses), 1) - self.assertEqual(len(self.mg.mmd.components.rpms), 0) - - def test_get_dependencies(self): - self.mg.args.pkgs = 'bash' - self.mg._get_dependencies() - - self.assertGreater(self.mg.build_deps, 0) - self.assertGreater(self.mg.run_deps, 0) - - if os.path.exists(self.mg.build_deps_file): - os.remove(self.mg.build_deps_file) - - if os.path.exists(self.mg.run_deps_file): - os.remove(self.mg.run_deps_file)