vagrant-unbundled 2.2.10.0 → 2.2.14.0

data/plugins/commands/cloud/version/create.rb

@@ -5,6 +5,8 @@ module VagrantPlugins
     module VersionCommand
       module Command
         class Create < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -19,48 +21,51 @@ module VagrantPlugins
               o.on("-d", "--description DESCRIPTION", String, "A description for this version") do |d|
                 options[:description] = d
               end
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
-                options[:username] = u
-              end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 2
+            if argv.empty? || argv.length != 2
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            @client = client_login(@env)
+            org, box_name = argv.first.split('/', 2)
             version = argv[1]
 
-            create_version(org, box_name, version, @client.token, options)
+            create_version(org, box_name, version, @client.token, options.slice(:description))
           end
 
-          def create_version(org, box_name, box_version, access_token, options)
-            org = options[:username] if options[:username]
-
-            server_url = VagrantPlugins::CloudCommand::Util.api_server_url
-            account = VagrantPlugins::CloudCommand::Util.account(org, access_token, server_url)
-            box = VagrantCloud::Box.new(account, box_name, nil, nil, nil, access_token)
-            version = VagrantCloud::Version.new(box, box_version, nil, options[:description], access_token)
-
-            begin
-              success = version.create_version
-              @env.ui.success(I18n.t("cloud_command.version.create_success", version: box_version, org: org, box_name: box_name))
-              success = success.delete_if{|_, v|v.nil?}
-              VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
-              return 0
-            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(e)
-              return 1
+          # Create a new version of the box
+          #
+          # @param [String] org Organization box is within
+          # @param [String] box_name Name of box
+          # @param [String] box_version Version of box to create
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options
+          # @option options [String] :description Description of box version
+          # @return [Integer]
+          def create_version(org, box_name, box_version, access_token, options={})
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_box(account: account, org: org, box: box_name) do |box|
+              version = box.add_version(box_version)
+              version.description = options[:description] if options.key?(:description)
+              version.save
+              @env.ui.success(I18n.t("cloud_command.version.create_success",
+                version: box_version, org: org, box_name: box_name))
+              format_box_results(version, @env)
+              0
             end
-            return 1
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.version.create_fail",
+              version: box_version, org: org, box_name: box_name))
+            @env.ui.error(e.message)
+            1
           end
         end
       end

data/plugins/commands/cloud/version/delete.rb

@@ -5,6 +5,8 @@ module VagrantPlugins
     module VersionCommand
       module Command
         class Delete < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -15,51 +17,56 @@ module VagrantPlugins
               o.separator ""
               o.separator "Options:"
               o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
-                options[:username] = u
+              o.on("-f", "--[no-]force", "Force deletion without confirmation") do |f|
+                options[:force] = f
               end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 2
+            if argv.size != 2
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            org, box_name = argv.first.split('/', 2)
             version = argv[1]
 
-            @env.ui.warn(I18n.t("cloud_command.version.delete_warn", version: version, box: argv.first))
-            cont = @env.ui.ask(I18n.t("cloud_command.continue"))
-            return 1 if cont.strip.downcase != "y"
+            if !options[:force]
+              @env.ui.warn(I18n.t("cloud_command.version.delete_warn", version: version, box: argv.first))
+              cont = @env.ui.ask(I18n.t("cloud_command.continue"))
+              return 1 if cont.strip.downcase != "y"
+            end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+            @client = client_login(@env)
 
-            delete_version(org, box_name, version, options, @client.token)
+            delete_version(org, box_name, version, @client.token, options.slice)
           end
 
