globbing: add old push_tests, test globbing for special file case as …

…well

internal/placeholders/placeholders.go

@@ -28,7 +28,13 @@ func ContainsTagPlaceholder(s string) bool {
 }
 
 func ToGlobbingPattern(s string) string {
-	return anyPlaceholderRegexp.ReplaceAllString(s, "*")
+	path := anyPlaceholderRegexp.ReplaceAllString(s, "*")
+	baseName := filepath.Base(s)
+	extension := filepath.Ext(s)
+	if baseName == extension {
+		return strings.Replace(path, baseName, "*"+baseName, 1)
+	}
+	return path
 }
 
 // Resolve matches s against pattern and maps placeholders in pattern to

internal/placeholders/placeholders_test.go

@@ -76,6 +76,31 @@ func TestResolve(t *testing.T) {
 	}
 }
 
+func TestToGlobbing(t *testing.T) {
+	tests := []struct {
+		path    string
+		pattern string
+	}{
+		{
+			path:    "abc/*.lproj/*.strings",
+			pattern: "abc/<locale_code>.lproj/.strings",
+		}, {
+			path:    "abc/defg/*.lproj/*.strings",
+			pattern: "abc/defg/<locale_code>.lproj/.strings",
+		}, {
+			path:    "abc/defg/*.lproj/Localizable.strings",
+			pattern: "abc/defg/<locale_code>.lproj/Localizable.strings",
+		},
+	}
+	for _, test := range tests {
+		result := ToGlobbingPattern(test.pattern)
+
+		if result != test.path {
+			t.Errorf("expected result to be %q, but got %q", test.path, result)
+		}
+	}
+}
+
 func TestResolve_errorPlaceholderReuse(t *testing.T) {
 	tests := []struct {
 		path    string

push_test.go

@@ -607,3 +607,344 @@ func TestShouldCreateLocale(t *testing.T) {
 		}
 	}
 }
