Merge pull request #5 from provenance-io/command-split-fixes

Command split fixes

Author: wbaker-figure

forgepb/__main__.py

@@ -1,4 +1,4 @@
-from command_line import root_cmd
+from forgepb.command_line import root_cmd
 
 if __name__ == '__main__':
     try:

forgepb/builder.py

@@ -36,7 +36,6 @@ def build(environment, network, config, provenance_branch=None, version=None, ar
         version = provenance_branch
         branches = utils.get_remote_branches()
         repo = git.Repo(provenance_path)
-        print(branches)
         try:
             if provenance_branch in branches:
                 repo.git.checkout(provenance_branch)
@@ -229,22 +228,27 @@ def spawnDaemon(node_command, version, network, config, log_path):
 
 
 def start_node(node_command, version, network, config, log_path):
-    log = open(log_path, 'w+')
-    print('Running {}'.format(''.join(node_command)))
-    print('You can view the logs here: {}'.format(log_path))
-    process = subprocess.Popen(
-        node_command, shell=False, stdout=log, stderr=log)
-    if network == 'localnet':
-        config[network][version]['run-command'] = node_command
-        config[network][version]['log-path'] = log_path
-    else:
-        config[network]['run-command'] = node_command
-        config[network]['log-path'] = log_path
-    config['running-node'] = True
-    config['running-node-info'] = {
-        "pid": process.pid,
-        "version": version,
-        "network": network
-    }
-    utils.save_config(config)
-    process.wait()
+    try:
+        log = open(log_path, 'w+')
+        print('Running {}'.format(' '.join(node_command)))
+        print('You can view the logs here: {}'.format(log_path))
+        process = subprocess.Popen(
+            node_command, shell=False, stdout=log, stderr=log)
+        if network == 'localnet':
+            config[network][version]['run-command'] = node_command
+            config[network][version]['log-path'] = log_path
+        else:
+            config[network]['run-command'] = node_command
+            config[network]['log-path'] = log_path
+        config['running-node'] = True
+        config['running-node-info'] = {
+            "pid": process.pid,
+            "version": version,
+            "network": network
+        }
+        utils.save_config(config)
+        process.wait()
+    except FileNotFoundError:
+        print("It looks like a node was initialized and deleted.\nForge is removing this from the config so you can run the same command again and the node will be initialized and started.".format())
+        config.pop(network)
+        utils.save_config(config)

forgepb/cmd/__init__.py

@@ -1,8 +1,8 @@
 import click
 
-from cmd.node import *
-from cmd.config import *
-from cmd.provenance import *
+from forgepb.cmd.config import *
+from forgepb.cmd.node import *
+from forgepb.cmd.provenance import *
 
 
 @click.group("node", help="Interact with nodes")
@@ -12,6 +12,7 @@ def node_cmd(): pass
 @click.group("config")
 def config_cmd(): pass
 
+
 @click.group("provenance", help="Retrieve information on provenance")
 def provenance_cmd(): pass
 
@@ -23,8 +24,7 @@ def provenance_cmd(): pass
 node_cmd.add_command(node_init_cmd)
 node_cmd.add_command(list_mnemonic_cmd)
 
-config_cmd.add_command(list_config_cmd)
 config_cmd.add_command(change_save_loc_cmd)
 
 provenance_cmd.add_command(list_tags_cmd)
-provenance_cmd.add_command(list_branches_cmd)
+provenance_cmd.add_command(list_branches_cmd)

forgepb/cmd/config.py

@@ -1,67 +1,26 @@
-import json
-import os
 import click
 
-from forgepb import utils, builder, forge, config_handler, global_
-
-
-@click.command(
-    'list',
-    help='List config information about localnet nodes that have been initialized'
-)
-@click.option(
-    "-t",
-    "--tag",
-    "tag",
-    default=None,
-    help="Release tag used to specify the localnet config to display")
-@click.option(
-    '-b',
-    '--provenance-branch',
-    'provenance_branch',
-    type=click.STRING,
-    help='Provenance branch used to specify the localnet config to display')
-def list_config_cmd(tag, provenance_branch):
-    # get config or set location of config to be made
-    if not os.path.exists(global_.CONFIG_PATH + "/config.json"):
-        config = config_handler.set_build_location()
-    else:
-        config = utils.load_config()
-    provenance_path = config['saveDir'] + "forge" + "/provenance"
-    # Retrieve the config information if it exists, else display a message saying that it couldn't be found
-    try:
-        if tag:
-            if tag not in utils.get_versions():
-                print(
-                    "The version entered doesn't exist in provenance. Please run 'forge -lsv' to list all versions")
-            else:
-                print(json.dumps(config['localnet'][tag], indent=4))
-        elif provenance_branch:
-            if provenance_branch not in utils.get_remote_branches():
-                print(
-                    "The version entered doesn't exist in provenance. Please run 'forge -lsv' to list all versions")
-            else:
-                print(json.dumps(config['localnet']
-                      [provenance_branch], indent=4))
-        else:
-            print(json.dumps(config['localnet'], indent=4))
-    except KeyError:
-        print("No nodes found.")
-    except:
-        print("No nodes have been initialized.")
+from forgepb import config_handler, utils
 
 
 @click.command(
     'save_location',
     help='Change the save location of forge'
 )
-@click.option(
-    '-p',
-    '--path',
+@click.argument(
     'path',
-    type=click.STRING,
-    help='Existing path that forge will save initialized nodes into'
+    type=str,
+    required=False,
 )
 def change_save_loc_cmd(path):
-    config_handler.check_save_location(path)
+    if path is None:
+        if not utils.exists_config():
+            print("save_location=None")
+            return
+
+        cfg = utils.load_config()
+        print(cfg["saveDir"])
+        return
+    else:
+        config_handler.check_save_location(path)
     return

forgepb/cmd/provenance.py

@@ -1,10 +1,6 @@
-import sys
 import click
 
-import utils
-
-
-sys.path.insert(1, './forgepb')
+from forgepb import utils
 
 
 @click.command(

forgepb/command_line.py

@@ -1,15 +1,9 @@
-import sys
-
 import click
 
-sys.path.insert(1, './forgepb')
-sys.path.insert(1, './forgepb/cmd')
-import forge
-from cmd import node_cmd, config_cmd, provenance_cmd
+from forgepb import forge, cmd
 
 
 class CustomMultiCommand(click.Group):
-
     def command(self, *args, **kwargs):
         """Behaves the same as `click.Group.command()` except if passed
         a list of names, all after the first will be aliases for the first.
@@ -42,9 +36,9 @@ def start_wizard():
     forge.main()
 
 
-root_cmd.add_command(node_cmd)
-root_cmd.add_command(config_cmd)
-root_cmd.add_command(provenance_cmd)
+root_cmd.add_command(cmd.node_cmd)
+root_cmd.add_command(cmd.config_cmd)
+root_cmd.add_command(cmd.provenance_cmd)
 
 # Point for setup.py to point to for installing
 start = click.CommandCollection(sources=[root_cmd])

forgepb/utils.py

@@ -126,7 +126,7 @@ def collect_args(args):
     while not args_complete:
         try:
             cleveldb = input(
-                "Build environment with C Level DB? Usually not required for local testing. [No]\n")
+                "Build environment with C Level DB? Usually not required for local testing. [No]/yes\n")
             if not cleveldb:
                 args.append("WITH_CLEVELDB=no")
                 args_complete = True

setup.py

@@ -7,11 +7,11 @@
 
 setup(
     name="forge.pb",
-    version="1.0.0",
+    version="1.0.1",
     url='https://github.com/provenance-io/forge.pb',
     author='Wyatt Baker',
     author_email='wbaker@figure.com',
-    packages=['forgepb'],
+    packages=['forgepb','forgepb.cmd'],
     install_requires = [requirements],
     python_requires='>=3.6',
     entry_points={