Skip to content

Commit 5c18251

Browse files
EyalDelareaEyalDelarea
authored
Update dependencies (#1402)
1 parent 7d96134 commit 5c18251

File tree

6 files changed

+40
-17
lines changed

6 files changed

+40
-17
lines changed

‎common/commands/configfile.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package commands
22

33
import (
44
"fmt"
5-
"github.com/jfrog/jfrog-client-go/artifactory/services"
65
"os"
76
"path/filepath"
87
"strconv"
98
"strings"
109

10+
"github.com/jfrog/jfrog-client-go/artifactory/services"
11+
1112
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
1213
"github.com/jfrog/jfrog-cli-core/v2/common/project"
1314
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
@@ -155,6 +156,8 @@ func handleInteractiveConfigCreation(configFile *ConfigFile, confType project.Pr
155156
return
156157
}
157158
switch confType {
159+
case project.Ruby:
160+
return configFile.setDeployerResolver()
158161
case project.Go:
159162
return configFile.setDeployerResolver()
160163
case project.Pip, project.Pipenv:

‎common/commands/configfile_test.go‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package commands
22

33
import (
44
"flag"
5-
testsutils "github.com/jfrog/jfrog-client-go/utils/tests"
65
"os"
76
"path/filepath"
87
"strings"
98
"testing"
109

10+
testsutils "github.com/jfrog/jfrog-client-go/utils/tests"
11+
1112
"github.com/jfrog/jfrog-cli-core/v2/common/project"
1213
"github.com/jfrog/jfrog-cli-core/v2/common/tests"
1314
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
@@ -158,6 +159,24 @@ func TestNpmConfigFile(t *testing.T) {
158159
assert.Equal(t, "repo-local", config.GetString("deployer.repo"))
159160
}
160161

162+
func TestRubyConfigFile(t *testing.T) {
163+
// Set JFROG_CLI_HOME_DIR environment variable
164+
tempDirPath := createTempEnv(t)
165+
defer testsutils.RemoveAllAndAssert(t, tempDirPath)
166+
167+
// Create build config
168+
context := createContext(t, resolutionServerId+"=relServer", resolutionRepo+"=repo", deploymentServerId+"=depServer", deploymentRepo+"=repo-local")
169+
err := CreateBuildConfig(context, project.Ruby)
170+
assert.NoError(t, err)
171+
172+
// Check configuration
173+
config := checkCommonAndGetConfiguration(t, project.Ruby.String(), tempDirPath)
174+
assert.Equal(t, "relServer", config.GetString("resolver.serverId"))
175+
assert.Equal(t, "repo", config.GetString("resolver.repo"))
176+
assert.Equal(t, "depServer", config.GetString("deployer.serverId"))
177+
assert.Equal(t, "repo-local", config.GetString("deployer.repo"))
178+
}
179+
161180
// In case resolver/deployer server-id flags are not provided - the default configured global server will be chosen.
162181
func TestNpmConfigFileWithDefaultServerId(t *testing.T) {
163182
// Set JFROG_CLI_HOME_DIR environment variable

‎common/project/projectconfig.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const (
4646
Podman
4747
Twine
4848
Helm
49+
Ruby
4950
)
5051

5152
type ConfigType string
@@ -75,6 +76,7 @@ var ProjectTypes = []string{
7576
"podman",
7677
"twine",
7778
"helm",
79+
"ruby",
7880
}
7981

8082
func (projectType ProjectType) String() string {

‎common/project/projectconfig_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package project
22

33
import (
4-
"github.com/stretchr/testify/assert"
54
"testing"
5+
6+
"github.com/stretchr/testify/assert"
67
)
78

89
func TestFromString(t *testing.T) {
@@ -15,6 +16,7 @@ func TestFromString(t *testing.T) {
1516
{"pip", Pip},
1617
{"npm", Npm},
1718
{"pnpm", Pnpm},
19+
{"ruby", Ruby},
1820
}
1921

2022
for _, testCase := range testCases {

‎go.mod‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/google/uuid v1.6.0
1414
github.com/gookit/color v1.5.4
1515
github.com/jedib0t/go-pretty/v6 v6.6.5
16-
github.com/jfrog/build-info-go v1.10.12
16+
github.com/jfrog/build-info-go v1.10.14
1717
github.com/jfrog/gofrog v1.7.6
18-
github.com/jfrog/jfrog-client-go v1.53.1
18+
github.com/jfrog/jfrog-client-go v1.54.1
1919
github.com/magiconair/properties v1.8.9
2020
github.com/manifoldco/promptui v0.9.0
2121
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
@@ -39,7 +39,7 @@ require (
3939
github.com/VividCortex/ewma v1.2.0 // indirect
4040
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
4141
github.com/andybalholm/brotli v1.1.1 // indirect
42-
github.com/cloudflare/circl v1.6.0 // indirect
42+
github.com/cloudflare/circl v1.6.1 // indirect
4343
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
4444
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
4545
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -114,9 +114,8 @@ require (
114114
sigs.k8s.io/yaml v1.4.0 // indirect
115115
)
116116

117+
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba
117118

118-
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba
119-
120-
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250226091544-c803cbbc5495
119+
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250611113558-c1a092f216fd
121120

122121
// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.3.3-0.20231223133729-ef57bd08cedc

‎go.sum‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk
3636
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
3737
github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
3838
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
39-
github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
40-
github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
39+
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
40+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
4141
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4242
github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
4343
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
@@ -54,8 +54,6 @@ github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o
5454
github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
5555
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
5656
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
57-
github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20250609120801-376c534a4738 h1:4baSyD3fdJ+eZZEvD9XaWU9Gvv0xuJGKWXdXsf+imtw=
58-
github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20250609120801-376c534a4738/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw=
5957
github.com/forPelevin/gomoji v1.3.0 h1:WPIOLWB1bvRYlKZnSSEevLt3IfKlLs+tK+YA9fFYlkE=
6058
github.com/forPelevin/gomoji v1.3.0/go.mod h1:mM6GtmCgpoQP2usDArc6GjbXrti5+FffolyQfGgPboQ=
6159
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -111,12 +109,12 @@ github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3N
111109
github.com/jedib0t/go-pretty/v6 v6.6.5/go.mod h1:Uq/HrbhuFty5WSVNfjpQQe47x16RwVGXIveNGEyGtHs=
112110
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
113111
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
114-
github.com/jfrog/build-info-go v1.10.12 h1:KO/YUeKYtDrnpcmsXmwqr6akjzrwA0hSTUB+Op/HF88=
115-
github.com/jfrog/build-info-go v1.10.12/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
112+
github.com/jfrog/build-info-go v1.10.14 h1:PWnw+rBwiQTHZ5q+84+E8MHFjtAQkB3+Oc2sKwBSSGE=
113+
github.com/jfrog/build-info-go v1.10.14/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
116114
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
117115
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
118-
github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba h1:smT4W847Vu3g7bktbQjMQhn2DQVZrzgORj7kfuh4Fnk=
119-
github.com/jfrog/jfrog-client-go v1.28.1-0.20250610112448-de5e55438dba/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw=
116+
github.com/jfrog/jfrog-client-go v1.54.1 h1:IvobRCmwFS/HDht6Vv1JtGzPPytmOX3qS57hRC5fU98=
117+
github.com/jfrog/jfrog-client-go v1.54.1/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
120118
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
121119
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
122120
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

0 commit comments

Comments
 (0)