vagrantup 1.0.7 → 1.1.0

data/lib/vagrant/action/vm/nfs.rb

@@ -1,196 +0,0 @@
-require 'digest/md5'
-require 'fileutils'
-require 'pathname'
-
-require 'log4r'
-
-module Vagrant
-  module Action
-    module VM
-      # Enables NFS based shared folders. `nfsd` must already be installed
-      # on the host machine, and NFS client must already be installed on
-      # the guest machine.
-      #
-      # This is a two part process:
-      #
-      #   1. Adds an entry to `/etc/exports` on the host machine using
-      #      the host class to export the proper folder to the proper
-      #      machine.
-      #   2. After boot, runs `mount` on the guest to mount the shared
-      #      folder.
-      #
-      class NFS
-        def initialize(app,env)
-          @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
-          @app = app
-          @env = env
-
-          verify_settings if nfs_enabled?
-        end
-
-        def call(env)
-          @env = env
-
-          extract_folders
-
-          if !folders.empty?
-            prepare_folders
-            export_folders
-          end
-
-          @app.call(env)
-
-          mount_folders if !folders.empty?
-        end
-
-        # Returns the folders which are to be synced via NFS.
-        def folders
-          @folders ||= {}
-        end
-
-        # Removes the NFS enabled shared folders from the configuration,
-        # so they will no longer be mounted by the actual shared folder
-        # task.
-        def extract_folders
-          # Load the NFS enabled shared folders
-          @folders = {}
-          @env[:vm].config.vm.shared_folders.each do |key, opts|
-            if opts[:nfs]
-              # Duplicate the options, set the hostpath, and set disabled on the original
-              # options so the ShareFolders middleware doesn't try to mount it.
-              folder = opts.dup
-              hostpath = Pathname.new(opts[:hostpath]).expand_path(@env[:root_path])
-
-              if !hostpath.directory? && opts[:create]
-                # Host path doesn't exist, so let's create it.
-                @logger.debug("Host path doesn't exist, creating: #{hostpath}")
-
-                begin
-                  FileUtils.mkpath(hostpath)
-                rescue Errno::EACCES
-                  raise Errors::SharedFolderCreateFailed, :path => hostpath.to_s
-                end
-              end
-
-              # Set the hostpath now that it exists.
-              folder[:hostpath] = hostpath.to_s
-
-              # Assign the folder to our instance variable for later use
-              @folders[key] = folder
-
-              # Disable the folder so that regular shared folders don't try to
-              # mount it.
-              opts[:disabled] = true
-            end
-          end
-        end
-
-        # Prepares the settings for the NFS folders, such as setting the
-        # options on the NFS folders.
-        def prepare_folders
-          @folders = @folders.inject({}) do |acc, data|
-            key, opts = data
-            opts[:map_uid] = prepare_permission(:uid, opts)
-            opts[:map_gid] = prepare_permission(:gid, opts)
-            opts[:nfs_version] ||= 3
-
-            # The poor man's UUID. An MD5 hash here is sufficient since
-            # we need a 32 character "uuid" to represent the filesystem
-            # of an export. Hashing the host path is safe because two of
-            # the same host path will hash to the same fsid.
-            opts[:uuid]    = Digest::MD5.hexdigest(opts[:hostpath])
-
-            acc[key] = opts
-            acc
-          end
-        end
-
-        # Prepares the UID/GID settings for a single folder.
-        def prepare_permission(perm, opts)
-          key = "map_#{perm}".to_sym
-          return nil if opts.has_key?(key) && opts[key].nil?
-
-          # The options on the hash get priority, then the default
-          # values
-          value = opts.has_key?(key) ? opts[key] : @env[:vm].config.nfs.send(key)
-          return value if value != :auto
-
-          # Get UID/GID from folder if we've made it this far
-          # (value == :auto)
-          stat = File.stat(opts[:hostpath])
-          return stat.send(perm)
-        end
-
-        # Uses the host class to export the folders via NFS. This typically
-        # involves adding a line to `/etc/exports` for this VM, but it is
-        # up to the host class to define the specific behavior.
-        def export_folders
-          @env[:ui].info I18n.t("vagrant.actions.vm.nfs.exporting")
-          @env[:host].nfs_export(@env[:vm].uuid, guest_ip, folders)
-        end
-
-        # Uses the system class to mount the NFS folders.
-        def mount_folders
-          @env[:ui].info I18n.t("vagrant.actions.vm.nfs.mounting")
-
-          # Only mount the folders which have a guest path specified
-          mount_folders = {}
-          folders.each do |name, opts|
-            if opts[:guestpath]
-              mount_folders[name] = opts.dup
-            end
-          end
-
-          @env[:vm].guest.mount_nfs(host_ip, mount_folders)
-        end
-
-        # Returns the IP address of the first host only network adapter
-        #
-        # @return [String]
-        def host_ip
-          @env[:vm].driver.read_network_interfaces.each do |adapter, opts|
-            if opts[:type] == :hostonly
-              @env[:vm].driver.read_host_only_interfaces.each do |interface|
-                if interface[:name] == opts[:hostonly]
-                  return interface[:ip]
-                end
-              end
-            end
-          end
-
-          nil
-        end
-
-        # Returns the IP address of the guest by looking at the first
-        # enabled host only network.
-        #
-        # @return [String]
-        def guest_ip
-          @env[:vm].config.vm.networks.each do |type, args|
-            if type == :hostonly && args[0].is_a?(String)
-              return args[0]
-            end
-          end
-
-          nil
-        end
-
-        # Checks if there are any NFS enabled shared folders.
-        def nfs_enabled?
-          @env[:vm].config.vm.shared_folders.each do |key, opts|
-            return true if opts[:nfs]
-          end
-
-          false
-        end
-
-        # Verifies that the host is set and supports NFS.
-        def verify_settings
-          raise Errors::NFSHostRequired if @env[:host].nil?
-          raise Errors::NFSNotSupported if !@env[:host].nfs?
-          raise Errors::NFSNoHostNetwork if !guest_ip
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/action/vm/provision.rb

