cmd/all: Fix flag usage

cmd/hvm/cmd.go

@@ -58,6 +58,7 @@ var App application = application{
 	RepositoryName:  "hugo",
 	RepositoryOwner: "gohugoio",
 }
+
 var Config configuration
 
 var (

cmd/hvm/install.go

@@ -26,7 +26,6 @@ import (
 	"github.com/jmooring/hvm/pkg/archive"
 	"github.com/jmooring/hvm/pkg/helpers"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 // installCmd represents the install command
@@ -47,10 +46,11 @@ you will be prompted to add it when installation is complete.`,
 	},
 }
 
+var useVersionInDotFile bool
+
 func init() {
 	rootCmd.AddCommand(installCmd)
-	installCmd.Flags().Bool("useVersionInDotFile", false, "Install the version specified by the "+App.DotFileName+" file\nin the current directory")
-	viper.BindPFlag("useVersionInDotFile", installCmd.Flags().Lookup("useVersionInDotFile"))
+	installCmd.Flags().BoolVar(&useVersionInDotFile, "useVersionInDotFile", false, "Install the version specified by the "+App.DotFileName+" file\nin the current directory")
 }
 
 // install sets the version of the Hugo executable to use when version
@@ -59,7 +59,7 @@ func install() error {
 	repo := newRepository()
 	asset := newAsset()
 
-	if viper.GetBool("useVersionInDotFile") {
+	if useVersionInDotFile {
 		version, err := getVersionFromDotFile(filepath.Join(App.WorkingDir, App.DotFileName))
 		if err != nil {
 			return err

cmd/hvm/status.go

@@ -28,7 +28,6 @@ import (
 
 	"github.com/jmooring/hvm/pkg/helpers"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"golang.org/x/mod/semver"
 )
 
@@ -44,10 +43,11 @@ location. The "default" directory created by the "install" command is excluded.`
 	},
 }
 
+var printExecPath bool
+
 func init() {
 	rootCmd.AddCommand(statusCmd)
-	statusCmd.Flags().Bool("printExecPath", false, "Print the path to the Hugo executable if version\nmanagement is enabled in the current directory")
-	viper.BindPFlag("printExecPath", statusCmd.Flags().Lookup("printExecPath"))
+	statusCmd.Flags().BoolVar(&printExecPath, "printExecPath", false, "Print the path to the Hugo executable if version\nmanagement is enabled in the current directory")
 }
 
 // status displays a list of cached assets, the size of the cache, and the
@@ -64,7 +64,7 @@ func status() error {
 		return err
 	}
 
