Merge pull request #27 from Lotti/feature/ls-remote

reworked command "list" display format and added command "list remote"

Author: hjbdev

README.md

@@ -42,9 +42,17 @@ pvm install 8.2
 
 Will install PHP 8.2 at the latest patch.
 
-## Build
+## Composer support
+`pvm` now installs also composer with each php version installed.
+It will install Composer latest stable release for PHP >= 7.2 and Composer latest 2.2.x LTS for PHP < 7.2.
+You'll be able to invoke composer from terminal as it is intended:
+```shell
+composer --version
+```
+
+## Build this project
 
-To compile the program use:
+To compile this project use:
 ```shell
 GOOS=windows GOARCH=amd64 go build -o pvm.exe
 ```

commands/help.go

@@ -17,6 +17,7 @@ func Help(notFoundError bool) {
 	fmt.Println("    help")
 	fmt.Println("    install")
 	fmt.Println("    list")
+	fmt.Println("    list-remote")
 	fmt.Println("    path")
 	fmt.Println("    use")
 }

commands/install.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 )
 
@@ -40,7 +39,7 @@ func Install(args []string) {
 		theme.Warning("Non-thread safe version will be installed")
 	}
 
-	desiredVersionNumbers := common.GetVersion(args[1], desireThreadSafe, "")
+	desiredVersionNumbers := common.ComputeVersion(args[1], desireThreadSafe, "")
 
 	if desiredVersionNumbers == (common.Version{}) {
 		theme.Error("Invalid version specified")
@@ -52,67 +51,10 @@ func Install(args []string) {
 	desiredMinorVersion := desiredVersionNumbers.Minor
 	desiredPatchVersion := desiredVersionNumbers.Patch
 
-	// perform get request to https://windows.php.net/downloads/releases/archives/
-	resp, err := http.Get("https://windows.php.net/downloads/releases/archives/")
+	versions, err := common.RetrievePHPVersions()
 	if err != nil {
 		log.Fatalln(err)
 	}
-	// We Read the response body on the line below.
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	// Convert the body to type string
-	sb := string(body)
-
-	// regex match
-	re := regexp.MustCompile(`<A HREF="([a-zA-Z0-9./-]+)">([a-zA-Z0-9./-]+)</A>`)
-	matches := re.FindAllStringSubmatch(sb, -1)
-
-	versions := make([]common.Version, 0)
-
-	for _, match := range matches {
-		url := match[1]
-		name := match[2]
-
-		// check if name starts with "php-devel-pack-"
-		if name != "" && len(name) > 15 && name[:15] == "php-devel-pack-" {
-			continue
-		}
-		// check if name starts with "php-debug-pack-"
-		if name != "" && len(name) > 15 && name[:15] == "php-debug-pack-" {
-			continue
-		}
-		// check if name starts with "php-test-pack-"
-		if name != "" && len(name) > 15 && name[:14] == "php-test-pack-" {
-			continue
-		}
-
-		// check if name contains "src"
-		if name != "" && strings.Contains(name, "src") {
-			continue
-		}
-
-		// check if name does not end in zip
-		if name != "" && !strings.HasSuffix(name, ".zip") {
-			continue
-		}
-
-		threadSafe := true
-
-		// check if name contains "nts" or "NTS"
-		if name != "" && (strings.Contains(name, "nts") || strings.Contains(name, "NTS")) {
-			threadSafe = false
-		}
-
-		// make sure we only get x64 versions
-		if name != "" && !strings.Contains(name, "x64") {
-			continue
-		}
-
-		// regex match name and push to versions
-		versions = append(versions, common.GetVersion(name, threadSafe, url))
-	}
 
 	// find desired version
 	var desiredVersion common.Version

commands/list-remote.go

@@ -0,0 +1,31 @@
+package commands
+
+import (
+	"hjbdev/pvm/common"
+	"hjbdev/pvm/theme"
+	"log"
+	"slices"
+
+	"github.com/fatih/color"
+)
+
+func ListRemote() {
+	versions, err := common.RetrievePHPVersions()
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	common.SortVersions(versions)
+
+	installedVersions, _ := common.RetrieveInstalledPHPVersions()
+
+	theme.Title("PHP versions available")
+	for _, version := range versions {
+		idx := slices.IndexFunc(installedVersions, func(v common.Version) bool { return v.Same(version) })
+		found := " "
+		if idx != -1 {
+			found = "*"
+		}
+		color.White(found + "   " + version.StringShort())
+	}
+}

commands/list.go

@@ -1,42 +1,21 @@
 package commands
 
 import (
+	"hjbdev/pvm/common"
 	"hjbdev/pvm/theme"
-	"log"
-	"os"
+
 	"github.com/fatih/color"
 )
 
 func List() {
-	// get users home dir
-	homeDir, err := os.UserHomeDir()
-
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	// check if .pvm folder exists
-	if _, err := os.Stat(homeDir + "/.pvm"); os.IsNotExist(err) {
-		theme.Error("No PHP versions installed")
-		return
-	}
-
-	// check if .pvm/versions folder exists
-	if _, err := os.Stat(homeDir + "/.pvm/versions"); os.IsNotExist(err) {
-		theme.Error("No PHP versions installed")
-		return
-	}
-
-	// get all folders in .pvm/versions
-	versions, err := os.ReadDir(homeDir + "/.pvm/versions")
+	versions, err := common.RetrieveInstalledPHPVersions()
 	if err != nil {
-		log.Fatalln(err)
+		theme.Error(err.Error())
 	}
 
 	theme.Title("Installed PHP versions")
-
 	// print all folders
 	for _, version := range versions {
-		color.White("    " + version.Name())
+		color.White("    " + version.StringShort())
 	}
 }

commands/use.go

@@ -63,7 +63,7 @@ func Use(args []string) {
 		if strings.Contains(version.Name(), "nts") || strings.Contains(version.Name(), "NTS") {
 			safe = false
 		}
-		foundVersion := common.GetVersion(version.Name(), safe, "")
+		foundVersion := common.ComputeVersion(version.Name(), safe, "")
 		if threadSafe == foundVersion.ThreadSafe && strings.HasPrefix(foundVersion.String(), args[0]) {
 			selectedVersion = &versionMeta{
 				number: foundVersion,
@@ -77,7 +77,7 @@ func Use(args []string) {
 		return
 	}
 
-	requestedVersion := common.GetVersion(args[0], threadSafe, "")
+	requestedVersion := common.ComputeVersion(args[0], threadSafe, "")
 	if requestedVersion.Minor == -1 {
 		theme.Warning(fmt.Sprintf("No minor version specified, assumed newest minor version %s.", selectedVersion.number.String()))
 	} else if requestedVersion.Patch == -1 {