haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove #Hash.compact for ruby 2.3 compatibility

This commit is contained in:
Brian Cain 2018-10-16 14:34:31 -07:00
parent b92b1ba0bb
commit 15fb2b729d
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
10 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/commands/cloud/box/create.rb
View File

@ -57,7 +57,8 @@ module VagrantPlugins
begin begin
success = box.create success = box.create
@env.ui.success(I18n.t("cloud_command.box.create_success", org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.box.create_success", org: org, box_name: box_name))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if { |_, v| v.nil? }
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.box.create_fail", org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.box.create_fail", org: org, box_name: box_name))

3
plugins/commands/cloud/box/show.rb
View File

@ -58,7 +58,8 @@ module VagrantPlugins
else else
results = success results = success
end end
VagrantPlugins::CloudCommand::Util.format_box_results(results.compact, @env) results = results.delete_if { |_, v| v.nil? }
VagrantPlugins::CloudCommand::Util.format_box_results(results, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.box.show_fail", org: org,box_name:box_name)) @env.ui.error(I18n.t("cloud_command.errors.box.show_fail", org: org,box_name:box_name))

3
plugins/commands/cloud/box/update.rb
View File

@ -54,7 +54,8 @@ module VagrantPlugins
begin begin
success = box.update(options) success = box.update(options)
@env.ui.success(I18n.t("cloud_command.box.update_success", org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.box.update_success", org: org, box_name: box_name))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.box.update_fail", org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.box.update_fail", org: org, box_name: box_name))

3
plugins/commands/cloud/provider/create.rb
View File

@ -57,7 +57,8 @@ module VagrantPlugins
begin begin
success = provider.create_provider success = provider.create_provider
@env.ui.success(I18n.t("cloud_command.provider.create_success", provider:provider_name, org: org, box_name: box_name, version: version)) @env.ui.success(I18n.t("cloud_command.provider.create_success", provider:provider_name, org: org, box_name: box_name, version: version))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.provider.create_fail", provider:provider_name, org: org, box_name: box_name, version: version)) @env.ui.error(I18n.t("cloud_command.errors.provider.create_fail", provider:provider_name, org: org, box_name: box_name, version: version))

3
plugins/commands/cloud/provider/update.rb
View File

@ -57,7 +57,8 @@ module VagrantPlugins
begin begin
success = provider.update success = provider.update
@env.ui.success(I18n.t("cloud_command.provider.update_success", provider:provider_name, org: org, box_name: box_name, version: version)) @env.ui.success(I18n.t("cloud_command.provider.update_success", provider:provider_name, org: org, box_name: box_name, version: version))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.provider.update_fail", provider:provider_name, org: org, box_name: box_name, version: version)) @env.ui.error(I18n.t("cloud_command.errors.provider.update_fail", provider:provider_name, org: org, box_name: box_name, version: version))

3
plugins/commands/cloud/publish.rb
View File

@ -149,7 +149,8 @@ module VagrantPlugins
end end
@env.ui.success(I18n.t("cloud_command.publish.complete", org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.publish.complete", org: org, box_name: box_name))
success = box.read(org, box_name) success = box.read(org, box_name)
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue Vagrant::Errors::UploaderError, VagrantCloud::ClientError => e rescue Vagrant::Errors::UploaderError, VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.publish.fail", org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.publish.fail", org: org, box_name: box_name))

3
plugins/commands/cloud/version/create.rb
View File

@ -52,7 +52,8 @@ module VagrantPlugins
begin begin
success = version.create_version success = version.create_version
@env.ui.success(I18n.t("cloud_command.version.create_success", version: box_version, org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.version.create_success", version: box_version, org: org, box_name: box_name))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.version.create_fail", version: box_version, org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.version.create_fail", version: box_version, org: org, box_name: box_name))

3
plugins/commands/cloud/version/release.rb
View File

@ -52,7 +52,8 @@ module VagrantPlugins
begin begin
success = version.release success = version.release
@env.ui.success(I18n.t("cloud_command.version.release_success", version: version, org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.version.release_success", version: version, org: org, box_name: box_name))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.version.release_fail", version: version, org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.version.release_fail", version: version, org: org, box_name: box_name))

3
plugins/commands/cloud/version/revoke.rb
View File

@ -52,7 +52,8 @@ module VagrantPlugins
begin begin
success = version.revoke success = version.revoke
@env.ui.success(I18n.t("cloud_command.version.revoke_success", version: box_version, org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.version.revoke_success", version: box_version, org: org, box_name: box_name))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.version.revoke_fail", version: box_version, org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.version.revoke_fail", version: box_version, org: org, box_name: box_name))

3
plugins/commands/cloud/version/update.rb
View File

@ -52,7 +52,8 @@ module VagrantPlugins
begin begin
success = version.update success = version.update
@env.ui.success(I18n.t("cloud_command.version.update_success", version: box_version, org: org, box_name: box_name)) @env.ui.success(I18n.t("cloud_command.version.update_success", version: box_version, org: org, box_name: box_name))
VagrantPlugins::CloudCommand::Util.format_box_results(success.compact, @env) success = success.delete_if{|_, v|v.nil?}
VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
return 0 return 0
rescue VagrantCloud::ClientError => e rescue VagrantCloud::ClientError => e
@env.ui.error(I18n.t("cloud_command.errors.version.update_fail", version: box_version, org: org, box_name: box_name)) @env.ui.error(I18n.t("cloud_command.errors.version.update_fail", version: box_version, org: org, box_name: box_name))