adds --verbose flag

.gitignore

@@ -0,0 +1 @@
+.phraseapp.yml

config.go

@@ -12,7 +12,7 @@ import (
 )
 
 const configName = ".phraseapp.yml"
-const defaultDir = ".config/phraseapp"
+const defaultDir = "./"
 
 func ConfigDefaultCredentials() (*phraseapp.AuthCredentials, error) {
 	content, err := ConfigContent()
@@ -92,6 +92,7 @@ type credentialConf struct {
 	Phraseapp struct {
 		AccessToken string `yaml:"access_token"`
 		Host        string `yaml:"host"`
+		Debug       bool   `yaml:"verbose"`
 		Username    string
 		TFA         bool
 	}
@@ -106,7 +107,7 @@ func parseCredentials(yml string) (*phraseapp.AuthCredentials, error) {
 	}
 
 	phrase := conf.Phraseapp
-	credentials := &phraseapp.AuthCredentials{Token: phrase.AccessToken, Username: phrase.Username, TFA: phrase.TFA, Host: phrase.Host}
+	credentials := &phraseapp.AuthCredentials{Token: phrase.AccessToken, Username: phrase.Username, TFA: phrase.TFA, Host: phrase.Host, Debug: phrase.Debug}
 
 	return credentials, nil
 }

pull.go

@@ -25,7 +25,7 @@ type PullParams struct {
 	FormatOptions            *map[string]interface{} `yaml:"format_options,omitempty"`
 	IncludeEmptyTranslations *bool                   `yaml:"include_empty_translations,omitempty"`
 	KeepNotranslateTags      *bool                   `yaml:"keep_notranslate_tags,omitempty"`
-	TagId                    *string                 `yaml:"tag_id,omitempty"`
+	Tag                      *string                 `yaml:"tag,omitempty"`
 }
 
 func (t *Target) GetFormat() string {
@@ -45,6 +45,13 @@ func (t *Target) GetLocaleId() string {
 	return ""
 }
 
+func (t *Target) GetTag() string {
+	if t.Params != nil && t.Params.Tag != nil {
+		return *t.Params.Tag
+	}
+	return ""
+}
+
 func PullAll(targets Targets) error {
 	alreadySeen := []string{}
 	for _, target := range targets {
@@ -70,7 +77,8 @@ func (target *Target) Pull(alreadySeen []string) ([]string, error) {
 		return nil, err
 	}
 
-	localeToPathMapping, err := ExpandPathsWithLocale(p, target.GetLocaleId(), locales)
+	info := &LocaleFileNameInfo{LocaleId: target.GetLocaleId(), Tag: target.GetTag()}
+	localeToPathMapping, err := ExpandPathsWithLocale(p, locales, info)
 	if err != nil {
 		return nil, err
 	}
@@ -115,7 +123,7 @@ func downloadAndWriteToFile(target *Target, localePath *LocalePath) error {
 	if params != nil && params.LocaleId != "" {
 		localeId = params.LocaleId
 	} else {
-		localeId = localePath.LocaleId
+		localeId = localePath.Info.LocaleId
 	}
 
 	res, err := phraseapp.LocaleDownload(target.ProjectId, localeId, downloadParams)
@@ -171,9 +179,9 @@ func setDownloadParams(target *Target, localePath *LocalePath) *phraseapp.Locale
 		downloadParams.KeepNotranslateTags = keepNotranslateTags
 	}
 
-	tagId := params.TagId
-	if tagId != nil {
-		downloadParams.TagId = tagId
+	tag := params.Tag
+	if tag != nil {
+		downloadParams.Tag = tag
 	}
 
 	return downloadParams

push.go

@@ -29,6 +29,7 @@ type PushParams struct {
 	SkipUnverification *bool                   `yaml:"skip_unverification,omitempty"`
 	SkipUploadTags     *bool                   `yaml:"skip_upload_tags,omitempty"`
 	Tags               []string                `yaml:"tags,omitempty"`
+	Tag                *string                 `yaml:"tag,omitempty"`
 	UpdateTranslations *bool                   `yaml:"update_translations,omitempty"`
 }
 
@@ -49,6 +50,13 @@ func (s *Source) GetLocaleId() string {
 	return ""
 }
 
+func (s *Source) GetTag() string {
+	if s.Params != nil && s.Params.Tag != nil {
+		return *s.Params.Tag
+	}
+	return ""
+}
+
 func PushAll(sources Sources) error {
 	alreadySeen := []string{}
 	for _, source := range sources {
@@ -74,7 +82,8 @@ func (source *Source) Push(alreadySeen []string) ([]string, error) {
 		return nil, err
 	}
 
-	localeToPathMapping, err := ExpandPathsWithLocale(p, source.GetLocaleId(), locales)
+	info := &LocaleFileNameInfo{LocaleId: source.GetLocaleId(), Tag: source.GetTag()}
+	localeToPathMapping, err := ExpandPathsWithLocale(p, locales, info)
 	if err != nil {
 		return nil, err
 	}
@@ -150,7 +159,7 @@ func setUploadParams(source *Source, localePath *LocalePath) (*phraseapp.LocaleF
 	uploadParams := new(phraseapp.LocaleFileImportParams)
 	uploadParams.File = localePath.Path
 	uploadParams.FileFormat = &source.FileFormat
-	remoteLocaleId := localePath.LocaleId
+	remoteLocaleId := localePath.Info.LocaleId
 
 	if remoteLocaleId != "" {
 		uploadParams.LocaleId = &remoteLocaleId
@@ -193,6 +202,13 @@ func setUploadParams(source *Source, localePath *LocalePath) (*phraseapp.LocaleF
 	}
 
 	tags := params.Tags
+	info := localePath.Info
+	if info != nil && info.Tag != "" {
+		if tags == nil {
+			tags = make([]string, 0)
+		}
+		tags = append(tags, info.Tag)
+	}
 	if tags != nil {
 		uploadParams.Tags = tags
 	}