Skip to content

Adding default --diff for --update flag #5

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
sporkd2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding default --diff for --update flag #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb36f6
cli now uses AWS_DEFAULT_REGION instead of EC2_REGION
Jan 15, 2014
7deea8f
IF logic for showing diff on update
Jun 17, 2014
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
9 changes: 6 additions & 3 deletions lib/cloud_builder/cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def execute
end
end

if diff?
if (diff? || update?)
remote_template = cf.stacks[key].template

# b = s3.buckets[bucket]
Expand All @@ -51,7 +51,10 @@ def execute
cmd = "%s %s %s" % [diff_tool ? diff_tool : "git diff --color", t1.path, t2.path]
# puts cmd
puts `#{cmd}`
return
if (diff? && !update?)
return
end
#return
end

if bucket
Expand All @@ -76,4 +79,4 @@ def execute

end
end
end
end