updating pull by version to only pull versioned files

README.md

@@ -50,9 +50,9 @@ When the repository has been cloned, running `$ cstore pull` in the same directo
 ## How to Use (3 minutes) ##
 
 #### Install/Upgrade ####
-mac: `$ curl -L -o  /usr/local/bin/cstore https://github.com/turnerlabs/cstore/releases/download/v1.0.1-rc/cstore_darwin_amd64 && chmod +x /usr/local/bin/cstore`
+mac: `$ curl -L -o  /usr/local/bin/cstore https://github.com/turnerlabs/cstore/releases/download/v1.3.0-rc/cstore_darwin_amd64 && chmod +x /usr/local/bin/cstore`
 
-linux: `$ curl -L -o  /usr/local/bin/cstore https://github.com/turnerlabs/cstore/releases/download/v1.0.1-rc/cstore_linux_386 && chmod +x /usr/local/bin/cstore`
+linux: `$ curl -L -o  /usr/local/bin/cstore https://github.com/turnerlabs/cstore/releases/download/v1.3.0-rc/cstore_linux_386 && chmod +x /usr/local/bin/cstore`
 
 The first push creates a catalog file in the same directory that can be checked into source control. Subsequent commands executed in the same directory will use the existing catalog.
 
@@ -180,9 +180,9 @@ exec ./my-application
 ```docker
 ENTRYPOINT ["./docker-entrypoint.sh"]
 ```
