vagrant-unbundled 1.9.5.1 → 1.9.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d495a5847304cac74b0de42f8db4da2809f58756
-  data.tar.gz: e894be37b991f66febb0682cc764d29aefd7aa8d
+  metadata.gz: aff8f1193fe95e18ecda858827bf0504a153d45f
+  data.tar.gz: a77b2accdc05f28604ff50abfee172861fa46f6f
 SHA512:
-  metadata.gz: bc241e8671128f790e56f1f5d6a47ca3e904798e022760702f6327345bbd1e16ed7ae078c69ab07235224ac3d451dc3318e56e3c11fd09224274f0a8baff8e5f
-  data.tar.gz: 3d9237118fca1791258ca9adac7fa220306c301d307bbf690c15cee71b946691e7dc83d1ed426940cb54b79df496f0f4388703129b57c2e236b8e6ca65f35225
+  metadata.gz: 9d8d35c3f4dfe559ef0bdea8ca8597399685f6bb8d5845c4e8055cb69b170017a55dd0f6761c641183a370e54750b3de1f433286681d9392f5c506ba9e0c1acd
+  data.tar.gz: 7d0fa5d7ffd7e6b7150b5cc48fbda454a1f5fbfa8caf6a0dd83c63f9ea3a90da972b3e98c862ec93b9cf03e13235b31677fb75267b262906d3c02449a4231648

data/2.14.0

@@ -0,0 +1,5 @@
+Successfully installed rspec-3.6.0
+Parsing documentation for rspec-3.6.0
+Installing ri documentation for rspec-3.6.0
+Done installing documentation for rspec after 0 seconds
+1 gem installed

data/CHANGELOG.md

@@ -1,3 +1,58 @@
+## 1.9.7 (July 7, 2017)
+
+FEATURES:
+
+  - core: Add support for preferred providers [GH-8558]
+
+IMPROVEMENTS:
+
+  - guests/bsd: Invoke `tee` with explicit path [GH-8740]
+  - guests/smartos: Guest updates for host name and nfs capabilities [GH-8695]
+  - guests/windows: Add public key capabilities for WinSSH communicator [GH-8761]
+
+BUG FIXES:
+
+  - communicators/winssh: Make script upload directory configurable [GH-8761]
+  - core: Update cygwin detection to prevent PATH related errors [GH-8749, GH-6788]
+  - core: Fix URI parsing of box names to prevent errors [GH-8762, GH-8758]
+  - provider/docker: Only rsync-auto current working dir with docker provider [GH-8756]
+
+## 1.9.6 (June 28, 2017)
+
+IMPROVEMENTS:
+
+  - commands/snapshot: Enforce unique snapshot names and introduce `--force` flag [GH-7810]
+  - commands/ssh: Introduce tty flag for `vagrant ssh -c` [GH-6827]
+  - core: Warn about vagrant CWD changes for a machine [GH-3921]
+  - core: Allow Compression and DSAAuthentication ssh flags to be configurable [GH-8693]
+  - core/box: Warn if user sets box as url [GH-7118]
+  - core/bundler: Enforce stict constraints on vendored libraries [GH-8692]
+  - guests/kali: Add support for guest [GH-8553]
+  - guests/smartos: Update halt capability and add public key insert and remove capabilities [GH-8618]
+  - provisioners/ansible: Fix SSH keys only behavior to be consistent with Vagrant [GH-8467]
+  - providers/docker: Add post install provisioner for docker setup [GH-8722]
+  - snapshot/delete: Improve error message when given snapshot doesn't exist [GH-8653]
+  - snapshot/list: Raise exception if provider does not support snapshots [GH-8619]
+  - snapshot/restore: Improve error message when given snapshot doesn't exist [GH-8653]
+  - snapshot/save: Raise exception if provider does not support snapshots [GH-8619]
+
+BUG FIXES:
+
+  - communicators/ssh: Move `none` cipher to end of default cipher list in Net::SSH [GH-8661]
+  - core: Add unique identifier to provisioner objects [GH-8680]
+  - core: Stop config loader from loading dupe config if home and project dir are equal [GH-8707]
+  - core/bundler: Impose constraints on update and allow system plugins to properly update [GH-8729]
+  - guests/linux: Strip whitespace from GID [GH-8666, GH-8664]
+  - guests/solaris: Do not use UNC style path for shared folders from windows hosts [GH-7723]
+  - guests/windows: Fix directory creation when using rsync for synced folders [GH-8588]
+  - hosts/windows: Force common encoding when running system commands [GH-8725]
+  - providers/docker: Fix check for docker-compose [GH-8659, GH-8660]
+  - providers/docker: Fix SSH under docker provider [GH-8706]
+  - providers/hyperv: Fix box import [GH-8678, GH-8677]
+  - provisioners/ansible_local: Catch pip_args in FreeBSD's and SUSE's ansible_install [GH-8676]
+  - provisioners/salt: Fix minion ID configuration [GH-7865, GH-7454]
+  - snapshot/restore: Exit 1 if vm has not been created when command is invoked [GH-8653]
+
 ## 1.9.5 (May 15, 2017)
 
 FEATURES:

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/mitchellh/vagrant-spec.git
-  revision: 1d09951eaef36fc36f47532645285e858a5a9ac1
+  revision: af86757912f7488fe693f52a80175057e6cf3349
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.6.0)
       log4r (~> 1.1.9)
