Added a new validate class, AlphanumericExt, that allows a few extra...

Added a new validate class, AlphanumericExt, that allows a few extra characters ontop of regular Alphanumeric validation. Closes #17 (#25)

pkg/cmd/delete.go

@@ -18,7 +18,7 @@ var Delete = &cli.Command{
 	Use:   "delete <template-tag>",
 	Short: "Delete a project template from the template registry",
 	Run: func(c *cli.Command, args []string) {
-		MustValidateVarArgs(args, validate.Argument{"template-path", validate.Alphanumeric})
+		MustValidateVarArgs(args, validate.Argument{"template-path", validate.AlphanumericExt})
 
 		MustValidateTemplateDir()
 

pkg/cmd/download.go

@@ -103,7 +103,7 @@ var Download = &cli.Command{
 
 		MustValidateArgs(args, []validate.Argument{
 			{"template-repo", validate.UnixPath},
-			{"template-tag", validate.Alphanumeric},
+			{"template-tag", validate.AlphanumericExt},
 		})
 
 		MustValidateTemplateDir()

pkg/cmd/save.go

@@ -21,7 +21,7 @@ var Save = &cli.Command{
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{
 			{"template-path", validate.UnixPath},
-			{"template-tag", validate.Alphanumeric},
+			{"template-tag", validate.AlphanumericExt},
 		})
 
 		MustValidateTemplateDir()

pkg/util/validate/pattern/pattern.go

@@ -12,6 +12,7 @@ const (
 	alphanumeric    = "^[a-zA-Z0-9]+$"
 	integer         = "^[-+]?(0|[1-9][0-9]*)$"
 	numeric         = "^[-+]?[0-9]+$"
+	alphanumericext = "^[a-zA-Z0-9-_]+$"
 )
 
 var (
@@ -21,6 +22,10 @@ var (
 	// Alphanumeric regular expression for alphanumeric strings.
 	Alphanumeric = regexp.MustCompile(alphanumeric)
 
+	// AlphanumericExt regular expression for alphanumeric strings plus
+	// certain allowed characters.
+	AlphanumericExt = regexp.MustCompile(alphanumericext)
+
 	// Email regular expression for e-mail strings.
 	Email = regexp.MustCompile(email)
 

pkg/util/validate/pattern/pattern_test.go

@@ -48,6 +48,28 @@ func TestAlphanumericPattern(t *testing.T) {
 	}
 }
 
+func TestAlphanumericExtPattern(t *testing.T) {
+	tests := []struct {
+		String string
+		Valid  bool
+	}{
+		{" ", false},
+		{"/", false},
+		{"root", true},
+		{"tmp-dir", true},
+		{"tmp-dir_now", true},
+		{"TMPDIR", true},
+		{"L33T", true},
+		{"L@@T", false},
+	}
+
+	for _, test := range tests {
+		if ok := pattern.AlphanumericExt.MatchString(test.String); ok != test.Valid {
+			t.Errorf("pattern.AlphanumericExt.MatchString(%q) expected to be %v", test.String, test.Valid)
+		}
+	}
+}
+
 func TestIntegerPattern(t *testing.T) {
 	tests := []struct {
 		String string

pkg/util/validate/string.go

@@ -37,3 +37,9 @@ func UnixPath(path string) bool {
 func Alphanumeric(s string) bool {
 	return pattern.Alphanumeric.MatchString(s)
 }
+
+// AlphanumericExt validates whether a string is an alphanumeric string, but a
+// small set of extra characters allowed
+func AlphanumericExt(s string) bool {
+	return pattern.AlphanumericExt.MatchString(s)
+}