@@ -1,61 +0,0 @@
-require "log4r"
-
-module Vagrant
-  module Action
-    module VM
-      class Provision
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant::action::vm::provision")
-          @app = app
-
-          env["provision.enabled"] = true if !env.has_key?("provision.enabled")
-        end
-
-        def call(env)
-          @env = env
-
-          provisioners = nil
-
-          # We set this here so that even if this value is changed in the future,
-          # it stays constant to what we expect here in this moment.
-          enabled = env["provision.enabled"]
-          # Instantiate and prepare the provisioners. Preparation must happen here
-          # so that shared folders and such can properly take effect.
-          provisioners = enabled_provisioners
-          provisioners.map { |p| p.prepare }
-
-          @app.call(env)
-
-          if enabled
-            # Take prepared provisioners and run the provisioning
-            provisioners.each do |instance|
-              @env[:ui].info I18n.t("vagrant.actions.vm.provision.beginning",
-                                    :provisioner => instance.class)
-              instance.provision!
-            end
-          end
-        end
-
-        def enabled_provisioners
-          enabled = []
-          @env[:vm].config.vm.provisioners.each do |provisioner|
-            if @env["provision.types"]
-              # If we've specified types of provisioners to enable, then we
-              # only use those provisioners, and skip any that we haven't
-              # specified.
-              if !@env["provision.types"].include?(provisioner.shortcut.to_s)
-                @logger.debug("Skipping provisioner: #{provisioner.shortcut}")
-                next
-              end
-            end
-
-            enabled << provisioner.provisioner.new(@env, provisioner.config)
-          end
-
-          # Return the enable provisioners
-          enabled
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/action/vm/provisioner_cleanup.rb

@@ -1,26 +0,0 @@
-module Vagrant
-  module Action
-    module VM
-      class ProvisionerCleanup
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          enabled_provisioners.each do |instance|
-            instance.cleanup
-          end
-
-          @app.call(env)
-        end
-
-        def enabled_provisioners
-          @env[:vm].config.vm.provisioners.map do |provisioner|
-            provisioner.provisioner.new(@env, provisioner.config)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/action/vm/resume.rb

@@ -1,20 +0,0 @@
-module Vagrant
-  module Action
-    module VM
-      class Resume
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:vm].state == :saved
-            env[:ui].info I18n.t("vagrant.actions.vm.resume.resuming")
-            env[:action_runner].run(Boot, env)
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/command.rb

@@ -1,24 +0,0 @@
-module Vagrant
-  module Command
-    autoload :Base,      'vagrant/command/base'
-
-    autoload :Box,          'vagrant/command/box'
-    autoload :BoxAdd,       'vagrant/command/box_add'
-    autoload :BoxRemove,    'vagrant/command/box_remove'
-    autoload :BoxRepackage, 'vagrant/command/box_repackage'
-    autoload :BoxList,      'vagrant/command/box_list'
-    autoload :Destroy,      'vagrant/command/destroy'
-    autoload :Gem,          'vagrant/command/gem'
-    autoload :Halt,         'vagrant/command/halt'
-    autoload :Init,         'vagrant/command/init'
-    autoload :Package,      'vagrant/command/package'
-    autoload :Provision,    'vagrant/command/provision'
-    autoload :Reload,       'vagrant/command/reload'
-    autoload :Resume,       'vagrant/command/resume'
-    autoload :SSH,          'vagrant/command/ssh'
-    autoload :SSHConfig,    'vagrant/command/ssh_config'
-    autoload :Status,       'vagrant/command/status'
-    autoload :Suspend,      'vagrant/command/suspend'
-    autoload :Up,           'vagrant/command/up'
-  end
-end

data/lib/vagrant/command/base.rb

