Skip to content

Commit

Permalink
Merge d0219b5 into 9b83970
Browse files Browse the repository at this point in the history
  • Loading branch information
@tamada
tamada committed Mar 24, 2019
2 parents 9b83970 + d0219b5 commit 8a6225d
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 55 deletions.
16 changes: 8 additions & 8 deletions clone/clone_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ func TestCloneCommand_MultipleProjects(t *testing.T) {
if len(db.Repositories) != 4 {
t.Fatal("helloworld and fibonacci were not registered.")
}
var hwRepo = db.Repositories[1]
if message := validate(hwRepo, "helloworld", "../testdata/hoge/helloworld"); message != "" {
var hwRepo = db.FindRepository("helloworld")
if message := validate(*hwRepo, "helloworld", "../testdata/hoge/helloworld"); message != "" {
t.Error(message)
}
var fiboRepo = db.Repositories[0]
if message := validate(fiboRepo, "fibonacci", "../testdata/hoge/fibonacci"); message != "" {
var fiboRepo = db.FindRepository("fibonacci")
if message := validate(*fiboRepo, "fibonacci", "../testdata/hoge/fibonacci"); message != "" {
t.Error(message)
}
if !db.HasGroup("not-exist-group") || len(db.Groups) != 3 {
Expand All @@ -92,8 +92,8 @@ func TestCloneCommand_Run(t *testing.T) {
if len(db.Repositories) != 3 {
t.Fatal("helloworld was not registered.")
}
var repo = db.Repositories[0]
if message := validate(repo, "helloworld", "./helloworld"); message != "" {
var repo = db.FindRepository("helloworld")
if message := validate(*repo, "helloworld", "./helloworld"); message != "" {
t.Error(message)
}
if db.ContainsCount("no-group") != 1 || !db.HasRelation("no-group", "helloworld") {
Expand All @@ -115,8 +115,8 @@ func TestCloneCommand_SpecifyingId(t *testing.T) {
if len(db.Repositories) != 3 {
t.Fatal("newid was not registered.")
}
var repo = db.Repositories[0]
if message := validate(repo, "newid", "../testdata/newid"); message != "" {
var repo = db.FindRepository("newid")
if message := validate(*repo, "newid", "../testdata/newid"); message != "" {
t.Error(message)
}
})
Expand Down
12 changes: 12 additions & 0 deletions common/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const (
RrhAutoDeleteGroup = "RRH_AUTO_DELETE_GROUP"
RrhAutoCreateGroup = "RRH_AUTO_CREATE_GROUP"
RrhTimeFormat = "RRH_TIME_FORMAT"
RrhSortOnUpdating = "RRH_SORT_ON_UPDATING"
)

const (
Expand All @@ -45,6 +46,7 @@ type Config struct {
DefaultGroupName string `json:"rrh_default_group_name"`
TimeFormat string `json:"rrh_time_format"`
OnError string `json:"rrh_on_error"`
SortOnUpdating string `json:"rrh_sort_on_updating"`
}

func trueOrFalse(value string) (string, error) {
Expand Down Expand Up @@ -78,6 +80,12 @@ func (config *Config) Update(label string, value string) error {
config.AutoCreateGroup = flag
}
return err
case RrhSortOnUpdating:
var flag, err = trueOrFalse(value)
if err == nil {
config.SortOnUpdating = flag
}
return err
case RrhHome:
config.Home = value
return nil
Expand Down Expand Up @@ -118,6 +126,8 @@ func (config *Config) GetString(label string) (value string, readFrom string) {
return config.getStringFromEnv(RrhAutoDeleteGroup, config.AutoDeleteGroup)
case RrhAutoCreateGroup:
return config.getStringFromEnv(RrhAutoCreateGroup, config.AutoCreateGroup)
case RrhSortOnUpdating:
return config.getStringFromEnv(RrhSortOnUpdating, config.SortOnUpdating)
case RrhHome:
return config.getStringFromEnv(RrhHome, config.Home)
case RrhConfigPath:
Expand Down Expand Up @@ -164,6 +174,8 @@ func (config *Config) findDefaultValue(label string) (value string, readFrom str
return "false", Default
case RrhAutoCreateGroup:
return "false", Default
case RrhSortOnUpdating:
return "false", Default
default:
return "", NotFound
}
Expand Down
1 change: 1 addition & 0 deletions common/config_cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ func (clc *configListCommand) Run(args []string) int {
fmt.Println(config.formatVariableAndValue(RrhTimeFormat))
fmt.Println(config.formatVariableAndValue(RrhAutoCreateGroup))
fmt.Println(config.formatVariableAndValue(RrhAutoDeleteGroup))
fmt.Println(config.formatVariableAndValue(RrhSortOnUpdating))
return 0
}

Expand Down
7 changes: 7 additions & 0 deletions common/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ func ExampleConfigCommand_Run() {
// RRH_TIME_FORMAT: relative (default)
// RRH_AUTO_CREATE_GROUP: true (config_file)
// RRH_AUTO_DELETE_GROUP: false (config_file)
// RRH_SORT_ON_UPDATING: true (config_file)
}
func Example_configListCommand_Run() {
os.Setenv(RrhConfigPath, "../testdata/config.json")
Expand All @@ -107,6 +108,7 @@ func Example_configListCommand_Run() {
// RRH_TIME_FORMAT: relative (default)
// RRH_AUTO_CREATE_GROUP: true (config_file)
// RRH_AUTO_DELETE_GROUP: false (config_file)
// RRH_SORT_ON_UPDATING: true (config_file)
}

func TestOpenConfigBrokenJson(t *testing.T) {
Expand All @@ -127,6 +129,7 @@ func TestLoadConfigFile(t *testing.T) {
}{
{RrhAutoDeleteGroup, "false", ConfigFile},
{RrhAutoCreateGroup, "true", ConfigFile},
{RrhSortOnUpdating, "true", ConfigFile},
{RrhConfigPath, "../testdata/config.json", Env},
{RrhTimeFormat, Relative, Default},
{RrhOnError, Warn, Default},
Expand Down Expand Up @@ -154,9 +157,12 @@ func TestUpdateTrueFalseValue(t *testing.T) {
}{
{RrhAutoDeleteGroup, "True", false, "true"},
{RrhAutoDeleteGroup, "FALSE", false, "false"},
{RrhAutoDeleteGroup, "FALSE", false, "false"},
{RrhAutoDeleteGroup, "YES", true, ""},
{RrhAutoCreateGroup, "FALSE", false, "false"},
{RrhAutoCreateGroup, "YES", true, ""},
{RrhSortOnUpdating, "FALSE", false, "false"},
{RrhSortOnUpdating, "YES", true, ""},
}

for _, data := range testdata {
Expand Down Expand Up @@ -235,6 +241,7 @@ func TestOpenConfig(t *testing.T) {
{RrhOnError, Warn},
{RrhAutoCreateGroup, "false"},
{RrhAutoDeleteGroup, "false"},
{RrhSortOnUpdating, "false"},
{RrhTimeFormat, Relative},
{"unknown", ""},
}
Expand Down
41 changes: 25 additions & 16 deletions common/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,24 @@ func (db *Database) FindGroup(groupID string) *Group {
return nil
}

func sortIfNeeded(db *Database) {
if db.Config.GetValue(RrhSortOnUpdating) != "true" {
return
}
sort.Slice(db.Repositories, func(i, j int) bool {
return db.Repositories[i].ID < db.Repositories[j].ID
})
sort.Slice(db.Groups, func(i, j int) bool {
return db.Groups[i].Name < db.Groups[j].Name
})
sort.Slice(db.Relations, func(i, j int) bool {
if db.Relations[i].GroupName == db.Relations[j].GroupName {
return db.Relations[i].RepositoryID < db.Relations[j].RepositoryID
}
return db.Relations[i].GroupName < db.Relations[j].GroupName
})
}

/*
CreateRepository returns the repository by creating the given parameters and store it to database.
*/
Expand All @@ -146,9 +164,7 @@ func (db *Database) CreateRepository(repoID string, path string, remotes []Remot
}
var repo = Repository{repoID, path, remotes}
db.Repositories = append(db.Repositories, repo)
sort.Slice(db.Repositories, func(i, j int) bool {
return db.Repositories[i].ID < db.Repositories[j].ID
})
sortIfNeeded(db)

return &repo, nil
}
Expand All @@ -162,10 +178,7 @@ func (db *Database) CreateGroup(groupID string, description string) (*Group, err
}
var group = Group{groupID, description}
db.Groups = append(db.Groups, group)

sort.Slice(db.Groups, func(i, j int) bool {
return db.Groups[i].Name < db.Groups[j].Name
})
sortIfNeeded(db)

return &group, nil
}
Expand All @@ -184,9 +197,7 @@ func (db *Database) UpdateGroup(groupID string, newGroupID string, newDescriptio
db.Groups[i].Description = newDescription
}
}
sort.Slice(db.Groups, func(i, j int) bool {
return db.Groups[i].Name < db.Groups[j].Name
})
sortIfNeeded(db)

return true
}
Expand All @@ -201,9 +212,7 @@ func (db *Database) Relate(groupID string, repoID string) error {
return nil
}
db.Relations = append(db.Relations, Relation{repoID, groupID})
sort.Slice(db.Relations, func(i, j int) bool {
return db.Relations[i].GroupName < db.Relations[j].GroupName
})
sortIfNeeded(db)

return nil
}
Expand Down Expand Up @@ -329,7 +338,7 @@ func (db *Database) DeleteRepository(repoID string) error {
return nil
}

func (db *Database) deleteGroup(groupID string) error {
func deleteGroup(db *Database, groupID string) error {
var groups = []Group{}
for _, group := range db.Groups {
if group.Name != groupID {
Expand All @@ -353,7 +362,7 @@ func (db *Database) DeleteGroup(groupID string) error {
if groups[groupID] != 0 {
return fmt.Errorf("%s: group has %d relatins", groupID, groups[groupID])
}
return db.deleteGroup(groupID)
return deleteGroup(db, groupID)
}

/*
Expand All @@ -365,7 +374,7 @@ func (db *Database) ForceDeleteGroup(groupID string) error {
return fmt.Errorf("%s: group not found", groupID)
}
db.UnrelateFromGroup(groupID)
return db.deleteGroup(groupID)
return deleteGroup(db, groupID)
}

func databasePath(config *Config) string {
Expand Down
17 changes: 15 additions & 2 deletions common/database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

func openDatabase() *Database {
os.Setenv(RrhDatabasePath, "../testdata/database.json")
os.Setenv(RrhConfigPath, "../testdata/config.json")
var config = OpenConfig()
var db, _ = Open(config)
return db
Expand Down Expand Up @@ -45,6 +46,9 @@ func TestOpenNullDatabase(t *testing.T) {
if len(db.Groups) != 0 {
t.Error("null db have no group entries")
}
if len(db.Relations) != 0 {
t.Error("null db have no group entries")
}
}

func TestStore(t *testing.T) {
Expand Down Expand Up @@ -72,7 +76,10 @@ func TestStore(t *testing.T) {
if !db2.HasRepository("repo2") {
t.Error("repo2 not found!")
}
os.Remove("./testdata/tmp.json")
if !db2.HasRelation("group1", "repo1") {
t.Error("group1 does not relate with repo1")
}

}

func TestPrune(t *testing.T) {
Expand All @@ -90,6 +97,9 @@ func TestPrune(t *testing.T) {
if db.HasRepository("repo2") {
t.Error("repo2 was not pruned")
}
if !db.HasRelation("group1", "repo1") {
t.Error("relation is removed?")
}
}

func TestDeleteGroup(t *testing.T) {
Expand Down Expand Up @@ -131,7 +141,6 @@ func TestDeleteRepository(t *testing.T) {
}

func TestUnrelate(t *testing.T) {
t.Skip("db.Unrelate never failed.")
var db = openDatabase()

db.CreateRepository("somerepo", "unknown", []Remote{})
Expand All @@ -141,6 +150,10 @@ func TestUnrelate(t *testing.T) {

db.Unrelate("group2", "Rrh")
db.Unrelate("no-group", "rrh")

if !db.HasRelation("group2", "somerepo") {
t.Error("group2 does not relate with somerepo")
}
}

func TestCreateRepository(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion remove/remove_cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (rm *RemoveCommand) Run(args []string) int {
}
}
if result == 0 {
if config.GetValue(common.RrhAutoDeleteGroup) == "yes" {
if config.GetValue(common.RrhAutoDeleteGroup) == "true" {
db.Prune()
}
db.StoreAndClose()
Expand Down
6 changes: 3 additions & 3 deletions remove/remove_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ func TestRemoveRepository(t *testing.T) {
if err := rm.executeRemoveRepository(db, "unknown-repo"); err == nil {
t.Error("unknown-repo: found")
}
var _ = rm.executeRemoveRepository(db, "repo1")
if len(db.Repositories) != 1 {
t.Error("repo1 did not remove?")
var err = rm.executeRemoveRepository(db, "repo1")
if err != nil || len(db.Repositories) != 1 {
t.Errorf("repo1 did not remove?: %s", err.Error())
}
if len(db.Groups) != 2 {
t.Error("the number of groups changed")
Expand Down

0 comments on commit 8a6225d

Please sign in to comment.