-      rspec (~> 2.14)
+      rspec (~> 3.5.0)
       thor (~> 0.18.1)
 
 PATH
   remote: .
   specs:
-    vagrant-unbundled (1.9.5.1)
+    vagrant-unbundled (1.9.7.1)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
@@ -43,13 +43,13 @@ GEM
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    fake_ftp (0.1.1)
+    fake_ftp (0.3.0)
     ffi (1.9.18)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.3.4)
+    hashdiff (0.3.5)
     hashicorp-checkpoint (0.1.4)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -77,23 +77,28 @@ GEM
     nori (2.6.0)
     public_suffix (2.0.5)
     rake (11.3.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
@@ -131,10 +136,10 @@ PLATFORMS
 DEPENDENCIES
   fake_ftp (~> 0.1)
   rake (~> 11.3.0)
-  rspec (~> 2.14.0)
+  rspec (~> 3.5.0)
   vagrant-spec!
   vagrant-unbundled!
   webmock (~> 1.20)
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

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

@@ -30,6 +30,16 @@ module Vagrant
         def call(env)
           @download_interrupted = false
 
+          unless env[:box_name].nil?
+            begin
+              if URI.parse(env[:box_name]).kind_of?(URI::HTTP)
+                env[:ui].warn(I18n.t("vagrant.box_add_url_warn"))
+              end
+            rescue URI::InvalidURIError
+              # do nothing
+            end
+          end
+
           url = Array(env[:box_url]).map do |u|
             u = u.gsub("\\", "/")
             if Util::Platform.windows? && u =~ /^[a-z]:/i

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

@@ -44,7 +44,9 @@ module Vagrant
 
           # Allow the user to specify a tty or non-tty manually, but if they
           # don't then we default to a TTY
-          if !opts[:extra_args].include?("-t") && !opts[:extra_args].include?("-T")
+          if !opts[:extra_args].include?("-t") &&
+              !opts[:extra_args].include?("-T") &&
+              env[:tty]
             opts[:extra_args] << "-t"
           end
 

data/lib/vagrant/bundler.rb

@@ -215,15 +215,21 @@ module Vagrant
       update = {} if !update.is_a?(Hash)
       skips = []
       source_list = {}
+      system_plugins = plugins.map do |plugin_name, plugin_info|
+        plugin_name if plugin_info["system"]
+      end.compact
       installer_set = VagrantSet.new(:both)
+      installer_set.system_plugins = system_plugins
 
       # Generate all required plugin deps
       plugin_deps = plugins.map do |name, info|
+        gem_version = info['gem_version'].to_s.empty? ? '> 0' : info['gem_version']
         if update[:gems] == true || (update[:gems].respond_to?(:include?) && update[:gems].include?(name))
-          gem_version = '> 0'
+          if Gem::Requirement.new(gem_version).exact?
+            gem_version = "> 0"
+            @logger.debug("Detected exact version match for `#{name}` plugin update. Reset to loose constraint #{gem_version.inspect}.")
+          end
           skips << name
-        else
-          gem_version = info['gem_version'].to_s.empty? ? '> 0' : info['gem_version']
         end
         source_list[name] ||= []
         if plugin_source = info.delete("local_source")
@@ -239,7 +245,18 @@ module Vagrant
         Gem::Dependency.new(name, gem_version)
       end
 
-      @logger.debug("Dependency list for installation: #{plugin_deps}")
+      if Vagrant.strict_dependency_enforcement
+        @logger.debug("Enabling strict dependency enforcement")
+        plugin_deps += vagrant_internal_specs.map do |spec|
+          next if system_plugins.include?(spec.name)
+          Gem::Dependency.new(spec.name, spec.version)
+        end.compact
+      else
+        @logger.debug("Disabling strict dependency enforcement")
+      end
+
+      @logger.debug("Dependency list for installation:\n - " \
+        "#{plugin_deps.map{|d| "#{d.name} #{d.requirement}"}.join("\n - ")}")
 
       all_sources = source_list.values.flatten.uniq
       default_sources = DEFAULT_GEM_SOURCES & all_sources
@@ -277,10 +294,9 @@ module Vagrant
 
       installer_set = Gem::Resolver.compose_sets(
         installer_set,
-        generate_builtin_set,
+        generate_builtin_set(system_plugins),
         generate_plugin_set(skips)
       )
-
       @logger.debug("Generating solution set for installation.")
 
       # Generate the required solution set for new plugins
@@ -349,11 +365,13 @@ module Vagrant
     end
 
     # Generate the builtin resolver set
-    def generate_builtin_set
+    def generate_builtin_set(system_plugins=[])
       builtin_set = BuiltinSet.new
       @logger.debug("Generating new builtin set instance.")
       vagrant_internal_specs.each do |spec|
-        builtin_set.add_builtin_spec(spec)
+        if !system_plugins.include?(spec.name)
+          builtin_set.add_builtin_spec(spec)
+        end
       end
       builtin_set
     end
@@ -428,9 +446,11 @@ module Vagrant
     # the entire set used for performing full resolutions on install.
     class VagrantSet < Gem::Resolver::InstallerSet
       attr_accessor :prefer_sources
+      attr_accessor :system_plugins
 
       def initialize(domain, defined_sources={})
         @prefer_sources = defined_sources
+        @system_plugins = []
         super(domain)
       end
 
@@ -438,6 +458,11 @@ module Vagrant
       # for preferred sources
       def find_all(req)
         result = super
+        if system_plugins.include?(req.name)
+          result.delete_if do |spec|
+            spec.is_a?(Gem::Resolver::InstalledSpecification)
+          end
+        end
         subset = result.find_all do |idx_spec|
           preferred = false
           if prefer_sources[req.name]

data/lib/vagrant/config/loader.rb

@@ -101,6 +101,18 @@ module Vagrant
         warnings = []
         errors   = []
 
+        if !@sources[:root].nil? && @sources[:root].eql?(@sources[:home])
+          # Vagrants home dir is set to the same dir as its project directory
+          # so we don't want to load and merge the same Vagrantfile config
+          # and execute its settings/procs twice
+          #
+          # Note: This protection won't work if there are two separate but
+          # identical Vagrantfiles in the home and project dir
+          @logger.info("Duplicate Vagrantfile config objects detected in :root and :home.")
+          @sources.delete(:home)
+          @logger.info("Removed :home config from being loaded")
+        end
+
         order.each do |key|
           next if !@sources.key?(key)
 

data/lib/vagrant/environment.rb

@@ -317,13 +317,35 @@ module Vagrant
       opts[:force_default] = true if !opts.key?(:force_default)
       opts[:check_usable] = true if !opts.key?(:check_usable)
 
-      default = ENV["VAGRANT_DEFAULT_PROVIDER"]
-      default = nil if default == ""
-      default = default.to_sym if default
+      # Implement the algorithm from
+      # https://www.vagrantup.com/docs/providers/basic_usage.html#default-provider
+      # with additional steps 2.5 and 3.5 from
+      # https://bugzilla.redhat.com/show_bug.cgi?id=1444492
+      # to allow system-configured provider priorities.
+      #
+      # 1. The --provider flag on a vagrant up is chosen above all else, if it is
+      #    present.
+      #
+      # (Step 1 is done by the caller; this method is only called if --provider
+      # wasn't given.)
+      #
+      # 2. If the VAGRANT_DEFAULT_PROVIDER environmental variable is set, it
+      #    takes next priority and will be the provider chosen.
+
+      default = ENV["VAGRANT_DEFAULT_PROVIDER"].to_s
+      if default.empty?
+        default = nil
+      else
+        default = default.to_sym
+        @logger.debug("Default provider: `#{default}`")
+      end
 
       # If we're forcing the default, just short-circuit and return
       # that (the default behavior)
-      return default if default && opts[:force_default]
+      if default && opts[:force_default]
+        @logger.debug("Using forced default provider: `#{default}`")
+        return default
+      end
 
       # Determine the config to use to look for provider definitions. By
       # default it is the global but if we're targeting a specific machine,
@@ -334,22 +356,12 @@ module Vagrant
         root_config = machine_info[:config]
       end
 
-      # Get the list of providers within our configuration and assign
-      # a priority to each in the order they exist so that we try these first.
-      config = {}
-      root_config.vm.__providers.reverse.each_with_index do |key, idx|
-        config[key] = idx + 1
-      end
+      # Get the list of providers within our configuration, in order.
+      config = root_config.vm.__providers
 
-      # Determine the max priority so that we can add the config priority
-      # to that to make sure it is highest.
-      max_priority = 0
-      Vagrant.plugin("2").manager.providers.each do |key, data|
-        priority = data[1][:priority]
-        max_priority = priority if priority > max_priority
-      end
-
-      ordered = []
+      # Get the list of usable providers with their internally-declared
+      # priorities.
+      usable = []
       Vagrant.plugin("2").manager.providers.each do |key, data|
         impl  = data[0]
         popts = data[1]
@@ -359,34 +371,86 @@ module Vagrant
 
         # Skip providers that can't be defaulted, unless they're in our
         # config, in which case someone made our decision for us.
-        if !config.key?(key)
+        if !config.include?(key)
           next if popts.key?(:defaultable) && !popts[:defaultable]
         end
 
-        # The priority is higher if it is in our config. Otherwise, it is
-        # the priority it set PLUS the length of the config to make sure it
-        # is never higher than the configuration keys.
-        priority = popts[:priority]
-        priority = config[key] + max_priority if config.key?(key)
+        # Skip providers that aren't usable.
+        next if opts[:check_usable] && !impl.usable?(false)
 
-        ordered << [priority, key, impl, popts]
+        # Each provider sets its own priority, defaulting to 5 so we can trust
+        # it's always set.
+        usable << [popts[:priority], key]
+      end
+      @logger.debug("Initial usable provider list: #{usable}")
+
+      # Sort the usable providers by priority. Higher numbers are higher
+      # priority, otherwise alpha sort.
+      usable = usable.sort {|a, b| a[0] == b[0] ? a[1] <=> b[1] : b[0] <=> a[0]}
+                      .map {|prio, key| key}
+      @logger.debug("Priority sorted usable provider list: #{usable}")
+
+      # If we're not forcing the default, but it's usable and hasn't been
+      # otherwise excluded, return it now.
+      if usable.include?(default)
+        @logger.debug("Using default provider `#{default}` as it was found in usable list.")
+        return default
       end
 
-      # Order the providers by priority. Higher values are tried first.
-      ordered = ordered.sort do |a, b|
-        # If we see the default, then that one always wins
-        next -1 if a[1] == default
-        next 1  if b[1] == default
+      # 2.5. Vagrant will go through all of the config.vm.provider calls in the
+      #      Vagrantfile and try each in order. It will choose the first
+      #      provider that is usable and listed in VAGRANT_PREFERRED_PROVIDERS.
+
+      preferred = ENV.fetch('VAGRANT_PREFERRED_PROVIDERS', '')
+                     .split(',')
+                     .map {|s| s.strip}
+                     .select {|s| !s.empty?}
+                     .map {|s| s.to_sym}
+      @logger.debug("Preferred provider list: #{preferred}")
+
+      config.each do |key|
+        if usable.include?(key) && preferred.include?(key)
+          @logger.debug("Using preferred provider `#{key}` detected in configuration and usable.")
+          return key
+        end
+      end
 
-        b[0] <=> a[0]
+      # 3. Vagrant will go through all of the config.vm.provider calls in the
+      #    Vagrantfile and try each in order. It will choose the first provider
+      #    that is usable. For example, if you configure Hyper-V, it will never
+      #    be chosen on Mac this way. It must be both configured and usable.
+
+      config.each do |key|
+        if usable.include?(key)
+          @logger.debug("Using provider `#{key}` detected in configuration and usable.")
+          return key
+        end
+      end
+
+      # 3.5. Vagrant will go through VAGRANT_PREFERRED_PROVIDERS and find the
+      #      first plugin that reports it is usable.
+
+      preferred.each do |key|
+        if usable.include?(key)
+          @logger.debug("Using preferred provider `#{key}` found in usable list.")
+          return key
+        end
       end
 
-      # Find the matching implementation
-      ordered.each do |_, key, impl, _|
-        return key if !opts[:check_usable]
-        return key if impl.usable?(false)
+      # 4. Vagrant will go through all installed provider plugins (including the
+      #    ones that come with Vagrant), and find the first plugin that reports
+      #    it is usable. There is a priority system here: systems that are known
+      #    better have a higher priority than systems that are worse. For
+      #    example, if you have the VMware provider installed, it will always
+      #    take priority over VirtualBox.
+
+      if !usable.empty?
+        @logger.debug("Using provider `#{usable[0]}` as it is the highest priority in the usable list.")
+        return usable[0]
       end
 
+      # 5. If Vagrant still has not found any usable providers, it will error.
+
       # No providers available is a critical error for Vagrant.
       raise Errors::NoDefaultProvider
     end