#11 allow create vagrant images - polishing code

db/db.go

@@ -13,24 +13,24 @@ const (
 )
 
 var (
-	ImagesDir  = getVerminDir() + string(os.PathSeparator) + "images"
-	VMsBaseDir = getVerminDir() + string(os.PathSeparator) + "vms"
+	ImagesDir  = filepath.Join(getVerminDir(), "images")
+	VMsBaseDir = filepath.Join(getVerminDir(), "vms")
 )
 
 func GetImageFilePath(imageName string) string {
-	return ImagesDir + string(os.PathSeparator) + imageName + ".ova"
+	return filepath.Join(ImagesDir, imageName+".ova")
 }
 
 func GetVMPath(vm string) string {
-	return VMsBaseDir + string(os.PathSeparator) + vm
+	return filepath.Join(VMsBaseDir, vm)
 }
 
 func getVerminDir() string {
 	dir, err := os.UserHomeDir()
 	if err != nil {
 		log.Fatal("cannot obtain user home dir")
 	}
-	return dir + string(os.PathSeparator) + ".vermin"
+	return filepath.Join(dir, ".vermin")
 }
 
 func GetUsername(vmName string) string {

db/info.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 )
 
 type Box struct {
@@ -62,7 +63,7 @@ func GetBoxInfo(vm string) (*Box, error) {
 }
 
 func getDiskSizeInGB(vm string, hdLocation string) string {
-	stat, err := os.Stat(GetVMPath(vm) + string(os.PathSeparator) + hdLocation)
+	stat, err := os.Stat(filepath.Join(GetVMPath(vm), hdLocation))
 	if err != nil {
 		return ""
 	}

vagrant/image.go

@@ -0,0 +1,65 @@
+package vagrant
+
+import (
+	"github.com/mhewedy/vermin/command"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+func ProcessImage(imagePath string) error {
+
+	imageDir := path.Dir(imagePath)
+
+	// gunzip the downloaded file
+	// TODO change from using tar command to golang code
+	if err := command.Tar("xzf", imagePath, "-C", imageDir).Run(); err != nil {
+		return err
+	}
+
+	// remove the downloaded file
+	if err := os.Remove(imagePath); err != nil {
+		return err
+	}
+
+	// get ovf, vmdk FileInfo
+	infos, err := ioutil.ReadDir(imageDir)
+	if err != nil {
+		return err
+	}
+	var ovaFileInfo, vmdkFileInfo os.FileInfo
+	for _, info := range infos {
+		if strings.HasSuffix(info.Name(), ".ovf") {
+			ovaFileInfo = info
+		}
+		if strings.HasSuffix(info.Name(), ".vmdk") {
+			vmdkFileInfo = info
+		}
+	}
+
+	// create ova by TARing (ovf and vmdk)
+	file, err := os.Create(imagePath)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	if err := tarFiles(file, imageDir, []os.FileInfo{ovaFileInfo, vmdkFileInfo}); err != nil {
+		return err
+	}
+
+	// remove all files except ova
+	return filepath.Walk(imageDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() && !strings.HasSuffix(info.Name(), ".ova") {
+			if err := os.Remove(path); err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}

vagrant/vagrant.go

@@ -1,71 +1,7 @@
 package vagrant
 
-import (
-	"github.com/mhewedy/vermin/command"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-)
-
 func GetImageURL(image string) (string, error) {
 	// TODO
 	// get json and parse it to return download URL
 	return "https://vagrantcloud.com/hashicorp/boxes/bionic64/versions/1.0.282/providers/virtualbox.box", nil
 }
-
-func ProcessImage(imagePath string) error {
-
-	imageDir := path.Dir(imagePath)
-
-	// gunzip the downloaded file
-	// TODO change from command to golang code
-	if err := command.Tar("xzf", imagePath, "-C", imageDir).Run(); err != nil {
-		return err
-	}
-
-	// remove the downloaded file
-	if err := os.Remove(imagePath); err != nil {
-		return err
-	}
-
-	// get ovf, vmdk FileInfo
-	infos, err := ioutil.ReadDir(imageDir)
-	if err != nil {
-		return err
-	}
-	var ovaFileInfo, vmdkFileInfo os.FileInfo
-	for _, info := range infos {
-		if strings.HasSuffix(info.Name(), ".ovf") {
-			ovaFileInfo = info
-		}
-		if strings.HasSuffix(info.Name(), ".vmdk") {
-			vmdkFileInfo = info
-		}
-	}
-
-	// create ova by TARing (ovf and vmdk)
-	file, err := os.Create(imagePath)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	if err := tarFiles(file, imageDir, []os.FileInfo{ovaFileInfo, vmdkFileInfo}); err != nil {
-		return err
-	}
-
-	// remove all files except ova
-	return filepath.Walk(imageDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.IsDir() && !strings.HasSuffix(info.Name(), ".ova") {
-			if err := os.Remove(path); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}