From 38b51382e710dda515e6d0df8fdc4f0b253d9cd7 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Fri, 13 Nov 2020 09:40:39 +0200
Subject: refactor: put all client functionality into one program

---
 subplot/obnam.py   | 18 ++++++++++++++++--
 subplot/obnam.yaml | 10 ++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'subplot')

diff --git a/subplot/obnam.py b/subplot/obnam.py
index ee48985..7df283a 100644
--- a/subplot/obnam.py
+++ b/subplot/obnam.py
@@ -237,7 +237,14 @@ def run_obnam_backup(ctx, filename=None):
     runcmd_run = globals()["runcmd_run"]
 
     _write_obnam_client_config(ctx, filename)
-    runcmd_run(ctx, ["env", "RUST_LOG=obnam", "obnam-backup", filename])
+    runcmd_run(ctx, ["env", "RUST_LOG=obnam", "obnam", "backup", filename])
+
+
+def run_obnam_list(ctx, filename=None):
+    runcmd_run = globals()["runcmd_run"]
+
+    _write_obnam_client_config(ctx, filename)
+    runcmd_run(ctx, ["env", "RUST_LOG=obnam", "obnam", "list", filename])
 
 
 def _write_obnam_client_config(ctx, filename):
@@ -254,7 +261,8 @@ def run_obnam_restore(ctx, filename=None, genid=None, dbname=None, todir=None):
     genid = ctx["vars"][genid]
     _write_obnam_client_config(ctx, filename)
     runcmd_run(
-        ctx, ["env", "RUST_LOG=obnam", "obnam-restore", filename, genid, dbname, todir]
+        ctx,
+        ["env", "RUST_LOG=obnam", "obnam", "restore", filename, genid, dbname, todir],
     )
 
 
@@ -274,3 +282,9 @@ def capture_generation_id(ctx, varname=None):
 
 def live_and_restored_data_match(ctx, live=None, restore=None):
     subprocess.check_call(["diff", "-rq", f"{live}/.", f"{restore}/{live}/."])
+
+
+def generation_list_contains(ctx, gen_id=None):
+    runcmd_stdout_contains = globals()["runcmd_stdout_contains"]
+    gen_id = ctx["vars"][gen_id]
+    runcmd_stdout_contains(ctx, text=gen_id)
diff --git a/subplot/obnam.yaml b/subplot/obnam.yaml
index 7d2d85b..8bde009 100644
--- a/subplot/obnam.yaml
+++ b/subplot/obnam.yaml
@@ -39,10 +39,13 @@
 - when: "I back up {dirname} with obnam-backup"
   function: back_up_directory
 
-- when: "I invoke obnam-backup {filename}"
+- when: "I invoke obnam backup {filename}"
   function: run_obnam_backup
 
-- when: "I invoke obnam-restore {filename} <{genid}> {dbname} {todir}"
+- when: "I invoke obnam list {filename}"
+  function: run_obnam_list
+
+- when: "I invoke obnam restore {filename} <{genid}> {dbname} {todir}"
   function: run_obnam_restore
 
 - then: "HTTP status code is {status}"
@@ -69,3 +72,6 @@
 
 - then: "data in {live} and {restore} match"
   function: live_and_restored_data_match
+
+- then: "generation list contains <{gen_id}>"
+  function: generation_list_contains
-- 
cgit v1.2.1