vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/plugins/provisioners/chef/cap/redhat/chef_install.rb

@@ -5,7 +5,7 @@ module VagrantPlugins
     module Cap
       module Redhat
         module ChefInstall
-          def self.chef_install(machine, project, version, channel, options = {})
+          def self.chef_install(machine, project, version, channel, omnibus_url, options = {})
             machine.communicate.sudo <<-EOH.gsub(/^ {14}/, '')
               if command -v dnf; then
                 dnf -y install curl
@@ -14,7 +14,7 @@ module VagrantPlugins
               fi
             EOH
 
-            command = Omnibus.sh_command(project, version, channel, options)
+            command = Omnibus.sh_command(project, version, channel, omnibus_url, options)
             machine.communicate.sudo(command)
           end
         end

data/plugins/provisioners/chef/cap/suse/chef_install.rb

@@ -5,13 +5,13 @@ module VagrantPlugins
     module Cap
       module Suse
         module ChefInstall
-          def self.chef_install(machine, project, version, channel, options = {})
+          def self.chef_install(machine, project, version, channel, omnibus_url, options = {})
             unless curl?(machine)
               machine.communicate.sudo("zypper -n -q update")
               machine.communicate.sudo("zypper -n -q install curl")
             end
 
-            command = Omnibus.sh_command(project, version, channel, options)
+            command = Omnibus.sh_command(project, version, channel, omnibus_url, options)
             machine.communicate.sudo(command)
           end
 

data/plugins/provisioners/chef/cap/windows/chef_install.rb

@@ -5,8 +5,8 @@ module VagrantPlugins
     module Cap
       module Windows
         module ChefInstall
-          def self.chef_install(machine, project, version, channel, options = {})
-            command = Omnibus.ps_command(project, version, channel, options)
+          def self.chef_install(machine, project, version, channel, omnibus_url, options = {})
+            command = Omnibus.ps_command(project, version, channel, omnibus_url, options)
             machine.communicate.sudo(command)
           end
         end

data/plugins/provisioners/chef/config/base.rb

@@ -56,6 +56,21 @@ module VagrantPlugins
         # @return [String]
         attr_accessor :version
 
+        # Location of Omnibus installation scripts.
+        # This URL specifies the location of install.sh/install.ps1 for
+        # Linux/Unix and Windows respectively.
+        #
+        # It defaults to https://omnitruck.chef.io/. The full URL is then:
+        #  - Linux/Unix: https://omnitruck.chef.io/install.sh
+        #  - Windows: https://omnitruck.chef.io/install.ps1
+        #
+        # If you want to have https://example.com/install.sh as Omnibus script
+        # for your Linux/Unix installations, you should set this option to
+        # https://example.com
+        #
+        # @return [String]
+        attr_accessor :omnibus_url
+
         # The path where the Chef installer will be downloaded to. Only valid if
         # install is true or "force". It defaults to nil, which means that the
         # omnibus installer will choose the destination and you have no control
@@ -74,6 +89,7 @@ module VagrantPlugins
           @log_level   = UNSET_VALUE
           @channel     = UNSET_VALUE
           @version     = UNSET_VALUE
+          @omnibus_url = UNSET_VALUE
           @installer_download_path = UNSET_VALUE
         end
 
@@ -85,6 +101,7 @@ module VagrantPlugins
           @log_level   = :info     if @log_level == UNSET_VALUE
           @channel     = "stable"  if @channel == UNSET_VALUE
           @version     = :latest   if @version == UNSET_VALUE
+          @omnibus_url = 'https://omnitruck.chef.io' if @omnibus_url == UNSET_VALUE
           @installer_download_path = nil  if @installer_download_path == UNSET_VALUE
 
           # Make sure the install is a symbol if it's not a boolean

data/plugins/provisioners/chef/config/chef_zero.rb

@@ -79,6 +79,13 @@ module VagrantPlugins
 
           if !present?(Array(nodes_path))
             errors << I18n.t("vagrant.config.chef.nodes_path_empty")
+          else
+            missing_paths = Array.new
+            nodes_path.each { |dir| missing_paths << dir[1] if !File.exists? dir[1] }
+            # If it exists at least one path on disk it's ok for Chef provisioning
+            if missing_paths.size == nodes_path.size
+              errors << I18n.t("vagrant.config.chef.nodes_path_missing", path: missing_paths.to_s)
+            end
           end
 
           if environment && environments_path.empty?

data/plugins/provisioners/chef/installer.rb

@@ -2,12 +2,13 @@ module VagrantPlugins
   module Chef
     class Installer
       def initialize(machine, options = {})
