vagrant-unbundled 1.8.5.2 → 1.9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c280ac0792c64572ea6568b5b7d296e77dbd92
-  data.tar.gz: a43db2283b94e957b61dbf98123f1b54144e7a0d
+  metadata.gz: fde757e34dcee067f88dff20c6d8817f8b95e772
+  data.tar.gz: 3e39ba6054e66a9cef60b6219f6f994c10fbea4f
 SHA512:
-  metadata.gz: 73808edeb47ee4fe562bbada0c966947879f31906c418e8328e39bc1a05742d313378e1188d50b19ad587dec9dea395a52499554971a7233ae080f5f25119c03
-  data.tar.gz: e8a77cc99786cfe17dca61a5b34603bd736336e64268d0985fed51604098ffaeb7f13e715d78c87b165b30cd804a9251940bbabc7cb6454066ba90d307cbceec
+  metadata.gz: 65afc154db7e1d92371b4e5e0efebb2bd0e502b8cee4f1f00c0d7e5dd289919343d2089b77d260399c3bcfeb04e5c6e05fc26114cf4a4400ab9d9d502ddde51b
+  data.tar.gz: a6d2b95aaca2e3669410baa1b8ebed4fdfc3d89830f4ca9551adce07585626eb41f2c3fa2a2c5434d1b7263fd2eb03bbee98dcf4bf74f2262afc4a8f99afe991

data/.gitignore

@@ -41,6 +41,7 @@ doc/
 
 # Ruby Managers
 .rbenv
+.rbenv-gemsets
 .ruby-gemset
 .ruby-version
 .rvmrc

data/.travis.yml

@@ -4,16 +4,14 @@ sudo: false
 
 cache: bundler
 
-before_install:
-  - gem install bundler -v '1.12.5'
-
 addons:
   apt:
     packages:
     - bsdtar
 
 rvm:
