vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/commands/login/client.rb

@@ -1,9 +1,12 @@
 require "rest_client"
 require "vagrant/util/downloader"
+require "vagrant/util/presence"
 
 module VagrantPlugins
   module LoginCommand
     class Client
+      include Vagrant::Util::Presence
+
       # Initializes a login client with the given Vagrant::Environment.
       #
       # @param [Vagrant::Environment] env
@@ -50,6 +53,7 @@ module VagrantPlugins
           proxy   = nil
           proxy ||= ENV["HTTPS_PROXY"] || ENV["https_proxy"]
           proxy ||= ENV["HTTP_PROXY"]  || ENV["http_proxy"]
+          RestClient.proxy = proxy
 
           response = RestClient::Request.execute(
             method: :post,
@@ -87,7 +91,21 @@ module VagrantPlugins
       #
       # @return [String]
       def token
-        if ENV["ATLAS_TOKEN"] && !ENV["ATLAS_TOKEN"].empty?
+        if present?(ENV["ATLAS_TOKEN"]) && token_path.exist?
+          @env.ui.warn <<-EOH.strip
+Vagrant detected both the ATLAS_TOKEN environment variable and a Vagrant login
+token are present on this system. The ATLAS_TOKEN environment variable takes
+precedence over the locally stored token. To remove this error, either unset
+the ATLAS_TOKEN environment variable or remove the login token stored on disk:
+
+    ~/.vagrant.d/data/vagrant_login_token
+
+In general, the ATLAS_TOKEN is more preferred because it is respected by all
+HashiCorp products.
+EOH
+        end
+
+        if present?(ENV["ATLAS_TOKEN"])
           @logger.debug("Using authentication token from environment variable")
           return ENV["ATLAS_TOKEN"]
         end

data/plugins/commands/package/command.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant package [options] [name]"
+          o.banner = "Usage: vagrant package [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

data/plugins/commands/plugin/command/mixin_install_opts.rb

@@ -5,7 +5,7 @@ module VagrantPlugins
         def build_install_opts(o, options)
           options[:plugin_sources] = [
             "https://rubygems.org",
-            "http://gems.hashicorp.com",
+            "https://gems.hashicorp.com",
           ]
 
           o.on("--entry-point NAME", String,

data/plugins/commands/plugin/gem_helper.rb

@@ -43,7 +43,7 @@ module VagrantPlugins
         # Clear the sources so that installation uses custom sources
         old_sources = Gem.sources
         Gem.sources = Gem.default_sources
-        Gem.sources << "http://gems.hashicorp.com"
+        Gem.sources << "https://gems.hashicorp.com"
 
         # Use a silent UI so that we have no output
         Gem::DefaultUserInteraction.use_ui(Gem::SilentUI.new) do

data/plugins/commands/port/command.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant port [options] [name]"
+          o.banner = "Usage: vagrant port [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

data/plugins/commands/rdp/command.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant rdp [options] [name] [-- extra args]"
+          o.banner = "Usage: vagrant rdp [options] [name|id] [-- extra args]"
         end
 
         # Parse out the extra args to send to the RDP client, which

data/plugins/commands/resume/command.rb

@@ -1,24 +1,38 @@
 require 'optparse'
 
+require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+
 module VagrantPlugins
   module CommandResume
     class Command < Vagrant.plugin("2", :command)
+      # We assume that the `up` plugin exists and that we'll have access
+      # to this.
+      include VagrantPlugins::CommandUp::StartMixins
+
       def self.synopsis
         "resume a suspended vagrant machine"
       end
 
       def execute
+        options = {}
+        options[:provision_ignore_sentinel] = false
+
         opts = OptionParser.new do |o|
           o.banner = "Usage: vagrant resume [vm-name]"
+          o.separator ""
+          build_start_options(o, options)
         end
 
         # Parse the options
         argv = parse_options(opts)
         return if !argv
 
+        # Validate the provisioners
+        validate_provisioner_flags!(options, argv)
+
         @logger.debug("'resume' each target VM...")
         with_target_vms(argv) do |machine|
-          machine.action(:resume)
+          machine.action(:resume, options)
         end
 
         # Success, exit status 0

data/plugins/commands/snapshot/command/pop.rb

@@ -1,6 +1,10 @@
 require 'json'
 require 'optparse'
 
+require 'vagrant'
+
+require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+
 require_relative "push_shared"
 
 module VagrantPlugins
@@ -8,19 +12,30 @@ module VagrantPlugins
     module Command
       class Pop < Vagrant.plugin("2", :command)
         include PushShared
+        include VagrantPlugins::CommandUp::StartMixins
 
         def execute
+          options = {}
+          options[:snapshot_delete] = true
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant snapshot pop [options] [vm-name]"
             o.separator ""
+            build_start_options(o, options)
             o.separator "Restore state that was pushed with `vagrant snapshot push`."
+
+            o.on("--no-delete", "Don't delete the snapshot after the restore") do
+                options[:snapshot_delete] = false
+            end
           end
 
           # Parse the options
           argv = parse_options(opts)
           return if !argv
 
-          return shared_exec(argv, method(:pop))
+          # Validate the provisioners
+          validate_provisioner_flags!(options, argv)
+
+          return shared_exec(argv, method(:pop), options)
         end
       end
     end

data/plugins/commands/snapshot/command/push_shared.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module CommandSnapshot
     module Command
       module PushShared
-        def shared_exec(argv, m)
+        def shared_exec(argv, m, opts={})
           with_target_vms(argv) do |vm|
             if !vm.id
               vm.ui.info("Not created. Cannot push snapshot state.")
@@ -12,7 +12,7 @@ module VagrantPlugins
             end
 
             vm.env.lock("machine-snapshot-stack") do
-              m.call(vm)
+              m.call(vm, opts)
             end
           end
 
@@ -20,14 +20,14 @@ module VagrantPlugins
           0
         end
 
-        def push(machine)
+        def push(machine, opts={})
           snapshot_name = "push_#{Time.now.to_i}_#{rand(10000)}"
 
           # Save the snapshot. This will raise an exception if it fails.
           machine.action(:snapshot_save, snapshot_name: snapshot_name)
         end
 
-        def pop(machine)
+        def pop(machine, opts={})
           # By reverse sorting, we should be able to find the first
           # pushed snapshot.
           name = nil
@@ -45,11 +45,9 @@ module VagrantPlugins
             return
           end
 
-          # Restore the snapshot and tell the provider to delete it as well.
-          machine.action(
-            :snapshot_restore,
-            snapshot_name: name,
-            snapshot_delete: true)
+          # Restore the snapshot and tell the provider to delete it, if required
+          opts[:snapshot_name] = name
+          machine.action(:snapshot_restore, opts)
         end
       end
     end

data/plugins/commands/snapshot/command/restore.rb

@@ -1,15 +1,23 @@
 require 'optparse'
 
+require 'vagrant'
+
+require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+
 module VagrantPlugins
   module CommandSnapshot
     module Command
       class Restore < Vagrant.plugin("2", :command)
+
+        include VagrantPlugins::CommandUp::StartMixins
+
         def execute
           options = {}
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant snapshot restore [options] [vm-name] <name>"
             o.separator ""
+            build_start_options(o, options)
             o.separator "Restore a snapshot taken previously with snapshot save."
           end
 
@@ -21,9 +29,14 @@ module VagrantPlugins
               help: opts.help.chomp
           end
 
+          # Validate the provisioners
+          validate_provisioner_flags!(options, argv)
+
           name = argv.pop
+          options[:snapshot_name] = name
+
           with_target_vms(argv) do |vm|
-            vm.action(:snapshot_restore, snapshot_name: name)
+            vm.action(:snapshot_restore, options)
           end
 
           # Success, exit status 0

data/plugins/commands/ssh/command.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant ssh [options] [name] [-- extra ssh args]"
+          o.banner = "Usage: vagrant ssh [options] [name|id] [-- extra ssh args]"
           o.separator ""
           o.separator "Options:"
           o.separator ""
@@ -55,6 +55,7 @@ module VagrantPlugins
             exit_status = env[:ssh_run_exit_status] || 0
             return exit_status
           else
+            Vagrant::Bundler.instance.deinit
             @logger.debug("Invoking `ssh` action on machine")
             vm.action(:ssh, ssh_opts: ssh_opts)
 

data/plugins/commands/ssh_config/command.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant ssh-config [options] [name]"
+          o.banner = "Usage: vagrant ssh-config [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""

data/plugins/commands/status/command.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
 
       def execute
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant status [name]"
+          o.banner = "Usage: vagrant status [name|id]"
         end
 
         # Parse the options

data/plugins/commands/suspend/command.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
 
       def execute
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant suspend [name]"
+          o.banner = "Usage: vagrant suspend [name|id]"
         end
 
         # Parse the options

data/plugins/commands/up/command.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
         options[:provision_ignore_sentinel] = false
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant up [options] [name]"
+          o.banner = "Usage: vagrant up [options] [name|id]"
           o.separator ""
           o.separator "Options:"
           o.separator ""
@@ -128,9 +128,9 @@ module VagrantPlugins
         # First create a set of all the providers we need to check for.
         # Most likely this will be a set of one.
         providers = Set.new
-        names.each do |name|
+        with_target_vms(names) do |machine|
           # Check if we have this machine in the index
-          entry    = @env.machine_index.get(name.to_s)
+          entry    = @env.machine_index.get(machine.name.to_s)
 
           # Get the provider for this machine. This logic isn't completely
           # straightforward. If we have a forced provider, we always use
@@ -146,7 +146,7 @@ module VagrantPlugins
           p = provider
           p = entry.provider.to_sym if !p && entry
           p = @env.default_provider(
-            machine: name.to_sym, check_usable: false) if !p
+            machine: machine.name.to_sym, check_usable: false) if !p
 
           # Add it to the set
           providers.add(p)

data/plugins/communicators/ssh/communicator.rb

@@ -335,8 +335,8 @@ module VagrantPlugins
           forward_agent:         ssh_info[:forward_agent],
           send_env:              ssh_info[:forward_env],
           keys:                  ssh_info[:private_key_path],
-          keys_only:             true,
-          paranoid:              false,
+          keys_only:             ssh_info[:keys_only],
+          paranoid:              ssh_info[:paranoid],
           password:              ssh_info[:password],
           port:                  ssh_info[:port],
           timeout:               15,

data/plugins/communicators/winrm/communicator.rb

@@ -1,6 +1,6 @@
-require "timeout"
-
 require "log4r"
+require "tempfile"
+require "timeout"
 
 require_relative "helper"
 require_relative "shell"
@@ -10,6 +10,8 @@ module VagrantPlugins
   module CommunicatorWinRM
     # Provides communication channel for Vagrant commands via WinRM.
     class Communicator < Vagrant.plugin("2", :communicator)
+      include Vagrant::Util
+
       def self.match?(machine)
         # This is useless, and will likely be removed in the future (this
         # whole method).
@@ -142,6 +144,7 @@ module VagrantPlugins
 
         opts[:good_exit] = Array(opts[:good_exit])
         command = wrap_in_scheduled_task(command, opts[:interactive]) if opts[:elevated]
+        @logger.debug("#{opts[:shell]} executing:\n#{command}")
         output = shell.send(opts[:shell], command, &block)
         execution_output(output, opts)
       end
@@ -201,15 +204,12 @@ module VagrantPlugins
           interactive: interactive,
         })
         guest_script_path = "c:/tmp/vagrant-elevated-shell.ps1"
