Merge pull request #7 from turnerlabs/importlibrary

Fix issue where Go cStore library is not importable.

README.md

@@ -51,7 +51,7 @@ When the repository has been cloned or the project shared, running `$ cstore pul
 
 Example: `cstore.yml`
 ```yml
-version: v3
+version: v4
 context: project
 files:
 - path: service/dev/.env
@@ -274,7 +274,7 @@ $ cstore pull -t dev -g task-def-secrets --store-command refs # AWS Task Definit
 * [S3 Bucket Store Terraform](docs/S3.md)
 * [Ghost Files (.cstore)](docs/GHOST.md)
 * [Terraform State Files](docs/TERRAFORM.md)
-* [Migrate from v1 to v3](docs/MIGRATE.md) (breaking changes)
+* [Migrate from v1 to v3+](docs/MIGRATE.md) (breaking changes)
 </details>
 
 <details>

cli/cmd/clean.go

@@ -5,11 +5,11 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/display"
-	"github.com/turnerlabs/cstore/components/path"
-	"github.com/turnerlabs/cstore/components/remote"
-	"github.com/turnerlabs/cstore/components/store"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/display"
+	"github.com/turnerlabs/cstore/v4/components/path"
+	"github.com/turnerlabs/cstore/v4/components/remote"
+	"github.com/turnerlabs/cstore/v4/components/store"
 )
 
 var cleanCmd = &cobra.Command{

cli/cmd/helpers.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 
 	"github.com/subosito/gotenv"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
 )
 
 //"\xE2\x9C\x94" This is a checkmark on mac, but question mark on windows; so,

cli/cmd/init.go

@@ -3,12 +3,12 @@ package cmd
 import (
 	"os"
 
-	"github.com/turnerlabs/cstore/components/remote"
+	"github.com/turnerlabs/cstore/v4/components/remote"
 
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/display"
-	localFile "github.com/turnerlabs/cstore/components/file"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/display"
+	localFile "github.com/turnerlabs/cstore/v4/components/file"
 )
 
 var initCmd = &cobra.Command{

cli/cmd/list.go

@@ -5,11 +5,11 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/display"
-	"github.com/turnerlabs/cstore/components/models"
-	"github.com/turnerlabs/cstore/components/path"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/display"
+	"github.com/turnerlabs/cstore/v4/components/models"
+	"github.com/turnerlabs/cstore/v4/components/path"
 )
 
 // listCmd represents the list command

cli/cmd/pull.go

@@ -6,21 +6,21 @@ import (
 	"os"
 	"time"
 
-	"github.com/turnerlabs/cstore/components/convert"
+	"github.com/turnerlabs/cstore/v4/components/convert"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/display"
-	"github.com/turnerlabs/cstore/components/env"
-	localFile "github.com/turnerlabs/cstore/components/file"
-	"github.com/turnerlabs/cstore/components/logger"
-	"github.com/turnerlabs/cstore/components/models"
-	"github.com/turnerlabs/cstore/components/path"
-	"github.com/turnerlabs/cstore/components/remote"
-	"github.com/turnerlabs/cstore/components/token"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/display"
+	"github.com/turnerlabs/cstore/v4/components/env"
+	localFile "github.com/turnerlabs/cstore/v4/components/file"
+	"github.com/turnerlabs/cstore/v4/components/logger"
+	"github.com/turnerlabs/cstore/v4/components/models"
+	"github.com/turnerlabs/cstore/v4/components/path"
+	"github.com/turnerlabs/cstore/v4/components/remote"
+	"github.com/turnerlabs/cstore/v4/components/token"
 )
 
 // pullCmd represents the pull command

cli/cmd/purge.go

@@ -7,14 +7,14 @@ import (
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/display"
-	"github.com/turnerlabs/cstore/components/logger"
-	"github.com/turnerlabs/cstore/components/models"
-	"github.com/turnerlabs/cstore/components/path"
-	"github.com/turnerlabs/cstore/components/prompt"
-	"github.com/turnerlabs/cstore/components/remote"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/display"
+	"github.com/turnerlabs/cstore/v4/components/logger"
+	"github.com/turnerlabs/cstore/v4/components/models"
+	"github.com/turnerlabs/cstore/v4/components/path"
+	"github.com/turnerlabs/cstore/v4/components/prompt"
+	"github.com/turnerlabs/cstore/v4/components/remote"
 )
 
 // purgeCmd represents the purge command

cli/cmd/push.go

@@ -9,17 +9,17 @@ import (
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/display"
-	localFile "github.com/turnerlabs/cstore/components/file"
-	"github.com/turnerlabs/cstore/components/logger"
-	"github.com/turnerlabs/cstore/components/models"
-	"github.com/turnerlabs/cstore/components/path"
-	"github.com/turnerlabs/cstore/components/prompt"
-	"github.com/turnerlabs/cstore/components/remote"
-	"github.com/turnerlabs/cstore/components/store"
-	"github.com/turnerlabs/cstore/components/token"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/display"
+	localFile "github.com/turnerlabs/cstore/v4/components/file"
+	"github.com/turnerlabs/cstore/v4/components/logger"
+	"github.com/turnerlabs/cstore/v4/components/models"
+	"github.com/turnerlabs/cstore/v4/components/path"
+	"github.com/turnerlabs/cstore/v4/components/prompt"
+	"github.com/turnerlabs/cstore/v4/components/remote"
+	"github.com/turnerlabs/cstore/v4/components/store"
+	"github.com/turnerlabs/cstore/v4/components/token"
 )
 
 var pushCmd = &cobra.Command{

cli/cmd/root.go

@@ -8,9 +8,9 @@ import (
 	"github.com/mattn/go-colorable"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/models"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/models"
 )
 
 const (

cli/cmd/stores.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/components/store"
+	"github.com/turnerlabs/cstore/v4/components/store"
 )
 
 // storesCmd represents the stores command

cli/cmd/tests/s3/pull_s3_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/turnerlabs/cstore/cli/cmd"
-	"github.com/turnerlabs/cstore/components/cfg"
+	"github.com/turnerlabs/cstore/v4/cli/cmd"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
 )
 
 //--------------------------------------------------

cli/cmd/tests/s3/push_s3_test.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/turnerlabs/cstore/cli/cmd"
-	"github.com/turnerlabs/cstore/components/cfg"
+	"github.com/turnerlabs/cstore/v4/cli/cmd"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
 )
 
 //---------------------------------------------------

cli/cmd/tests/s3/setup_test.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/turnerlabs/cstore/cli/cmd"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/models"
+	"github.com/turnerlabs/cstore/v4/cli/cmd"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/models"
 )
 
 const (

cli/cmd/vaults.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/components/vault"
+	"github.com/turnerlabs/cstore/v4/components/vault"
 )
 
 // vaultsCmd represents the vaults command

cli/cmd/version.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
 )
 
 // versionCmd represents the version command

v4/cli/cmd/version.go → cli/cmd/version.go-e

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/components/cfg"
 )
 
 // versionCmd represents the version command

cli/main.go

@@ -1,17 +1,19 @@
-package main // github.com/turnerlabs/cstore
+package main // github.com/turnerlabs/cstore/v4
 
 import (
 	"fmt"
 	"os"
 
-	"github.com/turnerlabs/cstore/cli/cmd"
-	"github.com/turnerlabs/cstore/components/cfg"
+	"github.com/turnerlabs/cstore/v4/cli/cmd"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
 )
 