-  - 2.2.3
+  - 2.2.5
+  - 2.3.3
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,3 +1,109 @@
+## 1.9.1 (December 7, 2016)
+
+IMPROVEMENTS:
+
+  - core: Disable Vagrantfile loading when running plugin commands [GH-8066]
+  - guests/redhat: Detect and restart NetworkManager service if in use [GH-8052, GH-7994]
+
+BUG FIXES:
+
+  - core: Detect load failures within install solution sets and retry [GH-8068]
+  - core: Prevent interactive shell on plugin uninstall [GH-8086, GH-8087]
+  - core: Remove bundler usage from Util::Env [GH-8090, GH-8094]
+  - guests/linux: Prevent stderr output on init version check for synced folders [GH-8051]
+
+## 1.9.0 (November 28, 2016)
+
+FEATURES:
+
+  - commands/box: Add `prune` subcommand for removing outdated boxes [GH-7978]
+  - core: Remove Bundler integration for handling internal plugins [GH-7793, GH-8000, GH-8011, GH-8031]
+  - providers/hyperv: Add support for Hyper-V binary configuration format
+      [GH-7854, GH-7706, GH-6102]
+  - provisioners/shell: Support MD5/SHA1 checksum validation of remote scripts [GH-7985, GH-6323]
+
+IMPROVEMENTS:
+
+  - commands/plugin: Retain name sorted output when listing plugins [GH-8028]
+  - communicator/ssh: Support custom environment variable export template
+      [GH-7976, GH-6747]
+  - provisioners/ansible(both): Add `config_file` option to point the location of an
+      `ansible.cfg` file via ANSIBLE_CONFIG environment variable [GH-7195, GH-7918]
+  - synced_folders: Support custom naming and disable auto-mount [GH-7980, GH-6836]
+
+BUG FIXES:
+
+  - guests/linux: Do not match interfaces with special characters when sorting [GH-7989, GH-7988]
+  - provisioner/salt: Fix Hash construction for constant [GH-7986, GH-7981]
+
+## 1.8.7 (November 4, 2016)
+
+IMPROVEMENTS:
+
+  - guests/linux: Place ethernet devices at start of network devices list [GH-7848]
+  - guests/linux: Provide more consistent guest detection [GH-7887, GH-7827]
+  - guests/openbsd: Validate guest rsync installation success [GH-7929, GH-7898]
+  - guests/redhat: Include Virtuozzo Linux 7 within flavor identification [GH-7818]
+  - guests/windows: Allow vagrant to start Windows Nano without provisioning [GH-7831]
+  - provisioners/ansible_local: Change the Ansible binary detection mechanism [GH-7536]
+  - provisioners/ansible(both): Add the `playbook_command` option [GH-7881]
+  - provisioners/puppet: Support custom environment variables [GH-7931, GH-7252, GH-2270]
+  - util/safe_exec: Use subprocess for safe_exec on Windows [GH-7802]
+  - util/subprocess: Allow closing STDIN [GH-7778]
+
+BUG FIXES:
+
+  - communicators/winrm: Prevent connection leakage [GH-7712]
+  - core: Prevent duplicate provider priorities [GH-7756]
+  - core: Allow Numeric type for box version [GH-7874, GH-6960]
+  - core: Provide friendly error when user environment is too large [GH-7889, GH-7857]
+  - guests: Remove `set -e` usage for better shell compatibility [GH-7921, GH-7739]
+  - guests/linux: Fix incorrectly configured private network [GH-7844, GH-7848]
+  - guests/linux: Properly order network interfaces
+      [GH-7866, GH-7876, GH-7858, GH-7876]
+  - guests/linux: Only emit upstart event if initctl is available [GH-7813]
+  - guests/netbsd: Fix rsync installation [GH-7922, GH-7901]
+  - guests/photon: Fix networking setup [GH-7808, GH-7873]
+  - guests/redhat: Properly configure network and restart service [GH-7751]
+  - guests/redhat: Prevent NetworkManager from managing devices on initial start [GH-7926]
+  - hosts/linux: Fix race condition in writing /etc/exports file for NFS configuration
+      [GH-7947, GH-7938] - Thanks to Aron Griffis (@agriffis) for identifying this issue
+  - plugins/rsync: Escape exclude paths [GH-7928, GH-7910]
+  - providers/docker: Remove --interactive flag when pty is true [GH-7688]
+  - provisioners/ansible_local: Use enquoted path for file/directory existence checks
+  - provisioners/salt: Synchronize configuration defaults with documentation [GH-7907, GH-6624]
+  - pushes/atlas: Fix atlas push on Windows platform [GH-6938, GH-7802]
+
+## 1.8.6 (September 27, 2016)
+
+IMPROVEMENTS:
+
+  - Add detection for DragonFly BSD [GH-7701]
+  - Implement auto_start and auto_stop actions for Hyper-V [GH-7647]
+  - communicators/ssh: Remove any content prepended to STDOUT [GH-7676, GH-7613]
+
+BUG FIXES:
+
+  - commands/package: Provide machine data directory for base box package
+      [GH-5070, GH-7725]
+  - core: Fix windows path formatting [GH-6598]
+  - core: Fixes for ssh-agent interactions [GH-7703, GH-7621, GH-7398]
+  - core: Support VAGRANT_DOTFILE_PATH relative to the Vagrantfile [GH-7623]
+  - guests: Prevent ssh disconnect errors on halt command [GH-7675]
+  - guests/bsd: Remove Darwin matching [GH-7701]
+  - guests/linux: Fix SSH key permissions [GH-7610, GH-7611]
+  - guests/linux: Always sort discovered network interfaces [GH-7705, GH-7668]
+  - guests/linux: Fixes for user and group ID lookups for virtualbox shared folders
+      [GH-7616, GH-7662, GH-7720]
+  - guests/openbsd: Add custom halt capability [GH-7701]
+  - guests/ubuntu: Fix detection on older guests [GH-7632, GH-7524, GH-7625]
+  - hosts/arch: Detect NFS server by service name on arch [GH-7630, GH-7629]
+  - hosts/darwin: Fix generated RDP configuration file [GH-7698]
+  - provisioners/ansible: Add support for `ssh.proxy_command` setting [GH-7752]
+  - synced_folders/nfs: Display warning when configured for NFSv4 and UDP [GH-7740]
+  - synced_folders/rsync: Properly ignore excluded files within synced directory
+      from `chown` command. [GH-5256, GH-7726]
+
 ## 1.8.5 (July 18, 2016)
 
 FEATURES:

