vagrant 0.8.10 → 0.9.0

data/keys/vagrant.ppk

@@ -1,26 +0,0 @@
-PuTTY-User-Key-File-2: ssh-rsa
-Encryption: none
-Comment: imported-openssh-key
-Public-Lines: 6
-AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+k
-z4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdO
-KLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4
-O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGj
-yiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPK
-cF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
-Private-Lines: 14
-AAABAQDiKpY8le3NkDryYp0QuziMmx3KTL57B1l412zm2NycdTnNRgTbkr598kQP
-2pRYgJwtkNzzVMZaMfICoPUHDtemBTAWB5QnBSXNC6sC/7/JKfGLC5oYl+EUzUJp
-AfN9emGBWaX59lS+clRO/N9MrYuDoR1tQT1NqtSUF//E9+4SExKUgTmR5v9nPf8t
-SVGDzIOrPnD5BZUni62cqcqKrBk3SbCnBTthLImGVPhhXUXefhiMuzAznAmzaiqb
-SOyxC78FPS3IRc0NgEsQXgCwKVpa5InaSOrsqGuthfNqCqGdJ6L04NgVKEm7xRZV
-5zciFvlleXM7q901DUn1ex/ib7bLAAAAgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/
-orApiHmHDsURs5rUKDx0f9iPcXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsM
-kE4CUSiJcYrMANtx54cGH7RkEjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTG
-yAK+OLD3M2QdCQAAAIEA7cfKTQgMUe8oR2yFk9QB+uvl1jfG16u5d0Tv7pHmnIvf
-CX5G5MVEWYbcVfxx7r1IZzy3V908MoDwWGRTaOKc1RIc1qE7ZxLaxbniscnN/i42
-abqPpgZUOjkbX4JK/YAVaYV2RmBM5Ag95VXZfC+HMPQVaSqyQrNXObWhow4HSJ0A
-AACANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH+vq/
-5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQNE5O
-gEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
-Private-MAC: bc710f345e67c736d57dd72aab10fe4625345dae

data/lib/vagrant/action/box.rb

@@ -1,11 +0,0 @@
-module Vagrant
-  class Action
-    module Box
-      autoload :Destroy,   'vagrant/action/box/destroy'
-      autoload :Download,  'vagrant/action/box/download'
-      autoload :Package,   'vagrant/action/box/package'
-      autoload :Unpackage, 'vagrant/action/box/unpackage'
-      autoload :Verify,    'vagrant/action/box/verify'
-    end
-  end
-end

data/lib/vagrant/action/env.rb

@@ -1,7 +0,0 @@
-module Vagrant
-  class Action
-    module Env
-      autoload :Set, 'vagrant/action/env/set'
-    end
-  end
-end

data/lib/vagrant/action/general.rb

@@ -1,8 +0,0 @@
-module Vagrant
-  class Action
-    module General
-      autoload :Package,  'vagrant/action/general/package'
-      autoload :Validate, 'vagrant/action/general/validate'
-    end
-  end
-end

data/lib/vagrant/action/vm.rb