-          def delete_version(org, box_name, box_version, options, access_token)
-            org = options[:username] if options[:username]
-
-            server_url = VagrantPlugins::CloudCommand::Util.api_server_url
-            account = VagrantPlugins::CloudCommand::Util.account(org, access_token, server_url)
-            box = VagrantCloud::Box.new(account, box_name, nil, nil, nil, access_token)
-            version = VagrantCloud::Version.new(box, box_version, nil, nil, access_token)
-
-            begin
-              success = version.delete
-              @env.ui.success(I18n.t("cloud_command.version.delete_success", version: box_version, org: org, box_name: box_name))
-              return 0
-            rescue VagrantCloud::ClientError => e
-              @env.ui.error(I18n.t("cloud_command.errors.version.delete_fail", version: box_version, org: org, box_name: box_name))
-              @env.ui.error(e)
-              return 1
+          # Delete the requested box version
+          #
+          # @param [String] org Box organization name
+          # @param [String] box_name Name of the box
+          # @param [String] box_version Version of the box
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options Current unsued
+          def delete_version(org, box_name, box_version, access_token, options={})
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_version(account: account, org: org, box: box_name, version: box_version) do |version|
+              version.delete
+              @env.ui.success(I18n.t("cloud_command.version.delete_success",
+                version: box_version, org: org, box_name: box_name))
+              0
             end
-            return 1
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.version.delete_fail",
+              version: box_version, org: org, box_name: box_name))
+            @env.ui.error(e.message)
+            1
           end
         end
       end

data/plugins/commands/cloud/version/release.rb

@@ -5,6 +5,8 @@ module VagrantPlugins
     module VersionCommand
       module Command
         class Release < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -15,52 +17,56 @@ module VagrantPlugins
               o.separator ""
               o.separator "Options:"
               o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
-                options[:username] = u
+              o.on("-f", "--[no-]force", "Release without confirmation") do |f|
+                options[:force] = f
               end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 2
+            if argv.size != 2
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @env.ui.warn(I18n.t("cloud_command.version.release_warn", version: argv[1], box: argv.first))
-            cont = @env.ui.ask(I18n.t("cloud_command.continue"))
-            return 1 if cont.strip.downcase != "y"
+            if !options[:force]
+              @env.ui.warn(I18n.t("cloud_command.version.release_warn", version: argv[1], box: argv.first))
+              cont = @env.ui.ask(I18n.t("cloud_command.continue"))
+              return 1 if cont.strip.downcase != "y"
+            end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            @client = client_login(@env)
+            org, box_name = argv.first.split('/', 2)
             version = argv[1]
 
             release_version(org, box_name, version, @client.token, options)
           end
 
-          def release_version(org, box_name, version, access_token, options)
-            org = options[:username] if options[:username]
-
-            server_url = VagrantPlugins::CloudCommand::Util.api_server_url
-            account = VagrantPlugins::CloudCommand::Util.account(org, access_token, server_url)
-            box = VagrantCloud::Box.new(account, box_name, nil, nil, nil, access_token)
-            version = VagrantCloud::Version.new(box, version, nil, nil, access_token)
-
-            begin
-              success = version.release
-              @env.ui.success(I18n.t("cloud_command.version.release_success", version: version, org: org, box_name: box_name))
-              success = success.delete_if{|_, v|v.nil?}
-              VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
-              return 0
-            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(e)
-              return 1
+          # Release the box version
+          #
+          # @param [String] org Organization name
+          # @param [String] box_name Box name
+          # @param [String] version Version of the box
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options Currently unused
+          # @return [Integer]
+          def release_version(org, box_name, version, access_token, options={})
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_version(account: account, org: org, box: box_name, version: version) do |v|
+              v.release
+              @env.ui.success(I18n.t("cloud_command.version.release_success",
+                version: version, org: org, box_name: box_name))
+              0
             end
-            return 1
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.version.release_fail",
+              version: version, org: org, box_name: box_name))
+            @env.ui.error(e.message)
+            1
           end
         end
       end

data/plugins/commands/cloud/version/revoke.rb

@@ -5,6 +5,8 @@ module VagrantPlugins
     module VersionCommand
       module Command
         class Revoke < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -15,52 +17,57 @@ module VagrantPlugins
               o.separator ""
               o.separator "Options:"
               o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
-                options[:username] = u
+              o.on("-f", "--[no-]force", "Force revocation without confirmation") do |f|
+                options[:force] = f
               end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 2