-	if viper.GetBool("printExecPath") {
+	if printExecPath {
 		if version == "" {
 			os.Exit(1)
 		} else {
@@ -186,7 +186,7 @@ func getVersionFromDotFile(path string) (string, error) {
 		return "", err
 	}
 	if !exists {
-		if !viper.GetBool("useVersionInDotFile") {
+		if !useVersionInDotFile {
 			return "", fmt.Errorf("the %s file in the current directory contains an invalid version (%s): %s", App.DotFileName, dotHvmContent, theFix)
 		}
 	}

cmd/hvm/testscripts/clean.txt

@@ -10,7 +10,7 @@
 # Test
 stdin input.txt
 exec hvm clean
-stdout 'This will delete cached versions of the Hugo executable.\n'
+stdout 'This will delete cached versions of the Hugo executable.'
 stdout 'Are you sure you want to clean the cache\? \(y/N\): '
 stdout 'Cache cleaned.'
 

cmd/hvm/testscripts/completion.txt

@@ -8,5 +8,5 @@
 [windows] env AppData=config
 
 exec hvm completion
-stdout 'Generate the autocompletion script for hvm for the specified shell.\n'
-stdout 'See each sub-command''s help for details on how to use the generated script.\n'
+stdout 'Generate the autocompletion script for hvm for the specified shell.'
+stdout 'See each sub-command''s help for details on how to use the generated script.'

cmd/hvm/testscripts/config.txt

@@ -10,6 +10,6 @@
 # Test
 exec hvm config
 stdout 'githubToken ='
-stdout 'numTagsToDisplay = 30\n'
-stdout 'sortAscending = true\n'
+stdout 'numTagsToDisplay = 30'
+stdout 'sortAscending = true'
 stdout 'Configuration file: '

cmd/hvm/testscripts/config_with_env_vars.txt

@@ -13,7 +13,7 @@ env HVM_SORTASCENDING=true
 
 # Test
 exec hvm config
-stdout 'githubToken = ''my-token''\n'
-stdout 'numTagsToDisplay = 42\n'
-stdout 'sortAscending = true\n'
+stdout 'githubToken = ''my-token'''
+stdout 'numTagsToDisplay = 42'
+stdout 'sortAscending = true'
 stdout 'Configuration file: '

cmd/hvm/testscripts/config_with_file.txt

@@ -10,7 +10,7 @@
 # Test
 exec hvm config
 stdout 'githubToken ='
-stdout 'numTagsToDisplay = 42\n'
+stdout 'numTagsToDisplay = 42'
 stdout 'sortAscending = false'
 stdout 'Configuration file: '
 

cmd/hvm/testscripts/disable.txt

@@ -17,7 +17,7 @@ exec hvm status
 stdout 'The current directory is configured to use Hugo'
 stdout 'Cached versions of the Hugo executable'
 exec hvm disable
-stdout 'Version management has been disabled in the current directory.\n'
+stdout 'Version management has been disabled in the current directory.'
 ! exists '.hvm'
 
 -- input.txt --

cmd/hvm/testscripts/gen.txt

@@ -9,10 +9,10 @@
 
 # Tests
 exec hvm gen
-stdout 'Generate various files.\n'
+stdout 'Generate various files.'
 
 exec hvm gen alias
-stdout 'Generate an alias function for the specified shell.\n'
+stdout 'Generate an alias function for the specified shell.'
 
 exec hvm gen alias bash
 stdout '# Hugo Version Manager: override path to the hugo executable.'

cmd/hvm/testscripts/help.txt

@@ -9,4 +9,4 @@
 
 # Test
 exec hvm help
-stdout 'Hugo Version Manager \(hvm\) is a tool that helps you download, manage, and switch\n'
+stdout 'Hugo Version Manager \(hvm\) is a tool that helps you download, manage, and switch'

cmd/hvm/testscripts/hvm.txt

@@ -9,16 +9,16 @@
 
 exec hvm
 
-stdout 'Hugo Version Manager \(hvm\) is a tool that helps you download, manage, and switch\n'
-stdout 'between different versions of the Hugo static site generator. You can also use\n'
-stdout 'hvm to install Hugo as a standalone application.\n'
-stdout 'clean\s+Clean the cache\n'
-stdout 'completion\s+Generate the autocompletion script for the specified shell\n'
-stdout 'config\s+Display the current configuration\n'
-stdout 'disable\s+Disable version management in the current directory\n'
-stdout 'gen\s+Generate various files\n'
-stdout 'help\s+Help about any command\n'
-stdout 'install\s+Install a default version to use when version management is disabled\n'
-stdout 'status\s+Display the status\n'
-stdout 'use\s+Select a version to use in the current directory\n'
-stdout 'version\s+Display the hvm version\n'
+stdout 'Hugo Version Manager \(hvm\) is a tool that helps you download, manage, and switch'
+stdout 'between different versions of the Hugo static site generator. You can also use'
+stdout 'hvm to install Hugo as a standalone application.'
+stdout 'clean\s+Clean the cache'
+stdout 'completion\s+Generate the autocompletion script for the specified shell'
+stdout 'config\s+Display the current configuration'
+stdout 'disable\s+Disable version management in the current directory'
+stdout 'gen\s+Generate various files'
+stdout 'help\s+Help about any command'
+stdout 'install\s+Install a default version to use when version management is disabled'
+stdout 'status\s+Display the status'
+stdout 'use\s+Select a version to use in the current directory'
+stdout 'version\s+Display the hvm version'

cmd/hvm/testscripts/install.txt

@@ -13,7 +13,7 @@
 # Test
 stdin input.txt
 exec hvm install
-stdout 'Downloading v.*\.\.\. done.\n'
+stdout 'Downloading v.*\.\.\. done.'
 
 # Files
 -- input.txt --

cmd/hvm/testscripts/install_use_dot_file_fail.txt

@@ -12,4 +12,4 @@
 
 # Test
 ! exec hvm install --useVersionInDotFile
-stderr 'Error: the current directory does not contain an \.hvm file\n'
+stderr 'Error: the current directory does not contain an \.hvm file'

cmd/hvm/testscripts/install_use_dot_file_pass.txt

@@ -12,8 +12,8 @@
 
 # Test
 exec hvm install --useVersionInDotFile
-stdout 'Downloading v0.54.0... done.\n'
-stdout 'Installation of v0.54.0 complete.\n'
+stdout 'Downloading v0.54.0... done.'
+stdout 'Installation of v0.54.0 complete.'
 
 # Files
 -- .hvm --

cmd/hvm/testscripts/remove.txt

@@ -9,7 +9,7 @@
 
 # Test
 exec hvm remove
-stdout 'Default version removed.\n'
+stdout 'Default version removed.'
 
 # Files
 -- home/Library/Caches/hvm/default/hugo --

cmd/hvm/testscripts/remove_nothing_to_remove.txt

@@ -9,4 +9,4 @@
 
 # Test
 exec hvm remove
-stdout 'Nothing to remove.\n'
+stdout 'Nothing to remove.'

cmd/hvm/testscripts/status.txt

@@ -7,11 +7,37 @@
 [windows] env LocalAppData=cache
 [windows] env AppData=config
 
-# Test
+# Test 1: dot file exists, cache not empty
 exec hvm status
-stdout 'The current directory is configured to use Hugo v0.117.0.\n'
-stdout 'Cached versions of the Hugo executable:\n'
-stdout 'v0.117.0\n'
+stdout 'The current directory is configured to use Hugo v0.117.0.'
+stdout 'Cached versions of the Hugo executable:'
+stdout 'v0.117.0'
+
+exec hvm status --printExecPath
+[darwin] stdout 'home/Library/Caches/hvm/v0.117.0/hugo'
+[linux] stdout 'cache/hvm/v0.117.0/hugo'
+[windows] stdout 'cache\\hvm\\v0.117.0\\hugo.exe'
+
+# Test 2: dot file does not exist, cache not empty
+rm .hvm
+
+exec hvm status
+stdout 'Version management is disabled in the current directory.'
+stdout 'Cached versions of the Hugo executable:'
+stdout 'v0.117.0'
+
+! exec hvm status --printExecPath
+
+# Test 3: dot file does not exist, cache empty
+rm home/Library/Caches/hvm/v0.117.0
+rm cache/hvm/v0.117.0
+rm cache/hvm/v0.117.0
+
+exec hvm status
+stdout 'Version management is disabled in the current directory.'
+stdout 'The cache is empty.'
+
+! exec hvm status --printExecPath
 
 # Files
 -- .hvm --

cmd/hvm/testscripts/use.txt

@@ -13,10 +13,10 @@
 # Test
 stdin input.txt
 exec hvm use
-stdout 'Downloading v.*\.\.\. done.\n'
+stdout 'Downloading v.*\.\.\. done.'
 
 exec hvm status
-stdout 'The current directory is configured to use Hugo v.*\n'
+stdout 'The current directory is configured to use Hugo v.*'
 
 # Files
 -- input.txt --