vagrant-unbundled 2.2.6.2 → 2.2.14.0

data/plugins/commands/cloud/list.rb

@@ -4,6 +4,8 @@ module VagrantPlugins
   module CloudCommand
     module Command
       class List < Vagrant.plugin("2", :command)
+        include Util
+
         def execute
           options = {}
 
@@ -27,9 +29,6 @@ module VagrantPlugins
             o.on("-s", "--sort-by", "Column to sort list (created, downloads, updated)") do |s|
               options[:check] = s
             end
-            o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
-              options[:username] = u
-            end
           end
 
           # Parse the options
@@ -40,7 +39,7 @@ module VagrantPlugins
               help: opts.help.chomp
           end
 
-          @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+          @client = client_login(@env)
 
           # TODO: This endpoint is not implemented yet
 

data/plugins/commands/cloud/locales/en.yml

@@ -13,14 +13,8 @@ en:
 
           Press ctrl-c to cancel...
     publish:
-      update_continue: |-
-        %{obj} already exists, updating instead...
-      box_create:
-        Creating a box entry...
-      version_create:
-        Creating a version entry...
-      provider_create:
-        Creating a provider entry...
+      box_save:
+        Saving box information...
       upload_provider:
         Uploading provider with file %{file}
       release:
@@ -45,7 +39,7 @@ en:
         version_desc: |-
             Version Description:   %{version_description}
     continue: |-
-      Do you wish to continue? [y/N] 
+      Do you wish to continue? [y/N]
     box:
       show_filter_empty: |-
         No version matched %{version} for %{org}/%{box_name}
@@ -57,6 +51,8 @@ en:
         This will completely remove %{box} from Vagrant Cloud. This cannot be undone.
       update_success: |-
         Updated box %{org}/%{box_name}
+      not_found: |-
+        Failed to locate requested box: %{org}/%{box_name}
     search:
       no_results: |-
         No results found for `%{query}`
@@ -77,6 +73,8 @@ en:
         Deleted provider %{provider} on %{org}/%{box_name} for version %{version}
       update_success: |-
         Updated provider %{provider} on %{org}/%{box_name} for version %{version}
+      not_found: |-
+        Failed to locate %{provider_name} provider for %{org}/%{box_name} on version %{version}
     version:
       create_success: |-
         Created version %{version} on %{org}/%{box_name} for version %{version}
@@ -94,6 +92,8 @@ en:
         This will release version %{version} from %{box} to Vagrant Cloud and be available to download.
       delete_warn: |-
         This will completely remove version %{version} from %{box} from Vagrant Cloud. This cannot be undone.
+      not_found: |-
+        Failed to locate version %{version} for %{org}/%{box_name}
     errors:
       search:
         fail: |-
@@ -144,7 +144,7 @@ en:
       unauthorized: |-
         Invalid username or password. Please try again.
       unexpected_error: |-
-        An unexpected error occured: %{error}
+        An unexpected error occurred: %{error}
 
     check_logged_in: |-
       You are already logged in.

data/plugins/commands/cloud/plugin.rb

@@ -12,6 +12,11 @@ module VagrantPlugins
       DESC
 
       command(:cloud) do
+        # Set this to match Vagant logging level so we get
+        # desired request/response information within the
+        # logger output
+        ENV["VAGRANT_CLOUD_LOG"] = Vagrant.log_level
+
         require_relative "root"
         init!
         Command::Root
@@ -22,6 +27,11 @@ module VagrantPlugins
         hook.prepend(AddAuthentication)
       end
 
+      action_hook(:cloud_authenticated_boxes, :authenticate_box_downloader) do |hook|
+        require_relative "auth/middleware/add_downloader_authentication"
+        hook.prepend(AddDownloaderAuthentication)
+      end
+
       protected
 
       def self.init!

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

@@ -5,6 +5,8 @@ module VagrantPlugins
     module ProviderCommand
       module Command
         class Create < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -16,9 +18,6 @@ module VagrantPlugins
               o.separator "Options:"
               o.separator ""
 
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
-                options[:username] = u
-              end
               o.on("-c", "--checksum CHECKSUM_VALUE", String, "Checksum of the box for this provider. --checksum-type option is required.") do |c|
                 options[:checksum] = c
               end
