Skip to content

[wip] Dump version section #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmatsu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[wip] Dump version section #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/remocon/command/create_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def run

artifact = {
conditions: condition_array,
parameters: parameter_hash
parameters: parameter_hash,
}.skip_nil_values.stringify_values

File.open(config.config_json_file_path, "w+") do |f|
Expand Down
5 changes: 5 additions & 0 deletions lib/remocon/command/lib/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class Config
CONFIG_JSON_FILE = "config.json"
CONDITIONS_FILE_NAME = "conditions.yml"
PARAMETERS_FILE_NAME = "parameters.yml"
VERSION_FILE_NAME = "version.json"
ETAG_FILE_NAME = "etag"

attr_reader :opts
Expand Down Expand Up @@ -67,6 +68,10 @@ def parameters_file_path
end
end

def version_file_path
@version_file_path = File.join(project_dir_path, VERSION_FILE_NAME)
end

def etag_file_path
@etag_file_path ||= opts[:etag] || begin
File.join(project_dir_path, ETAG_FILE_NAME)
Expand Down
10 changes: 8 additions & 2 deletions lib/remocon/command/pull_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def run

conditions = raw_hash[:conditions] || []
parameters = raw_hash[:parameters] || {}
versions = raw_hash[:versions] || {}

if config.merge? && File.exist?(config.parameters_file_path) && File.exist?(config.parameters_file_path)
unchanged_conditions, added_conditions, changed_conditions, = conditions_diff(left.conditions_to_be_compared, conditions)
Expand All @@ -63,7 +64,7 @@ def run
parameters_hash = JSON.parse(sort_parameters(Remocon::ParameterFileDumper.new(parameters).dump).to_json)
end

write_to_files(conditions_array, parameters_hash, etag)
write_to_files(conditions_array, parameters_hash, versions, etag)
end

def conditions_diff(left, right)
Expand Down Expand Up @@ -133,7 +134,7 @@ def parameters_diff(left, right)

private

def write_to_files(conditions_array, parameters_hash, etag)
def write_to_files(conditions_array, parameters_hash, versions, etag)
File.open(config.conditions_file_path, "w+") do |f|
f.write(conditions_array.to_yaml)
f.flush
Expand All @@ -144,6 +145,11 @@ def write_to_files(conditions_array, parameters_hash, etag)
f.flush
end

File.open(config.version_file_path, "w+") do |f|
f.write(JSON.pretty_generate(JSON.parse(versions.to_json)))
f.flush
end

File.open(config.etag_file_path, "w+") do |f|
f.write(etag)
f.flush
Expand Down