Merge pull request #12 from kwozyman/pep8

PEP8-ifying

.gitignore

@@ -1,6 +1,2 @@
-
-
-
-
-
 node_modules/*
+*/__pycache__/*

fab/.pep8

@@ -0,0 +1,3 @@
+[pycodestyle]
+max_line_length = 120
+ignore = E501

fab/cli.py

@@ -1,10 +1,12 @@
 import logging
 from fab.fab import Fab
 
+
 class FabCli():
     """
     Fab command line
     """
+
     def __init__(self, **kwargs):
         self.loglevel = 'info'
         self.log_format = '%(asctime)19s - %(levelname)8s - %(message)s'
@@ -56,7 +58,7 @@ def _cmdargs(self):
             import argparse
             parser = argparse.ArgumentParser(
                 description=description
-                )
+            )
 
         parser.add_argument('--log-level', '--loglevel',
                             choices=self.logmap.keys(),
@@ -73,11 +75,11 @@ def _cmdargs(self):
                             default=self.log_datefmt,
                             help='Python Logger() compatible date format str')
         parser.add_argument('--container-tool',
-                                  help='What container tool to use',
-                                  default='/usr/bin/podman')
+                            help='What container tool to use',
+                            default='/usr/bin/podman')
         parser.add_argument('--container-tool-extra-args',
-                                  help='container tool extra arguments',
-                                  default=[])
+                            help='container tool extra arguments',
+                            default=[])
 
         subparsers = parser.add_subparsers(dest='command')
         subparsers.required = False

fab/fab.py

@@ -3,10 +3,12 @@
 import subprocess
 from fab.module import FabModule
 
+
 class Fab:
     """
     Fabfile definition
     """
+
     def __init__(self, source, container_tool='/usr/bin/podman', tool_args=[]):
         self.source = source
         self.name = source
@@ -37,7 +39,7 @@ def _validate(self):
                 logging.warning("No name set in fabfile {} metadata. Autosetting to {}".format(self.name, self.name))
                 self.definition['metadata']['name'] = self.name
             else:
-                self.name =  self.definition['metadata']['name']
+                self.name = self.definition['metadata']['name']
             if not 'description' in self.definition['metadata']:
                 logging.warning("No description set in fabfile {} metadata. Autosetting".format(self.name))
                 self.definition['metadata']['description'] = 'Autogenerated'
@@ -57,7 +59,7 @@ def _validate(self):
         else:
             self.definition['buildargs'] = []
 
-        return(is_valid)
+        return (is_valid)
 
     def _load_includes(self):
         for include in self.definition['include']:
@@ -93,8 +95,8 @@ def build(self):
         print(len(self.includes))
         for module in self.includes:
             tag = '{}-stage-{}'.format(
-                    self.name,
-                    module.name)
+                self.name,
+                module.name)
             podman_args = []
             podman_args.append(self.tool_args)
             podman_args.append('build')

fab/module.py

@@ -4,10 +4,12 @@
 import urllib.parse
 import pathlib
 
+
 class FabModule():
     """
     Definition of a generic Fab module
     """
+
     def __init__(self, source, **kwargs):
         self.source = source
         self.name = self.source
@@ -21,8 +23,8 @@ def __init__(self, source, **kwargs):
             raise Exception("YAML is not valid")
 
     def __str__(self):
-        return(pprint.pformat(self.definition, indent=4))
-    
+        return (pprint.pformat(self.definition, indent=4))
+
     def _read(self):
         parsed_source = urllib.parse.urlparse(self.source)
         logging.debug('Decoded source: {}'.format(parsed_source))
@@ -56,7 +58,7 @@ def _validate(self):
             if not 'description' in self.definition['metadata']:
                 logging.warning("No description set in module {}'s metadata. Autosetting".format(self.name))
                 self.definition['metadata']['description'] = 'Autogenerated'
-        
+
         if not 'containerfile' in self.definition:
             logging.debug("'containerfile' missing from definition yaml for module {}, using default".format(self.name))
             self.definition['containerfile'] = 'Containerfile'
@@ -72,4 +74,4 @@ def _validate(self):
         else:
             self.definition['buildargs'] = []
 
-        return(is_valid)
+        return (is_valid)

requirements.txt

@@ -1,2 +1,2 @@
-pyyaml
 configargparse
+pyyaml