-        @machine    = machine
-        @product    = options.fetch(:product)
-        @channel    = options.fetch(:channel)
-        @version    = options.fetch(:version)
-        @force      = options.fetch(:force)
-        @options    = options.dup
+        @machine     = machine
+        @product     = options.fetch(:product)
+        @channel     = options.fetch(:channel)
+        @version     = options.fetch(:version)
+        @force       = options.fetch(:force)
+        @omnibus_url = options.fetch(:omnibus_url)
+        @options     = options.dup
       end
 
       # This handles verifying the Chef installation, installing it if it was
@@ -29,7 +30,7 @@ module VagrantPlugins
 
         @machine.ui.detail(I18n.t("vagrant.chef_installing",
           version: @version.to_s))
-        @machine.guest.capability(:chef_install, @product, @version, @channel, @options)
+        @machine.guest.capability(:chef_install, @product, @version, @channel, @omnibus_url, @options)
 
         if !@machine.guest.capability(:chef_installed, @product, @version)
           raise Provisioner::Base::ChefError, :install_failed

data/plugins/provisioners/chef/omnibus.rb

@@ -5,10 +5,8 @@ module VagrantPlugins
     #   https://docs.chef.io/install_omnibus.html
     #
     module Omnibus
-      OMNITRUCK = "https://omnitruck.chef.io".freeze
-
-      def sh_command(project, version, channel, options = {})
-        command =  "curl -sL #{OMNITRUCK}/install.sh | bash"
+      def sh_command(project, version, channel, omnibus_url, options = {})
+        command =  "curl -sL #{omnibus_url}/install.sh | bash"
         command << " -s -- -P \"#{project}\" -c \"#{channel}\""
 
         if version != :latest
@@ -23,8 +21,8 @@ module VagrantPlugins
       end
       module_function :sh_command
 
-      def ps_command(project, version, channel, options = {})
-        command =  ". { iwr -useb #{OMNITRUCK}/install.ps1 } | iex; install"
+      def ps_command(project, version, channel, omnibus_url, options = {})
+        command =  ". { iwr -useb #{omnibus_url}/install.ps1 } | iex; install"
         command << " -project '#{project}' -channel '#{channel}'"
 
         if version != :latest

data/plugins/provisioners/chef/provisioner/base.rb

@@ -58,6 +58,7 @@ module VagrantPlugins
             product: config.product,
             channel: config.channel,
             version: config.version,
+            omnibus_url: config.omnibus_url,
             force: config.install == :force,
             download_path:  config.installer_download_path
           )

data/plugins/provisioners/chef/provisioner/chef_solo.rb

@@ -87,7 +87,8 @@ module VagrantPlugins
                 key         = Digest::MD5.hexdigest(local_path)
                 remote_path = "#{guest_provisioning_path}/#{key}"
               else
