Pending changes

Author: dpaz

cli/enry/main.go

@@ -24,7 +24,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	enry.LoadGitattributes()
+	enry.LoadGitAttributes()
 
 	errors := false
 	out := make(map[string][]string, 0)

common.go

@@ -18,7 +18,7 @@ type Strategy func(filename string, content []byte, candidates []string) (langua
 
 // DefaultStrategies is the strategies' sequence GetLanguage uses to detect languages.
 var DefaultStrategies = []Strategy{
-	GetLanguagesByGitattributes,
+	GetLanguagesByGitAttributes,
 	GetLanguagesByModeline,
 	GetLanguagesByFilename,
 	GetLanguagesByShebang,
@@ -96,10 +96,10 @@ func GetLanguageByClassifier(content []byte, candidates []string) (language stri
 	return getLanguageByStrategy(GetLanguagesByClassifier, "", content, candidates)
 }
 
-// GetLanguageByGitattributes returns the language assigned to a file for a given regular expresion in .gitattributes.
-// This strategy needs to be initialized calling LoadGitattributes
-func GetLanguageByGitattributes(filename string) (language string, safe bool) {
-	return getLanguageByStrategy(GetLanguagesByGitattributes, filename, nil, nil)
+// GetLanguageByGitAttributes returns the language assigned to a file for a given regular expresion in .gitattributes.
+// This strategy needs to be initialized calling LoadGitAttributes
+func GetLanguageByGitAttributes(filename string) (language string, safe bool) {
+	return getLanguageByStrategy(GetLanguagesByGitAttributes, filename, nil, nil)
 }
 
 func getLanguageByStrategy(strategy Strategy, filename string, content []byte, candidates []string) (string, bool) {
@@ -450,15 +450,14 @@ func GetLanguageByAlias(alias string) (lang string, ok bool) {
 	return
 }
 
-// GetLanguagesByGitattributes returns a length 1 slice with the language assigned in .gitattributes if the regular expresion
-// matchs with the filename. It is comply with the signature to be a Strategy type.
-func GetLanguagesByGitattributes(filename string, content []byte, candidates []string) []string {
-	languages := []string{}
-	for regExp, language := range languageGitattributes {
+// GetLanguagesByGitAttributes returns either a string slice with the lenguage if the filename match with a regExp in .gitattributes
+//or return nil in case of none regexp matchs the filename . It complies with the signature to be a Strategy type.
+func GetLanguagesByGitAttributes(filename string, content []byte, candidates []string) []string {
+	for regExp, language := range languageGitAttributes {
 		if regExp.MatchString(filename) {
-			return append(languages, language)
+			return []string{language}
 		}
 	}
 
-	return languages
+	return nil
 }

utils.go

@@ -30,9 +30,9 @@ var (
 		"XML": true, "JSON": true, "TOML": true, "YAML": true, "INI": true, "SQL": true,
 	}
 
-	vendorGitattributes        = map[string]bool{}
-	documentationGitattributes = map[string]bool{}
-	languageGitattributes      = map[*regexp.Regexp]string{}
+	vendorGitAttributes        = map[string]bool{}
+	documentationGitAttributes = map[string]bool{}
+	languageGitAttributes      = map[*regexp.Regexp]string{}
 )
 
 type OverrideError struct {
@@ -64,7 +64,7 @@ func IsDotFile(path string) bool {
 
 // IsVendor returns whether or not path is a vendor path.
 func IsVendor(path string) bool {
-	if val, ok := vendorGitattributes[path]; ok {
+	if val, ok := vendorGitAttributes[path]; ok {
 		return val
 	}
 
@@ -73,7 +73,7 @@ func IsVendor(path string) bool {
 
 // IsDocumentation returns whether or not path is a documentation path.
 func IsDocumentation(path string) bool {
-	if val, ok := documentationGitattributes[path]; ok {
+	if val, ok := documentationGitAttributes[path]; ok {
 		return val
 	}
 
@@ -97,14 +97,14 @@ func IsBinary(data []byte) bool {
 }
 
 // LoadGitattributes reads and parses the file .gitattributes which overrides the standard strategies
-func LoadGitattributes() {
-	rawAttributes, err := loadRawGitattributes(".gitattributes")
+func LoadGitAttributes() {
+	rawAttributes, err := loadRawGitAttributes(".gitattributes")
 	if err == nil && len(rawAttributes) > 0 {
 		parseAttributes(rawAttributes)
 	}
 }
 
-func loadRawGitattributes(name string) (map[string][]string, error) {
+func loadRawGitAttributes(name string) (map[string][]string, error) {
 	gitattributes := map[string][]string{}
 	data, err := ioutil.ReadFile(name)
 	if err != nil {
@@ -171,31 +171,31 @@ func parseAttribute(key string, attribute string) error {
 
 func processVendorAttr(key string, attribute string) error {
 	var err error
-	if _, ok := vendorGitattributes[key]; ok {
+	if _, ok := vendorGitAttributes[key]; ok {
 		err = &OverrideError{attribute: "vendor", path: key}
 	}
 
 	switch {
 	case attribute == "linguist-vendored":
-		vendorGitattributes[key] = true
+		vendorGitAttributes[key] = true
 	case attribute == "linguist-vendored=false":
-		vendorGitattributes[key] = false
+		vendorGitAttributes[key] = false
 	}
 
 	return err
 }
 
 func processDocumentationAttr(key string, attribute string) error {
 	var err error
-	if _, ok := documentationGitattributes[key]; ok {
+	if _, ok := documentationGitAttributes[key]; ok {
 		err = &OverrideError{attribute: "documentation", path: key}
 	}
 
 	switch {
 	case attribute == "linguist-documentation":
-		documentationGitattributes[key] = true
+		documentationGitAttributes[key] = true
 	case attribute == "linguist-documentation=false":
-		documentationGitattributes[key] = false
+		documentationGitAttributes[key] = false
 	}
 
 	return err
@@ -210,9 +210,9 @@ func processLanguageAttr(regExpString string, attribute string) error {
 	}
 	lang, _ := GetLanguageByAlias(tokens[1])
 	if lang != OtherLanguage {
-		languageGitattributes[regExp] = lang
+		languageGitAttributes[regExp] = lang
 	} else {
-		languageGitattributes[regExp] = tokens[1]
+		languageGitAttributes[regExp] = tokens[1]
 	}
 
 	return nil