From 508b7fcc95ae9139331665c0fffcd3287b2ebc23 Mon Sep 17 00:00:00 2001 From: Bassel Mbariky Date: Wed, 4 Jun 2025 14:12:29 +0300 Subject: [PATCH 1/5] Added-ruby-config --- buildtools/cli.go | 21 ++++++++++++++++++--- docs/buildtools/ruby/help.go | 16 ++++++++++++++++ docs/buildtools/rubyconfig/help.go | 7 +++++++ utils/cliutils/commandsflags.go | 8 +++++++- 4 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 docs/buildtools/ruby/help.go create mode 100644 docs/buildtools/rubyconfig/help.go diff --git a/buildtools/cli.go b/buildtools/cli.go index 44e4182d2..4a8e1e7a5 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -3,15 +3,17 @@ package buildtools import ( "errors" "fmt" + "os" + "strconv" + "strings" + "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python" "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/setup" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" "github.com/jfrog/jfrog-cli-core/v2/utils/ioutils" "github.com/jfrog/jfrog-cli-security/utils/techutils" + "github.com/jfrog/jfrog-cli/docs/buildtools/rubyconfig" setupdocs "github.com/jfrog/jfrog-cli/docs/buildtools/setup" - "os" - "strconv" - "strings" "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container" "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet" @@ -127,6 +129,19 @@ func GetCommands() []cli.Command { return cliutils.CreateConfigCmd(c, project.Gradle) }, }, + { + Name: "ruby-config", + Aliases: []string{"rubyc"}, + Flags: cliutils.GetCommandFlags(cliutils.RubyConfig), + Usage: gradleconfig.GetDescription(), + HelpName: corecommon.CreateUsage("ruby-config", rubyconfig.GetDescription(), rubyconfig.Usage), + ArgsUsage: common.CreateEnvVars(), + BashComplete: corecommon.CreateBashCompletionFunc(), + Category: buildToolsCategory, + Action: func(c *cli.Context) error { + return cliutils.CreateConfigCmd(c, project.Ruby) + }, + }, { Name: "gradle", Flags: cliutils.GetCommandFlags(cliutils.Gradle), diff --git a/docs/buildtools/ruby/help.go b/docs/buildtools/ruby/help.go new file mode 100644 index 000000000..45da21181 --- /dev/null +++ b/docs/buildtools/ruby/help.go @@ -0,0 +1,16 @@ +package ruby + +import "github.com/jfrog/jfrog-cli/docs/common" + +var Usage = []string{"ruby [command options]"} + +var EnvVar = []string{common.JfrogCliReleasesRepo, common.JfrogCliDependenciesDir} + +func GetDescription() string { + return "Run Ruby build." +} + +func GetArguments() string { + return ` tasks and options + Tasks and options to run with Ruby command. For example, -b path/to/GemFile.` +} diff --git a/docs/buildtools/rubyconfig/help.go b/docs/buildtools/rubyconfig/help.go new file mode 100644 index 000000000..8caba394f --- /dev/null +++ b/docs/buildtools/rubyconfig/help.go @@ -0,0 +1,7 @@ +package rubyconfig + +var Usage = []string{"ruby-config [command options]"} + +func GetDescription() string { + return "Generate ruby build configuration." +} diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index 15b786258..4593796b5 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -2,10 +2,11 @@ package cliutils import ( "fmt" - "github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit" "sort" "strconv" + "github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit" + commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" @@ -41,6 +42,8 @@ const ( SwiftConfig = "swift-config" Gradle = "gradle" GradleConfig = "gradle-config" + Ruby = "ruby" + RubyConfig = "ruby-config" DockerPromote = "docker-promote" Docker = "docker" DockerPush = "docker-push" @@ -1821,6 +1824,9 @@ var commandFlags = map[string][]string{ global, serverIdResolve, serverIdDeploy, repoResolve, repoDeploy, usesPlugin, UseWrapper, deployMavenDesc, deployIvyDesc, ivyDescPattern, ivyArtifactsPattern, }, + RubyConfig: { + global, serverIdResolve, serverIdDeploy, repoResolve, repoDeploy, + }, Mvn: { BuildName, BuildNumber, deploymentThreads, InsecureTls, Project, detailedSummary, xrayScan, xrOutput, }, From 40637dbb103d874cb1bf02d681c4e1d0d088005d Mon Sep 17 00:00:00 2001 From: Bassel Mbariky Date: Wed, 4 Jun 2025 14:29:00 +0300 Subject: [PATCH 2/5] Fixed-typo --- buildtools/cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/cli.go b/buildtools/cli.go index 4a8e1e7a5..0d7d6580a 100644 --- a/buildtools/cli.go +++ b/buildtools/cli.go @@ -133,7 +133,7 @@ func GetCommands() []cli.Command { Name: "ruby-config", Aliases: []string{"rubyc"}, Flags: cliutils.GetCommandFlags(cliutils.RubyConfig), - Usage: gradleconfig.GetDescription(), + Usage: rubyconfig.GetDescription(), HelpName: corecommon.CreateUsage("ruby-config", rubyconfig.GetDescription(), rubyconfig.Usage), ArgsUsage: common.CreateEnvVars(), BashComplete: corecommon.CreateBashCompletionFunc(), From d49cceffcf8decc508d597250eff3da7e1127dbe Mon Sep 17 00:00:00 2001 From: Bassel Mbariky Date: Wed, 4 Jun 2025 15:02:53 +0300 Subject: [PATCH 3/5] Removed-ruby --- docs/buildtools/ruby/help.go | 16 ---------------- utils/cliutils/commandsflags.go | 1 - 2 files changed, 17 deletions(-) delete mode 100644 docs/buildtools/ruby/help.go diff --git a/docs/buildtools/ruby/help.go b/docs/buildtools/ruby/help.go deleted file mode 100644 index 45da21181..000000000 --- a/docs/buildtools/ruby/help.go +++ /dev/null @@ -1,16 +0,0 @@ -package ruby - -import "github.com/jfrog/jfrog-cli/docs/common" - -var Usage = []string{"ruby [command options]"} - -var EnvVar = []string{common.JfrogCliReleasesRepo, common.JfrogCliDependenciesDir} - -func GetDescription() string { - return "Run Ruby build." -} - -func GetArguments() string { - return ` tasks and options - Tasks and options to run with Ruby command. For example, -b path/to/GemFile.` -} diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index 4593796b5..fef3aed5d 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -42,7 +42,6 @@ const ( SwiftConfig = "swift-config" Gradle = "gradle" GradleConfig = "gradle-config" - Ruby = "ruby" RubyConfig = "ruby-config" DockerPromote = "docker-promote" Docker = "docker" From 98253d4bf1118bb7d848f97cad957762d8c6d869 Mon Sep 17 00:00:00 2001 From: Bassel Mbariky Date: Tue, 10 Jun 2025 10:57:44 +0300 Subject: [PATCH 4/5] Added-new-cli-core-version --- go.mod | 2 ++ go.sum | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 02a432181..11a8b2840 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/jfrog/jfrog-cli go 1.23.9 +replace github.com/jfrog/jfrog-cli-core/v2 => /Users/basselm/Github/jfrog-cli-core + replace ( // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372) github.com/c-bata/go-prompt => github.com/c-bata/go-prompt v0.2.5 diff --git a/go.sum b/go.sum index 981586c60..64dabd3d6 100644 --- a/go.sum +++ b/go.sum @@ -188,8 +188,6 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-artifactory v0.3.1 h1:0F5CgS8iR7o0PoQWcjyLWWnZVrfruNstLezzRaAb9EY= github.com/jfrog/jfrog-cli-artifactory v0.3.1/go.mod h1:6QUvZ7US2VVUWzixh/ofn6LHhBelzLkAK+v5FqBvwZ4= -github.com/jfrog/jfrog-cli-core/v2 v2.58.7 h1:njRlkJjNZ1cvG25S/6T4h+ouI+ZRABN6xZN87UIzB/M= -github.com/jfrog/jfrog-cli-core/v2 v2.58.7/go.mod h1:ZXcipUeTTEQ/phqHdbCh4wJ5Oo4QVDxzQBREQ0J9mDc= github.com/jfrog/jfrog-cli-platform-services v1.9.0 h1:r/ETgJuMUOUu12w20ydsF6paqEaj0khH6bxMRsdNz1Y= github.com/jfrog/jfrog-cli-platform-services v1.9.0/go.mod h1:pMZMSwhj7yA4VKyj0Skr2lObIyGpZUxNJ40DSLKXU38= github.com/jfrog/jfrog-cli-security v1.18.0 h1:+Lf7lW7C6XfCsCd11swJicgFackEPIKOOpQTbX3cd/M= From 19a0daa6019e8a7d532728396c660f2a2464c84c Mon Sep 17 00:00:00 2001 From: Bassel Mbariky Date: Tue, 10 Jun 2025 11:00:14 +0300 Subject: [PATCH 5/5] change-directory-path --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 11a8b2840..2e7fb4523 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/jfrog/jfrog-cli go 1.23.9 -replace github.com/jfrog/jfrog-cli-core/v2 => /Users/basselm/Github/jfrog-cli-core +replace github.com/jfrog/jfrog-cli-core/v2 => ../jfrog-cli-core replace ( // Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372)