blis-cloud-cli 0.1.2__tar.gz → 0.2.1__tar.gz

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blis-cloud-cli
-Version: 0.1.2
+Version: 0.2.1
 Summary: Command-line tool for the BLIS web-based lab information system.
 Home-page: https://c4gblis.org/
 License: MIT
@@ -14,13 +14,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: Jinja2 (>=3.1.3,<3.2.0)
-Requires-Dist: PyYAML (>=6.0.1,<6.1.0)
-Requires-Dist: click (>=8.1.7,<8.2.0)
-Requires-Dist: colorama (>=0.4.4,<0.5.0)
-Requires-Dist: docker (>=6.1.3,<6.2.0)
-Requires-Dist: psutil (>=5.9.0,<5.10.0)
-Requires-Dist: requests (>=2.31.0,<2.32.0)
+Requires-Dist: Jinja2 (>=3.1,<4.0)
+Requires-Dist: PyYAML (>=6.0,<7.0)
+Requires-Dist: click (>=8.1,<9.0)
+Requires-Dist: colorama (>=0.4,<1.0)
+Requires-Dist: docker (>=6.1,<7.0)
+Requires-Dist: psutil (>=5.9,<6.0)
+Requires-Dist: requests (>=2.25,<3.0)
 Project-URL: Repository, https://github.com/C4G/blis-cloud-cli
 Description-Content-Type: text/markdown
 

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/blis_cli/commands/docker.py

@@ -17,7 +17,7 @@ def entrypoint():
     pass
 
 
-@click.command
+@click.command()
 def install():
     # If Docker is installed, and we are in the docker group, we will not need root privileges.
     if not (env.in_docker_grp() and docker_util.installed()):
@@ -82,7 +82,7 @@ def install_docker():
     click.echo("Please log out and log back in, and run this command again.")
 
 
-@click.command
+@click.command()
 def purge():
     if not env.can_sudo():
         click.secho("You must have root privileges to run this.", fg="red")
@@ -101,7 +101,7 @@ def purge():
     packages.apt_update()
 
 
-@click.command
+@click.command()
 def status():
     docker_ok = True
     click.echo("Docker is accessible? ", nl=False)

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/blis_cli/commands/logs.py

@@ -8,7 +8,7 @@ from blis_cli.util import environment
 from blis_cli.util import docker_util
 
 
-@click.group
+@click.group()
 def entrypoint():
     pass
 

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/blis_cli/commands/update.py

@@ -31,6 +31,11 @@ def run():
             click.secho(e, fg="red")
             return 1
 
+    if not config.volume_exists("blis-local"):
+        config.add_volume("blis-local")
+        config.add_mount("app", "blis-local", "/var/www/blis/local")
+        click.echo("Created blis-local volume.")
+
     if restart_blis:
         return docker_util.start_blis("app")
 

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/blis_cli/extra/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 #####
 # This file is an example docker-compose file for deploying BLIS to a cloud provider
 # This file is used as a template, but will be rewritten by the BLIS tool as necessary.
@@ -34,6 +32,7 @@ services:
       - db
     volumes:
       - blis-files:/var/www/blis/files
+      - blis-local:/var/www/blis/local
       - blis-logs:/var/www/blis/log
 
   db:
@@ -51,6 +50,7 @@ services:
 
 volumes:
   blis-files:
+  blis-local:
   blis-logs:
   blis-mysql:
   caddy_data:

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/blis_cli/util/config.py

@@ -101,6 +101,23 @@ def add_volume(volname, opts=None):
     _save_compose(contents)
 
 
+def volume_exists(volname):
+    contents = _open_compose()
+    return volname in contents["volumes"]
+
+
+def add_mount(svc: str, volname: str, path: str):
+    contents = _open_compose()
+    vols = contents["services"][svc]["volumes"]
+    if not vols:
+        vols = []
+    mount = f"{volname}:{path}"
+    if mount not in vols:
+        vols.append(mount)
+    contents["services"][svc]["volumes"] = vols
+    _save_compose(contents)
+
+
 def add_section_from_template(keyname: str):
     template_section = compose_key(keyname, _load_template_yml())
     contents = _open_compose()

{blis_cloud_cli-0.1.2 → blis_cloud_cli-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blis-cloud-cli"
-version = "0.1.2"
+version = "0.2.1"
 description = "Command-line tool for the BLIS web-based lab information system."
 authors = ["Mitchell Rysavy <mitchell.rysavy@gmail.com>"]
 homepage = "https://c4gblis.org/"
@@ -16,13 +16,13 @@ blis = "blis_cli.blis:main"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-click = "~= 8.1.7"
-colorama = "~= 0.4.4"
-docker = "~= 6.1.3"
-Jinja2 = "~= 3.1.3"
-psutil = "~= 5.9.0"
-requests = "~= 2.31.0"
-PyYAML = "~= 6.0.1"
+click = "~= 8.1"
+colorama = "~= 0.4"
+docker = "~= 6.1"
+Jinja2 = "~= 3.1"
+psutil = "~= 5.9"
+requests = "~= 2.25"
+PyYAML = "~= 6.0"
 
 
 [build-system]