Avoid magic prefix parsing

This commit is contained in:
Ethan Dennis
2023-07-31 16:45:40 -07:00
parent 5b17fd0d81
commit f6e39fd06c
32 changed files with 67 additions and 61 deletions
+14 -8
View File
@@ -20,7 +20,7 @@ class Arguments
def to_output
arguments = @args.to_a || []
arguments.concat(["--custom-transformers", *@custom_transformers]) if @custom_transformers.length.positive?
arguments.push(["--custom-transformers", *@custom_transformers]) if @custom_transformers.length.positive?
return if arguments.blank?
@@ -29,21 +29,27 @@ class Arguments
set_output(
"args",
arguments.map do |a|
value = a.include?(" ") ? a.inspect : a
arguments.map do |value|
unless value.is_a?(Array)
value = value.inspect if value.include?(" ")
next value
end
value.map.with_index do |v, index|
v = v.inspect if v.include?(" ")
next v if index.zero?
unless value.start_with?("--")
name = "variable_#{rng.rand(1000..9999)}"
name = "variable_#{rng.rand(1000..9999)}" while variable_names.include?(name)
variable_names.add(name)
set_environment(name, value)
set_environment(name, v)
value = "$#{name}"
"$#{name}"
end
value
end.join(" ")
)
end
+2 -2
View File
@@ -11,8 +11,8 @@ module AzureDevops
def to_a
args = []
args.concat(["--azure-devops-organization", @organization]) unless @organization.nil?
args.concat(["--azure-devops-project", @project]) unless @project.nil?
args.push(["--azure-devops-organization", @organization]) unless @organization.nil?
args.push(["--azure-devops-project", @project]) unless @project.nil?
return args unless args.empty?
end
+3 -3
View File
@@ -14,9 +14,9 @@ module AzureDevops
def to_a
args = [@pipeline_type]
args.concat(["--azure-devops-organization", @organization]) unless @organization.nil?
args.concat(["--azure-devops-project", @project]) unless @project.nil?
args.concat(["--pipeline-id", @pipeline_id]) unless @pipeline_id.nil?
args.push(["--azure-devops-organization", @organization]) unless @organization.nil?
args.push(["--azure-devops-project", @project]) unless @project.nil?
args.push(["--pipeline-id", @pipeline_id]) unless @pipeline_id.nil?
return args unless args.empty?
end
+4 -4
View File
@@ -15,10 +15,10 @@ module AzureDevops
def to_a
args = [@pipeline_type]
args.concat(["--azure-devops-organization", @organization]) unless @organization.nil?
args.concat(["--azure-devops-project", @project]) unless @project.nil?
args.concat(["--pipeline-id", @pipeline_id]) unless @pipeline_id.nil?
args.concat(["--target-url", @target_url]) unless @target_url.nil?
args.push(["--azure-devops-organization", @organization]) unless @organization.nil?
args.push(["--azure-devops-project", @project]) unless @project.nil?
args.push(["--pipeline-id", @pipeline_id]) unless @pipeline_id.nil?
args.push(["--target-url", @target_url]) unless @target_url.nil?
return args unless args.empty?
end
+1 -1
View File
@@ -11,7 +11,7 @@ module CircleCI
def to_a
return if @organization.nil?
["--circle-ci-organization", @organization]
[["--circle-ci-organization", @organization]]
end
end
end
+2 -2
View File
@@ -11,8 +11,8 @@ module CircleCI
def to_a
args = []
args.concat(["--circle-ci-organization", @organization]) unless @organization.nil?
args.concat(["--circle-ci-project", @project]) unless @project.nil?
args.push(["--circle-ci-organization", @organization]) unless @organization.nil?
args.push(["--circle-ci-project", @project]) unless @project.nil?
return args unless args.empty?
end
+3 -3
View File
@@ -12,9 +12,9 @@ module CircleCI
def to_a
args = []
args.concat(["--circle-ci-organization", @organization]) unless @organization.nil?
args.concat(["--circle-ci-project", @project]) unless @project.nil?
args.concat(["--target-url", @target_url]) unless @target_url.nil?
args.push(["--circle-ci-organization", @organization]) unless @organization.nil?
args.push(["--circle-ci-project", @project]) unless @project.nil?
args.push(["--target-url", @target_url]) unless @target_url.nil?
return args unless args.empty?
end
+1 -1
View File
@@ -11,7 +11,7 @@ module GitlabCI
def to_a
return if @namespace.nil?
["--namespace", @namespace]
[["--namespace", @namespace]]
end
end
end
+2 -2
View File
@@ -11,8 +11,8 @@ module GitlabCI
def to_a
args = []
args.concat(["--namespace", @namespace]) unless @namespace.nil?
args.concat(["--project", @project]) unless @project.nil?
args.push(["--namespace", @namespace]) unless @namespace.nil?
args.push(["--project", @project]) unless @project.nil?
return args unless args.empty?
end
+3 -3
View File
@@ -12,9 +12,9 @@ module GitlabCI
def to_a
args = []
args.concat(["--namespace", @namespace]) unless @namespace.nil?
args.concat(["--project", @project]) unless @project.nil?
args.concat(["--target-url", @target_url]) unless @target_url.nil?
args.push(["--namespace", @namespace]) unless @namespace.nil?
args.push(["--project", @project]) unless @project.nil?
args.push(["--target-url", @target_url]) unless @target_url.nil?
return args unless args.empty?
end
+1 -1
View File
@@ -11,7 +11,7 @@ module Jenkins
def to_a
return if @folders.nil?
["--folders", @folders]
[["--folders", @folders]]
end
end
end
+1 -1
View File
@@ -11,7 +11,7 @@ module Jenkins
def to_a
return if @source_url.nil?
["--source-url", @source_url]
[["--source-url", @source_url]]
end
end
end
+2 -2
View File
@@ -11,8 +11,8 @@ module Jenkins
def to_a
args = []
args.concat(["--source-url", @source_url]) unless @source_url.nil?
args.concat(["--target-url", @target_url]) unless @target_url.nil?
args.push(["--source-url", @source_url]) unless @source_url.nil?
args.push(["--target-url", @target_url]) unless @target_url.nil?
return args unless args.empty?
end
+1 -1
View File
@@ -11,7 +11,7 @@ module TravisCI
def to_a
return if @organization.nil?
["--travis-ci-organization", @organization]
[["--travis-ci-organization", @organization]]
end
end
end
+2 -2
View File
@@ -11,8 +11,8 @@ module TravisCI
def to_a
args = []
args.concat(["--travis-ci-organization", @organization]) unless @organization.nil?
args.concat(["--travis-ci-repository", @repository]) unless @repository.nil?
args.push(["--travis-ci-organization", @organization]) unless @organization.nil?
args.push(["--travis-ci-repository", @repository]) unless @repository.nil?
return args unless args.empty?
end
+3 -3
View File
@@ -12,9 +12,9 @@ module TravisCI
def to_a
args = []
args.concat(["--travis-ci-organization", @organization]) unless @organization.nil?
args.concat(["--travis-ci-repository", @repository]) unless @repository.nil?
args.concat(["--target-url", @target_url]) unless @target_url.nil?
args.push(["--travis-ci-organization", @organization]) unless @organization.nil?
args.push(["--travis-ci-repository", @repository]) unless @repository.nil?
args.push(["--target-url", @target_url]) unless @target_url.nil?
return args unless args.empty?
end