@@ -1,167 +0,0 @@
-require 'log4r'
-
-require "vagrant/util/safe_puts"
-
-module Vagrant
-  module Command
-    # Base class for any CLI commands.
-    #
-    # This class provides documentation on the interface as well as helper
-    # functions that a command has.
-    class Base
-      include Util::SafePuts
-
-      def initialize(argv, env)
-        @argv = argv
-        @env  = env
-        @logger = Log4r::Logger.new("vagrant::command::#{self.class.to_s.downcase}")
-      end
-
-      # This is what is called on the class to actually execute it. Any
-      # subclasses should implement this method and do any option parsing
-      # and validation here.
-      def execute; end
-
-      protected
-
-      # Parses the options given an OptionParser instance.
-      #
-      # This is a convenience method that properly handles duping the
-      # originally argv array so that it is not destroyed.
-      #
-      # This method will also automatically detect "-h" and "--help"
-      # and print help. And if any invalid options are detected, the help
-      # will be printed, as well.
-      #
-      # If this method returns `nil`, then you should assume that help
-      # was printed and parsing failed.
-      def parse_options(opts=nil)
-        # Creating a shallow copy of the arguments so the OptionParser
-        # doesn't destroy the originals.
-        argv = @argv.dup
-
-        # Default opts to a blank optionparser if none is given
-        opts ||= OptionParser.new
-
-        # Add the help option, which must be on every command.
-        opts.on_tail("-h", "--help", "Print this help") do
-          safe_puts(opts.help)
-          return nil
-        end
-
-        opts.parse!(argv)
-        return argv
-      rescue OptionParser::InvalidOption
-        raise Errors::CLIInvalidOptions, :help => opts.help.chomp
-      end
-
-      # Yields a VM for each target VM for the command.
-      #
-      # This is a convenience method for easily implementing methods that
-      # take a target VM (in the case of multi-VM) or every VM if no
-      # specific VM name is specified.
-      #
-      # @param [String] name The name of the VM. Nil if every VM.
-      # @param [Boolean] single_target If true, then an exception will be
-      #   raised if more than one target is found.
-      def with_target_vms(names=nil, options=nil)
-        # Using VMs requires a Vagrant environment to be properly setup
-        raise Errors::NoEnvironmentError if !@env.root_path
-
-        # Setup the options hash
-        options ||= {}
-
-        # Require that names be an array
-        names ||= []
-        names = [names] if !names.is_a?(Array)
-
-        # First determine the proper array of VMs.
-        vms = []
-        if names.length > 0
-          names.each do |name|
-            raise Errors::MultiVMEnvironmentRequired if !@env.multivm?
-
-            if name =~ /^\/(.+?)\/$/
-              # This is a regular expression name, so we convert to a regular
-              # expression and allow that sort of matching.
-              regex = Regexp.new($1.to_s)
-
-              @env.vms.each do |name, vm|
-                vms << vm if name =~ regex
-              end
-
-              raise Errors::VMNoMatchError if vms.empty?
-            else
-              # String name, just look for a specific VM
-              vms << @env.vms[name.to_sym]
-              raise Errors::VMNotFoundError, :name => name if !vms[0]
-            end
-          end
-        else
-          vms = @env.vms_ordered
-        end
-
-        # Make sure we're only working with one VM if single target
-        raise Errors::MultiVMTargetRequired if options[:single_target] && vms.length != 1
-
-        # If we asked for reversed ordering, then reverse it
-        vms.reverse! if options[:reverse]
-
-        # Go through each VM and yield it!
-        vms.each do |old_vm|
-          # We get a new VM from the environment here to avoid potentially
-          # stale VMs (if there was a config reload on the environment
-          # or something).
-          vm = @env.vms[old_vm.name]
-          yield vm
-        end
-      end
-
-      # This method will split the argv given into three parts: the
-      # flags to this command, the subcommand, and the flags to the
-      # subcommand. For example:
-      #
-      #     -v status -h -v
-      #
-      # The above would yield 3 parts:
-      #
-      #     ["-v"]
-      #     "status"
-      #     ["-h", "-v"]
-      #
-      # These parts are useful because the first is a list of arguments
-      # given to the current command, the second is a subcommand, and the
-      # third are the commands given to the subcommand.
-      #
-      # @return [Array] The three parts.
-      def split_main_and_subcommand(argv)
-        # Initialize return variables
-        main_args   = nil
-        sub_command = nil
-        sub_args    = []
-
-        # We split the arguments into two: One set containing any
-        # flags before a word, and then the rest. The rest are what
-        # get actually sent on to the subcommand.
-        argv.each_index do |i|
-          if !argv[i].start_with?("-")
-            # We found the beginning of the sub command. Split the
-            # args up.
-            main_args   = argv[0, i]
-            sub_command = argv[i]
-            sub_args    = argv[i + 1, argv.length - i + 1]
-
-            # Break so we don't find the next non flag and shift our
-            # main args.
-            break
-          end
-        end
-
-        # Handle the case that argv was empty or didn't contain any subcommand
-        main_args = argv.dup if main_args.nil?
-
-        return [main_args, sub_command, sub_args]
-      end
-    end
-  end
-end