-                @machine.ui.warn(I18n.t("vagrant.provisioners.chef.cookbook_folder_not_found_warning",
+                appended_folder = "cookbooks" if appended_folder.nil?
+                @machine.ui.warn(I18n.t("vagrant.provisioners.chef.#{appended_folder}_folder_not_found_warning",
                                        path: local_path.to_s))
                 next
               end

data/plugins/provisioners/file/provisioner.rb

@@ -3,14 +3,30 @@ module VagrantPlugins
     class Provisioner < Vagrant.plugin("2", :provisioner)
       def provision
         @machine.communicate.tap do |comm|
+          source = File.expand_path(config.source)
           destination = expand_guest_path(config.destination)
 
+          # if source is a directory, make it then trim destination with dirname
           # Make sure the remote path exists
-          command = "mkdir -p %s" % File.dirname(destination)
+          if File.directory?(source)
+            # We need to make sure the actual destination folder
+            # also exists before uploading, otherwise
+            # you will get nested folders. We also need to append
+            # a './' to the source folder so we copy the contents
+            # rather than the folder itself, in case a users destination
+            # folder differs from its source.
+            #
+            # https://serverfault.com/questions/538368/make-scp-always-overwrite-or-create-directory
+            # https://unix.stackexchange.com/questions/292641/get-scp-path-behave-like-rsync-path/292732
+            command = "mkdir -p \"%s\"" % destination
+            source << "/."
+          else
+            command = "mkdir -p \"%s\"" % File.dirname(destination)
+          end
           comm.execute(command)
 
           # now upload the file
-          comm.upload(File.expand_path(config.source), destination)
+          comm.upload(source, destination)
         end
       end
 

data/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -199,8 +199,6 @@ module VagrantPlugins
           if config.environment_path
             options << "--environmentpath #{environments_guest_path}/"
             options << "--environment #{@config.environment}"
-          else
-            options << "--manifestdir #{manifests_guest_path}"
           end
 
           options << @manifest_file

data/plugins/provisioners/salt/bootstrap-salt.sh

@@ -2,11 +2,15 @@
 
 # We just download the bootstrap script by default and execute that.
 if [ -x /usr/bin/fetch ]; then
-    /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
+    /usr/bin/fetch -o bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 elif [ -x /usr/bin/curl ]; then
-    /usr/bin/curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
+    /usr/bin/curl -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 else
-    python \
-        -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' \
-        | sh -s -- "$@"
+    python -c 'import urllib; urllib.urlretrieve("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh", "bootstrap-salt.sh")'
+fi
+
+if [ -e bootstrap-salt.sh ]; then
+  sh bootstrap-salt.sh "$@"
+else
+  exit 1
 fi

data/plugins/provisioners/shell/provisioner.rb

@@ -265,7 +265,7 @@ module VagrantPlugins
         # or we're running on Windows.
         if !config.binary && @machine.config.vm.communicator != :winrm
           begin
-            script.gsub!(/\r\n?$/, "\n")
+            script = script.gsub(/\r\n?$/, "\n")
           rescue ArgumentError
             script = script.force_encoding("ASCII-8BIT").gsub(/\r\n?$/, "\n")
           end

data/plugins/synced_folders/rsync/command/rsync_auto.rb

@@ -78,8 +78,13 @@ module VagrantPlugins
             # syncing all known containers with rsync to the boot2docker vm
             # and only syncs the current working dirs folders.
             sync_folders = {}
+            # Still sync existing synced folders from vagrantfile
+            config_synced_folders = machine.config.vm.synced_folders.values.map { |x| x[:hostpath] }
+            config_synced_folders.map! { |x| File.expand_path(x, machine.env.root_path) }
             folders.each do |id, folder_opts|
-              if cwd != folder_opts[:hostpath]
+              if cwd != folder_opts[:hostpath] &&
+                  !config_synced_folders.include?(folder_opts[:hostpath])
+
                 machine.ui.info(I18n.t("vagrant.rsync_auto_remove_folder",
                                     folder: folder_opts[:hostpath]))
               else

data/plugins/synced_folders/rsync/helper.rb

@@ -1,3 +1,4 @@
+require "ipaddr"
 require "shellwords"
 
 require "vagrant/util/platform"
@@ -147,6 +148,15 @@ module VagrantPlugins
           args << "--rsync-path"<< rsync_path
         end
 
+        # If the remote host is an IPv6 address reformat
+        begin
+          if IPAddr.new(host).ipv6?
+            host = "[#{host}]"
+          end
+        rescue IPAddr::Error
+          # Ignore
+        end
+
         # Build up the actual command to execute
         command = [
           "rsync",

data/templates/locales/en.yml

@@ -1014,6 +1014,11 @@ en:
 
           vagrant plugin expunge --reinstall
 
+        Or you may want to try updating the installed plugins to their latest
+        versions:
+
+          vagrant plugin update
+
         Error message given during initialization: %{message}
       plugin_load_error: |-
         The plugins failed to load properly. The error message given is
@@ -1046,6 +1051,17 @@ en:
           %{error_msg}
 
         Source: %{source}
+      powershell_not_found: |-
+        Failed to locate the powershell executable on the available PATH. Please
+        ensure powershell is installed and available on the local PATH, then
+        run the command again.
+      powershell_invalid_version: |-
+        The version of powershell currently installed on this host is less than
+        the required minimum version. Please upgrade the installed version of
+        powershell to the minimum required version and run the command again.
+
+          Installed version: %{installed_version}
+          Minimum required version: %{minimum_version}
       pushes_not_defined: |-
         The Vagrantfile does not define any 'push' strategies. In order to use
         `vagrant push`, you must define at least one push strategy:
@@ -1579,6 +1595,8 @@ en:
           Missing required value for `chef.nodes_path'.
         environment_path_missing: |-
           Environment path not found: %{path}
+        nodes_path_missing: |-
+          Path specified for `nodes_path` does not exist: %{path}
         environment_path_required: |-
           When 'environment' is specified, you must provide 'environments_path'.
         cookbooks_path_missing: |-
@@ -2158,8 +2176,16 @@ en:
           The chef binary (either `chef-solo` or `chef-client`) was not found on
           the VM and is required for chef provisioning. Please verify that chef
           is installed and that the binary is available on the PATH.
-        cookbook_folder_not_found_warning:
+        cookbooks_folder_not_found_warning:
           "The cookbook path '%{path}' doesn't exist. Ignoring..."
+        nodes_folder_not_found_warning:
+          "The node path '%{path}' doesn't exist. Ignoring..."
+        data_bags_folder_not_found_warning:
+          "The databag path '%{path}' doesn't exist. Ignoring..."
+        roles_folder_not_found_warning:
+          "The role path '%{path}' doesn't exist. Ignoring..."
+        environments_folder_not_found_warning:
+          "The environment path '%{path}' doesn't exist. Ignoring..."
         json: "Generating chef JSON and uploading..."
         client_key_folder: "Creating folder to hold client key..."
         generating_node_name: |-

data/templates/locales/providers_docker.yml

@@ -145,6 +145,8 @@ en:
           One of "build_dir" or "image" must be set
         compose_configuration_hash: |-
           "compose_configuration" must be a hash
+        compose_force_vm: |-
+          Docker compose is not currently supported from within proxy VM.
         create_args_array: |-
           "create_args" must be an array
         invalid_link: |-

data/test/unit/base.rb

@@ -3,8 +3,8 @@ require "rubygems"
 
 # Gems
 require "checkpoint"
-require "rspec/autorun"
 require "webmock/rspec"
+require "rspec/its"
 
 # Require Vagrant itself so we can reference the proper
 # classes to test.
@@ -33,8 +33,6 @@ VAGRANT_TEST_CWD = Dir.mktmpdir("vagrant-test-cwd")
 
 # Configure RSpec
 RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-
   if Vagrant::Util::Platform.windows?
     c.filter_run_excluding :skip_windows
   else

data/test/unit/plugins/commands/box/command/add_test.rb

@@ -18,7 +18,7 @@ describe VagrantPlugins::CommandBox::Command::Add do
   let(:action_runner) { double("action_runner") }
 
   before do
-    iso_env.stub(action_runner: action_runner)
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
   end
 
   context "with no arguments" do
@@ -32,7 +32,7 @@ describe VagrantPlugins::CommandBox::Command::Add do
     let(:argv) { ["foo"] }
 
     it "executes the runner with the proper actions" do
-      expect(action_runner).to receive(:run).with { |action, **opts|
+      expect(action_runner).to receive(:run).with(any_args) { |action, **opts|
         expect(opts[:box_name]).to be_nil
         expect(opts[:box_url]).to eq("foo")
         true
@@ -46,7 +46,7 @@ describe VagrantPlugins::CommandBox::Command::Add do
     let(:argv) { ["foo", "bar"] }
 
     it "executes the runner with the proper actions" do
-      expect(action_runner).to receive(:run).with { |action, **opts|
+      expect(action_runner).to receive(:run).with(any_args) { |action, **opts|
         expect(opts[:box_name]).to eq("foo")
         expect(opts[:box_url]).to eq("bar")
         true

data/test/unit/plugins/commands/box/command/remove_test.rb

@@ -18,7 +18,7 @@ describe VagrantPlugins::CommandBox::Command::Remove do
   let(:action_runner) { double("action_runner") }
 
   before do
-    iso_env.stub(action_runner: action_runner)
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
   end
 
   context "with no arguments" do
@@ -32,9 +32,9 @@ describe VagrantPlugins::CommandBox::Command::Remove do
     let(:argv) { ["foo"] }
 
     it "invokes the action runner" do
-      expect(action_runner).to receive(:run).with { |action, opts|
+      expect(action_runner).to receive(:run).with(any_args) { |action, opts|
         expect(opts[:box_name]).to eq("foo")
-        expect(opts[:force_confirm_box_remove]).to be_false
+        expect(opts[:force_confirm_box_remove]).to be(false)
         true
       }
 
@@ -45,9 +45,9 @@ describe VagrantPlugins::CommandBox::Command::Remove do
       let(:argv) { super() + ["--force"] }
 
       it "invokes the action runner with force option" do
-        expect(action_runner).to receive(:run).with { |action, opts|
+        expect(action_runner).to receive(:run).with(any_args) { |action, opts|
           expect(opts[:box_name]).to eq("foo")
-          expect(opts[:force_confirm_box_remove]).to be_true
+          expect(opts[:force_confirm_box_remove]).to be(true)
           true
         }
 
@@ -60,7 +60,7 @@ describe VagrantPlugins::CommandBox::Command::Remove do
     let(:argv) { ["foo", "bar"] }
 
     it "uses the 2nd arg as a provider" do
-      expect(action_runner).to receive(:run).with { |action, opts|
+      expect(action_runner).to receive(:run).with(any_args) { |action, opts|
         expect(opts[:box_name]).to eq("foo")
         expect(opts[:box_provider]).to eq("bar")
         true

data/test/unit/plugins/commands/box/command/repackage_test.rb

@@ -18,7 +18,7 @@ describe VagrantPlugins::CommandBox::Command::Repackage do
   let(:action_runner) { double("action_runner") }
 
   before do
-    iso_env.stub(action_runner: action_runner)
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
   end
 
   context "with no arguments" do
@@ -47,9 +47,7 @@ describe VagrantPlugins::CommandBox::Command::Repackage do
   end
 
   context "with three arguments" do
-    it "repackages the box with the given provider" do
-      pending
-    end
+    it "repackages the box with the given provider"
   end
 
   context "with more than three arguments" do