Merge pull request #35 from typecode/develop

Version 0.4.2

Author: Didericis

sykle/__init__.py

@@ -1,6 +1,6 @@
 # __init__.py
 
-__version__ = '0.4.1'
+__version__ = '0.4.2'
 
 
 class Sykle():
@@ -12,7 +12,7 @@ class Sykle():
     def __init__(
         self, project_name='sykle-project',
         unittest_config=[], e2e_config=[],
-        predeploy_config=[], debug=False,
+        predeploy_config=[], preup_config=[], debug=False,
         aliases={}
     ):
         """
@@ -22,6 +22,7 @@ def __init__(
             unittest_config (array[dict]): Array of unittest configs
             e2e_config (array[dict]): Array of end to end test configs
             predeploy_config (array[dict]): Array with predeploy steps
+            preup_config (array[dict]): Array with preup steps
             aliases (dict): Dictionary defining custom commands
         """
         from .call_subprocess import call_subprocess
@@ -31,6 +32,7 @@ def __init__(
         self.project_name = project_name
         self.e2e_config = e2e_config
         self.predeploy_config = predeploy_config
+        self.preup_config = preup_config
         self.unittest_config = unittest_config
 
     def _read_env_file(self, env_file):
@@ -138,6 +140,7 @@ def build(self, docker_type='dev', docker_vars={}):
 
     def up(self, docker_type='dev'):
         """Starts up relevant docker compose services"""
+        self.preup(docker_type=docker_type)
         self.dc(
             input=['up', '--build', '--force-recreate'],
             docker_type=docker_type
@@ -192,31 +195,47 @@ def deployment_ssh(self, target):
         """Opens an ssh connection to the deployment"""
         return self.call_subprocess(['ssh', target], debug=self.debug)
 
+    def preup(self, docker_type):
+        for config in self.preup_config:
+            if config.get('service'):
+                self.dc_run(
+                    input=config['command'].split(' '),
+                    service=config['service'],
+                    docker_type=docker_type,
+                )
+            else:
+                self.call_subprocess(config['command'].split(' '))
+
     def predeploy(self, env_file=None, docker_vars={}):
         for config in self.predeploy_config:
-            self.dc_run(
-                input=config['command'].split(' '),
-                service=config['service'],
-                docker_type='prod-build',
-                env_file=env_file,
-                docker_vars=docker_vars
-            )
+            if config.get('service'):
+                self.dc_run(
+                    input=config['command'].split(' '),
+                    service=config['service'],
+                    docker_type='prod-build',
+                    env_file=env_file,
+                    docker_vars=docker_vars
+                )
+            else:
+                self.call_subprocess(config['command'].split(' '))
 
     def deploy(self, target, env_file=None, docker_vars={}):
         """Deploys docker images/static assets and starts services"""
         self.predeploy(env_file=env_file, docker_vars=docker_vars)
         self.push(docker_vars=docker_vars)
         self.deployment_cp([env_file], target=target, dest='~/.env')
         self.deployment_cp(['docker-compose.prod.yml'], target=target)
-        # TODO: might want to make this optional
-        self.deployment_exec(
-            ['docker', 'system', 'prune', '-a', '--force'], target=target
-        )
 
         command = self._remote_docker_compose_command(docker_vars)
         self.deployment_exec(command + ['pull'], target=target)
         self.deployment_exec(command + ['up', '-d'], target=target)
 
+        # cleans up docker system
+        # TODO: might want to make this optional
+        self.deployment_exec(
+            ['docker', 'system', 'prune', '-a', '--force'], target=target
+        )
+
     def run_alias(self, alias, input=[], docker_type=None, docker_vars={}, target=None):
         alias_config = self.aliases.get(alias)
         is_exec = alias_config.get('exec', False)

sykle/cli.py

@@ -160,6 +160,7 @@ def main():
         unittest_config=config.unittest,
         e2e_config=config.e2e,
         predeploy_config=config.predeploy,
+        preup_config=config.preup,
         aliases=config.aliases,
         debug=args['--debug']
     )

sykle/config.py

@@ -36,11 +36,22 @@ class Config():
             "command": "behave"
         }
     ],
-    // list of commands to invoke before deploying (run sequentially)
+    // list of commands to invoke before deploy (run sequentially)
     "predeploy": [
         {
             "service": "django",
             "command": "django-admin collectstatic --no-input"
+        },
+        {
+            // if no service is specified, will run as normal bash command
+            "command": "aws ecr get-login --region us-east-1"
+        }
+    ],
+    // list of commands to invoke before up (run sequentially)
+    "preup": [
+        {
+            // if no service is specified, will run as normal bash command
+            "command": "syk down"
         }
     ],
     // deployment to use by default (must be listed in deployments section)
@@ -152,6 +163,7 @@ def init(enable_print=False):
                     ("unittest", [{"service": None, "command": None}]),
                     ("e2e", [{"service": None, "command": None}]),
                     ("predeploy", []),
+                    ("preup", []),
                     ("default_deployment", "staging"),
                     ("deployments", {
                         "staging": {
@@ -207,10 +219,11 @@ def interpolate_env_values(dict, env):
         with their associated env vars
         """
         new_dict = {}
-        for (k, v) in dict.items():
-            if v is None or len(v) == 0:
+        for (k, _v) in dict.items():
+            v = '' if _v is None else str(_v)
+            if len(v) == 0:
                 new_dict[k] = ''
-            elif not isinstance(v, str) or v[0] != '$':
+            elif v[0] != '$':
                 new_dict[k] = v
             else:
                 new_dict[k] = env.get(v[1:], '')
@@ -225,8 +238,8 @@ def interpolate_env_values_from_file(dict, env_file):
 
     def __init__(
         self, project_name, default_service, default_deployment, plugins={},
-        aliases={}, unittest=[], e2e=[], predeploy=[], deployments={},
-        version=None,
+        aliases={}, unittest=[], e2e=[], predeploy=[], preup=[],
+        deployments={}, version=None,
     ):
         self.version = version
         self.project_name = project_name
@@ -236,6 +249,7 @@ def __init__(
         self.unittest = unittest
         self.e2e = e2e
         self.predeploy = predeploy
+        self.preup = preup
         self.deployments = deployments
         self.plugins = plugins