-        file = Tempfile.new(["vagrant-elevated-shell", "ps1"])
-        begin
-          file.write(script)
-          file.fsync
-          file.close
-          upload(file.path, guest_script_path)
-        ensure
-          file.close
-          file.unlink
+        Tempfile.open(["vagrant-elevated-shell", "ps1"]) do |f|
+          f.binmode
+          f.write(script)
+          f.fsync
+          f.close
+          upload(f.path, guest_script_path)
         end
 
         # Convert to double byte unicode string then base64 encode

data/plugins/communicators/winrm/config.rb

@@ -12,6 +12,7 @@ module VagrantPlugins
       attr_accessor :transport
       attr_accessor :ssl_peer_verification
       attr_accessor :execution_time_limit
+      attr_accessor :basic_auth_only
 
       def initialize
         @username               = UNSET_VALUE
@@ -25,12 +26,13 @@ module VagrantPlugins
         @transport              = UNSET_VALUE
         @ssl_peer_verification  = UNSET_VALUE
         @execution_time_limit   = UNSET_VALUE
+        @basic_auth_only        = UNSET_VALUE
       end
 
       def finalize!
         @username = "vagrant"   if @username == UNSET_VALUE
         @password = "vagrant"   if @password == UNSET_VALUE
-        @transport = :plaintext if @transport == UNSET_VALUE
+        @transport = :negotiate if @transport == UNSET_VALUE
         @host = nil           if @host == UNSET_VALUE
         is_ssl = @transport == :ssl
         @port = (is_ssl ? 5986 : 5985)       if @port == UNSET_VALUE
@@ -40,6 +42,7 @@ module VagrantPlugins
         @timeout = 1800        if @timeout == UNSET_VALUE
         @ssl_peer_verification = true if @ssl_peer_verification == UNSET_VALUE
         @execution_time_limit = "PT2H"   if @execution_time_limit == UNSET_VALUE
+        @basic_auth_only = false    if @basic_auth_only == UNSET_VALUE
       end
 
       def validate(machine)
@@ -56,6 +59,9 @@ module VagrantPlugins
         unless @ssl_peer_verification == true || @ssl_peer_verification == false
           errors << "winrm.ssl_peer_verification must be a boolean."
         end
+        unless @basic_auth_only == true || @basic_auth_only == false
+          errors << "winrm.basic_auth_only must be a boolean."
+        end
 
         { "WinRM" => errors }
       end