data/Gemfile.lock

@@ -1,5 +1,6 @@
-PATH
-  remote: ../vagrant-spec
+GIT
+  remote: https://github.com/mitchellh/vagrant-spec.git
+  revision: 9bba7e1228379c0a249a06ce76ba8ea7d276afbe
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.5.0)
@@ -10,8 +11,7 @@ PATH
 PATH
   remote: .
   specs:
-    vagrant-unbundled (1.8.5.2)
-      bundler
+    vagrant-unbundled (1.9.1.1)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
@@ -26,6 +26,7 @@ PATH
       nokogiri (~> 1.6.8)
       rb-kqueue (~> 0.2.0)
       rest-client (~> 2.0)
+      ruby_dep (<= 1.3.1)
       wdm (~> 0.1.0)
       winrm (~> 1.6)
       winrm-fs (~> 0.3.0)
@@ -40,20 +41,20 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     fake_ftp (0.1.1)
-    ffi (1.9.12)
+    ffi (1.9.10)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashdiff (0.3.0)
     hashicorp-checkpoint (0.1.4)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httpclient (2.8.0)
+    httpclient (2.8.3)
     i18n (0.7.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -64,7 +65,7 @@ GEM
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mime-types (2.99.2)
+    mime-types (2.99.3)
     mini_portile2 (2.1.0)
     multi_json (1.12.1)
     net-scp (1.2.1)
@@ -73,13 +74,11 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (3.0.2)
     netrc (0.11.0)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nori (2.6.0)
-    pkg-config (1.1.7)
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
+    rake (11.3.0)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
@@ -96,8 +95,8 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby_dep (1.4.0)
-    rubyntlm (0.6.0)
+    ruby_dep (1.3.1)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)
     thor (0.18.1)
@@ -128,11 +127,11 @@ PLATFORMS
 
 DEPENDENCIES
   fake_ftp (~> 0.1)
-  rake
+  rake (~> 11.3.0)
   rspec (~> 2.14.0)
   vagrant-spec!
   vagrant-unbundled!
   webmock (~> 1.20)
 
 BUNDLED WITH
-   1.12.5
+   1.13.7

data/README.md

