vagrantup 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd836a15024ed281e1843a1d9641c8f2d8c12e6
-  data.tar.gz: d44a4add3767e321e8a58a111be37258912c7c24
+  metadata.gz: f14b71b08aed93d452a7c2f2228cecd0699ee64d
+  data.tar.gz: eed47175f676b5c3448da623b490ccae429f8e8f
 SHA512:
-  metadata.gz: c915f5739663561b7434c2c4bbf0c265b22fdb758e86d7caf4d621bf465b94475c6f5a749243ffde3f9c709a94f6da38a02f41eee0b8f08436506c2487bf9b1a
-  data.tar.gz: a08b020df05c86b6c4eef07b4bb7810f08c9188c449593f1e4c599e7e6b1df40637749e323b7dcaa0a07110e3f9a2929c735e661e2a893f762767e6f5dde0e0c
+  metadata.gz: 3fc432df825159db92569c2862a979408dd4387ffdf18cdf19979dabd725db09200c42a225273ffcdb8fdf3f8f2ffaecfbbcfe3f6c0b34c78736b5ccc908c332
+  data.tar.gz: 97433e3f5136c2b28fff946df2d9e73851b21154d58498d8a7f5d194d95a6584098aab570387b468ed1b66bcdffb5154fafbdf5e781ff67c786d81194eb6e8f4

data/Gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 
 # Gems required for the lib to even run
-gem "virtualbox", ">= 0.5.0"
+gem "virtualbox", ">= 0.5.3"
 gem "net-ssh", ">= 2.0.19"
 gem "net-scp", ">= 1.0.2"
 gem "git-style-binaries", ">= 0.1.10"

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gemspec.homepage = "http://github.com/mitchellh/vagrant"
     gemspec.authors = ["Mitchell Hashimoto", "John Bender"]
 
-    gemspec.add_dependency('virtualbox', '>= 0.5.0')
+    gemspec.add_dependency('virtualbox', '>= 0.5.3')
     gemspec.add_dependency('net-ssh', '>= 2.0.19')
     gemspec.add_dependency('net-scp', '>= 1.0.2')
     gemspec.add_dependency('json', '>= 1.2.0')

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/bin/vagrant

@@ -9,7 +9,7 @@ end
 require 'git-style-binary/command'
 
 GitStyleBinary.primary do
-  version "0.1.4"
+  version "0.2.0"
 
   run { educate }
 end

data/bin/vagrant-box

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "manage boxes"

data/bin/vagrant-down

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "destroys the vagrant environment"

data/bin/vagrant-halt

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "forcibly halts the vagrant environment"

data/bin/vagrant-init

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "initializes directory for vagrant use"

data/bin/vagrant-package

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "package the current vagrant environment"

data/bin/vagrant-reload

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "reload the vagrant environment"

data/bin/vagrant-resume

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "resumes the vagrant environment"

data/bin/vagrant-ssh

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "opens an SSH connection into the VM"

data/bin/vagrant-status

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+begin
+  require File.expand_path('../../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fallback on rubygems
+  require "rubygems"
+end
+
+require 'git-style-binary/command'
+
+# Get library
+libdir = File.join(File.dirname(__FILE__), '..', 'lib')
+require File.expand_path('vagrant', libdir)
+
+GitStyleBinary.command do
+  short_desc "Outputs the status of the current environment"
+  banner <<-EOS
+Usage: #{command.full_name} #{all_options_string}
+
+This command outputs the status of the current environment. This command
+tells you whether the environment is created, running, suspended,
+etc.
+
+EOS
+
+  run do |command|
+    Vagrant::Commands.status
+  end
+end

data/bin/vagrant-suspend

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "suspends the vagrant environment"

data/bin/vagrant-up

@@ -10,8 +10,7 @@ require 'git-style-binary/command'
 
 # Get library
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(libdir) unless $:.include?(libdir)
-require 'vagrant'
+require File.expand_path('vagrant', libdir)
 
 GitStyleBinary.command do
   short_desc "create the vagrant environment"

data/config/default.rb

@@ -9,22 +9,18 @@ Vagrant::Config.run do |config|
   config.ssh.host = "localhost"
   config.ssh.forwarded_port_key = "ssh"
   config.ssh.max_tries = 10
-  config.ssh.timeout = 10
+  config.ssh.timeout = 30
+  config.ssh.private_key_path = File.join(PROJECT_ROOT, 'keys', 'vagrant')
 
   config.vm.box_ovf = "box.ovf"
   config.vm.base_mac = "0800279C2E42"
   config.vm.project_directory = "/vagrant"
   config.vm.forward_port("ssh", 22, 2222)
   config.vm.disk_image_format = 'VMDK'
+  config.vm.provisioner = nil
+  config.vm.shared_folder_uid = nil
+  config.vm.shared_folder_gid = nil
 
   config.package.name = 'vagrant'
   config.package.extension = '.box'
-
-  config.chef.enabled = false
-  config.chef.cookbooks_path = "cookbooks"
-  config.chef.provisioning_path = "/tmp/vagrant-chef"
-  config.chef.json = {
-    :instance_role => "vagrant",
-    :recipes => ["vagrant_main"]
-  }
 end

data/keys/README.md

@@ -0,0 +1,10 @@
+# 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`

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.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== johnbender@vagrant.local

data/lib/vagrant.rb

@@ -1,14 +1,19 @@
 libdir = File.dirname(__FILE__)
-$:.unshift(libdir)
 PROJECT_ROOT = File.join(libdir, '..') unless defined?(PROJECT_ROOT)
 
 # The libs which must be loaded prior to the rest
 %w{tempfile open-uri json pathname logger uri net/http virtualbox net/ssh archive/tar/minitar
-  net/scp fileutils vagrant/util vagrant/actions/base vagrant/downloaders/base vagrant/actions/runner}.each do |f|
-  require f
+  net/scp fileutils}.each do |lib|
+  require lib
+end
+
+# The vagrant specific files which must be loaded prior to the rest
+%w{vagrant/util vagrant/stacked_proc_runner vagrant/actions/base vagrant/downloaders/base vagrant/actions/collection
+  vagrant/actions/runner vagrant/config vagrant/provisioners/base vagrant/provisioners/chef}.each do |f|
+  require File.expand_path(f, libdir)
 end
 
 # Glob require the rest