+            if argv.size != 2
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @env.ui.warn(I18n.t("cloud_command.version.revoke_warn", version: argv[1], box: argv.first))
-            cont = @env.ui.ask(I18n.t("cloud_command.continue"))
-            return 1 if cont.strip.downcase != "y"
+            if !options[:force]
+              @env.ui.warn(I18n.t("cloud_command.version.revoke_warn", version: argv[1], box: argv.first))
+              cont = @env.ui.ask(I18n.t("cloud_command.continue"))
+              return 1 if cont.strip.downcase != "y"
+            end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            @client = client_login(@env)
+            org, box_name = argv.first.split('/', 2)
             version = argv[1]
 
             revoke_version(org, box_name, version, @client.token, options)
           end
 
-          def revoke_version(org, box_name, box_version, access_token, options)
-            org = options[:username] if options[:username]
-
-            server_url = VagrantPlugins::CloudCommand::Util.api_server_url
-            account = VagrantPlugins::CloudCommand::Util.account(org, access_token, server_url)
-            box = VagrantCloud::Box.new(account, box_name, nil, nil, nil, access_token)
-            version = VagrantCloud::Version.new(box, box_version, nil, nil, access_token)
-
-            begin
-              success = version.revoke
-              @env.ui.success(I18n.t("cloud_command.version.revoke_success", version: box_version, org: org, box_name: box_name))
-              success = success.delete_if{|_, v|v.nil?}
-              VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
-              return 0
-            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(e)
-              return 1
+          # Revoke release of box version
+          #
+          # @param [String] org Organization name
+          # @param [String] box_name Box name
+          # @param [String] version Version of the box
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options Currently unused
+          # @return [Integer]
+          def revoke_version(org, box_name, box_version, access_token, options={})
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_version(account: account, org: org, box: box_name, version: box_version) do |version|
+              version.revoke
+              @env.ui.success(I18n.t("cloud_command.version.revoke_success",
+                version: box_version, org: org, box_name: box_name))
+              format_box_results(version, @env)
+              0
             end
-            return 1
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.version.revoke_fail",
+              version: box_version, org: org, box_name: box_name))
+            @env.ui.error(e.message)
+            1
           end
         end
       end

data/plugins/commands/cloud/version/update.rb

@@ -5,6 +5,8 @@ module VagrantPlugins
     module VersionCommand
       module Command
         class Update < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -19,48 +21,50 @@ module VagrantPlugins
               o.on("-d", "--description DESCRIPTION", "A description for this version") do |d|
                 options[:description] = d
               end
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
-                options[:username] = u
-              end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 2
+            if argv.size != 2
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            @client = client_login(@env)
+            org, box_name = argv.first.split('/', 2)
             version = argv[1]
 
             update_version(org, box_name, version, @client.token, options)
           end
 
+          # Update the version of the box
+          # @param [String] org Organization name
+          # @param [String] box_name Box name
+          # @param [String] version Version of the box
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options
+          # @options options [String] :description Description of box version
+          # @return [Integer]
           def update_version(org, box_name, box_version, access_token, options)
-            org = options[:username] if options[:username]
-
-            server_url = VagrantPlugins::CloudCommand::Util.api_server_url
-            account = VagrantPlugins::CloudCommand::Util.account(org, access_token, server_url)
-            box = VagrantCloud::Box.new(account, box_name, nil, nil, nil, access_token)
-            version = VagrantCloud::Version.new(box, box_version, nil, options[:description], access_token)
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_version(account: account, org: org, box: box_name, version: box_version) do |version|
+              version.description = options[:description] if options.key?(:description)
+              version.save
 
-            begin
-              success = version.update
-              @env.ui.success(I18n.t("cloud_command.version.update_success", version: box_version, org: org, box_name: box_name))
-              success = success.delete_if{|_, v|v.nil?}
-              VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
-              return 0
-            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(e)
-              return 1
+              @env.ui.success(I18n.t("cloud_command.version.update_success",
+                version: box_version, org: org, box_name: box_name))
+              format_box_results(version, @env)
+              0
             end
-            return 1
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.version.update_fail",
+              version: box_version, org: org, box_name: box_name))
+            @env.ui.error(e.message)
+            1
           end
         end
       end