@@ -30,48 +29,59 @@ module VagrantPlugins
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 4
+            if argv.count < 3 || argv.count > 4
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+            @client = client_login(@env)
 
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            org, box_name = argv.first.split('/', 2)
             provider_name = argv[1]
             version = argv[2]
             url = argv[3]
 
-            upload_provider(org, box_name, provider_name, version, url, @client.token, options)
+            create_provider(org, box_name, version, provider_name, url, @client.token, options)
           end
 
-          def upload_provider(org, box_name, provider_name, version, url, access_token, options)
+          # Create a provider for the box version
+          #
+          # @param [String] org Organization name
+          # @param [String] box Box name
+          # @param [String] version Box version
+          # @param [String] provider Provider name
+          # @param [String] url Provider asset URL
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options
+          # @option options [String] :checksum Checksum of the box asset
+          # @option options [String] :checksum_type Type of the checksum
+          # @return [Integer]
+          def create_provider(org, box, version, provider, url, access_token, options={})
             if !url
               @env.ui.warn(I18n.t("cloud_command.upload.no_url"))
             end
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_version(account: account, org: org, box: box, version: version) do |version|
+              provider = version.add_provider(provider)
+              provider.checksum = options[:checksum] if options.key?(:checksum)
+              provider.checksum_type = options[:checksum_type] if options.key?(:checksum_type)
+              provider.url = url if url
 
-            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)
-            cloud_version = VagrantCloud::Version.new(box, version, nil, nil, access_token)
-            provider = VagrantCloud::Provider.new(cloud_version, provider_name, nil, url, org, box_name,
-              access_token, nil, options[:checksum], options[:checksum_type])
+              provider.save
 
-            begin
-              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))
-              success = success.compact
-              VagrantPlugins::CloudCommand::Util.format_box_results(success, @env)
-              return 0
-            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(e)
-              return 1
+              @env.ui.success(I18n.t("cloud_command.provider.create_success",
+                provider: provider.name, org: org, box_name: box, version: version.version))
+              format_box_results(provider, @env)
+              0
             end
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.provider.create_fail",
+              provider: provider, org: org, box_name: box, version: version))
+            @env.ui.error(e.message)
+            1
           end
         end
       end

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

@@ -5,6 +5,8 @@ module VagrantPlugins
     module ProviderCommand
       module Command
         class Delete < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
@@ -15,53 +17,61 @@ 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 of box version provider without confirmation") do |f|
+                options[:force] = f
               end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 3
+            if argv.count != 3
               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)
             provider_name = argv[1]
             version = argv[2]
 
-            @env.ui.warn(I18n.t("cloud_command.provider.delete_warn", provider: provider_name, version:version, box: argv.first))
-            cont = @env.ui.ask(I18n.t("cloud_command.continue"))
-            return 1 if cont.strip.downcase != "y"
-
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+            @env.ui.warn(I18n.t("cloud_command.provider.delete_warn",
+              provider: provider_name, version:version, box: argv.first))
 
-            delete_provider(org, box_name, provider_name, version, @client.token, options)
-          end
+            if !options[:force]
+              cont = @env.ui.ask(I18n.t("cloud_command.continue"))
+              return 1 if cont.strip.downcase != "y"
+            end
 
-          def delete_provider(org, box_name, provider_name, version, access_token, options)
-            org = options[:username] if options[:username]
+            @client = client_login(@env)
 
-            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)
-            cloud_version = VagrantCloud::Version.new(box, version, nil, nil, access_token)
-            provider = VagrantCloud::Provider.new(cloud_version, provider_name, nil, nil, nil, nil, access_token)
+            delete_provider(org, box_name, version, provider_name, @client.token, options)
+          end
 