-Dir[File.join(PROJECT_ROOT, "lib", "vagrant", "**", "*.rb")].each do |f|
-  require f
+Dir[File.join(libdir, "vagrant", "**", "*.rb")].each do |f|
+  require File.expand_path(f)
 end

data/lib/vagrant/actions/base.rb

@@ -82,6 +82,20 @@ module Vagrant
       # all your own exceptions, otherwise it'll mask the initially raised
       # exception.
       def rescue(exception); end
+
+      # The following two methods are used for declaring action dependencies.
+      # For example, you require that the reload action be in place before 
+      # a your new FooAction you might do the following
+      #
+      # def follows; [Reload] end
+      
+      # This method is called when the runner is determining the actions that
+      # must precede a given action. You would say "This action follows [Action1, Action2]"
+      def follows; [] end
+      
+      # This method is called when the runner is determining the actions that
+      # must follow a given action. You would say "This action precedes [Action3, Action4]
+      def precedes; [] end
     end
 
     # An exception which occured within an action. This should be used instead of

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

@@ -26,6 +26,9 @@ module Vagrant
           end
 
           raise ActionException.new("Unknown URI type for box download.") unless @downloader
+
+          # Prepare the downloader
+          @downloader.prepare(@runner.uri)
         end
 
         def execute!

data/lib/vagrant/actions/collection.rb

@@ -0,0 +1,36 @@
+module Vagrant
+  module Actions
+    class Collection < Array
+      def dependencies!
+        each_with_index do |action, i|
+          action.follows.each do |klass|
+            unless self[0..i].klasses.include?(klass)
+              raise DependencyNotSatisfiedException.new("#{action.class} action must follow #{klass}")
+            end	
+          end
+          
+          action.precedes.each do |klass|
+            unless self[i..length].klasses.include?(klass)
+              raise DependencyNotSatisfiedException.new("#{action.class} action must precede #{klass}")
+            end
+          end
+        end
+      end
+
+      def duplicates?
+        klasses.uniq.size != size
+      end
+
+      def duplicates!
+        raise DuplicateActionException.new if duplicates?
+      end
+    
+      def klasses
+        map { |o| o.class }
+      end
+    end
+
+    class DuplicateActionException < Exception; end
+    class DependencyNotSatisfiedException < Exception; end
+  end
+end    

data/lib/vagrant/actions/runner.rb

@@ -47,7 +47,7 @@ module Vagrant
       #
       # @return [Array]
       def actions
-        @actions ||= []
+        @actions ||= Actions::Collection.new
       end
 
       # Returns the first action instance which matches the given class.
@@ -75,9 +75,9 @@ module Vagrant
           add_action(single_action, *args)
         end
 
-        # Raising it here might be too late and hard debug where the actions are comming from (meta actions)
-        raise DuplicateActionException.new if action_klasses.uniq.size < action_klasses.size
-    
+        actions.duplicates!
+        actions.dependencies!
+
         # Call the prepare method on each once its
         # initialized, then call the execute! method
         begin
@@ -127,12 +127,6 @@ module Vagrant
         end
         results
       end
-
-      def action_klasses
-        actions.map { |a| a.class }
-      end
     end
-    
-    class DuplicateActionException < Exception; end
   end
 end

data/lib/vagrant/actions/vm/boot.rb

@@ -2,6 +2,10 @@ module Vagrant
   module Actions
     module VM
       class Boot < Base
+        def prepare
+          Vagrant.config.vm.share_folder("vagrant-root", Vagrant.config.vm.project_directory, Env.root_path)
+        end
+
         def execute!
           @runner.invoke_around_callback(:boot) do
             # Startup the VM
@@ -17,11 +21,6 @@ error
           end
         end
 
-        def collect_shared_folders
-          # The root shared folder for the project
-          ["vagrant-root", Env.root_path, Vagrant.config.vm.project_directory]
-        end
-
         def boot
           logger.info "Booting VM..."
           @runner.vm.start(:headless, true)

data/lib/vagrant/actions/vm/customize.rb

@@ -0,0 +1,17 @@
+module Vagrant
+  module Actions
+    module VM
+      class Customize < Base
+        def execute!
+          logger.info "Running any VM customizations..."
+
+          # Run the customization procs over the VM
+          Vagrant.config.vm.run_procs!(@runner.vm)
+
+          # Save the vm
+          @runner.vm.save(true)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/actions/vm/destroy.rb

@@ -4,10 +4,19 @@ module Vagrant
       class Destroy < Base
         def execute!
           @runner.invoke_around_callback(:destroy) do
-            logger.info "Destroying VM and associated drives..."
-            @runner.vm.destroy(:destroy_image => true)
+            destroy_vm
+            depersist
           end
         end
+
+        def destroy_vm
+          logger.info "Destroying VM and associated drives..."
+          @runner.vm.destroy(:destroy_image => true)
+        end
+
+        def depersist
+          Env.depersist_vm(@runner)
+        end
       end
     end
   end