Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions app/models/shipit/deploy_spec/file_system.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,30 @@ def load_config
build_config(config_file_path, config_obj)
end

YAML_EXTENSIONS = ["yml", "yaml"].freeze

def shipit_file_names_in_priority_order
[
"#{app_name}.#{@env}.yml",
".shipit/#{app_name}.#{@env}.yml",
YAML_EXTENSIONS.flat_map do |ext|
[
"#{app_name}.#{@env}.#{ext}",
".shipit/#{app_name}.#{@env}.#{ext}",

"#{app_name}.yml",
".shipit/#{app_name}.yml",
"#{app_name}.#{ext}",
".shipit/#{app_name}.#{ext}",

"shipit.#{@env}.yml",
".shipit/#{@env}.yml",
"shipit.#{@env}.#{ext}",
".shipit/#{@env}.#{ext}",

"shipit.yml",
".shipit/shipit.yml"
].uniq
"shipit.#{ext}",
".shipit/shipit.#{ext}"
]
end.uniq
end

def bare_shipit_filenames
["#{app_name}.yml", "shipit.yml", ".shipit/#{app_name}.yml", ".shipit/shipit.yml"].uniq
YAML_EXTENSIONS.flat_map do |ext|
["#{app_name}.#{ext}", "shipit.#{ext}", ".shipit/#{app_name}.#{ext}", ".shipit/shipit.#{ext}"]
end.uniq
end

def config_file_path
Expand Down
Loading