vagrant 0.5.1 → 0.5.2

data/README.md

@@ -18,14 +18,17 @@ First, make sure your development machine has [VirtualBox](http://www.virtualbox
 installed. The setup from that point forward is very easy, since Vagrant is simply
 a rubygem.
 
-    sudo gem install vagrant
+    gem install vagrant
 
 To build your first virtual environment:
 
-    vagrant init
-    vagrant box add base http://files.vagrantup.com/base.box
+    vagrant init lucid32 http://files.vagrantup.com/lucid32.box
     vagrant up
 
+Note: The above `vagrant up` command will also trigger Vagrant to download the
+`lucid32` box via the specified URL. Vagrant only does this if it detects that
+the box doesn't already exist on your system.
+
 ## Getting Started Guide and Video
 
 To learn how to build a fully functional rails development environment, view the
@@ -40,13 +43,12 @@ covers a few parts of Vagrant in more detail than the website guide.
 If you want the bleeding edge version of Vagrant, we try to keep master pretty stable
 and you're welcome to give it a shot. The following is an example showing how to do this:
 
-    rake build
-    sudo rake install
+    rake install
 
 ## Contributing to Vagrant
 
 To hack on vagrant, you'll need [bundler](http://github.com/carlhuda/bundler) which can
-be installed with a simple `sudo gem install bundler`. Afterwords, do the following:
+be installed with a simple `gem install bundler`. Afterwords, do the following:
 
     bundle install
     bundle exec rake

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

@@ -21,7 +21,7 @@ module Vagrant
         # box. This Vagrantfile contains the MAC address so that the user doesn't
         # have to worry about it.
         def create_vagrantfile
-          File.open(File.join(@env["package.directory"], "Vagrantfile"), "w") do |f|
+          File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
             f.write(TemplateRenderer.render("package_Vagrantfile", {
               :base_mac => @env["vm"].vm.network_adapters.first.mac_address
             }))

data/lib/vagrant/commands/init.rb

@@ -5,28 +5,32 @@ module Vagrant
       description "Initializes current folder for Vagrant usage"
 
       def execute(args)
-        create_vagrantfile(args[0])
+        create_vagrantfile(:default_box => args[0] , :default_box_url => args[1])
       end
 
       def options_spec(opts)
-        opts.banner = "Usage: vagrant init [name]"
+        opts.banner = "Usage: vagrant init [name] [box_url]"
       end
 
       # Actually writes the initial Vagrantfile to the current working directory.
       # The Vagrantfile will contain the base box configuration specified, or
       # will just use "base" if none is specified.
       #
-      # @param [String] default_box The default base box for this Vagrantfile
-      def create_vagrantfile(default_box=nil)
+      # @param [String] :default_box The default base box for this
+      # Vagrantfile
+      # @param [String] :default_box_url The default url for fetching
+      # the given box for the Vagrantfile
+      def create_vagrantfile(opts={})
         rootfile_path = File.join(Dir.pwd, Environment::ROOTFILE_NAME)
         error_and_exit(:rootfile_already_exists) if File.exist?(rootfile_path)
 
-        # Write the rootfile
-        default_box ||= "base"
+        # Set the defaults of the Vagrantfile
+        opts[:default_box] ||= "base"
+
         File.open(rootfile_path, 'w+') do |f|
-          f.write(TemplateRenderer.render(Environment::ROOTFILE_NAME, :default_box => default_box))
+          f.write(TemplateRenderer.render(Environment::ROOTFILE_NAME, opts))
         end
       end
     end
   end
-end
+end

data/lib/vagrant/provisioners/chef_server.rb

@@ -48,7 +48,7 @@ module Vagrant
       end
 
       def run_chef_client
-        command = "cd #{env.config.chef.provisioning_path} && sudo chef-client -c client.rb -j dna.json"
+        command = "cd #{env.config.chef.provisioning_path} && sudo -E chef-client -c client.rb -j dna.json"
 
         logger.info "Running chef-client..."
         vm.ssh.execute do |ssh|

data/lib/vagrant/provisioners/chef_solo.rb

@@ -38,7 +38,7 @@ module Vagrant
       end
 
       def run_chef_solo
-        command = "cd #{env.config.chef.provisioning_path} && sudo chef-solo -c solo.rb -j dna.json"
+        command = "cd #{env.config.chef.provisioning_path} && sudo -E chef-solo -c solo.rb -j dna.json"
 
         logger.info "Running chef-solo..."
         vm.ssh.execute do |ssh|

data/lib/vagrant/ssh.rb

@@ -33,7 +33,8 @@ module Vagrant
 
       # Command line options
       command_options = ["-p #{options[:port]}", "-o UserKnownHostsFile=/dev/null",
-                         "-o StrictHostKeyChecking=no", "-i #{options[:private_key_path]}"]
+                         "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
+                         "-i #{options[:private_key_path]}"]
       command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
 
       # Some hackery going on here. On Mac OS X Leopard (10.5), exec fails

data/lib/vagrant/util/template_renderer.rb

@@ -68,7 +68,7 @@ module Vagrant
       #
       # @return [String]
       def render_string
-        ERB.new(template).result(binding)
+        ERB.new(template, nil, "%<>-").result(binding)
       end
 
       # Returns the full path to the template, taking into accoun the gem directory

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/vagrant/vm.rb

@@ -103,6 +103,7 @@ module Vagrant
 
     def start
       return if @vm.running?
+      return resume if @vm.saved?
 
       env.actions.run(:start)
     end

data/templates/Vagrantfile.erb

@@ -5,4 +5,10 @@ Vagrant::Config.run do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "<%= default_box %>"
+
+  <% if !default_box_url.nil? -%>
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system
+  config.vm.box_url = "<%= default_box_url %>"
+  <% end -%>
 end

data/templates/ssh_config.erb

@@ -6,3 +6,4 @@ Host <%= host_key %>
   StrictHostKeyChecking no
   PasswordAuthentication no
   IdentityFile <%= private_key_path %>
+  IdentitiesOnly yes

data/templates/strings.yml

@@ -191,7 +191,7 @@
   Unknown provisioner type: <%= provisioner %>
 :rootfile_already_exists: |-
   It looks like this directory is already setup for vagrant! (A <%= Vagrant::Environment::ROOTFILE_NAME %>
-  already exists.)
+   already exists.)
 :rootfile_not_found: |-
   A `<%= Vagrant::Environment::ROOTFILE_NAME %>` was not found! This file is required for vagrant to run
   since it describes the expected environment that vagrant is supposed

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 -07:00
+date: 2010-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency