deranjer/gvc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

working on merging configs, adding branch/switch/pull commands

Browse Source
This commit is contained in:
deranjer
2020-06-10 22:45:15 -04:00
parent c4aa5a1c66
commit 2cbdf21a81
12 changed files with 269 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/.gvc/.gvcconfig.toml
View File

@@ -2,8 +2,8 @@ version = "0.1.5"
rootpath = ""
reponame = "gvc"
currentbranch = "master"
localbranches = ["master"]
remotebranches = ["master", "test", "test2"]
localbranches = ["master", "localbranch1", "localbranch2"]
remotebranches = ["master", "serveronlybranch", "anotherserverbranch"]
[[remote]]
name = "test2"
@@ -36,12 +36,16 @@ remotebranches = ["master", "test", "test2"]
default = false
[locked]
files = ["test1\\client8.exe", "client1.exe", "client.go"]
exts = [".png"]
files = ["client1.exe", "client2.exe", "client.go", "serverLocked.go"]
exts = [".exeServer", "serverCOMP2EXT"]
[ignore]
files = ["client1.exe", "client2.exe", "client3.exe", "client4.exe", "client5.exe", "client6.exe", "client7.exe", "test1\\client8.exe", "clientcmd\\init.go"]
files = ["client1.exe", "client2.exe", "client3.exe", "client4.exe", "client5.exe", "client6.exe", "client7.exe", "test1\\client8.exe", "clientcmd\\init.go", "localignoreonly.go"]
exts = [".exe", ".tl"]
folders = ["serverFolderIgnore", "serverFolderignore2"]
[nocompress]
files = ["localnocompress.go"]
exts = ["serverNoCompressEXT", "serverCOMP2EXT"]
folders = []

63
client/.gvc/.gvcconfig.toml.old
View File

@@ -1,25 +1,50 @@
rootPath = "client"
version = "0.1.5"
rootpath = ""
reponame = "gvc"
currentbranch = "master"
localbranches = ["master", "localbranch1", "localbranch2"]
remotebranches = ["master"]
[[remote]]
name = "test2"
host = "localhost"
port = 80
default = true
[[remote]]
name = "test4"
host = "localhost"
port = 9998
default = false
[[remote]]
name = "test3"
host = "localhost"
port = 9997
default = false
[[remote]]
name = "test5"
host = "localhost1"
port = 9997
default = false
[[remote]]
name = "test6"
host = "localhost1"
port = 9995
default = false
[locked]
files = ["client1.exe", "client2.exe", "client.go", "locallocked.go"]
[ignore]
files = [ "file1.txt", "file2.txt" ]
exts = [ ".jpg", ".png" ]
folders = []
files = ["client1.exe", "client2.exe", "client3.exe", "client4.exe", "client5.exe", "client6.exe", "client7.exe", "test1\\client8.exe", "clientcmd\\init.go", "localignoreonly.go"]
exts = [".exe", ".tl"]
folders = []
[nocompress]
files = [ "fileA.log", "fileB.txt" ]
exts = [ ".exe", ".jpg" ]
folders = ["binaries"]
[[remote]]
name = "origin"
host = "testorigin.com"
port = 8694
[[remote]]
name = "secondOrigin"
host = "170.5.95.195"
port = 4253
files = ["localnocompress.go"]
exts = []
folders = []

109
client/client.go
View File

@@ -67,6 +67,15 @@ func main() {
// Adding the "remote" commands
remoteCommands(cli, &conf)
// Adding the "branch" command
branchCommand(cli, &conf)
// Adding the "switch" command
switchCommand(cli, &conf)
// Adding the "pull" command
pullCommand(cli, &conf)
err = cli.Run()
if err != nil {
fmt.Printf("Error occurred: %v\n", err)
@@ -510,26 +519,26 @@ func lockCommands(cli *clir.Cli, conf *clientconfig.Gvcconfig) {
// removeLockCmd removes files/folders/wildcard from the ignore list
func removeLockCmd(ignoreCmd *clir.Command, conf *clientconfig.Gvcconfig) {
RemoveLockCmd := ignoreCmd.NewSubCommand("remove", "remove from ignores file(s)/folder(s) (recursively for folder) to repo")
RemoveLockCmd.LongDescription("You can remove from ignore all: all, a -file (-f): file.txt, or a -folder (-fd): folder, or a -wildcard (-wc): *.txt")
removeLockCmd := ignoreCmd.NewSubCommand("remove", "remove from ignores file(s)/folder(s) (recursively for folder) to repo")
removeLockCmd.LongDescription("You can remove from ignore all: all, a -file (-f): file.txt, or a -folder (-fd): folder, or a -wildcard (-wc): *.txt")
//File/Folder/Wildcard Ignoring
var file string
var folder string
var wildcard string
fileFlag := RemoveLockCmd.StringFlag("file", "removes ignored file from config", &file)
fileFlag := removeLockCmd.StringFlag("file", "removes ignored file from config", &file)
fileFlag.FlagShortCut("file", "f")
folderFlag := RemoveLockCmd.StringFlag("folder", "removes ignored folder", &folder)
folderFlag := removeLockCmd.StringFlag("folder", "removes ignored folder", &folder)
folderFlag.FlagShortCut("folder", "fd")
wildCardFlag := RemoveLockCmd.StringFlag("wildcard", "removes wildcard from ignores", &wildcard)
wildCardFlag := removeLockCmd.StringFlag("wildcard", "removes wildcard from ignores", &wildcard)
wildCardFlag.FlagShortCut("wildcard", "wc")
RemoveLockCmd.Action(func() error {
removeLockCmd.Action(func() error {
isRepo := validateRepo()
if !isRepo {
fmt.Println("no valid repo found.. please run 'init' to setup a repo first")
os.Exit(0)
}
if len(RemoveLockCmd.OtherArgs()) > 0 {
RemoveLockCmd.PrintHelp()
if len(removeLockCmd.OtherArgs()) > 0 {
removeLockCmd.PrintHelp()
return fmt.Errorf("incorrect input detected, please fix and retry")
}
if file != "" { // if the file flag was used it won't be empty
@@ -559,3 +568,87 @@ func removeLockCmd(ignoreCmd *clir.Command, conf *clientconfig.Gvcconfig) {
return nil
})
}
func branchCommand(cli *clir.Cli, conf *config.Gvcconfig) {
branchCommand := cli.NewSubCommand("branch", "creates a new branch off of the current branch")
var branchName string
nameFlag := branchCommand.StringFlag("name", "name of the branch to create", &branchName)
nameFlag.FlagShortCut("name", "n")
nameFlag.FlagRequired("name")
branchCommand.Action(func() error {
isRepo := validateRepo()
if !isRepo {
fmt.Println("no valid repo found.. please run 'init' to setup a repo first")
os.Exit(0)
}
err := clientcmd.CreateBranch(conf, branchName)
if err != nil {
return err
}
return nil
})
}
func switchCommand(cli *clir.Cli, conf *config.Gvcconfig) {
switchCommand := cli.NewSubCommand("switch", "switches (and can create if needed) a new branch to work on")
var createBranch bool
createFlag := switchCommand.BoolFlag("create", "creates the branch if it does not exist", &createBranch)
createFlag.FlagShortCut("create", "c")
switchCommand.Action(func() error {
isRepo := validateRepo()
if !isRepo {
fmt.Println("no valid repo found.. please run 'init' to setup a repo first")
os.Exit(0)
}
if createBranch {
if len(switchCommand.OtherArgs()) < 1 {
switchCommand.PrintHelp()
fmt.Println("branch name required..")
os.Exit(0)
}
branchName := switchCommand.OtherArgs()[0]
fmt.Println("attempting to create branch name: ", branchName)
err := clientcmd.CreateBranch(conf, branchName)
if err != nil {
return fmt.Errorf("error creating branch: %s", err)
}
return nil
}
if len(switchCommand.OtherArgs()) == 0 {
switchCommand.PrintHelp()
fmt.Println("branch name required..")
os.Exit(0)
}
branchName := switchCommand.OtherArgs()[0]
err := clientcmd.SwitchBranch(conf, branchName)
if err != nil {
return fmt.Errorf("unable to switch branch: %s", err)
}
return nil
})
}
func pullCommand(cli *clir.Cli, conf *config.Gvcconfig) {
pullCommand := cli.NewSubCommand("pull", "pulls the latest commit from the server (default if none specified) on your current branch")
var createBranch bool
createFlag := pullCommand.BoolFlag("create", "creates the branch if it does not exist", &createBranch)
createFlag.FlagShortCut("create", "c")
pullCommand.Action(func() error {
isRepo := validateRepo()
if !isRepo {
fmt.Println("no valid repo found.. please run 'init' to setup a repo first")
os.Exit(0)
}
if len(pullCommand.OtherArgs()) == 0 {
pullCommand.PrintHelp()
fmt.Println("branch name required..")
os.Exit(0)
}
branchName := pullCommand.OtherArgs()[0]
err := clientcmd.SwitchBranch(conf, branchName)
if err != nil {
return fmt.Errorf("unable to pull branch: %s", err)
}
return nil
})
}

25
client/clientcmd/branch.go Normal file
View File

@@ -0,0 +1,25 @@
package clientcmd
import (
"fmt"
clientconfig "github.com/deranjer/gvc/client/clientconfig"
)
// CreateBranch creates a new branch with the supplied name
func CreateBranch(conf *clientconfig.Gvcconfig, branchName string) error {
branches := conf.LocalBranches
for _, branch := range branches {
if branch == branchName {
return fmt.Errorf("Branch already exists, unable to create, use the switch command to switch to this branch: %s", branchName)
}
}
conf.LocalBranches = append(conf.LocalBranches, branchName) //add the branch to the config
// TODO Create the branch
//If success, switch to new branch
err := SwitchBranch(conf, branchName)
if err != nil {
return fmt.Errorf("error switching to new branch: %s", err)
}
return nil
}

30
client/clientcmd/refresh.go
View File

@@ -5,6 +5,7 @@ import (
clientconfig "github.com/deranjer/gvc/client/clientconfig"
"github.com/deranjer/gvc/common"
"github.com/deranjer/store"
"github.com/go-resty/resty/v2"
)
@@ -31,7 +32,34 @@ func RefreshContent(conf *clientconfig.Gvcconfig, repoName string) error { //TOD
}
return fmt.Errorf("response not a success: %d: connection URL: %s", resp.StatusCode(), resp.Request.URL)
}
fmt.Println(resp)
//fmt.Println(resp)
fmt.Printf("%+v\n", refreshResult)
fmt.Println("Merging server config with local config...")
// TODO: Save a backup of the config in case we need to roll back
// TODO: Before merging check to make sure the slices aren't already the same
conf.Locked = refreshResult.Locked // Overwriting locks on client since server is authoritative on locks
fmt.Println("Replaced client locked with server locked...")
// Now merging the structs where the user might have customized for their environment
conf.NoCompress.Exts = append(conf.NoCompress.Exts, refreshResult.NoCompress.Exts...)
conf.NoCompress.Files = append(conf.NoCompress.Files, refreshResult.NoCompress.Files...)
conf.NoCompress.Folders = append(conf.NoCompress.Folders, refreshResult.NoCompress.Folders...)
conf.Ignores.Exts = append(conf.Ignores.Exts, refreshResult.Ignores.Exts...)
conf.Ignores.Files = append(conf.Ignores.Files, refreshResult.Ignores.Files...)
conf.Ignores.Folders = append(conf.Ignores.Folders, refreshResult.Ignores.Folders...)
// And then purging the duplicates using a map in case there are very large slices
conf.NoCompress.Exts = common.RemoveDuplicatesFromSlice(conf.NoCompress.Exts)
conf.NoCompress.Files = common.RemoveDuplicatesFromSlice(conf.NoCompress.Files)
conf.NoCompress.Folders = common.RemoveDuplicatesFromSlice(conf.NoCompress.Folders)
conf.Ignores.Exts = common.RemoveDuplicatesFromSlice(conf.Ignores.Exts)
conf.Ignores.Files = common.RemoveDuplicatesFromSlice(conf.Ignores.Files)
conf.Ignores.Folders = common.RemoveDuplicatesFromSlice(conf.Ignores.Folders)
fmt.Println("Joined and purged duplicates for Ignore and NoCompress...")
conf.RemoteBranches = refreshResult.Branches
fmt.Println("updated remote branches...")
// TODO Update Commits
err = store.Save(ConfigPath, &conf)
if err != nil {
return fmt.Errorf("unable to save refreshed config to file: %s", err)
}
return nil
}

21
client/clientcmd/switch.go Normal file
View File

@@ -0,0 +1,21 @@
package clientcmd
import (
"fmt"
clientconfig "github.com/deranjer/gvc/client/clientconfig"
)
// SwitchBranch switches to a different branch
func SwitchBranch(conf *clientconfig.Gvcconfig, branchName string) error {
fmt.Println("Attempting to switch to branch: ", branchName)
branches := conf.LocalBranches
for _, branch := range branches {
if branch == branchName {
fmt.Println("Found Branch: ", branch)
// TODO: do the actual branch switch
return nil
}
}
return fmt.Errorf("unable to locate requested branch: %s", branchName)
}

15
client/test/test.go
View File

@@ -2,7 +2,6 @@ package main
import (
"fmt"
"reflect"
"github.com/imdario/mergo"
)
@@ -21,20 +20,8 @@ func main() {
Ignore: []string{"one", "two", "four", "seven"},
}
mergo.Merge(&dest, src, mergo.WithTransformers(StringSliceTransformer{}))
mergo.Merge(&dest, src)
fmt.Println(dest)
// Will print
// {two 2}
}
type StringSliceTransformer struct {
}
// MergeStrings merges two strings
func (s StringSliceTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
if typ == reflect.TypeOf([]string{}) {
return func(dst, src reflect.Value) error {
}
}
}