fixed-vagrant 0.7.4.dev

data/config/default.rb

@@ -0,0 +1,39 @@
+Vagrant::Config.run do |config|
+  # default config goes here
+  config.vagrant.dotfile_name = ".vagrant"
+  config.vagrant.host = :detect
+
+  config.ssh.username = "vagrant"
+  config.ssh.host = "127.0.0.1"
+  config.ssh.forwarded_port_key = "ssh"
+  config.ssh.max_tries = 10
+  config.ssh.timeout = 30
+  config.ssh.private_key_path = File.expand_path("keys/vagrant", Vagrant.source_root)
+  config.ssh.forward_agent = false
+  config.ssh.forward_x11 = false
+
+  config.vm.auto_port_range = (2200..2250)
+  config.vm.box_ovf = "box.ovf"
+  config.vm.box_url = nil
+  config.vm.base_mac = nil
+  config.vm.forward_port("ssh", 22, 2222, :auto => true)
+  config.vm.disk_image_format = 'VMDK'
+  config.vm.shared_folder_uid = nil
+  config.vm.shared_folder_gid = nil
+  config.vm.boot_mode = "vrdp"
+  config.vm.system = :linux
+
+  config.vm.customize do |vm|
+    # Make VM name the name of the containing folder by default
+    vm.name = File.basename(config.env.cwd) + "_#{Time.now.to_i}"
+  end
+
+  # Share the root folder. This can then be overridden by
+  # other Vagrantfiles, if they wish.
+  config.vm.share_folder("v-root", "/vagrant", ".")
+
+  config.nfs.map_uid = :auto
+  config.nfs.map_gid = :auto
+
+  config.package.name = 'package.box'
+end

data/contrib/README.md

@@ -0,0 +1,12 @@
+# Vagrant Contrib
+
+Miscellaneous contributions which assist people in using Vagrant will
+make their way into this directory. An up-to-date list of short descriptions
+for each item will be kept below.
+
+## List of Contrib Items
+
+* `emacs` - Contains a file showing how to associate `Vagrantfile` with
+  Ruby syntax highlighting.
+* `vim` - Contains a `.vim` file for enabling Ruby syntax highlighting
+  for `Vagrantfile`s.

data/contrib/emacs/vagrant.el

@@ -0,0 +1,8 @@
+;;--------------------------------------------------------------------
+;; Teach emacs to syntax highlight Vagrantfile as Ruby.
+;;
+;; Installation: Copy the line below into your emacs configuration,
+;; or drop this file anywhere in your "~/.emacs.d" directory and be
+;; sure to "load" it.
+;;--------------------------------------------------------------------
+(add-to-list 'auto-mode-alist '("Vagrantfile$" . ruby-mode))

data/contrib/vim/vagrantfile.vim

@@ -0,0 +1,9 @@
+" Teach vim to syntax highlight Vagrantfile as ruby
+"
+" Install: $HOME/.vim/plugin/vagrant.vim
+" Author: Brandon Philips <brandon@ifup.org>
+
+augroup vagrant
+	au!
+	au BufRead,BufNewFile Vagrantfile set filetype=ruby
+augroup END

data/keys/README.md