-var version = "v3.0.0-rc"
+var version = ""
 
 func main() {
-	cfg.Version = version
+	if len(version) > 0 {
+		cfg.Version = version
+	}
 
 	if err := cmd.RootCmd.Execute(); err != nil {
 		fmt.Println(err)

components/catalog/create.go

@@ -1,9 +1,9 @@
 package catalog
 
 import (
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/models"
-	"github.com/turnerlabs/cstore/components/prompt"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/models"
+	"github.com/turnerlabs/cstore/v4/components/prompt"
 )
 
 func create(io models.IO) Catalog {

components/catalog/detect.go

@@ -3,7 +3,7 @@ package catalog
 import (
 	"errors"
 
-	"github.com/turnerlabs/cstore/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
 	yaml "gopkg.in/yaml.v2"
 )
 

components/catalog/file.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/turnerlabs/cstore/components/local"
-	"github.com/turnerlabs/cstore/components/logger"
+	"github.com/turnerlabs/cstore/v4/components/local"
+	"github.com/turnerlabs/cstore/v4/components/logger"
 	yaml "gopkg.in/yaml.v2"
 )
 

components/catalog/get.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	uuid "github.com/satori/go.uuid"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/models"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/models"
 	yaml "gopkg.in/yaml.v2"
 )
 

components/catalog/ghost.go

@@ -23,7 +23,7 @@ func WriteGhost(path string, g Ghost) error {
 	comment := `# Ghost replacement files are created in the directories of remotely stored files. 
 # These files make it possible to run cStore commands from the local directory of remotely 
 # stored files without being in the same directory as the catalog file. To learn more, 
-# visit https://github.com/turnerlabs/cstore/blob/master/docs/GHOST.md.
+# visit https://github.com/turnerlabs/cstore/v4/blob/master/docs/GHOST.md.
 `
 	d = append([]byte(comment), d...)
 

components/catalog/model.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/turnerlabs/cstore/components/path"
+	"github.com/turnerlabs/cstore/v4/components/path"
 )
 
 // DefaultFileName ...

components/catalog/update.go

@@ -18,7 +18,7 @@ func Write(path string, catalog Catalog) error {
 		return err
 	}
 
-	// Do not upgrade the catalog unless, the catalog version has been changed to v3. This
+	// Do not upgrade the catalog unless, the catalog version has been changed to v3+. This
 	// will support backwards compatibility for all existing catalogs.
 	if catalog.Version == "v2" {
 		d, err = yaml.Marshal(&catalog)
@@ -30,8 +30,8 @@ func Write(path string, catalog Catalog) error {
 	comment := `# This catalog lists files stored remotely based on the files current location.
 # To restore the files, run '$ cstore pull' in the same directory as this catalog file.
 # If this file is deleted without running a purge command, stored data may be orphaned 
-# without a way to recover. To get set up, visit https://github.com/turnerlabs/cstore.
-# To understand the catalog, visit https://github.com/turnerlabs/cstore/blob/master/docs/CATALOG.md
+# without a way to recover. To get set up, visit https://github.com/turnerlabs/cstore/v4.
+# To understand the catalog, visit https://github.com/turnerlabs/cstore/v4/blob/master/docs/CATALOG.md
 `
 	d = append([]byte(comment), d...)
 

components/cfg/version.go

@@ -2,7 +2,7 @@ package cfg
 
 // Version is overridden by the main function unless tests
 // which require a default are running.
-var Version = "v3.0.0-default"
+var Version = "v4.0.0-default"
 
 // SupportedVersions ...
-var SupportedVersions = []string{"v2", Version}
+var SupportedVersions = []string{"v2", "v3", Version}

components/contract/store.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/models"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/models"
 )
 
 // IStore is a persistence abstraction facilitating the

components/contract/vault.go

@@ -3,9 +3,9 @@ package contract
 import (
 	"errors"
 
-	"github.com/turnerlabs/cstore/components/catalog"
-	"github.com/turnerlabs/cstore/components/cfg"
-	"github.com/turnerlabs/cstore/components/models"
+	"github.com/turnerlabs/cstore/v4/components/catalog"
+	"github.com/turnerlabs/cstore/v4/components/cfg"
+	"github.com/turnerlabs/cstore/v4/components/models"
 )
 
 // IVault ...