Fixed depends check (yet another try)

Author: cmaglie

src/arduino.cc/repository/libraries/db/dependencies_test.go

@@ -31,6 +31,7 @@ func TestDependencyExtract(t *testing.T) {
 		[]string{">=1.2.3", "", "=1.0.0"})
 	invalid("MyLib (>=1.2.3)()")
 	invalid("MyLib (>=1.2.3),_aaaa")
+	invalid("MyLib,,AnotherLib")
 	invalid("MyLib (>=1.2.3)(),AnotherLib, YetAnotherLib (=1.0.0)")
 	check("Arduino Uno WiFi Dev Ed Library, LoRa Node (^2.1.2)",
 		[]string{"Arduino Uno WiFi Dev Ed Library", "LoRa Node"},
@@ -41,4 +42,5 @@ func TestDependencyExtract(t *testing.T) {
 	check("Arduino_OAuth, ArduinoHttpClient (<0.3.0), NonExistentLib",
 		[]string{"Arduino_OAuth", "ArduinoHttpClient", "NonExistentLib"},
 		[]string{"", "<0.3.0", ""})
+	check("", []string{}, []string{})
 }

src/arduino.cc/repository/libraries/db/library.go

@@ -47,11 +47,16 @@ var re = regexp.MustCompile("^([a-zA-Z0-9](?:[a-zA-Z0-9._\\- ]*[a-zA-Z0-9])?) *(
 
 // ExtractDependenciesList extracts dependencies from the "depends" field of library.properties
 func ExtractDependenciesList(depends string) ([]*Dependency, error) {
+	// TODO: merge this method with metadata.IsValidDependency
 	deps := []*Dependency{}
+	depends = strings.TrimSpace(depends)
+	if depends == "" {
+		return deps, nil
+	}
 	for _, dep := range strings.Split(depends, ",") {
 		dep = strings.TrimSpace(dep)
 		if dep == "" {
-			continue
+			return nil, fmt.Errorf("invalid dep: %s", dep)
 		}
 		matches := re.FindAllStringSubmatch(dep, -1)
 		if matches == nil {

src/arduino.cc/repository/libraries/metadata/metadata.go

@@ -17,10 +17,9 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
+	"regexp"
 	"strings"
 
-	"arduino.cc/repository/libraries/db"
-
 	"github.com/google/go-github/github"
 	ini "github.com/vaughan0/go-ini"
 )
@@ -123,10 +122,26 @@ func IsValidLibraryName(name string) bool {
 	return true
 }
 
+var re = regexp.MustCompile("^([a-zA-Z0-9](?:[a-zA-Z0-9._\\- ]*[a-zA-Z0-9])?) *(?: \\(([^()]*)\\))?$")
+
 // IsValidDependency checks if the `depends` field of library.properties is correctly formatted
 func IsValidDependency(depends string) bool {
-	_, err := db.ExtractDependenciesList(depends)
-	return err == nil
+	// TODO: merge this method with db.ExtractDependenciesList
+	depends = strings.TrimSpace(depends)
+	if depends == "" {
+		return true
+	}
+	for _, dep := range strings.Split(depends, ",") {
+		dep = strings.TrimSpace(dep)
+		if dep == "" {
+			return false
+		}
+		matches := re.FindAllStringSubmatch(dep, -1)
+		if matches == nil {
+			return false
+		}
+	}
+	return true
 }
 
 // ParsePullRequest makes a LibraryMetadata by reading library.properties from a github.PullRequest