@@ -0,0 +1,17 @@
+# Insecure Keypair
+
+These keys are the "insecure" public/private keypair we offer to
+[base box creators](http://vagrantup.com/docs/base_boxes.html) for use in their base boxes so that
+vagrant installations can automatically SSH into the boxes.
+
+If you're working with a team or company or with a custom box and
+you want more secure SSH, you should create your own keypair
+and configure the private key in the Vagrantfile with
+`config.ssh.private_key_path`
+
+# Putty
+
+If you are using Vagrant on windows, the .ppk file contained here, in the keys directory,
+has been generated from the private key and should be used to connect Putty to any VMs that 
+are leveraging the default key pair. See [guide](http://vagrantup.com/docs/getting-started/windows.html) 
+in the documentation for more details on using Putty with Vagrant.

data/keys/vagrant

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+-----END RSA PRIVATE KEY-----

data/keys/vagrant.ppk

@@ -0,0 +1,26 @@
+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/keys/vagrant.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key

data/lib/vagrant.rb

@@ -0,0 +1,42 @@
+require 'pathname'
+require 'json'
+require 'i18n'
+require 'virtualbox'
+
+module Vagrant
+  autoload :Action,        'vagrant/action'
+  autoload :Box,           'vagrant/box'
+  autoload :BoxCollection, 'vagrant/box_collection'
+  autoload :CLI,           'vagrant/cli'
+  autoload :Config,        'vagrant/config'
+  autoload :DataStore,     'vagrant/data_store'
+  autoload :Downloaders,   'vagrant/downloaders'
+  autoload :Environment,   'vagrant/environment'
+  autoload :Errors,        'vagrant/errors'
+  autoload :Hosts,         'vagrant/hosts'
+  autoload :Plugin,        'vagrant/plugin'
+  autoload :TestHelpers,   'vagrant/test_helpers'
+  autoload :UI,            'vagrant/ui'
+  autoload :Util,          'vagrant/util'
+  autoload :VM,            'vagrant/vm'
+
+  # The source root is the path to the root directory of
+  # the Vagrant gem.
+  def self.source_root
+    @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+  end
+end
+
+# Default I18n to load the en locale
+I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root)
+
+# Load the things which must be loaded before anything else. Note that
+# I'm not sure why 'vagrant/ssh' must be loaded. But if I don't, I get
+# a very scary "unsupported cipher" error from net-ssh for no apparent reason.
+require 'vagrant/command'
+require 'vagrant/provisioners'
+require 'vagrant/systems'
+require 'vagrant/ssh'
+require 'vagrant/version'
+Vagrant::Action.builtin!
+Vagrant::Plugin.load!

data/lib/vagrant/action.rb

@@ -0,0 +1,134 @@
+require 'vagrant/action/builder'
+require 'vagrant/action/builtin'
+
+# The builtin middlewares
+require 'vagrant/action/box'
+require 'vagrant/action/env'
+require 'vagrant/action/general'
+require 'vagrant/action/vm'
+
+module Vagrant
+  # Manages action running and registration. Every Vagrant environment
+  # has an instance of {Action} to allow for running in the context of
+  # the environment, which is accessible at {Environment#actions}. Actions
+  # are the foundation of most functionality in Vagrant, and are implemented
+  # architecturally as "middleware."
+  #
+  # # Registering an Action
+  #
+  # The main benefits of registering an action is the ability to retrieve and
+  # modify that registered action, as well as easily run the action. An example
+  # of registering an action is shown below, with a simple middleware which just
+  # outputs to `STDOUT`:
+  #
+  #     class StdoutMiddleware
+  #       def initialize(app, env)
+  #         @app = app
+  #       end
+  #
+  #       def call(env)
+  #         puts "HI!"
+  #         @app.call(env)
+  #       end
+  #     end
+  #
+  #     Vagrant::Action.register(:stdout, StdoutMiddleware)
+  #
+  # Then to run a registered action, assuming `env` is a loaded {Environment}:
+  #
+  #     env.actions.run(:stdout)
+  #
+  # Or to retrieve the action class for any reason:
+  #
+  #     Vagrant::Action[:stdout]
+  #
+  # # Running an Action
+  #
+  # There are various built-in registered actions such as `start`, `stop`, `up`,
+  # etc. Actions are built to be run in the context of an environment, so use
+  # {Environment#actions} to run all actions. Then simply call {#run}:
+  #
+  #     env.actions.run(:name)
+  #
+  # Where `:name` is the name of the registered action.
+  #
+  class Action
+    autoload :Environment, 'vagrant/action/environment'
+    autoload :Warden,      'vagrant/action/warden'
+
+    include Util
+    @@reported_interrupt = false
+
+    class << self
+      # Returns the list of registered actions.
+      #
+      # @return [Array]
+      def actions
+        @actions ||= {}
+      end
+
+      # Registers an action and associates it with a symbol. This
+      # symbol can then be referenced in other action builds and
+      # callbacks can be registered on that symbol.
+      #
+      # @param [Symbol] key
+      def register(key, callable)
+        actions[key.to_sym] = callable
+      end
+
+      # Retrieves a registered action by key.
+      #
+      # @param [Symbol] key
+      def [](key)
+        actions[key.to_sym]
+      end
+    end
+
+    # The environment to run the actions in.
+    attr_reader :env
+
+    # Initializes the action with the given environment which the actions
+    # will be run in.
+    #
+    # @param [Environment] env
+    def initialize(env)
+      @env = env
+    end
+
+    # Runs the given callable object in the context of the environment.
+    # If a symbol is given as the `callable` parameter, then it is looked
+    # up in the registered actions list which are registered with {register}.
+    #
+    # Any options given are injected into the environment hash.
+    #
+    # @param [Object] callable An object which responds to `call`.
+    def run(callable_id, options=nil)
+      callable = callable_id
+      callable = Builder.new.use(callable_id) if callable_id.kind_of?(Class)
+      callable = self.class.actions[callable_id] if callable_id.kind_of?(Symbol)
+      raise ArgumentError, "Argument to run must be a callable object or registered action." if !callable || !callable.respond_to?(:call)
+
+      action_environment = Action::Environment.new(env)
+      action_environment.merge!(options || {})
+
+      # Run the before action run callback, if we're not doing that already
+      run(:before_action_run, action_environment) if callable_id != :before_action_run
+
+      # Run the action chain in a busy block, marking the environment as
+      # interrupted if a SIGINT occurs, and exiting cleanly once the
+      # chain has been run.
+      int_callback = lambda do
+        if action_environment.interrupted?
+          env.ui.error I18n.t("vagrant.actions.runner.exit_immediately")
+          abort
+        end
+
+        env.ui.warn I18n.t("vagrant.actions.runner.waiting_cleanup") if !@@reported_interrupt
+        action_environment.interrupt!
+        @@reported_interrupt = true
+      end
+
+      Busy.busy(int_callback) { callable.call(action_environment) }
+    end
+  end
+end

data/lib/vagrant/action/box.rb

@@ -0,0 +1,11 @@
+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/box/destroy.rb

@@ -0,0 +1,21 @@
+require 'fileutils'
+
+module Vagrant
+  class Action
+    module Box
+      class Destroy
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          env.ui.info I18n.t("vagrant.actions.box.destroy.destroying", :name => env["box"].name)
+          FileUtils.rm_rf(env["box"].directory)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/box/download.rb

@@ -0,0 +1,72 @@
+module Vagrant
+  class Action
+    module Box
+      class Download
+        BASENAME = "box"
+
+        include Util
+
+        attr_reader :temp_path
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+          @env["download.classes"] ||= []
+          @env["download.classes"] += [Downloaders::HTTP, Downloaders::File]
+          @downloader = nil
+        end
+
+        def call(env)
+          @env = env
+
+          download if instantiate_downloader
+          @app.call(@env)
+
+          recover(env) # called in both cases to cleanup workspace
+        end
+
+        def instantiate_downloader
+          @env["download.classes"].each do |klass|
+            if klass.match?(@env["box"].uri)
+              @env.ui.info I18n.t("vagrant.actions.box.download.with", :class => klass.to_s)
+              @downloader = klass.new(@env)
+            end
+          end
+
+          raise Errors::BoxDownloadUnknownType if !@downloader
+
+          @downloader.prepare(@env["box"].uri)
+          true
+        end
+
+        def download
+          with_tempfile do |tempfile|
+            download_to(tempfile)
+            @temp_path = @env["download.temp_path"] = tempfile.path
+          end
+        end
+
+        def recover(env)
+          if temp_path && File.exist?(temp_path)
+            env.ui.info I18n.t("vagrant.actions.box.download.cleaning")
+            File.unlink(temp_path)
+          end
+        end
+
+        def with_tempfile
+          File.open(box_temp_path, Platform.tar_file_options) do |tempfile|
+            yield tempfile
+          end
+        end
+
+        def box_temp_path
+          @env.env.tmp_path.join(BASENAME + Time.now.to_i.to_s)
+        end
+
+        def download_to(f)
+          @downloader.download!(@env["box"].uri, f)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/box/package.rb

@@ -0,0 +1,19 @@
+require 'vagrant/action/general/package'
+
+module Vagrant
+  class Action
+    module Box
+      # Packages a box which has already been unpackaged (such as
+      # for the `vagrant box repackage` command) by leveraging the
+      # general packager middleware.
+      class Package < General::Package
+        # Alias instead of calling super for testability
+        alias_method :general_call, :call
+        def call(env)
+          env["package.directory"] = env["box"].directory
+          general_call(env)
+        end
+      end
+    end
+  end
+end