@@ -2,7 +2,7 @@
 
 * Website: [https://www.vagrantup.com/](https://www.vagrantup.com/)
 * Source: [https://github.com/mitchellh/vagrant](https://github.com/mitchellh/vagrant)
-* IRC: `#vagrant` on Freenode
+* [![Gitter chat](https://badges.gitter.im/mitchellh/vagrant.png)](https://gitter.im/mitchellh/vagrant)
 * Mailing list: [Google Groups](https://groups.google.com/group/vagrant-up)
 
 Vagrant is a tool for building and distributing development environments.
@@ -45,11 +45,7 @@ To learn how to build a fully functional development environment, follow the
 ## Installing the Gem from Git
 
 If you want the bleeding edge version of Vagrant, we try to keep master pretty stable
-and you're welcome to give it a shot. The following is an example showing how to do this:
-
-    rake install
-
-Ruby 2.0 is needed.
+and you're welcome to give it a shot. Please review the installation page [here](https://www.vagrantup.com/docs/installation/source.html).
 
 ## Contributing to Vagrant
 
@@ -66,11 +62,6 @@ like so:
 
     bundle exec vagrant help
 
-**NOTE:** By default running Vagrant via `bundle` will disable plugins.
-This is necessary because Vagrant creates its own private Bundler context
-(it does not respect your Gemfile), because it uses Bundler to manage plugin
-dependencies.
-
 ### Acceptance Tests
 
 Vagrant also comes with an acceptance test suite that does black-box

data/Vagrantfile

@@ -25,9 +25,11 @@ Vagrant.configure("2") do |config|
   end
 end
 
-$shell = <<-CONTENTS
+$shell = <<-'CONTENTS'
 export DEBIAN_FRONTEND=noninteractive
 MARKER_FILE="/usr/local/etc/vagrant_provision_marker"
+RUBY_VER_REQ=$(awk '$1 == "s.required_ruby_version" { print $4 }' /vagrant/vagrant.gemspec | tr -d '"')
+BUNDLER_VER_REQ=$(awk '/s.add_dependency "bundler"/ { print $4 }' /vagrant/vagrant.gemspec | tr -d '"')
 
 # Only provision once
 if [ -f "${MARKER_FILE}" ]; then
@@ -35,13 +37,13 @@ if [ -f "${MARKER_FILE}" ]; then
 fi
 
 # Update apt
-apt-get update
+apt-get update --quiet
 
 # Install basic dependencies
-apt-get install -y build-essential bsdtar curl
+apt-get install -qy build-essential bsdtar curl
 
 # Import the mpapis public key to verify downloaded releases
-su -l -c 'curl -sSL https://rvm.io/mpapis.asc | gpg -q --import -' vagrant
+su -l -c 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3' vagrant
 
 # Install RVM
 su -l -c 'curl -sL https://get.rvm.io | bash -s stable' vagrant
@@ -49,15 +51,23 @@ su -l -c 'curl -sL https://get.rvm.io | bash -s stable' vagrant
 # Add the vagrant user to the RVM group
 #usermod -a -G rvm vagrant
 
-# Install some Rubies
-su -l -c 'rvm install 2.1.1' vagrant
-su -l -c 'rvm --default use 2.1.1' vagrant
+# Install latest Ruby that complies with Vagrant's version constraint
+RUBY_VER_LATEST=$(su -l -c 'rvm list known' vagrant | tr '[]-' ' ' | awk "/^ ruby  ${RUBY_VER_REQ:0:1}\./ { print \$2 }" | sort | tail -n1)
+su -l -c "rvm install ${RUBY_VER_LATEST}" vagrant
+su -l -c "rvm --default use ${RUBY_VER_LATEST}" vagrant
 
 # Output the Ruby version (for sanity)
 su -l -c 'ruby --version' vagrant
 
 # Install Git
-apt-get install -y git
+apt-get install -qy git
+
+# Upgrade Rubygems
+su -l -c "rvm ${RUBY_VER_LATEST} do gem update --system" vagrant
+
+# Install bundler and prepare to run unit tests
+su -l -c "gem install bundler -v ${BUNDLER_VER_REQ}" vagrant
+su -l -c 'cd /vagrant; bundle install' vagrant
 
 # Automatically move into the shared folder, but only add the command
 # if it's not already there.

data/bin/vagrant

@@ -8,6 +8,11 @@ Signal.trap("INT") { abort }
 # Split arguments by "--" if its there, we'll recombine them later
 argv = ARGV.dup
 argv_extra = []
+
+# These will be the options that are passed to initialze the Vagrant
+# environment.
+opts = {}
+
 if idx = argv.index("--")
   argv_extra = argv.slice(idx+1, argv.length-2)
   argv = argv.slice(0, idx)
@@ -20,43 +25,26 @@ if argv.include?("-v") || argv.include?("--version")
   exit 0
 end
 
-# This is kind of hacky, and I'd love to find a better way to do this, but
-# if we're accessing the plugin interface, we want to NOT load plugins
-# for this run, because they can actually interfere with the function
-# of the plugin interface.
+# Disable plugin loading for commands where plugins are not required. This will
+# also disable loading of the Vagrantfile if it available as the environment
+# is not required for these commands
 argv.each_index do |i|
   arg = argv[i]
 
   if !arg.start_with?("-")
-    if arg == "plugin"
-      ENV["VAGRANT_NO_PLUGINS"] = "1"
-      ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
+    if ["plugin", "help"].include?(arg) || (arg == "box" && argv[i+1] == "list")
+      opts[:vagrantfile_name] = ""
+      ENV['VAGRANT_NO_PLUGINS'] = "1"
     end
 
-    if arg == "help"
-      ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
-    end
-
-    if arg == "box" && argv[i+1] == "list"
-      ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
+    if arg == "plugin" && argv[i+1] != "list"
+      ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = "1"
     end
 
     break
   end
 end
 
-# First, make sure that we're executing using the proper Bundler context
-# with our plugins. If we're not, then load that and reload Vagrant.
-if !ENV["VAGRANT_INTERNAL_BUNDLERIZED"]
-  require "rbconfig"
-  ruby_path = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
-  Kernel.exec(
-    ruby_path,
-    File.expand_path("../../lib/vagrant/pre-rubygems.rb", __FILE__),
-    *ARGV)
-  raise "Fatal error: this line should never be reached"
-end
-
 # Set logging level to `debug`. This is done before loading 'vagrant', as it
 # sets up the logging system.
 if argv.include?("--debug")
@@ -64,37 +52,6 @@ if argv.include?("--debug")
   ENV["VAGRANT_LOG"] = "debug"
 end
 
-# Setup our dependencies by initializing Bundler. If we're using plugins,
-# then also initialize the paths to the plugins.
-require "bundler"
-begin
-  $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)
-rescue Bundler::GemNotFound
-  $stderr.puts "Bundler, the underlying system used to manage Vagrant plugins,"
-  $stderr.puts "is reporting that a plugin or its dependency can't be found."
-  $stderr.puts "This is usually caused by manual tampering with the 'plugins.json'"
-  $stderr.puts "file in the Vagrant home directory. To fix this error, please"
-  $stderr.puts "remove that file and reinstall all your plugins using `vagrant"
-  $stderr.puts "plugin install`."
-rescue Bundler::VersionConflict => e
-  $stderr.puts "Vagrant experienced a version conflict with some installed plugins!"
-  $stderr.puts "This usually happens if you recently upgraded Vagrant. As part of the"
-  $stderr.puts "upgrade process, some existing plugins are no longer compatible with"
-  $stderr.puts "this version of Vagrant. The recommended way to fix this is to remove"
-  $stderr.puts "your existing plugins and reinstall them one-by-one. To remove all"
-  $stderr.puts "plugins:"
-  $stderr.puts ""
-  $stderr.puts "    rm -r ~/.vagrant.d/plugins.json ~/.vagrant.d/gems"
-  $stderr.puts ""
-  $stderr.puts "Note if you have an alternate VAGRANT_HOME environmental variable"
-  $stderr.puts "set, the folders above will be in that directory rather than your"
-  $stderr.puts "user's home directory."
-  $stderr.puts ""
-  $stderr.puts "The error message is shown below:\n\n"
-  $stderr.puts e.message
-  exit 1
-end
-
 # Stdout/stderr should not buffer output
 $stdout.sync = true
 $stderr.sync = true
@@ -114,10 +71,6 @@ begin
   logger = Log4r::Logger.new("vagrant::bin::vagrant")
   logger.info("`vagrant` invoked: #{ARGV.inspect}")
 
-  # These will be the options that are passed to initialze the Vagrant
-  # environment.
-  opts = {}
-
   # Disable color in a few cases:
   #
   #   * --no-color is anywhere in our arguments

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

@@ -30,7 +30,7 @@ module Vagrant
 
           info[:private_key_path] ||= []
 
-          if info[:private_key_path].empty?
+          if info[:keys_only] && info[:private_key_path].empty?
             raise Errors::SSHRunRequiresKeys
           end