@@ -1,34 +0,0 @@
-module Vagrant
-  class Action
-    module VM
-      autoload :Boot,                'vagrant/action/vm/boot'
-      autoload :CheckAccessible,     'vagrant/action/vm/check_accessible'
-      autoload :CheckBox,            'vagrant/action/vm/check_box'
-      autoload :CheckGuestAdditions, 'vagrant/action/vm/check_guest_additions'
-      autoload :CleanMachineFolder,  'vagrant/action/vm/clean_machine_folder'
-      autoload :ClearForwardedPorts, 'vagrant/action/vm/clear_forwarded_ports'
-      autoload :ClearNFSExports,     'vagrant/action/vm/clear_nfs_exports'
-      autoload :ClearSharedFolders,  'vagrant/action/vm/clear_shared_folders'
-      autoload :Customize,           'vagrant/action/vm/customize'
-      autoload :Destroy,             'vagrant/action/vm/destroy'
-      autoload :DestroyUnusedNetworkInterfaces, 'vagrant/action/vm/destroy_unused_network_interfaces'
-      autoload :DiscardState,        'vagrant/action/vm/discard_state'
-      autoload :Export,              'vagrant/action/vm/export'
-      autoload :ForwardPorts,        'vagrant/action/vm/forward_ports'
-      autoload :Halt,                'vagrant/action/vm/halt'
-      autoload :HostName,            'vagrant/action/vm/host_name'
-      autoload :Import,              'vagrant/action/vm/import'
-      autoload :MatchMACAddress,     'vagrant/action/vm/match_mac_address'
-      autoload :Modify,              'vagrant/action/vm/modify'
-      autoload :Network,             'vagrant/action/vm/network'
-      autoload :NFS,                 'vagrant/action/vm/nfs'
-      autoload :Package,             'vagrant/action/vm/package'
-      autoload :PackageVagrantfile,  'vagrant/action/vm/package_vagrantfile'
-      autoload :Provision,           'vagrant/action/vm/provision'
-      autoload :ProvisionerCleanup,  'vagrant/action/vm/provisioner_cleanup'
-      autoload :Resume,              'vagrant/action/vm/resume'
-      autoload :ShareFolders,        'vagrant/action/vm/share_folders'
-      autoload :Suspend,             'vagrant/action/vm/suspend'
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-module Vagrant
-  class Action
-    module VM
-      # Helper methods for forwarding ports. Requires that the environment
-      # is set to the `@env` instance variable.
-      module ForwardPortsHelpers
-        # Returns an array of used ports. This method is implemented
-        # differently depending on the VirtualBox version, but the
-        # behavior is the same.
-        #
-        # @return [Array<String>]
-        def used_ports
-          result = VirtualBox::VM.all.collect do |vm|
-            if vm.accessible? && vm.running? && vm.uuid != @env["vm"].uuid
-              vm.network_adapters.collect do |na|
-                na.nat_driver.forwarded_ports.collect do |fp|
-                  fp.hostport.to_i
-                end
-              end
-            end
-          end
-
-          result.flatten.uniq
-        end
-      end
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-module Vagrant
-  class Action
-    module VM
-      # This class allows other actions on the virtual machine object
-      # to be consolidated under a single write lock. This vastly speeds
-      # up modification of virtual machines. This should be used whereever
-      # possible when dealing with virtual machine modifications.
-      class Modify
-        include Util::StackedProcRunner
-
-        def initialize(app, env)
-          @app = app
-
-          # Initialize the proc_stack, which should already be empty
-          # but just making sure here.
-          proc_stack.clear
-
-          # Create the lambda in the environment which is to be called
-          # to add new procs to the modification sequence.
-          env["vm.modify"] = lambda do |*procs|
-            procs.each { |p| push_proc(&p) }
-          end
-        end
-
-        def call(env)
-          # Run the procs we have saved up, save the machine, and reload
-          # to verify we get the new settings
-          run_procs!(env["vm"].vm)
-          env["vm"].vm.save
-          env["vm"].reload!
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Vagrant
-  class Action
-    module VM
-      module NFSHelpers
-        def clear_nfs_exports(env)
-          env["host"].nfs_cleanup if env["host"]
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/command/group_base.rb

@@ -1,107 +0,0 @@
-require 'thor'
-require 'thor/actions'
-
-module Vagrant
-  module Command
-    # A {GroupBase} is the superclass which should be used if you're
-    # creating a CLI command which has subcommands such as `vagrant box`,
-    # which has subcommands such as `add`, `remove`, `list`. If you're
-    # creating a simple command which has no subcommands, such as `vagrant up`,
-    # then use {Base} instead.
-    #
-    # Unlike {Base}, where all public methods are executed, in a {GroupBase},
-    # each public method defines a separate task which can be invoked. The best
-    # way to get examples of how to create a {GroupBase} command is to look
-    # at the built-in commands, such as {BoxCommand}.
-    #
-    # # Defining a New Command
-    #
-    # To define a new command with subcommands, create a new class which inherits
-    # from this class, then call {register} to register the command. That's it! When
-    # the command is invoked, the method matching the subcommand is invoked. An
-    # example is shown below:
-    #
-    #     class SayCommand < Vagrant::Command::GroupBase
-    #       register "say", "Say hello or goodbye"
-    #
-    #       desc "hello", "say hello"
-    #       def hello
-    #         env.ui.info "Hello"
-    #       end
-    #
-    #       desc "goodbye", "say goodbye"
-    #       def goodbye
-    #         env.ui.info "Goodbye"
-    #       end
-    #     end
-    #
-    # In this case, the above class is invokable via `vagrant say hello` or
-    # `vagrant say goodbye`. To give it a try yourself, just copy and paste
-    # the above into a Vagrantfile somewhere, and run `vagrant` from within
-    # that directory. You should see the new command!
-    #
-    # Also notice that in the above, each task follows a `desc` call. This
-    # call is used to provide usage and description for each task, and is
-    # required.
-    #
-    # ## Defining Command-line Options
-    #
-    # ### Arguments
-    #
-    # To define arguments to your commands, such as `vagrant say hello mitchell`,
-    # then you simply define them as arguments to the method implementing the
-    # task. An example is shown below (only the method, to keep things brief):
-    #
-    #     def hello(name)
-    #       env.ui.info "Hello, #{name}"
-    #     end
-    #
-    # Then, if `vagrant say hello mitchell` was called, then the output would
-    # be "Hello, mitchell"
-    #
-    # ### Switches or Other Options
-    #
-    # TODO
-    class GroupBase < Thor
-      include Thor::Actions
-      include Helpers
-
-      attr_reader :env
-
-      # Register the command with the main Vagrant CLI under the given
-      # usage. The usage will be used for accessing it from the CLI,
-      # so if you give it a usage of `lamp [subcommand]`, then the command
-      # to invoke this will be `vagrant lamp` (with a subcommand).
-      #
-      # The description is used when a listing of the commands is given
-      # and is meant to be a brief (one sentence) description of what this
-      # command does.
-      #
-      # Some additional options may be passed in as the last parameter:
-      #
-      # * `:alias` - If given as an array or string, these will be aliases
-      #  for the same command. For example, `vagrant version` is also
-      #  `vagrant --version` and `vagrant -v`
-      #
-      # @param [String] usage
-      # @param [String] description
-      # @param [Hash] opts
-      def self.register(usage, description, opts=nil)
-        @_name = Base.extract_name_from_usage(usage)
-        CLI.register(self, @_name, usage, description, opts)
-      end
-
-      def initialize(*args)
-        super
-        initialize_environment(*args)
-      end
-
-      protected
-
-      # Override the basename to include the subcommand name.
-      def self.basename
-        "#{super} #{@_name}"
-      end
-    end
-  end
-end