+
+// Push pattern tests
+type Patterns []*Pattern
+
+type Pattern struct {
+	File         string
+	Ext          string
+	TestPath     string
+	ExpectedCode string
+	ExpectedName string
+	ExpectedTag  string
+}
+
+func TestSpecialCharacters(t *testing.T) {
+	patterns := Patterns{
+		{
+			File:     "./locales/?*.yml",
+			Ext:      "yml",
+			TestPath: "locales/?en.yml",
+		},
+		{
+			File:         "./abc+/defg./}{x/][etc??/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "abc+/defg./}{x/][etc??/en.yml",
+			ExpectedCode: "en",
+		},
+	}
+	patterns.TestPatterns(t)
+}
+
+func TestSinglePlaceholders(t *testing.T) {
+	patterns := Patterns{
+		{
+			File:         "./.abc/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     ".abc/en.yml",
+			ExpectedCode: "en",
+		},
+		{
+			File:     "./*.yml",
+			Ext:      "yml",
+			TestPath: "en.yml",
+		},
+		{
+			File:     "./locales/en.yml",
+			Ext:      "yml",
+			TestPath: "locales/en.yml",
+		},
+		{
+			File:     "./locales/.yml",
+			Ext:      "yml",
+			TestPath: "locales/en.yml",
+		},
+		{
+			File:         "./locales/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "locales/en.yml",
+			ExpectedCode: "en",
+		},
+	}
+	patterns.TestPatterns(t)
+}
+
+func TestMultiplePlaceholders(t *testing.T) {
+	patterns := Patterns{
+		{
+			File:         "./config/<tag>/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "config/abc/en.yml",
+			ExpectedCode: "en",
+			ExpectedTag:  "abc",
+		},
+		{
+			File:         "./config/<locale_name>/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "config/german/de.yml",
+			ExpectedCode: "de",
+			ExpectedTag:  "",
+			ExpectedName: "german",
+		},
+		{
+			File:         "./config/<locale_code>/*.yml",
+			Ext:          "yml",
+			TestPath:     "config/en/english.yml",
+			ExpectedCode: "en",
+		},
+		{
+			File:         "./no_tag/<tag>/<locale_code>.lproj/Localizable.strings",
+			Ext:          "strings",
+			TestPath:     "no_tag/abc/en.lproj/Localizable.strings",
+			ExpectedCode: "en",
+			ExpectedTag:  "abc",
+		},
+		{
+			File:         "./abc/<locale_code>.lproj/<tag>.strings",
+			Ext:          "strings",
+			TestPath:     "abc/en.lproj/MyStoryboard.strings",
+			ExpectedCode: "en",
+			ExpectedTag:  "MyStoryboard",
+		},
+		{
+			File:         "./*/<tag>/<locale_code>-values/Strings.xml",
+			Ext:          "xml",
+			TestPath:     "no_tag/abc/en-values/Strings.xml",
+			ExpectedCode: "en",
+			ExpectedTag:  "abc",
+		},
+		{
+			File:         "./lang/<locale_code>/**/*.php",
+			Ext:          "php",
+			TestPath:     "lang/en/hijk/bla/bla/someName.php",
+			ExpectedCode: "en",
+		},
+		{
+			File:         "./**/<tag>/<locale_name>/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "abc/defg/someTag/english/en.yml",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./**/<locale_name>/<tag>/*.yml",
+			Ext:          "yml",
+			TestPath:     "haha/haha/haha/haha/english/someTag/filename.yml",
+			ExpectedCode: "",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/**/*/<tag>/*.yml",
+			Ext:          "yml",
+			TestPath:     "english/abc/defg/haha/hahah/hahah/someTag/main.yml",
+			ExpectedCode: "",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./locales/**/<tag>.*.yml",
+			Ext:          "yml",
+			TestPath:     "./locales/a/b/my-tag.anything.yml",
+			ExpectedCode: "",
+			ExpectedTag:  "my-tag",
+			ExpectedName: "",
+		},
+		{
+			File:         "./locales/**/<tag>.*.yml",
+			Ext:          "yml",
+			TestPath:     "./locales/a/b/my-tag.anything.yml",
+			ExpectedCode: "",
+			ExpectedTag:  "my-tag",
+			ExpectedName: "",
+		},
+		{
+			File:         "./**/<tag>.*/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "./locales/a/my-tag.anything/en.yml",
+			ExpectedCode: "en",
+			ExpectedTag:  "my-tag",
+			ExpectedName: "",
+		},
+	}
+	patterns.TestPatterns(t)
+}
+
+func TestMultipleWithPlaceholderExtension(t *testing.T) {
+	patterns := Patterns{
+		{
+			File:         "./abc/<locale_code>/<tag>.<locale_name>",
+			Ext:          "<locale_name>",
+			TestPath:     "abc/en/MyStoryboard.english",
+			ExpectedCode: "en",
+			ExpectedTag:  "MyStoryboard",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./*/<tag>/play.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "no_tag/abc/play.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "abc",
+		},
+		{
+			File:         "./*/<tag>/<locale_name>.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "no_tag/abc/play.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "abc",
+			ExpectedName: "play",
+		},
+		{
+			File:         "./**/*.<locale_name>",
+			Ext:          "<locale_name>",
+			TestPath:     "abc/defg/hijk/some_name.english",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./**/<tag>.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "abc/defg/hijk/someTag.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+		},
+		{
+			File:         "./**/xyz/<locale_name>/<tag>.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "abc/xyz/english/someTag.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/<tag>/**/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/someTag/abc/defg/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/<tag>/**/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/someTag/abc/defg/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/**/<tag>/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/abc/defg/someTag/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>_more/**/<tag>no_tag/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english_more/abc/defg/someTagno_tag/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/**/<tag>/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/abc/defg/haha/hahah/hahah/someTag/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/<tag>/**/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/someTag/haha/hahah/hahah/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./**/<locale_name>/<tag>/*.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "haha/haha/haha/haha/english/someTag/filename.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/**/*/<tag>/main.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/abc/defg/haha/hahah/hahah/someTag/main.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./**/<locale_code>/<locale_name>/*/<tag>/main.yml",
+			Ext:          "<locale_code>",
+			TestPath:     "haha/haha/haha/en/english/hahah/someTag/main.yml",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./<locale_name>/*/<tag>/**/main.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "english/xyz/someTag/haha/hahah/hahah/main.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./**/<locale_name>/*/<tag>.<locale_code>",
+			Ext:          "<locale_code>",
+			TestPath:     "haha/haha/haha/hahah/english/hahah/someTag.en",
+			ExpectedCode: "en",
+			ExpectedTag:  "someTag",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./**/<locale_name>/abc.*/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "./locales/a/english/abc.lol/en.yml",
+			ExpectedCode: "en",
+			ExpectedTag:  "",
+			ExpectedName: "english",
+		},
+		{
+			File:         "./a/b/<locale_name>/abc.*/**/<locale_code>.yml",
+			Ext:          "yml",
+			TestPath:     "./a/b/english/abc.lol/a/b/c/en.yml",
+			ExpectedCode: "en",
+			ExpectedTag:  "",
+			ExpectedName: "english",
+		},
+	}
+	patterns.TestPatterns(t)
+}
+
+func (patterns Patterns) TestPatterns(t *testing.T) {
+	for idx, pattern := range patterns {
+		pattern.TestPattern(t, idx)
+	}
+}
+
+func (pattern *Pattern) TestPattern(t *testing.T, idx int) {
+	localeFile := new(LocaleFile)
+	localeFile.fillFromPath(pattern.TestPath, pattern.File)
+
+	if localeFile.Code != pattern.ExpectedCode {
+		t.Errorf("Expected Code to equal '%s' but was '%s' Pattern: %d", pattern.ExpectedCode, localeFile.Code, idx+1)
+	}
+
+	if localeFile.Tag != pattern.ExpectedTag {
+		t.Errorf("Expected Tag to equal '%s' but was '%s' Pattern: %d", pattern.ExpectedTag, localeFile.Tag, idx+1)
+	}
+
+	if localeFile.Name != pattern.ExpectedName {
+		t.Errorf("Expected LocaleName to equal '%s' but was '%s' Pattern: %d", pattern.ExpectedName, localeFile.Name, idx+1)
+	}
+}