From 0f083e440a213817edd51711c8c9c1766a6bbf74 Mon Sep 17 00:00:00 2001
From: Florent Gluck <florent.gluck@hesge.ch>
Date: Mon, 29 Aug 2022 17:37:51 +0200
Subject: [PATCH] nexus-client's file hierarchy overhaul

---
 src/client_exam/utils/go.mod                  |  3 --
 src/client_exam/utils/utils.go                | 33 -------------------
 src/{client_cli => nexus-cli}/cmd/Command.go  |  0
 src/{client_cli => nexus-cli}/cmd/go.mod      |  0
 src/{client_cli => nexus-cli}/cmdLogin/go.mod |  0
 .../cmdLogin/login.go                         |  0
 .../cmdTemplate/go.mod                        |  0
 .../cmdTemplate/helper.go                     |  0
 .../cmdTemplate/templateCreate.go             |  0
 .../cmdTemplate/templateCreate.go.new         |  0
 .../cmdTemplate/templateDel.go                |  0
 .../cmdTemplate/templateList.go               |  0
 src/{client_cli => nexus-cli}/cmdUser/go.mod  |  0
 src/{client_cli => nexus-cli}/cmdUser/go.sum  |  0
 .../cmdUser/helper.go                         |  0
 .../cmdUser/userAdd.go                        |  0
 .../cmdUser/userDel.go                        |  0
 .../cmdUser/userList.go                       |  0
 .../cmdUser/userSetCaps.go                    |  0
 .../cmdUser/userUpdatePwd.go                  |  0
 .../cmdUser/userWhoami.go                     |  0
 src/{client_cli => nexus-cli}/cmdVM/go.mod    |  0
 src/{client_cli => nexus-cli}/cmdVM/go.sum    |  0
 src/{client_cli => nexus-cli}/cmdVM/helper.go |  0
 .../cmdVM/vmAttach.go                         |  0
 .../cmdVM/vmCreate.go                         |  0
 .../cmdVM/vmCred2pdf.go                       |  0
 src/{client_cli => nexus-cli}/cmdVM/vmDel.go  |  0
 .../cmdVM/vmDelAccess.go                      |  0
 src/{client_cli => nexus-cli}/cmdVM/vmEdit.go |  0
 .../cmdVM/vmExportDir.go                      |  0
 src/{client_cli => nexus-cli}/cmdVM/vmList.go |  0
 .../cmdVM/vmListAttach.go                     |  0
 .../cmdVM/vmListDel.go                        |  0
 .../cmdVM/vmListEdit.go                       |  0
 .../cmdVM/vmListEditAccess.go                 |  0
 .../cmdVM/vmListExportDir.go                  |  0
 .../cmdVM/vmListStart.go                      |  0
 .../cmdVM/vmListStop.go                       |  0
 .../cmdVM/vmSetAccess.go                      |  0
 .../cmdVM/vmShutdown.go                       |  0
 .../cmdVM/vmStart.go                          |  0
 src/{client_cli => nexus-cli}/cmdVM/vmStop.go |  0
 .../globals/Globals.go                        |  0
 src/{client_cli => nexus-cli}/globals/go.mod  |  0
 src/{client_cli => nexus-cli}/go.mod          |  4 +--
 src/{client_cli => nexus-cli}/go.sum          |  0
 src/{client_cli => nexus-cli}/nexus-client.go |  0
 src/{client_exam => nexus-exam}/go.mod        |  4 +--
 src/{client_exam => nexus-exam}/go.sum        |  0
 .../nexus-exam.go}                            |  0
 src/{client_gui => nexus-gui}/go.mod          |  0
 src/{client_gui => nexus-gui}/go.sum          |  0
 .../nexus-client-gui.go                       |  0
 src/{client_cli => }/utils/go.mod             |  0
 src/{client_cli => }/utils/utils.go           |  0
 56 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 src/client_exam/utils/go.mod
 delete mode 100644 src/client_exam/utils/utils.go
 rename src/{client_cli => nexus-cli}/cmd/Command.go (100%)
 rename src/{client_cli => nexus-cli}/cmd/go.mod (100%)
 rename src/{client_cli => nexus-cli}/cmdLogin/go.mod (100%)
 rename src/{client_cli => nexus-cli}/cmdLogin/login.go (100%)
 rename src/{client_cli => nexus-cli}/cmdTemplate/go.mod (100%)
 rename src/{client_cli => nexus-cli}/cmdTemplate/helper.go (100%)
 rename src/{client_cli => nexus-cli}/cmdTemplate/templateCreate.go (100%)
 rename src/{client_cli => nexus-cli}/cmdTemplate/templateCreate.go.new (100%)
 rename src/{client_cli => nexus-cli}/cmdTemplate/templateDel.go (100%)
 rename src/{client_cli => nexus-cli}/cmdTemplate/templateList.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/go.mod (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/go.sum (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/helper.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/userAdd.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/userDel.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/userList.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/userSetCaps.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/userUpdatePwd.go (100%)
 rename src/{client_cli => nexus-cli}/cmdUser/userWhoami.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/go.mod (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/go.sum (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/helper.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmAttach.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmCreate.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmCred2pdf.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmDel.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmDelAccess.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmEdit.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmExportDir.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmList.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListAttach.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListDel.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListEdit.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListEditAccess.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListExportDir.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListStart.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmListStop.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmSetAccess.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmShutdown.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmStart.go (100%)
 rename src/{client_cli => nexus-cli}/cmdVM/vmStop.go (100%)
 rename src/{client_cli => nexus-cli}/globals/Globals.go (100%)
 rename src/{client_cli => nexus-cli}/globals/go.mod (100%)
 rename src/{client_cli => nexus-cli}/go.mod (95%)
 rename src/{client_cli => nexus-cli}/go.sum (100%)
 rename src/{client_cli => nexus-cli}/nexus-client.go (100%)
 rename src/{client_exam => nexus-exam}/go.mod (96%)
 rename src/{client_exam => nexus-exam}/go.sum (100%)
 rename src/{client_exam/nexus-client-exam.go => nexus-exam/nexus-exam.go} (100%)
 rename src/{client_gui => nexus-gui}/go.mod (100%)
 rename src/{client_gui => nexus-gui}/go.sum (100%)
 rename src/{client_gui => nexus-gui}/nexus-client-gui.go (100%)
 rename src/{client_cli => }/utils/go.mod (100%)
 rename src/{client_cli => }/utils/utils.go (100%)

diff --git a/src/client_exam/utils/go.mod b/src/client_exam/utils/go.mod
deleted file mode 100644
index 56925e5..0000000
--- a/src/client_exam/utils/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module nexus-client/utils
-
-go 1.18
diff --git a/src/client_exam/utils/utils.go b/src/client_exam/utils/utils.go
deleted file mode 100644
index a765f51..0000000
--- a/src/client_exam/utils/utils.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"os"
-)
-
-func Print(a ...any) {
-	os.Stdout.WriteString(fmt.Sprint(a ...))
-}
-
-func Println(a ...any) {
-	Print(a...)
-	Print("\n")
-}
-
-func PrintErr(a ...any) {
-	os.Stderr.WriteString(fmt.Sprint(a ...))
-}
-
-func PrintlnErr(a ...any) {
-	PrintErr(a...)
-	PrintErr("\n")
-}
-
-// Returns true if the specified file exists, false otherwise.
-func FileExists(filename string) bool {
-	info, err := os.Stat(filename)
-	if os.IsNotExist(err) {
-	   return false
-	}
-	return !info.IsDir()
-}
diff --git a/src/client_cli/cmd/Command.go b/src/nexus-cli/cmd/Command.go
similarity index 100%
rename from src/client_cli/cmd/Command.go
rename to src/nexus-cli/cmd/Command.go
diff --git a/src/client_cli/cmd/go.mod b/src/nexus-cli/cmd/go.mod
similarity index 100%
rename from src/client_cli/cmd/go.mod
rename to src/nexus-cli/cmd/go.mod
diff --git a/src/client_cli/cmdLogin/go.mod b/src/nexus-cli/cmdLogin/go.mod
similarity index 100%
rename from src/client_cli/cmdLogin/go.mod
rename to src/nexus-cli/cmdLogin/go.mod
diff --git a/src/client_cli/cmdLogin/login.go b/src/nexus-cli/cmdLogin/login.go
similarity index 100%
rename from src/client_cli/cmdLogin/login.go
rename to src/nexus-cli/cmdLogin/login.go
diff --git a/src/client_cli/cmdTemplate/go.mod b/src/nexus-cli/cmdTemplate/go.mod
similarity index 100%
rename from src/client_cli/cmdTemplate/go.mod
rename to src/nexus-cli/cmdTemplate/go.mod
diff --git a/src/client_cli/cmdTemplate/helper.go b/src/nexus-cli/cmdTemplate/helper.go
similarity index 100%
rename from src/client_cli/cmdTemplate/helper.go
rename to src/nexus-cli/cmdTemplate/helper.go
diff --git a/src/client_cli/cmdTemplate/templateCreate.go b/src/nexus-cli/cmdTemplate/templateCreate.go
similarity index 100%
rename from src/client_cli/cmdTemplate/templateCreate.go
rename to src/nexus-cli/cmdTemplate/templateCreate.go
diff --git a/src/client_cli/cmdTemplate/templateCreate.go.new b/src/nexus-cli/cmdTemplate/templateCreate.go.new
similarity index 100%
rename from src/client_cli/cmdTemplate/templateCreate.go.new
rename to src/nexus-cli/cmdTemplate/templateCreate.go.new
diff --git a/src/client_cli/cmdTemplate/templateDel.go b/src/nexus-cli/cmdTemplate/templateDel.go
similarity index 100%
rename from src/client_cli/cmdTemplate/templateDel.go
rename to src/nexus-cli/cmdTemplate/templateDel.go
diff --git a/src/client_cli/cmdTemplate/templateList.go b/src/nexus-cli/cmdTemplate/templateList.go
similarity index 100%
rename from src/client_cli/cmdTemplate/templateList.go
rename to src/nexus-cli/cmdTemplate/templateList.go
diff --git a/src/client_cli/cmdUser/go.mod b/src/nexus-cli/cmdUser/go.mod
similarity index 100%
rename from src/client_cli/cmdUser/go.mod
rename to src/nexus-cli/cmdUser/go.mod
diff --git a/src/client_cli/cmdUser/go.sum b/src/nexus-cli/cmdUser/go.sum
similarity index 100%
rename from src/client_cli/cmdUser/go.sum
rename to src/nexus-cli/cmdUser/go.sum
diff --git a/src/client_cli/cmdUser/helper.go b/src/nexus-cli/cmdUser/helper.go
similarity index 100%
rename from src/client_cli/cmdUser/helper.go
rename to src/nexus-cli/cmdUser/helper.go
diff --git a/src/client_cli/cmdUser/userAdd.go b/src/nexus-cli/cmdUser/userAdd.go
similarity index 100%
rename from src/client_cli/cmdUser/userAdd.go
rename to src/nexus-cli/cmdUser/userAdd.go
diff --git a/src/client_cli/cmdUser/userDel.go b/src/nexus-cli/cmdUser/userDel.go
similarity index 100%
rename from src/client_cli/cmdUser/userDel.go
rename to src/nexus-cli/cmdUser/userDel.go
diff --git a/src/client_cli/cmdUser/userList.go b/src/nexus-cli/cmdUser/userList.go
similarity index 100%
rename from src/client_cli/cmdUser/userList.go
rename to src/nexus-cli/cmdUser/userList.go
diff --git a/src/client_cli/cmdUser/userSetCaps.go b/src/nexus-cli/cmdUser/userSetCaps.go
similarity index 100%
rename from src/client_cli/cmdUser/userSetCaps.go
rename to src/nexus-cli/cmdUser/userSetCaps.go
diff --git a/src/client_cli/cmdUser/userUpdatePwd.go b/src/nexus-cli/cmdUser/userUpdatePwd.go
similarity index 100%
rename from src/client_cli/cmdUser/userUpdatePwd.go
rename to src/nexus-cli/cmdUser/userUpdatePwd.go
diff --git a/src/client_cli/cmdUser/userWhoami.go b/src/nexus-cli/cmdUser/userWhoami.go
similarity index 100%
rename from src/client_cli/cmdUser/userWhoami.go
rename to src/nexus-cli/cmdUser/userWhoami.go
diff --git a/src/client_cli/cmdVM/go.mod b/src/nexus-cli/cmdVM/go.mod
similarity index 100%
rename from src/client_cli/cmdVM/go.mod
rename to src/nexus-cli/cmdVM/go.mod
diff --git a/src/client_cli/cmdVM/go.sum b/src/nexus-cli/cmdVM/go.sum
similarity index 100%
rename from src/client_cli/cmdVM/go.sum
rename to src/nexus-cli/cmdVM/go.sum
diff --git a/src/client_cli/cmdVM/helper.go b/src/nexus-cli/cmdVM/helper.go
similarity index 100%
rename from src/client_cli/cmdVM/helper.go
rename to src/nexus-cli/cmdVM/helper.go
diff --git a/src/client_cli/cmdVM/vmAttach.go b/src/nexus-cli/cmdVM/vmAttach.go
similarity index 100%
rename from src/client_cli/cmdVM/vmAttach.go
rename to src/nexus-cli/cmdVM/vmAttach.go
diff --git a/src/client_cli/cmdVM/vmCreate.go b/src/nexus-cli/cmdVM/vmCreate.go
similarity index 100%
rename from src/client_cli/cmdVM/vmCreate.go
rename to src/nexus-cli/cmdVM/vmCreate.go
diff --git a/src/client_cli/cmdVM/vmCred2pdf.go b/src/nexus-cli/cmdVM/vmCred2pdf.go
similarity index 100%
rename from src/client_cli/cmdVM/vmCred2pdf.go
rename to src/nexus-cli/cmdVM/vmCred2pdf.go
diff --git a/src/client_cli/cmdVM/vmDel.go b/src/nexus-cli/cmdVM/vmDel.go
similarity index 100%
rename from src/client_cli/cmdVM/vmDel.go
rename to src/nexus-cli/cmdVM/vmDel.go
diff --git a/src/client_cli/cmdVM/vmDelAccess.go b/src/nexus-cli/cmdVM/vmDelAccess.go
similarity index 100%
rename from src/client_cli/cmdVM/vmDelAccess.go
rename to src/nexus-cli/cmdVM/vmDelAccess.go
diff --git a/src/client_cli/cmdVM/vmEdit.go b/src/nexus-cli/cmdVM/vmEdit.go
similarity index 100%
rename from src/client_cli/cmdVM/vmEdit.go
rename to src/nexus-cli/cmdVM/vmEdit.go
diff --git a/src/client_cli/cmdVM/vmExportDir.go b/src/nexus-cli/cmdVM/vmExportDir.go
similarity index 100%
rename from src/client_cli/cmdVM/vmExportDir.go
rename to src/nexus-cli/cmdVM/vmExportDir.go
diff --git a/src/client_cli/cmdVM/vmList.go b/src/nexus-cli/cmdVM/vmList.go
similarity index 100%
rename from src/client_cli/cmdVM/vmList.go
rename to src/nexus-cli/cmdVM/vmList.go
diff --git a/src/client_cli/cmdVM/vmListAttach.go b/src/nexus-cli/cmdVM/vmListAttach.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListAttach.go
rename to src/nexus-cli/cmdVM/vmListAttach.go
diff --git a/src/client_cli/cmdVM/vmListDel.go b/src/nexus-cli/cmdVM/vmListDel.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListDel.go
rename to src/nexus-cli/cmdVM/vmListDel.go
diff --git a/src/client_cli/cmdVM/vmListEdit.go b/src/nexus-cli/cmdVM/vmListEdit.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListEdit.go
rename to src/nexus-cli/cmdVM/vmListEdit.go
diff --git a/src/client_cli/cmdVM/vmListEditAccess.go b/src/nexus-cli/cmdVM/vmListEditAccess.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListEditAccess.go
rename to src/nexus-cli/cmdVM/vmListEditAccess.go
diff --git a/src/client_cli/cmdVM/vmListExportDir.go b/src/nexus-cli/cmdVM/vmListExportDir.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListExportDir.go
rename to src/nexus-cli/cmdVM/vmListExportDir.go
diff --git a/src/client_cli/cmdVM/vmListStart.go b/src/nexus-cli/cmdVM/vmListStart.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListStart.go
rename to src/nexus-cli/cmdVM/vmListStart.go
diff --git a/src/client_cli/cmdVM/vmListStop.go b/src/nexus-cli/cmdVM/vmListStop.go
similarity index 100%
rename from src/client_cli/cmdVM/vmListStop.go
rename to src/nexus-cli/cmdVM/vmListStop.go
diff --git a/src/client_cli/cmdVM/vmSetAccess.go b/src/nexus-cli/cmdVM/vmSetAccess.go
similarity index 100%
rename from src/client_cli/cmdVM/vmSetAccess.go
rename to src/nexus-cli/cmdVM/vmSetAccess.go
diff --git a/src/client_cli/cmdVM/vmShutdown.go b/src/nexus-cli/cmdVM/vmShutdown.go
similarity index 100%
rename from src/client_cli/cmdVM/vmShutdown.go
rename to src/nexus-cli/cmdVM/vmShutdown.go
diff --git a/src/client_cli/cmdVM/vmStart.go b/src/nexus-cli/cmdVM/vmStart.go
similarity index 100%
rename from src/client_cli/cmdVM/vmStart.go
rename to src/nexus-cli/cmdVM/vmStart.go
diff --git a/src/client_cli/cmdVM/vmStop.go b/src/nexus-cli/cmdVM/vmStop.go
similarity index 100%
rename from src/client_cli/cmdVM/vmStop.go
rename to src/nexus-cli/cmdVM/vmStop.go
diff --git a/src/client_cli/globals/Globals.go b/src/nexus-cli/globals/Globals.go
similarity index 100%
rename from src/client_cli/globals/Globals.go
rename to src/nexus-cli/globals/Globals.go
diff --git a/src/client_cli/globals/go.mod b/src/nexus-cli/globals/go.mod
similarity index 100%
rename from src/client_cli/globals/go.mod
rename to src/nexus-cli/globals/go.mod
diff --git a/src/client_cli/go.mod b/src/nexus-cli/go.mod
similarity index 95%
rename from src/client_cli/go.mod
rename to src/nexus-cli/go.mod
index 56bdf6b..41a60d9 100644
--- a/src/client_cli/go.mod
+++ b/src/nexus-cli/go.mod
@@ -1,4 +1,4 @@
-module nexus-client
+module nexus-cli
 
 go 1.18
 
@@ -6,7 +6,7 @@ replace nexus-client/cmd => ./cmd
 
 replace nexus-client/globals => ./globals
 
-replace nexus-client/utils => ./utils
+replace nexus-client/utils => ../utils
 
 replace nexus-client/cmdLogin => ./cmdLogin
 
diff --git a/src/client_cli/go.sum b/src/nexus-cli/go.sum
similarity index 100%
rename from src/client_cli/go.sum
rename to src/nexus-cli/go.sum
diff --git a/src/client_cli/nexus-client.go b/src/nexus-cli/nexus-client.go
similarity index 100%
rename from src/client_cli/nexus-client.go
rename to src/nexus-cli/nexus-client.go
diff --git a/src/client_exam/go.mod b/src/nexus-exam/go.mod
similarity index 96%
rename from src/client_exam/go.mod
rename to src/nexus-exam/go.mod
index b62115b..2398a8d 100644
--- a/src/client_exam/go.mod
+++ b/src/nexus-exam/go.mod
@@ -1,8 +1,8 @@
-module nexus-client-exam
+module nexus-exam
 
 go 1.18
 
-replace nexus-client/utils => ./utils
+replace nexus-client/utils => ../utils
 
 require fyne.io/fyne/v2 v2.2.1
 
diff --git a/src/client_exam/go.sum b/src/nexus-exam/go.sum
similarity index 100%
rename from src/client_exam/go.sum
rename to src/nexus-exam/go.sum
diff --git a/src/client_exam/nexus-client-exam.go b/src/nexus-exam/nexus-exam.go
similarity index 100%
rename from src/client_exam/nexus-client-exam.go
rename to src/nexus-exam/nexus-exam.go
diff --git a/src/client_gui/go.mod b/src/nexus-gui/go.mod
similarity index 100%
rename from src/client_gui/go.mod
rename to src/nexus-gui/go.mod
diff --git a/src/client_gui/go.sum b/src/nexus-gui/go.sum
similarity index 100%
rename from src/client_gui/go.sum
rename to src/nexus-gui/go.sum
diff --git a/src/client_gui/nexus-client-gui.go b/src/nexus-gui/nexus-client-gui.go
similarity index 100%
rename from src/client_gui/nexus-client-gui.go
rename to src/nexus-gui/nexus-client-gui.go
diff --git a/src/client_cli/utils/go.mod b/src/utils/go.mod
similarity index 100%
rename from src/client_cli/utils/go.mod
rename to src/utils/go.mod
diff --git a/src/client_cli/utils/utils.go b/src/utils/utils.go
similarity index 100%
rename from src/client_cli/utils/utils.go
rename to src/utils/utils.go
-- 
GitLab