data/lib/vagrant/command/helpers.rb

@@ -1,33 +0,0 @@
-module Vagrant
-  module Command
-    module Helpers
-      # Initializes the environment by pulling the environment out of
-      # the configuration hash and sets up the UI if necessary.
-      def initialize_environment(args, options, config)
-        raise Errors::CLIMissingEnvironment if !config[:env]
-        @env = config[:env]
-      end
-
-      # This returns an array of {VM} objects depending on the arguments
-      # given to the command.
-      def target_vms(name=nil)
-        raise Errors::NoEnvironmentError if !env.root_path
-
-        name ||= self.name rescue nil
-
-        @target_vms ||= begin
-          if env.multivm?
-            return env.vms_ordered if !name
-            vm = env.vms[name.to_sym]
-            raise Errors::VMNotFoundError, :name => name if !vm
-          else
-            raise Errors::MultiVMEnvironmentRequired if name
-            vm = env.vms.values.first
-          end
-
-          [vm]
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/command/named_base.rb

@@ -1,14 +0,0 @@
-module Vagrant
-  module Command
-    # Same as {Base} except adds the `name` argument for you. This superclass
-    # is useful if you're creating a command which should be able to target
-    # a specific VM in a multi-VM environment. For example, in a multi-VM
-    # environment, `vagrant up` "ups" all defined VMs, but you can specify a
-    # name such as `vagrant up web` to target only a specific VM. That name
-    # argument is from {NamedBase}. Of course, you can always add it manually
-    # yourself, as well.
-    class NamedBase < Base
-      argument :name, :type => :string, :optional => true
-    end
-  end
-end

data/lib/vagrant/command/upgrade_to_060.rb

@@ -1,45 +0,0 @@
-require 'fileutils'
-
-module Vagrant
-  module Command
-    class UpgradeTo060Command < Base
-      register "upgrade_to_060", "Upgrade pre-0.6.0 environment to 0.6.0", :hide => true
-
-      def execute
-        @env.ui.warn I18n.t("vagrant.commands.upgrade_to_060.info"), :prefix => false
-        @env.ui.warn "", :prefix => false
-        if !@env.ui.yes? I18n.t("vagrant.commands.upgrade_to_060.ask"), :prefix => false, :color => :yellow
-          @env.ui.info I18n.t("vagrant.commands.upgrade_to_060.quit"), :prefix => false
-          return
-        end
-
-        local_data = @env.local_data
-        if !local_data.empty?
-          if local_data[:active]
-            @env.ui.confirm I18n.t("vagrant.commands.upgrade_to_060.already_done"), :prefix => false
-            return
-          end
-
-          # Backup the previous file
-          @env.ui.info I18n.t("vagrant.commands.upgrade_to_060.backing_up"), :prefix => false
-          FileUtils.cp(local_data.file_path, "#{local_data.file_path}.bak-#{Time.now.to_i}")
-
-          # Gather the previously set virtual machines into a single
-          # active hash
-          active = local_data.inject({}) do |acc, data|
-            key, uuid = data
-            acc[key.to_sym] = uuid
-            acc
-          end
-
-          # Set the active hash to the active list and save it
-          local_data.clear
-          local_data[:active] = active
-          local_data.commit
-        end
-
-        @env.ui.confirm I18n.t("vagrant.commands.upgrade_to_060.complete"), :prefix => false
-      end
-    end
-  end
-end

data/lib/vagrant/command/version.rb

