vagrant-unbundled 2.2.6.1 → 2.2.10.0

data/plugins/hosts/linux/cap/rdp.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
           end
 
           # Finally, run the client.
-          Vagrant::Util::Subprocess.execute(rdp_client, *args)
+          Vagrant::Util::Subprocess.execute(rdp_client, *args, {:detach => true})
         end
       end
     end

data/plugins/hosts/linux/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("linux", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("linux", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("linux", "nfs_export") do
         require_relative "cap/nfs"
         Cap::NFS

data/plugins/hosts/windows/cap/fs_iso.rb

@@ -0,0 +1,48 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostWindows
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+
+        @@logger = Log4r::Logger.new("vagrant::host::windows::fs_iso")
+
+        BUILD_ISO_CMD = "oscdimg".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "-j1", "-o", "-m"]
+          iso_command << "-l#{extra_opts[:volume_id]}" if extra_opts[:volume_id]
+          iso_command << source_directory.to_s
+          iso_command << file_destination.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/windows/cap/rdp.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
             args = rdp_info[:extra_args] + args
           end
           # Launch it
-          Vagrant::Util::Subprocess.execute("mstsc", *args)
+          Vagrant::Util::Subprocess.execute("mstsc", *args, {:detach => true})
         end
       end
     end

data/plugins/hosts/windows/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("windows", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("windows", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("windows", "provider_install_virtualbox") do
         require_relative "cap/provider_install_virtualbox"
         Cap::ProviderInstallVirtualBox
@@ -60,6 +70,11 @@ module VagrantPlugins
         require_relative "cap/ssh"
         Cap::SSH
       end
+
+      host_capability("windows", "smb_validate_password") do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end

data/plugins/kernel_v2/config/cloud_init.rb

@@ -0,0 +1,126 @@
+require "log4r"
+require "securerandom"
+
+module VagrantPlugins
+  module Kernel_V2
+    class VagrantConfigCloudInit < Vagrant.plugin("2", :config)
+      #-------------------------------------------------------------------
+      # Config class for cloud-init
+      #-------------------------------------------------------------------
+
+      DEFAULT_CONTENT_TYPES = ["text/cloud-boothook", "text/cloud-config",
+                               "text/cloud-config-archive", "text/jinja2",
+                               "text/part-handler", "text/upstart-job",
+                               "text/x-include-once-url", "text/x-include-url",
+                               "text/x-shellscript"].map(&:freeze).freeze
+
+      DEFAULT_CONFIG_TYPE = :user_data
+
+      # @note This value is for internal use only
+      #
+      # @return [String]
+      attr_reader :id
+
+      # The 'type' of data being stored. If not defined,
+      # will default to :user_data
+      #
+      # @return [Symbol]
+      attr_accessor :type
+
+      # @return [String]
+      attr_accessor :content_type
+
+      # @return [String]
+      attr_accessor :path
+
+      # @return [String]
+      attr_accessor :inline
+
+      def initialize(type=nil)
+        @logger = Log4r::Logger.new("vagrant::config::vm::cloud_init")
+
+        @type = type if type
+
+        @content_type = UNSET_VALUE
+        @path = UNSET_VALUE
+        @inline = UNSET_VALUE
+
+        # Internal options
+        @id = SecureRandom.uuid
+      end
+
+      def finalize!
+        if !@type
+          @type = DEFAULT_CONFIG_TYPE
+        else
+          @type = @type.to_sym
+        end
+
+        @content_type = nil if @content_type == UNSET_VALUE
+        @path = nil if @path == UNSET_VALUE
+        @inline = nil if @inline == UNSET_VALUE
+      end
+
+      # @return [Array] array of strings of error messages from config option validation
+      def validate(machine)
+        errors = _detected_errors
+
+        if @type && @type != DEFAULT_CONFIG_TYPE
+          errors << I18n.t("vagrant.cloud_init.incorrect_type_set",
+                           type: @type,
+                           machine: machine.name,
+                           default_type: DEFAULT_CONFIG_TYPE)
+        end
+
+        if !@content_type
+          errors << I18n.t("vagrant.cloud_init.content_type_not_set",
+                           machine: machine.name,
+                           accepted_types: DEFAULT_CONTENT_TYPES.join(', '))
+        elsif !DEFAULT_CONTENT_TYPES.include?(@content_type)
+          errors << I18n.t("vagrant.cloud_init.incorrect_content_type",
+                           machine: machine.name,
+                           content_type: @content_type,
+                           accepted_types: DEFAULT_CONTENT_TYPES.join(', '))
+        end
+
+        if @path && @inline
+          errors << I18n.t("vagrant.cloud_init.path_and_inline_set",
+                           machine: machine.name)
+        end
+
+        if @path
+          if !@path.is_a?(String)
+            errors << I18n.t("vagrant.cloud_init.incorrect_path_type",
+                              machine: machine.name,
+                              path: @path,
+                              type: @path.class.name)
+          else
+            expanded_path = Pathname.new(@path).expand_path(machine.env.root_path)
+            if !expanded_path.file?
+              errors << I18n.t("vagrant.cloud_init.path_invalid",
+                               path: expanded_path,
+                               machine: machine.name)
+            end
+          end
+        end
+
+        if @inline
+          if !@inline.is_a?(String)
+            errors << I18n.t("vagrant.cloud_init.incorrect_inline_type",
+                             machine: machine.name,
+                             type: @inline.class.name)
+          end
+        end
+
+        errors
+      end
+
+      # The String representation of this config.
+      #
+      # @return [String]
+      def to_s
+        "cloud_init config"
+      end
+    end
+  end
+end

data/plugins/kernel_v2/config/disk.rb

@@ -0,0 +1,221 @@
+require "log4r"
+require "securerandom"
+
+require "vagrant/util/numeric"
+
+module VagrantPlugins
+  module Kernel_V2
+    class VagrantConfigDisk < Vagrant.plugin("2", :config)
+      #-------------------------------------------------------------------
+      # Config class for a given Disk
+      #-------------------------------------------------------------------
+
+      DEFAULT_DISK_TYPES = [:disk, :dvd, :floppy].freeze
+
+      FILE_CHAR_REGEX = /[^-a-z0-9_]/i.freeze
+
+      # Note: This value is for internal use only
+      #
+      # @return [String]
+      attr_reader :id
+
+      # File name for the given disk. Defaults to a generated name that is:
+      #
+      #  vagrant_<disk_type>_<short_uuid>
+      #
+      # @return [String]
+      attr_accessor :name
+
+      # Type of disk to create. Defaults to `:disk`
+      #
+      # @return [Symbol]
+      attr_accessor :type
+
+      # Type of disk extension to create. Defaults to `vdi`
+      #
+      # @return [String]
+      attr_accessor :disk_ext
+
+      # Size of disk to create
+      #
+      # @return [Integer,String]
+      attr_accessor :size
+
+      # Path to the location of the disk file (Optional for `:disk` type,
+      # required for `:dvd` type.)
+      #
+      # @return [String]
+      attr_accessor :file
+
+      # Determines if this disk is the _main_ disk, or an attachment.
+      # Defaults to true.
+      #
+      # @return [Boolean]
+      attr_accessor :primary
+
+      # Provider specific options
+      #
+      # @return [Hash]
+      attr_accessor :provider_config
+
+      def initialize(type)
+        @logger = Log4r::Logger.new("vagrant::config::vm::disk")
+
+        @type = type
+        @provider_config = {}
+
+        @name = UNSET_VALUE
+        @provider_type = UNSET_VALUE
+        @size = UNSET_VALUE
+        @primary = UNSET_VALUE
+        @file = UNSET_VALUE
+        @disk_ext = UNSET_VALUE
+
+        # Internal options
+        @id = SecureRandom.uuid
+      end
+
+      # Helper method for storing provider specific config options
+      #
+      # Expected format is:
+      #
+      # - `provider__diskoption: value`
+      # - `{provider: {diskoption: value, otherdiskoption: value, ...}`
+      #
+      # Duplicates will be overriden
+      #
+      # @param [Hash] options
+      def add_provider_config(**options, &block)
+        current = {}
+        options.each do |k,v|
+          opts = k.to_s.split("__")
+
+          if opts.size == 2
+            current[opts[0].to_sym] = {opts[1].to_sym => v}
+          elsif v.is_a?(Hash)
+            current[k] = v
+          else
+            @logger.warn("Disk option '#{k}' found that does not match expected provider disk config schema.")
+          end
+        end
+
+        current = @provider_config.merge(current) if !@provider_config.empty?
+        if current
+          @provider_config = current[:provider_config]
+        else
+          @provider_config = {}
+        end
+      end
+
+      def finalize!
+        # Ensure all config options are set to nil or default value if untouched
+        # by user
+        @type = :disk if @type == UNSET_VALUE
+        @size = nil if @size == UNSET_VALUE
+        @file = nil if @file == UNSET_VALUE
+
+        if @primary == UNSET_VALUE
+          @primary = false
+        end
+
+        if @name.is_a?(String) && @name.match(FILE_CHAR_REGEX)
+            @logger.warn("Vagrant will remove detected invalid characters in '#{@name}' and convert the disk name into something usable for a file")
+            @name.gsub!(FILE_CHAR_REGEX, "_")
+        elsif @name == UNSET_VALUE
+          if @primary
+            @name = "vagrant_primary"
+          else
+            @name = nil
+          end
+        end
+      end
+
+      # @return [Array] array of strings of error messages from config option validation
+      def validate(machine)
+        errors = _detected_errors
+        # validate type with list of known disk types
+
+        if !DEFAULT_DISK_TYPES.include?(@type)
+          errors << I18n.t("vagrant.config.disk.invalid_type", type: @type,
+                           types: DEFAULT_DISK_TYPES.join(', '))
+        end
+
+        if @disk_ext == UNSET_VALUE
+          if machine.provider.capability?(:set_default_disk_ext)
+            @disk_ext = machine.provider.capability(:set_default_disk_ext)
+          else
+            @logger.warn("No provider capability defined to set default 'disk_ext' type. Will use 'vdi' for disk extension.")
+            @disk_ext = "vdi"
+          end
+        elsif @disk_ext
+          @disk_ext = @disk_ext.downcase
+
+          if machine.provider.capability?(:validate_disk_ext)
+            if !machine.provider.capability(:validate_disk_ext, @disk_ext)
+              if machine.provider.capability?(:default_disk_exts)
+                disk_exts = machine.provider.capability(:default_disk_exts).join(', ')
+              else
+                disk_exts = "not found"
+              end
+              errors << I18n.t("vagrant.config.disk.invalid_ext", ext: @disk_ext,
+                               name: @name,
+                               exts: disk_exts)
+            end
+          else
+            @logger.warn("No provider capability defined to validate 'disk_ext' type")
+          end
+        end
+
+        if @size && !@size.is_a?(Integer)
+          if @size.is_a?(String)
+            @size = Vagrant::Util::Numeric.string_to_bytes(@size)
+          end
+        end
+
+        if !@size && type == :disk
+          errors << I18n.t("vagrant.config.disk.invalid_size", name: @name, machine: machine.name)
+        end
+
+        if @type == :dvd && !@file
+          errors << I18n.t("vagrant.config.disk.dvd_type_file_required", name: @name, machine: machine.name)
+        end
+
+        if @type == :dvd && @primary
+          errors << I18n.t("vagrant.config.disk.dvd_type_primary", name: @name, machine: machine.name)
+        end
+
+        if @file
+          if !@file.is_a?(String)
+            errors << I18n.t("vagrant.config.disk.invalid_file_type", file: @file, machine: machine.name)
+          elsif !File.file?(@file)
+            errors << I18n.t("vagrant.config.disk.missing_file", file_path: @file,
+                             name: @name, machine: machine.name)
+          end
+        end
+
+        if @provider_config
+          if !@provider_config.empty?
+            if !@provider_config.key?(machine.provider_name)
+              machine.env.ui.warn(I18n.t("vagrant.config.disk.missing_provider",
+                                         machine: machine.name,
+                                         provider_name: machine.provider_name))
+            end
+          end
+        end
+
+        if !@name
+          errors << I18n.t("vagrant.config.disk.no_name_set", machine: machine.name)
+        end
+
+        errors
+      end
+
+      # The String representation of this Disk.
+      #
+      # @return [String]
+      def to_s
+        "disk config"
+      end
+    end
+  end
+end