-            begin
-              success = provider.delete
-              @env.ui.error(I18n.t("cloud_command.provider.delete_success", provider: provider_name, org: org, box_name: box_name, version: version))
-              return 0
-            rescue VagrantCloud::ClientError => e
-              @env.ui.error(I18n.t("cloud_command.errors.provider.delete_fail", provider: provider_name, org: org, box_name: box_name, version: version))
-              @env.ui.error(e)
-              return 1
+          # Delete a provider for the box version
+          #
+          # @param [String] org Organization name
+          # @param [String] box Box name
+          # @param [String] version Box version
+          # @param [String] provider Provider name
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options Currently unused
+          # @return [Integer]
+          def delete_provider(org, box, version, provider, access_token, options={})
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
+            with_provider(account: account, org: org, box: box, version: version, provider: provider) do |p|
+              p.delete
+              @env.ui.error(I18n.t("cloud_command.provider.delete_success",
+                provider: provider, org: org, box_name: box, version: version))
+              0
             end
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.provider.delete_fail",
+              provider: provider, org: org, box_name: box, version: version))
+            @env.ui.error(e)
+            1
           end
         end
       end

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

@@ -5,20 +5,19 @@ module VagrantPlugins
     module ProviderCommand
       module Command
         class Update < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
             options = {}
 
             opts = OptionParser.new do |o|
-              o.banner = "Usage: vagrant cloud provider update [options] organization/box-name provider-name version url"
+              o.banner = "Usage: vagrant cloud provider update [options] organization/box-name provider-name version [url]"
               o.separator ""
               o.separator "Updates a provider entry on Vagrant Cloud"
               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
-              end
               o.on("-c", "--checksum CHECKSUM_VALUE", String, "Checksum of the box for this provider. --checksum-type option is required.") do |c|
                 options[:checksum] = c
               end
@@ -30,48 +29,58 @@ module VagrantPlugins
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 4
+            if argv.count < 3 || argv.count > 4
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+            @client = client_login(@env)
 
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            org, box_name = argv.first.split('/', 2)
             provider_name = argv[1]
             version = argv[2]
             url = argv[3]
 
-            update_provider(org, box_name, provider_name, version, url, @client.token, options)
+            update_provider(org, box_name, version, provider_name, url, @client.token, options)
           end
 
-          def update_provider(org, box_name, provider_name, version, url, access_token, options)
+          # Update a provider for the box version
+          #
+          # @param [String] org Organization name
+          # @param [String] box Box name
+          # @param [String] version Box version
+          # @param [String] provider Provider name
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options
+          # @option options [String] :checksum Checksum of the box asset
+          # @option options [String] :checksum_type Type of the checksum
+          # @return [Integer]
+          def update_provider(org, box, version, provider, url, access_token, options)
             if !url
               @env.ui.warn(I18n.t("cloud_command.upload.no_url"))
             end
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
 
-            org = options[:username] if options[:username]
+            with_provider(account: account, org: org, box: box, version: version, provider: provider) do |p|
+              p.checksum = options[:checksum] if options.key?(:checksum)
+              p.checksum_type = options[:checksum_type] if options.key?(:checksum_type)
+              p.url = url if !url.nil?
+              p.save
 
-            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)
-            cloud_version = VagrantCloud::Version.new(box, version, nil, nil, access_token)
-            provider = VagrantCloud::Provider.new(cloud_version, provider_name, nil, url, org, box_name,
-              access_token, nil, options[:checksum], options[:checksum_type])
+              @env.ui.success(I18n.t("cloud_command.provider.update_success",
+                provider: provider, org: org, box_name: box, version: version))
 
-            begin
-              success = provider.update
-              @env.ui.success(I18n.t("cloud_command.provider.update_success", provider:provider_name, org: org, box_name: box_name, version: version))
-              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.provider.update_fail", provider:provider_name, org: org, box_name: box_name, version: version))
-              @env.ui.error(e)
-              return 1
+              format_box_results(p, @env)
+              0
             end
+          rescue VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.provider.update_fail",
+              provider: provider, org: org, box_name: box, version: version))
+            @env.ui.error(e.message)
+            1
           end
         end
       end

data/plugins/commands/cloud/provider/upload.rb