@@ -1,13 +0,0 @@
-module Vagrant
-  module Command
-    class VersionCommand < Base
-      register "version", "Prints the Vagrant version information", :alias => %w(-v --version)
-
-      def version
-        env.ui.info(I18n.t("vagrant.commands.version.output",
-                    :version => Vagrant::VERSION),
-                    :prefix => false)
-      end
-    end
-  end
-end

data/lib/vagrant/ssh/session.rb

@@ -1,136 +0,0 @@
-module Vagrant
-  class SSH
-    # A helper class which wraps around `Net::SSH::Connection::Session`
-    # in order to provide basic command error checking while still
-    # providing access to the actual session object.
-    class Session
-      include Util::Retryable
-
-      attr_reader :session
-      attr_reader :env
-
-      def initialize(session, env)
-        @session = session
-        @env = env
-      end
-
-      # Executes a given command and simply returns true/false if the
-      # command succeeded or not.
-      def test?(command)
-        exec!(command) do |ch, type, data|
-          return true if type == :exit_status && data == 0
-        end
-
-        false
-      end
-
-      # Executes a given command on the SSH session using `sudo` and
-      # blocks until the command completes. This takes the same parameters
-      # as {#exec!}. The only difference is that the command can be an
-      # array of commands, which will be placed into the same script.
-      #
-      # This is different than just calling {#exec!} with `sudo`, since
-      # this command is tailor-made to be compliant with older versions
-      # of `sudo`.
-      def sudo!(commands, options=nil, &block)
-        channel = session.open_channel do |ch|
-          ch.exec("sudo -H #{env.config.ssh.shell} -l") do |ch2, success|
-            # Set the terminal
-            ch2.send_data "export TERM=vt100\n"
-
-            # Output each command as if they were entered on the command line
-            [commands].flatten.each do |command|
-              ch2.send_data "#{command}\n"
-            end
-
-            # Remember to exit or we'll hang!
-            ch2.send_data "exit\n"
-
-            # Setup the callbacks with our options so we get all the
-            # stdout/stderr and error checking goodies
-            setup_channel_callbacks(ch2, commands, options, block)
-          end
-        end
-
-        channel.wait
-        channel[:result]
-      end
-
-      # Executes a given command on the SSH session and blocks until
-      # the command completes. This is an almost line for line copy of
-      # the actual `exec!` implementation, except that this
-      # implementation also reports `:exit_status` to the block if given.
-      def exec!(commands, options=nil, &block)
-        retryable(:tries => env.config.ssh.max_tries, :on => [IOError, Net::SSH::Disconnect], :sleep => 1.0) do
-          metach = session.open_channel do |ch|
-            ch.exec("#{env.config.ssh.shell} -l") do |ch2, success|
-              # Set the terminal
-              ch2.send_data "export TERM=vt100\n"
-
-              # Output the commands as if they were entered on the command line
-              [commands].flatten.each do |command|
-                ch2.send_data "#{command}\n"
-              end
-
-              # Remember to exit
-              ch2.send_data "exit\n"
-
-              # Setup the callbacks
-              setup_channel_callbacks(ch2, commands, options, block)
-            end
-          end
-
-          metach.wait
-          metach[:result]
-        end
-      end
-
-      # Sets up the channel callbacks to properly check exit statuses and
-      # callback on stdout/stderr.
-      def setup_channel_callbacks(channel, command, options, block)
-        options = { :error_check => true }.merge(options || {})
-
-        block ||= Proc.new do |ch, type, data|
-          check_exit_status(data, command, options, ch[:result]) if type == :exit_status && options[:error_check]
-
-          ch[:result] ||= ""
-          ch[:result] << data if [:stdout, :stderr].include?(type)
-        end
-
-        # Output stdout data to the block
-        channel.on_data do |ch2, data|
-          # This clears the screen, we want to filter it out.
-          data.gsub!("\e[H", "")
-
-          block.call(ch2, :stdout, data)
-        end
-
-        # Output stderr data to the block
-        channel.on_extended_data do |ch2, type, data|
-          block.call(ch2, :stderr, data)
-        end
-
-        # Output exit status information to the block
-        channel.on_request("exit-status") do |ch2, data|
-          block.call(ch2, :exit_status, data.read_long)
-        end
-      end
-
-      # Checks for an erroroneous exit status and raises an exception
-      # if so.
-      def check_exit_status(exit_status, commands, options=nil, output=nil)
-        if exit_status != 0
-          output ||= '[no output]'
-          options = {
-            :_error_class => Errors::VagrantError,
-            :_key => :ssh_bad_exit_status,
-            :command => [commands].flatten.join("\n"),
-            :output => output
-          }.merge(options || {})
-
-          raise options[:_error_class], options
-        end
-      end
-    end
-  end
-end