-4. Update the `Dockerfile` to install [cStore](https://github.com/turnerlabs/cstore/releases/download/v0.3.6-alpha/cstore_linux_amd64) for Linux (or the appropriate os) adding execute permissions.
+4. Update the `Dockerfile` to install [cStore](https://github.com/turnerlabs/cstore/releases/download/v1.3.0-rc/cstore_linux_amd64) for Linux (or the appropriate os) adding execute permissions.
 ```docker
-RUN curl -L -o  /usr/local/bin/cstore https://github.com/turnerlabs/cstore/releases/download/v1.0.1-rc/cstore_linux_386 && chmod +x /usr/local/bin/cstore
+RUN curl -L -o  /usr/local/bin/cstore https://github.com/turnerlabs/cstore/releases/download/v1.3.0-rc/cstore_linux_386 && chmod +x /usr/local/bin/cstore
 ```
 5. Update the `docker-compose.yml` file to specify which environment config should be pulled by the `docker-entrypoint.sh` script.    
 ```docker

cmd/pull.go

@@ -37,8 +37,8 @@ var secrets bool
 // pullCmd represents the pull command
 var pullCmd = &cobra.Command{
 	Use:   "pull",
-	Short: "Restore file(s) on file system.",
-	Long:  `Restore file(s) on file system.`,
+	Short: "Retrieve file(s).",
+	Long:  `Retrieve file(s).`,
 	Run: func(cmd *cobra.Command, args []string) {
 
 		tags := getTags(tagList)
@@ -48,7 +48,7 @@ var pullCmd = &cobra.Command{
 			logger.L.Fatal(err)
 		}
 
-		logger.L.Printf("%d of %d file(s) restored on file system.\n", count, total)
+		logger.L.Printf("%d of %d file(s) retrieved.\n", count, total)
 	},
 }
 
@@ -61,7 +61,7 @@ func pull(catalogPath, cVault, eVault string, args []string, tags []string) (int
 		return 0, 0, err
 	}
 
-	files := clog.FilesBy(args, tags)
+	files := clog.FilesBy(args, tags, version)
 
 	restoredCount := 0
 	totalCount := 0
@@ -74,7 +74,7 @@ func pull(catalogPath, cVault, eVault string, args []string, tags []string) (int
 
 		cv, err := vault.GetBy(credsVaultName)
 		if err != nil {
-			logger.L.Printf("\nCould not restore %s!\n", fileInfo.Path)
+			logger.L.Printf("\nCould not retrieve %s!\n", buildPath(root, fileInfo.Path))
 			logger.L.Print(err)
 			continue
 		}
@@ -86,7 +86,7 @@ func pull(catalogPath, cVault, eVault string, args []string, tags []string) (int
 
 		ev, err := vault.GetBy(encryptVaultName)
 		if err != nil {
-			logger.L.Printf("\nCould not restore %s!\n", fileInfo.Path)
+			logger.L.Printf("\nCould not retrieve %s!\n", buildPath(root, fileInfo.Path))
 			logger.L.Print(err)
 			continue
 		}
@@ -118,8 +118,9 @@ func pull(catalogPath, cVault, eVault string, args []string, tags []string) (int
 		}
 
 		b, attr, err := st.Pull(contextKey, fileInfo)
+
 		if err != nil {
-			logger.L.Printf("\nCould not restore %s!\n", fileInfo.Path)
+			logger.L.Printf("\nCould not retrieve %s!\n", buildPath(root, fileInfo.Path))
 			logger.L.Print(err)
 			continue
 		}
@@ -131,7 +132,7 @@ func pull(catalogPath, cVault, eVault string, args []string, tags []string) (int
 			tokens, err = st.GetTokens(tokens, clog.Context)
 
 			if err != nil {
-				logger.L.Printf("\nFailed to get tokens for %s!\n", fileInfo.Path)
+				logger.L.Printf("\nFailed to get tokens for %s!\n", buildPath(root, fileInfo.Path))
 				logger.L.Print(err)
 				continue
 			}
@@ -168,6 +169,8 @@ func pull(catalogPath, cVault, eVault string, args []string, tags []string) (int
 				}
 			}
 
+			logger.L.Printf(" - %s (retrieved)\n", buildPath(root, fileInfo.Path))
+
 			restoredCount++
 		}
 	}

cmd/purge.go

@@ -40,7 +40,7 @@ If all files were removed successfully, the local catalog is deleted.`,
 
 		tags := getTags(tagList)
 
-		files := clog.FilesBy(args, tags)
+		files := clog.FilesBy(args, tags, version)
 
 		count := 0
 		purged := 0

cmd/push.go

@@ -64,7 +64,6 @@ var pushCmd = &cobra.Command{
 		if len(paths) == 0 {
 			if len(tags) > 0 {
 				paths = append(paths, clog.GetTaggedPaths(tags, true)...)
-				fmt.Println(paths)
 			} else {
 				paths = clog.GetFileNames()
 			}

components/catalog/get.go

@@ -46,7 +46,7 @@ func getContext() string {
 
 func create() Catalog {
 
-	val := prompt.GetValFromUser("Context", getContext(), "The folder or context for the configuration files.", false)
+	val := prompt.GetValFromUser("Context", getContext(), "A remote parent folder for stored files. Can be a project name for easy reference.", false)
 
 	return Catalog{
 		Version: v1,

components/catalog/model.go

@@ -117,16 +117,35 @@ func (c Catalog) GetTaggedPaths(tags []string, all bool) []string {
 }
 
 // FilesBy ...
-func (c Catalog) FilesBy(args, tags []string) map[string]File {
-	return getFiles(c.Files, args, tags)
+func (c Catalog) FilesBy(args, tags []string, version string) map[string]File {
+	return getFiles(c.Files, args, tags, version)
 }
 
-func getFiles(files map[string]File, paths []string, tags []string) map[string]File {
+func getFiles(files map[string]File, paths []string, tags []string, version string) map[string]File {
 
 	targets := FilterByPath(files, paths)
 
 	targets = FilterByTag(targets, tags, false)
 
+	targets = FilterByVersion(targets, version)
+
+	return targets
+}
+
+//FilterByVersion ...
+func FilterByVersion(files map[string]File, version string) map[string]File {
+	targets := map[string]File{}
+
+	if len(version) == 0 {
+		return files
+	}
+
+	for key, file := range files {
+		if file.VersionExists(version) {
+			targets[key] = file
+		}
+	}
+
 	return targets
 }