lib/travis/cli/encrypt.rb in travis-1.8.12.travis.1125.9 vs lib/travis/cli/encrypt.rb in travis-1.8.12.travis.1135.9
- old
+ new
@@ -14,10 +14,11 @@
on('-s', '--[no-]split', "treat each line as a separate input")
on('-p', '--append', "don't override existing values, instead treat as list")
on('-x', '--override', "override existing value")
def run(*args)
+ confirm = force_interactive.nil? || force_interactive
error "cannot combine --override and --append" if append? and override?
error "--append without --add makes no sense" if append? and not add?
error "--override without --add makes no sense" if override? and not add?
self.override |= !config_key.start_with?('env.') if add? and not append?
@@ -39,10 +40,10 @@
warn_env_assignments(data)
encrypted = data.map { |data| repository.encrypt(data) }
if config_key
set_config encrypted.map { |e| { 'secure' => e } }
- save_travis_config
+ confirm_and_save_travis_config confirm
else
list = encrypted.map { |data| format(data.inspect, " secure: %s") }
say(list.join("\n"), template(__FILE__), :none)
end
rescue OpenSSL::PKey::RSAError => error