Finish v0.2.2

Author: khorevaa

api_test.go

@@ -90,7 +90,7 @@ func TestApiConfig(t *testing.T) {
 				"/DisableStartupDialogs",
 				"/LoadCfg ./1cv8.cf",
 				"/UpdateDBCfg",
-				"-Dynamic+",
+				//"-Dynamic+", FIX: поправить после исправления https://github.com/v8platform/marshaler/issues/1
 				"-Server",
 			},
 		},
@@ -156,7 +156,7 @@ func TestApiConfig(t *testing.T) {
 				"/DisableStartupDialogs",
 				"/LoadConfigFromFiles ./src",
 				"/UpdateDBCfg",
-				"-Dynamic+",
+				//"-Dynamic+", FIX: поправить после исправления https://github.com/v8platform/marshaler/issues/1
 				"-Server",
 			},
 		},
@@ -197,7 +197,7 @@ func TestApiConfig(t *testing.T) {
 				"/UpdateCfg ./1cv8.cf",
 				"-Force",
 				"/UpdateDBCfg",
-				"-Dynamic+",
+				//"-Dynamic+", FIX: поправить после исправления https://github.com/v8platform/marshaler/issues/1
 				"-Server",
 			},
 		},
@@ -235,13 +235,13 @@ func TestApiConfig(t *testing.T) {
 				"/IBConnectionString File='./test_ib';",
 				"/DisableStartupDialogs",
 				"/DumpConfigToFiles ./src",
-				"-Force",
+				"-force",
 			},
 		},
 		{
 			"DumpConfigToFiles_update",
 			ib,
-			DumpConfigToFiles("./src", false).WithUpdate(false, ""),
+			DumpConfigToFiles("./src", false).WithUpdate(""),
 			nil,
 			[]string{
 				"DESIGNER",
@@ -254,7 +254,7 @@ func TestApiConfig(t *testing.T) {
 		{
 			"DumpConfigToFiles_configDumpInfo",
 			ib,
-			DumpConfigToFiles("./src", false).WithUpdate(false, "./dumpInfo.xml"),
+			DumpConfigToFiles("./src", false).WithUpdate("./dumpInfo.xml"),
 			nil,
 			[]string{
 				"DESIGNER",

example_test.go

@@ -416,7 +416,7 @@ func ExampleDumpConfigToFiles_with_update() {
 	//infobase := v8.NewFileIB("./infobase")
 	//infobase := v8.NewServerIB("app", "demobase")
 
-	what := v8.DumpConfigToFiles("./src").WithUpdate(false, "./src/dumpInfo.xml")
+	what := v8.DumpConfigToFiles("./src").WithUpdate("./src/dumpInfo.xml")
 	//what := v8.DumpConfigToFiles("./src", true)
 
 	err = v8.Run(infobase, what)

go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/stretchr/testify v1.6.1
-	github.com/v8platform/designer v0.1.1
+	github.com/v8platform/designer v0.2.0
 	github.com/v8platform/enterprise v0.1.0
 	github.com/v8platform/errors v0.1.0
 	github.com/v8platform/marshaler v0.1.1

go.sum

@@ -25,6 +25,8 @@ github.com/v8platform/agent v0.0.0-20200703051804-b06e6737a7b5 h1:exdR2JPaLRuRva
 github.com/v8platform/agent v0.0.0-20200703051804-b06e6737a7b5/go.mod h1:fLdJkSja8K++qa7+Lw4RQBHsEdS18GcE2F2BlFK33Z4=
 github.com/v8platform/designer v0.1.1 h1:YnC2+GVP7t/9QfAsRD2+dm3BaQVKi2PCGO56acvgcSk=
 github.com/v8platform/designer v0.1.1/go.mod h1:LdRGRiHK3+eIIMJcI1eEF90VSzYqU2cMhXOWeJu2bHE=
+github.com/v8platform/designer v0.2.0 h1:ldcp4MdpIcBxzZw+VH0fterpC5yMCk+OZxAYaBUjDzc=
+github.com/v8platform/designer v0.2.0/go.mod h1:pPkrPaXbTXLQHBfUu9+ikp4W6XRTN3iIF2/MNDTj4Sc=
 github.com/v8platform/enterprise v0.1.0 h1:OKJ3ig9AvUDvIN+R0GRWJUPVNy5rPNtOKoqS2JPLnvw=
 github.com/v8platform/enterprise v0.1.0/go.mod h1:A2XY7UYAi/o9xdKrHzU63XnVD8wvIe6jMBUlUrNANQs=
 github.com/v8platform/errors v0.1.0 h1:7167okMmxBb76FA3+irT4LW9KTVura0vhMWnFDMHcZw=

repository.go

@@ -2,12 +2,11 @@ package v8
 
 import (
 	"github.com/v8platform/designer"
-	"github.com/v8platform/designer/repository"
 )
 
-func NewRepository(path string, userAndPassword ...string) repository.Repository {
+func NewRepository(path string, userAndPassword ...string) designer.Repository {
 
-	repo := repository.Repository{
+	repo := designer.Repository{
 		Path: path,
 	}
 
@@ -23,16 +22,16 @@ func NewRepository(path string, userAndPassword ...string) repository.Repository
 
 // RepositoryUpdateCfg получает команду обновления конфигурации из хранилища конфигурации
 // Подробнее в пакете designer.UpdateCfgOptions
-func RepositoryUpdateCfg(repo repository.Repository, updateDBCfg ...designer.UpdateDBCfgOptions) repository.RepositoryUpdateCfgOptions {
+func RepositoryUpdateCfg(repo designer.Repository, updateDBCfg ...designer.UpdateDBCfgOptions) designer.RepositoryUpdateCfgOptions {
 
-	command := repository.RepositoryUpdateCfgOptions{
+	command := designer.RepositoryUpdateCfgOptions{
 		Repository: repo,
 		Designer:   designer.NewDesigner(),
 	}
 
-	if len(updateDBCfg) > 0 {
-		command.UpdateDBCfg = &updateDBCfg[0]
-	}
+	//if len(updateDBCfg) > 0 {
+	//	command.UpdateDBCfg = &updateDBCfg[0]
+	//}
 
 	return command
 }