vagrant-unbundled 1.9.1.1 → 1.9.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde757e34dcee067f88dff20c6d8817f8b95e772
-  data.tar.gz: 3e39ba6054e66a9cef60b6219f6f994c10fbea4f
+  metadata.gz: d495a5847304cac74b0de42f8db4da2809f58756
+  data.tar.gz: e894be37b991f66febb0682cc764d29aefd7aa8d
 SHA512:
-  metadata.gz: 65afc154db7e1d92371b4e5e0efebb2bd0e502b8cee4f1f00c0d7e5dd289919343d2089b77d260399c3bcfeb04e5c6e05fc26114cf4a4400ab9d9d502ddde51b
-  data.tar.gz: a6d2b95aaca2e3669410baa1b8ebed4fdfc3d89830f4ca9551adce07585626eb41f2c3fa2a2c5434d1b7263fd2eb03bbee98dcf4bf74f2262afc4a8f99afe991
+  metadata.gz: bc241e8671128f790e56f1f5d6a47ca3e904798e022760702f6327345bbd1e16ed7ae078c69ab07235224ac3d451dc3318e56e3c11fd09224274f0a8baff8e5f
+  data.tar.gz: 3d9237118fca1791258ca9adac7fa220306c301d307bbf690c15cee71b946691e7dc83d1ed426940cb54b79df496f0f4388703129b57c2e236b8e6ca65f35225

data/.gitignore

@@ -45,3 +45,6 @@ doc/
 .ruby-gemset
 .ruby-version
 .rvmrc