@@ -6,8 +6,10 @@ module VagrantPlugins
     module ProviderCommand
       module Command
         class Upload < Vagrant.plugin("2", :command)
+          include Util
+
           def execute
-            options = {}
+            options = {direct: true}
 
             opts = OptionParser.new do |o|
               o.banner = "Usage: vagrant cloud provider upload [options] organization/box-name provider-name version box-file"
@@ -16,57 +18,65 @@ 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("-D", "--[no-]direct", "Upload asset directly to backend storage") do |d|
+                options[:direct] = d
               end
             end
 
             # Parse the options
             argv = parse_options(opts)
             return if !argv
-            if argv.empty? || argv.length > 4
+            if argv.count != 4
               raise Vagrant::Errors::CLIInvalidUsage,
                 help: opts.help.chomp
             end
 
-            @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+            @client = client_login(@env)
 
-            box = argv.first.split('/', 2)
-            org = box[0]
-            box_name = box[1]
+            org, box_name = argv.first.split('/', 2)
             provider_name = argv[1]
             version = argv[2]
-            file = argv[3] # path expand
+            file = File.expand_path(argv[3])
 
-            upload_provider(org, box_name, provider_name, version, file, @client.token, options)
+            upload_provider(org, box_name, version, provider_name, file, @client.token, options)
           end
 
-          def upload_provider(org, box_name, provider_name, version, file, 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)
-            cloud_version = VagrantCloud::Version.new(box, version, nil, nil, access_token)
-            provider = VagrantCloud::Provider.new(cloud_version, provider_name, nil, nil, org, box_name, access_token)
-
-            ul = Vagrant::Util::Uploader.new(provider.upload_url, file, ui: @env.ui)
-            ui = Vagrant::UI::Prefixed.new(@env.ui, "cloud")
+          # Upload an asset for a box version provider
+          #
+          # @param [String] org Organization name
+          # @param [String] box Box name
+          # @param [String] version Box version
+          # @param [String] provider Provider name
+          # @param [String] file Path to asset
+          # @param [String] access_token User Vagrant Cloud access token
+          # @param [Hash] options
+          # @option options [Boolean] :direct Upload directly to backend storage
+          # @return [Integer]
+          def upload_provider(org, box, version, provider, file, access_token, options)
+            account = VagrantCloud::Account.new(
+              custom_server: api_server_url,
+              access_token: access_token
+            )
 
-            begin
-              ui.output(I18n.t("cloud_command.provider.upload", org: org, box_name: box_name, version: version, provider: provider_name))
-              ui.info("Upload File: #{file}")
-
-              ul.upload!
-
-              ui.success("Successfully uploaded box '#{org}/#{box_name}' (v#{version}) for '#{provider_name}'")
-              return 0
-            rescue Vagrant::Errors::UploaderError, VagrantCloud::ClientError => e
-              @env.ui.error(I18n.t("cloud_command.errors.provider.upload_fail", provider: provider_name, org: org, box_name: box_name, version: version))
-              @env.ui.error(e)
-              return 1
+            with_provider(account: account, org: org, box: box, version: version, provider: provider) do |p|
+              p.upload(direct: options[:direct]) do |upload_url|
+                m = options[:direct] ? :put : :put
+                uploader = Vagrant::Util::Uploader.new(upload_url, file, ui: @env.ui, method: m)
+                ui = Vagrant::UI::Prefixed.new(@env.ui, "cloud")
+                ui.output(I18n.t("cloud_command.provider.upload",
+                  org: org, box_name: box, version: version, provider: provider))
+                ui.info("Upload File: #{file}")
+                uploader.upload!
+                ui.success(I18n.t("cloud_command.provider.upload_success",
+                  org: org, box_name: box, version: version, provider: provider))
+              end
+              0
             end
+          rescue Vagrant::Errors::UploaderError, VagrantCloud::Error => e
+            @env.ui.error(I18n.t("cloud_command.errors.provider.upload_fail",
+              provider: provider, org: org, box_name: box, version: version))
+            @env.ui.error(e.message)
+            1
           end
         end
       end