adding up, down, create

Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>

Author: vsoch

scompose/client/__init__.py

@@ -54,7 +54,7 @@ def get_parser():
                         help='specify project name (defaults to $PWD)')
 
     parser.add_argument("--project-directory", default=None, 
-                        dest='project_dir', type=str,
+                        dest='working_dir', type=str,
                         help='specify project working directory (defaults to compose file location)')
 
     parser.add_argument("--env-file", default=None, 
@@ -82,19 +82,21 @@ def get_parser():
     config = subparsers.add_parser("config",
                                    help="Validate and view the compose file")
 
-    # Create
+    # Create (assumes built already)
 
     create = subparsers.add_parser("create",
                                    help="create instances")
 
+    # Down
+
     down = subparsers.add_parser("down",
                                   help="stop instances")
 
     execute = subparsers.add_parser("exec",
-                                    help="execute a command to a container")
+                                    help="execute a command to an instance")
 
     images = subparsers.add_parser("images",
-                                    help="list images")
+                                    help="list running instances")
 
     kill = subparsers.add_parser("kill",
                                  help="kill instances")
@@ -106,22 +108,18 @@ def get_parser():
                                help="list instances")
 
     restart = subparsers.add_parser("restart",
-                                     help="restart images")
+                                     help="stop and start containers.")
 
     rm = subparsers.add_parser("rm",
                                help="remove non-running container images")
 
-    stop = subparsers.add_parser("stop",
-                                 help="stop running containers")
-
     up = subparsers.add_parser("up",
                                help="build and start containers")
 
-
-    # Add a context to relevant subparsers
-    for sub in [config, build]:
-        sub.add_argument('context', nargs=1,
-                          help='the context for the command (e.g., . means pwd)')
+    # Add list of names
+    for sub in [create, down, up]:
+        sub.add_argument('names', nargs="?",
+                          help='the names of the instances to target')
 
     return parser
 

scompose/client/build.py

@@ -34,14 +34,9 @@ def main(args, parser, extra):
        e.g. `folder_db`. If a Singularity recipe changes for a container folder,
        you can run "singularity-compose build" to rebuild it.
     '''
-    working_dir = args.context
-    if working_dir == ".":
-        working_dir = os.getcwd()
-
     # Initialize the project
     project = Project(filename=args.file,
                       name=args.project_name,
-                      working_dir=working_dir,
                       env_file=args.env_file)
 
     # Builds any containers into folders

scompose/client/create.py

@@ -0,0 +1,41 @@
+'''
+
+Copyright (C) 2019 Vanessa Sochat.
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
+License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+'''
+
+from scompose.project import Project
+import logging
+import json
+import sys
+import os
+
+
+log = logging.getLogger(__name__)
+
+def main(args, parser, extra):
+    '''create one or more instances. If they don't exist, build first.
+
+       This will build and bring up one or more named instances, or if None
+       are provided, we create all of them.
+    '''
+    # Initialize the project
+    project = Project(filename=args.file,
+                      name=args.project_name,
+                      env_file=args.env_file)
+
+    # Create instances, and if none specified, create all
+    project.create(args.names)

scompose/client/down.py

@@ -0,0 +1,38 @@
+'''
+
+Copyright (C) 2019 Vanessa Sochat.
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
+License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+'''
+
+from scompose.project import Project
+import logging
+import json
+import sys
+import os
+
+
+log = logging.getLogger(__name__)
+
+def main(args, parser, extra):
+    '''bring one or more instances down
+    '''
+    # Initialize the project
+    project = Project(filename=args.file,
+                      name=args.project_name,
+                      env_file=args.env_file)
+
+    # Create instances, and if none specified, create all
+    project.down(args.names)

scompose/client/up.py

@@ -0,0 +1,41 @@
+'''
+
+Copyright (C) 2019 Vanessa Sochat.
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public
+License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+'''
+
+from scompose.project import Project
+import logging
+import json
+import sys
+import os
+
+
+log = logging.getLogger(__name__)
+
+def main(args, parser, extra):
+    '''bring up one or more instances. They must exist.
+
+       This will build and bring up one or more named instances, or if None
+       are provided, we create all of them.
+    '''
+    # Initialize the project
+    project = Project(filename=args.file,
+                      name=args.project_name,
+                      env_file=args.env_file)
+
+    # Create instances, and if none specified, create all
+    project.up(args.names)