+
+# Box storage for spec
+test/vagrant-spec/boxes/*.box

data/CHANGELOG.md

@@ -1,3 +1,129 @@
+## 1.9.5 (May 15, 2017)
+
+FEATURES:
+
+  - hosts/windows: Support running within WSL [GH-8570, GH-8582]
+
+IMPROVEMENTS:
+
+  - communicators/ssh: Retry on aborted connections [GH-8526, GH-8520]
+  - communicators/winssh: Enabling shared folders and networking setup [GH-8567]
+  - core: Remove nokogiri dependency and constraint [GH-8571]
+  - guests: Do not modify existing /etc/hosts content [GH-8506, GH-7794]
+  - guests/redhat: Update network configuration capability to properly handle NM [GH-8531]
+  - hosts/windows: Check for elevated shell for Hyper-V [GH-8548, GH-8510]
+  - hosts/windows: Fix invalid share names on Windows guests from Windows hosts [GH-8433]
+  - providers: Return errors from docker/hyperv on ssh when not available [GH-8565, GH-8508]
+  - providers/docker: Add support for driving provider with docker-compose [GH-8576]
+
+BUG FIXES:
+
+  - guests/debian: Fix use_dhcp_assigned_default_route [GH-8577, GH-8575]
+  - provisioners/shell: Fix Windows batch file provisioning [GH-8539, GH-8535]
+  - providers/docker: Fall back to old style for SSH info lookup [GH-8566, GH-8552]
+  - providers/hyperv: Fix import script [GH-8529]
+  - providers/hyperv: Use string comparison for conditional checks in import scripts [GH-8568, GH-8444]
+
+## 1.9.4 (April 24, 2017)
+
+FEATURES:
+
+  - command/validate: Add Vagrantfile validation command [GH-8264, GH-8151]
+  - communicators/winssh: Add WinSSH communicator for Win32-OpenSSH [GH-8485]
+  - provider/hyperv: Support integration services configuration [GH-8379, GH-8378]
+
+IMPROVEMENTS:
+
+  - core: Update internal dependencies [GH-8329, GH-8456]
+  - core/bundler: Warn when plugin require fails instead of generating hard failure [GH-8400, GH-8392]
+  - core/bundler: Error when configured plugin sources are unavailable [GH-8442]
+  - guests/elementary: Add support for new guest "Elementary OS" [GH-8472]
+  - guests/esxi: Add public_key capability [GH-8310]
+  - guests/freebsd: Add chef_install and chef_installed? capabilities [GH-8443]
+  - guests/gentoo: Add support for systemd in network configuration [GH-8407, GH-8406]
+  - guests/windows: Support mounting synced folders via SSH on windows [GH-7425, GH-6220]
+  - hosts/windows: Improve user permission detection [GH-7797]
+  - provider/docker: Improve IP and port detection [GH-7840, GH-7651]
+  - provider/docker: Do not force docker host VM on Darwin or Windows [GH-8437, GH-7895]
+  - provisioners/ansible_local: Add `pip_args` option to define additional parameters when installing Ansible via pip [GH-8170, GH-8405]
+  - provisioners/ansible_local: Add `:pip_args_only` install mode to allow full custom pip installations [GH-8405]
+  - provisioners/salt: Update minion version installed to 2016.11.3 [GH-8448]
+
+BUG FIXES:
+
+  - command/box: Remove extraneous sort from box list prior to display [GH-8422]
+  - command/box: Properly handle local paths with spaces for box add [GH-8503, GH-6825]
+  - command/up: Prevent other provider installation when explicitly defined [GH-8393, GH-8389]
+  - communicators/ssh: Do not yield empty output data [GH-8495, GH-8259]
+  - core: Provide fallback and retry when 0.0.0.0 is unavailable during port check [GH-8399, GH-8395]
+  - core: Support port checker methods that do not expect inclusion of host_ip [GH-8497, GH-8423]
+  - core/bundler: Check if source is local path and prevent addition to remote sources [GH-8401]
+  - core/ui: Prevent deadlock detection errors [GH-8414, GH-8125]
+  - guests/debian: Remove hardcoded device name in interface template [GH-8336, GH-7960]
+  - guests/linux: Fix SMB mount capbability [GH-8410, GH-8404]
+  - hosts/windows: Fix issues with Windows encoding [GH-8385, GH-8380, GH-8212, GH-8207, GH-7516]
+  - hosts/windows: Fix UNC path generation when UNC path is provided [GH-8504]
+  - provisioners/salt: Allow Salt version to match 2 digit month [GH-8428]
+  - provisioners/shell: Properly handle remote paths on Windows that include spaces [GH-8498, GH-7234]
+
+## 1.9.3 (March 21, 2017)
+
+IMPROVEMENTS:
+
+  - command/plugin: Remove requirement for paths with no spaces [GH-7967]
+  - core: Support host_ip for forwarded ports [GH-7035, GH-8350]
+  - core: Include disk space hint in box install failure message [GH-8089]
+  - core/bundler: Allow vagrant constraint matching in prerelease mode [GH-8341]
+  - provisioner/docker: Include /bin/docker as valid path [GH-8390]
+  - provider/hyperv: Support enabling Hyper-V nested virtualization [GH-8325, GH-7738]
+
+BUG FIXES:
+
+  - communicator/winrm: Prevent inaccurate WinRM address [GH-7983, GH-8073]
+  - contrib/bash: Handle path spaces in bash completion [GH-8337]
+  - core: Fix box sorting on find and list [GH-7956, GH-8334]
+  - core/bundler: Force path as preferred source on install [GH-8327]
+  - core/provision: Update "never" behavior to match documentation [GH-8366, GH-8016]
+  - plugins/push: Isolate deprecation to Atlas strategy only
+  - plugins/synced_folders: Give UID/GID precedence if found within mount options
+      [GH-8122, GH-8064, GH-7859]
+
+## 1.9.2 (February 27, 2017)
+
+FEATURES:
+
+  - providers/hyperv: Support packaging of Hyper-V boxes [GH-7867]
+  - util/command_deprecation: Add utility module for command deprecation [GH-8300]
+  - util/subprocess: Add #stop and #running? methods [GH-8270]
+
+IMPROVEMENTS:
+
+  - commands/expunge: Display default value on prompt and validate input [GH-8192, GH-8171]
+  - communicator/winrm: Refactor WinRM communicator to use latest WinRM
+      gems and V2 API [GH-8102]
+  - core: Scrub URL credentials from output when adding boxes [GH-8194, GH-8117]
+  - providers/hyperv: Prefer VMCX over XML configuration when VMCX is supported [GH-8119]
+
+BUG FIXES:
+
+  - command/init: Include box version when using minimal option [GH-8283, GH-8282]
+  - command/package: Fix SecureRandom constant error [GH-8159]
+  - communicator/ssh: Remove any STDERR output prior to command execution [GH-8291, GH-8288]
+  - core/bundler: Prevent pristine warning messages [GH-8191, GH-8190, GH-8147]
+  - core/bundler: Fix local installations of pre-release plugins [GH-8252, GH-8253]
+  - core/bundler: Prefer user defined source when installing plugins [GH-8273, GH-8210]
+  - core/environment: Prevent persisting original environment variable if name is empty
+      [GH-8198, GH-8126]
+  - core/environment: Fix gems_path location [GH-8248]
+  - core/environment: Properly expand dotfile path [GH-8196, GH-8108]
+  - guests/arch: Fix configuring multiple network interfaces [GH-8165]
+  - guests/linux: Fix guest detection for names with spaces [GH-8092]
+  - guests/redhat: Fix network interface configuration [GH-8148]
+
+DEPRECATIONS:
+
+  - command/push: Disable push command [GH-8300]
+
 ## 1.9.1 (December 7, 2016)
 
 IMPROVEMENTS:

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2016 Mitchell Hashimoto
+Copyright (c) 2010-2017 Mitchell Hashimoto
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -21,7 +21,7 @@ between Windows, Mac OS X, and Linux.
 For the quick-start, we'll bring up a development machine on
 [VirtualBox](https://www.virtualbox.org/) because it is free and works
 on all major platforms. Vagrant can, however, work with almost any
-system such as [OpenStack] (https://www.openstack.org/), [VMware] (https://www.vmware.com/), [Docker] (https://docs.docker.com/), etc.
+system such as [OpenStack](https://www.openstack.org/), [VMware](https://www.vmware.com/), [Docker](https://docs.docker.com/), etc.
 
 First, make sure your development machine has
 [VirtualBox](https://www.virtualbox.org/)

data/bin/vagrant

@@ -117,6 +117,17 @@ begin
   logger.debug("Creating Vagrant environment")
   env = Vagrant::Environment.new(opts)
 
+  # If we are running with the Windows Subsystem for Linux do
+  # some extra setup to allow access to Vagrant managed machines
+  # outside the subsystem
+  if Vagrant::Util::Platform.wsl?
+    recreate_env = Vagrant::Util::Platform.wsl_init(env, logger)
+    if recreate_env
+      logger.info("Re-creating Vagrant environment due to WSL modifications.")
+      env = Vagrant::Environment.new(opts)
+    end
+  end
+
   if !Vagrant.in_installer? && !Vagrant.very_quiet?
     # If we're not in the installer, warn.
     #env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)

data/contrib/bash/completion.sh

@@ -71,9 +71,9 @@ _vagrant() {
             ;;
             "up")
               vagrant_state_file=$(__vagrantinvestigate) || return 1
-              if [[ -d $vagrant_state_file ]]
+              if [[ -d "${vagrant_state_file}" ]]
               then
-                local vm_list=$(find $vagrant_state_file/machines -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+                local vm_list=$(find "${vagrant_state_file}/machines" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
               fi
               local up_commands="--no-provision"
               COMPREPLY=($(compgen -W "${up_commands} ${vm_list}" -- ${cur}))
@@ -81,12 +81,12 @@ _vagrant() {
             ;;
             "ssh"|"provision"|"reload"|"halt"|"suspend"|"resume"|"ssh-config")
               vagrant_state_file=$(__vagrantinvestigate) || return 1
-      	      if [[ -f $vagrant_state_file ]]
+              if [[ -f "${vagrant_state_file}" ]]
               then
-		            running_vm_list=$(grep 'active' $vagrant_state_file | sed -e 's/"active"://' | tr ',' '\n' | cut -d '"' -f 2 | tr '\n' ' ')
-      	      else
-		            running_vm_list=$(find $vagrant_state_file -type f -name "id" | awk -F"/" '{print $(NF-2)}')
-      	      fi
+                running_vm_list=$(grep 'active' "${vagrant_state_file}" | sed -e 's/"active"://' | tr ',' '\n' | cut -d '"' -f 2 | tr '\n' ' ')
+              else
+                running_vm_list=$(find "${vagrant_state_file}" -type f -name "id" | awk -F"/" '{print $(NF-2)}')
+              fi
               COMPREPLY=($(compgen -W "${running_vm_list}" -- ${cur}))
               return 0
             ;;
@@ -121,9 +121,9 @@ _vagrant() {
         "up")
           if [ "$prev" == "--no-provision" ]
           then
-            if [[ -d $vagrant_state_file ]]
+            if [[ -d "${vagrant_state_file}" ]]
             then
-              local vm_list=$(find $vagrant_state_file/machines -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+              local vm_list=$(find "${vagrant_state_file}/machines" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
             fi
             COMPREPLY=($(compgen -W "${vm_list}" -- ${cur}))
             return 0

data/lib/vagrant.rb

@@ -226,7 +226,9 @@ module Vagrant
       ENV.each do |k,v|
         if k.start_with?("VAGRANT_OLD_ENV")
           key = k.sub(/^VAGRANT_OLD_ENV_/, "")
-          h[key] = v
+          if !key.empty?
+            h[key] = v
+          end
         end
       end
     end
@@ -318,7 +320,7 @@ if Vagrant.plugins_enabled?
               global_logger.debug("Loading plugin `#{plugin_name}` with slash require: `#{plugin_slash}`")
               require plugin_slash
             rescue LoadError, Gem::LoadError
-              raise load_error
+              global_logger.warn("Failed to load plugin `#{plugin_name}`. Assuming library and moving on.")
             end
           end
         end

data/lib/vagrant/action/builtin/box_add.rb

@@ -168,12 +168,15 @@ module Vagrant
             url               = url[0]
           end
 
+          display_original_url = Util::CredentialScrubber.scrub(Array(original_url).first)
+          display_url = Util::CredentialScrubber.scrub(url)
+
           env[:ui].output(I18n.t(
             "vagrant.box_loading_metadata",
-            name: Array(original_url).first))
+            name: display_original_url))
           if original_url != url
             env[:ui].detail(I18n.t(
-              "vagrant.box_expanding_url", url: url))
+              "vagrant.box_expanding_url", url: display_url))
           end
 
           metadata = nil
@@ -189,8 +192,8 @@ module Vagrant
             raise if !expanded
             raise Errors::BoxAddShortNotFound,
               error: e.extra_data[:message],
-              name: original_url,
-              url: url
+              name: display_original_url,
+              url: display_url
           ensure
             metadata_path.delete if metadata_path && metadata_path.file?
           end
@@ -208,12 +211,12 @@ module Vagrant
               raise Errors::BoxAddNoMatchingProvider,
                 name: metadata.name,
                 requested: provider,
-                url: url
+                url: display_url
             else
               raise Errors::BoxAddNoMatchingVersion,
                 constraints: version || ">= 0",
                 name: metadata.name,
-                url: url,
+                url: display_url,
                 versions: metadata.versions.join(", ")
             end
           end
@@ -265,7 +268,7 @@ module Vagrant
               raise "Bad box authentication hook, did not generate proper results."
             end
             provider_url = authed_urls[0]
-        end
+          end
 
           box_add(
             [[provider_url, metadata_provider.url]],
@@ -429,6 +432,7 @@ module Vagrant
           if opts[:ui]
             show_url = opts[:show_url]
             show_url ||= url
+            display_url = Util::CredentialScrubber.scrub(show_url)
 
             translation = "vagrant.box_downloading"
 
@@ -439,7 +443,7 @@ module Vagrant
 
             env[:ui].detail(I18n.t(
               translation,
-              url: show_url))
+              url: display_url))
             if File.file?(d.destination)
               env[:ui].info(I18n.t("vagrant.actions.box.download.resuming"))
             end
@@ -474,6 +478,7 @@ module Vagrant
             url ||= uri.opaque
             #7570 Strip leading slash left in front of drive letter by uri.path
             Util::Platform.windows? && url.gsub!(/^\/([a-zA-Z]:)/, '\1')
+            url = URI.unescape(url)
 
             begin
               File.open(url, "r") do |f|

data/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb

@@ -62,7 +62,13 @@ module Vagrant
           @logger.info("Detecting any forwarded port collisions...")
 
           # Get the extra ports we consider in use
-          extra_in_use = env[:port_collision_extra_in_use] || []
+          extra_in_use = env[:port_collision_extra_in_use] || {}
+
+          # If extras are provided as an Array (previous behavior) convert
+          # to Hash as expected for IP aliasing support
+          if extra_in_use.is_a?(Array)
+            extra_in_use = Hash[extra_in_use.map{|port| [port, Set.new(["*"])]}]
+          end
 
           # Get the remap
           remap = env[:port_collision_remap] || {}
@@ -81,7 +87,7 @@ module Vagrant
 
           # Determine a list of usable ports for repair
           usable_ports = Set.new(env[:machine].config.vm.usable_port_range)
-          usable_ports.subtract(extra_in_use)
+          usable_ports.subtract(extra_in_use.keys)
 
           # Pass one, remove all defined host ports from usable ports
           with_forwarded_ports(env) do |options|
@@ -92,6 +98,7 @@ module Vagrant
           with_forwarded_ports(env) do |options|
             guest_port = options[:guest]
             host_port  = options[:host]
+            host_ip    = options[:host_ip]
 
             if options[:disabled]
               @logger.debug("Skipping disabled port #{host_port}.")
@@ -110,9 +117,9 @@ module Vagrant
             end
 
             # If the port is open (listening for TCP connections)
-            in_use = extra_in_use.include?(host_port) ||
-              port_checker[host_port] ||
-              lease_check(host_port)
+            in_use = is_forwarded_already(extra_in_use, host_port, host_ip) ||
+              call_port_checker(port_checker, host_ip, host_port) ||
+              lease_check(host_ip, host_port)
             if in_use
               if !repair || !options[:auto_correct]
                 raise Errors::ForwardPortCollision,
@@ -129,9 +136,9 @@ module Vagrant
                 usable_ports.delete(repaired_port)
 
                 # If the port is in use, then we can't use this either...
-                in_use = extra_in_use.include?(repaired_port) ||
-                  port_checker[repaired_port] ||
-                  lease_check(repaired_port)
+                in_use = is_forwarded_already(extra_in_use, repaired_port, host_ip) ||
+                  call_port_checker(port_checker, host_ip, repaired_port) ||
+                  lease_check(host_ip, repaired_port)
                 if in_use
                   @logger.info("Repaired port also in use: #{repaired_port}. Trying another...")
                   next
@@ -163,13 +170,19 @@ module Vagrant
           end
         end
 
-        def lease_check(port)
+        def lease_check(host_ip=nil, host_port)
           # Check if this port is "leased". We use a leasing system of
           # about 60 seconds to avoid any forwarded port collisions in
           # a highly parallelized environment.
           leasedir = @machine.env.data_dir.join("fp-leases")
           leasedir.mkpath
 
+          if host_ip.nil?
+            lease_file_name = host_port.to_s
+          else
+            lease_file_name = "#{host_ip.gsub('.','_')}_#{host_port.to_s}"
+          end
+
           invalid = false
           oldest  = Time.now.to_i - 60
           leasedir.children.each do |child|
@@ -178,7 +191,7 @@ module Vagrant
               child.delete
             end
 
-            if child.basename.to_s == port.to_s
+            if child.basename.to_s == lease_file_name
               invalid = true
             end
           end
@@ -187,13 +200,13 @@ module Vagrant
           return true if invalid
 
           # Otherwise, create the lease
-          leasedir.join(port.to_s).open("w+") do |f|
+          leasedir.join(lease_file_name).open("w+") do |f|
             f.binmode
             f.write(Time.now.to_i.to_s + "\n")
           end
 
           # Add to the leased array so we unlease it right away
-          @leased << port.to_s
+          @leased << lease_file_name
 
           # Things look good to us!
           false
@@ -208,8 +221,41 @@ module Vagrant
           end
         end
 
-        def port_check(port)
-          is_port_open?("127.0.0.1", port)
+        # This functions checks to see if the current instance's hostport and
+        # hostip for forwarding is in use by the virtual machines created
+        # previously.
+        def is_forwarded_already(extra_in_use, hostport, hostip)
+          hostip = '*' if hostip.nil? || hostip.empty?
+          # ret. false if none of the VMs we spun up had this port forwarded.
+          return false if not extra_in_use.has_key?(hostport)
+
+          # ret. true if the user has requested to bind on all interfaces but
+          # we already have a rule in one the VMs we spun up.
+          if hostip == '*'
+            if extra_in_use.fetch(hostport).size != 0
+              return true
+            else
+              return false
+            end
+          end
+
+          return extra_in_use.fetch(hostport).include?(hostip)
+        end
+
+        def port_check(host_ip, host_port)
+          # If no host_ip is specified, intention taken to be list on all interfaces.
+          # If platform is windows, default back to localhost only
+          test_host_ip = host_ip || "0.0.0.0"
+          begin
+            is_port_open?(test_host_ip, host_port)
+          rescue Errno::EADDRNOTAVAIL
+            if !host_ip && test_host_ip == "0.0.0.0"
+              test_host_ip = "127.0.0.1"
+              retry
+            else
+              raise
+            end
+          end
         end
 
         def with_forwarded_ports(env)
@@ -220,6 +266,13 @@ module Vagrant
             yield options
           end
         end
+
+        def call_port_checker(port_checker, host_ip, host_port)
+          call_args = [host_ip, host_port]
+          # Trim args if checker method does not support inclusion of host_ip
+          call_args = call_args.slice(call_args.size - port_checker.arity.abs, port_checker.arity.abs)
+          port_checker[*call_args]
+        end
       end
     end
   end