Merge pull request #3 from KomodoPlatform/master

merge upstream

dragonriders/dokomodo/cli.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 from jinja2 import Environment, FileSystemLoader
 from ruamel.yaml import YAML
-import socket
-import shlex
-import subprocess
-import time
+from socket import gethostbyname
+from shlex import split
+from subprocess import Popen
+from time import sleep
 from configparser import ConfigParser
 import click
-import py
-import colorama
-import sys
+from py import path
+from sys import exit
+from os import path as expander
 
 # asset_data_url = ("https://raw.githubusercontent.com/patchkez/kmdplatform/"
 #    "master/yaml/data.yaml")
@@ -17,32 +17,61 @@ import sys
 env = Environment(loader=FileSystemLoader('./dokomodo/templates/'), trim_blocks=True,
     lstrip_blocks=True)
 
-config_dir = py.path.local('dokomodo/yaml')
+config_dir = path.local('/yaml_data')
+if config_dir.check() is False:
+    config_dir = path.local('dokomodo/yaml')
 
 
 class Config(object):
     def __init__(self, *args, **kwargs):
-        # self.config = py.path.local('dokomodo').join('yaml').join('data.yaml')
         self.config = config_dir.join('data.yaml')
-        # self.config_ini = py.path.local('dokomodo').join('yaml').join('config.ini')
         self.config_ini = config_dir.join('config.ini')
 
         super(Config, self).__init__(*args, **kwargs)
 
     def load(self):
         """Try to load the yaml"""
+        # Configure yaml loader
         yaml = YAML(typ='safe', pure=True)
         yaml.default_flow_style = True
-        self.config_data = yaml.load(self.config.read())
+        # Try to read yaml file
+        try:
+            self.config_data = yaml.load(self.config.read())
+        except OSError as exception:
+            click.echo('{} yaml file could not be read: {}'.format(self.config.read, exception))
         self.branches = self.config_data['assetchains']
-        self.seed_ip = socket.gethostbyname(self.config_data['seed_host'])
+        self.seed_ip = gethostbyname(self.config_data['seed_host'])
 
     def load_ini(self):
+        # initialize INI parser
         ini_parser = ConfigParser()
-        ini_parser.read(str(self.config_ini))
+        # Try to read ini file
+        try:
+            ini_parser.read(str(self.config_ini))
+        except OSError as exception:
+            click.echo('{} file could not be read: {}'.format(self.config_ini, exception))
+
         self.assetchains = ini_parser['ASSETCHAINS']
         self.mined_coins = self.assetchains['mined_coins'].split()
         self.delay_asset = float(self.assetchains['delay_asset'])
+        self.rpc_username = self.assetchains['rpc_username']
+        self.rpc_password = self.assetchains['rpc_password']
+        self.write_path_conf = self.assetchains['write_path_conf']
+
+    def write_config(self, dirname, filename, templatized_config):
+        # If directory is not set, set it to current directory
+        if dirname is False:
+            dirname = './'
+        # Expand ~ to full path
+        dirname_expanded = expander.expanduser(dirname)
+        # Construct full path - directory + filename
+        temppath = path.local(dirname_expanded).join(filename)
+        # Try to open config in write mode
+        try:
+            myfile = temppath.open(mode='w', ensure=True)
+            myfile.write(templatized_config)
+        except OSError as exception:
+            click.echo('File could not be opened in write mode or be written: {}'.format(exception))
 
 
 # This is click thing, it will create decorator named pass_config from our Config class
@@ -65,14 +94,12 @@ def cli(config):
 def generate_docker_compose(ctx, branch):
     """ TODO """
     filename = 'docker-compose_assets_' + branch + '.yml'
-    click.echo('Writing new docker compose file into: %s' % filename)
+    click.echo('Writing new docker compose file into: {}'.format(filename))
     template = env.get_template('docker-compose-template.conf.j2')
     templatized_config = template.render(items=ctx.config_data['assetchains'][branch],
         seed_ip=ctx.seed_ip, mined=ctx.mined_coins)
 
-    fo = open(filename, 'w')
-    fo.write(templatized_config)
-    fo.close()
+    ctx.write_config(filename=filename, templatized_config=templatized_config)
 
 
 @click.command('assetchains', short_help='Replacement for assetchains script')
@@ -84,26 +111,56 @@ def assetchains(ctx, branch):
     bash_templatized_config = bash_template.render(items=ctx.config_data['assetchains'][branch],
         seed_ip=ctx.seed_ip, mined=ctx.mined_coins)
 
-    # fa = open('assetchains', 'w')
-    # fa.write(bash_templatized_config)
-    # fa.close()
-
     # Remove empty strings
     assetchains = list(filter(None, bash_templatized_config.split("\n")))
     # Executed komodod commands with predefined sleep time
     for assetchain_command in assetchains:
-        args = shlex.split(assetchain_command)
+        args = split(assetchain_command)
         try:
-            subprocess.Popen(args)
+            Popen(args)
         except OSError as exception:
             click.echo(exception)
-            sys.exit(1)
-        time.sleep(ctx.delay_asset)
+            exit(1)
+        sleep(ctx.delay_asset)
+
+
+@click.command('generate_assetchains_conf', short_help='Generates configuration file for \
+    assetchains')
+@click.option('-b', '--branch', required=True, type=click.Choice(['development', 'production']))
+@click.option('-a', '--asset', required=False)
+@pass_config
+def generate_assetchains_conf(ctx, branch, asset):
+    asset_template = env.get_template('assetchains_config.j2')
+
+    def templatize(assetchain_name):
+        dirname = ctx.write_path_conf + '/' + assetchain_name
+        filename = assetchain_name + '.conf'
+        asset_templatized_config = asset_template.render(
+            rpcuser=ctx.rpc_username,
+            rpcpassword=ctx.rpc_password,
+            rpcport=ctx.config_data['assetchains'][branch][assetchain_name]['rpc_port']
+        )
+
+        ctx.write_config(dirname, filename, asset_templatized_config)
+
+        # return click.echo(asset_templatized_config)
+        return asset_templatized_config
+
+    for assetchain_name in ctx.config_data['assetchains'][branch]:
+        if asset and asset == assetchain_name:
+            click.echo('Writing CONFIG_FILE: {}'.format(assetchain_name))
+            templatize(assetchain_name)
+        elif asset:
+            pass
+        else:
+            click.echo('Writing CONFIG_FILE: {}'.format(assetchain_name))
+            templatize(assetchain_name)
 
 
 # Add functions into cli() function which is main group for all commands
 cli.add_command(generate_docker_compose)
 cli.add_command(assetchains)
+cli.add_command(generate_assetchains_conf)
 
 
 if __name__ == "__main__":

dragonriders/dokomodo/yaml/config.ini

@@ -17,3 +17,8 @@ mined_coins =
 
 # Delay in seconds between each assetchain is started
 delay_asset = 20
+
+rpc_username = rpcusernameINI
+rpc_password = rpcpasswordINI
+
+write_path_conf = ~/.komodo