vagrant 0.9.7 → 1.0.0

data/lib/vagrant/provisioners/chef.rb

@@ -57,7 +57,9 @@ module Vagrant
         temp.write(config_file)
         temp.close
 
-        env[:vm].channel.upload(temp.path, File.join(config.provisioning_path, filename))
+        remote_file = File.join(config.provisioning_path, filename)
+        env[:vm].channel.sudo("rm #{remote_file}", :error_check => false)
+        env[:vm].channel.upload(temp.path, remote_file)
       end
 
       def setup_json

data/lib/vagrant/provisioners/puppet.rb

@@ -13,13 +13,13 @@ module Vagrant
         attr_accessor :module_path
         attr_accessor :pp_path
         attr_accessor :options
+        attr_accessor :facter
 
-        def initialize
-          @manifest_file = "default.pp"
-          @manifests_path = "manifests"
-          @pp_path = "/tmp/vagrant-puppet"
-          @options = []
-        end
+        def manifest_file; @manifest_file || "default.pp"; end
+        def manifests_path; @manifests_path || "manifests"; end
+        def pp_path; @pp_path || "/tmp/vagrant-puppet"; end
+        def options; @options ||= []; end
+        def facter; @facter ||= {}; end
 
         # Returns the manifests path expanded relative to the root path of the
         # environment.
@@ -140,7 +140,18 @@ module Vagrant
         options << @manifest_file
         options = options.join(" ")
 
-        command = "cd #{manifests_guest_path} && puppet apply #{options}"
+        # Build up the custom facts if we have any
+        facter = ""
+        if !config.facter.empty?
+          facts = []
+          config.facter.each do |key, value|
+            facts << "FACTER_#{key}='#{value}'"
+          end
+
+          facter = "#{facts.join(" ")} "
+        end
+
+        command = "cd #{manifests_guest_path} && #{facter}puppet apply #{options}"
 
         env[:ui].info I18n.t("vagrant.provisioners.puppet.running_puppet",
                              :manifest => @manifest_file)

data/lib/vagrant/util/line_ending_helpers.rb

@@ -0,0 +1,14 @@
+module Vagrant
+  module Util
+    module LineEndingHelpers
+      # Converts line endings to unix-style line endings in the
+      # given string.
+      #
+      # @param [String] string Original string
+      # @return [String] The fixed string
+      def dos_to_unix(string)
+        string.gsub("\r\n", "\n")
+      end
+    end
+  end
+end

data/lib/vagrant/util/subprocess.rb

@@ -171,6 +171,15 @@ module Vagrant
               # Windows doesn't support non-blocking reads on
               # file descriptors or pipes so we have to get
               # a bit more creative.
+
+              # Check if data is actually ready on this IO device.
+              # We have to do this since `readpartial` will actually block
+              # until data is available, which can cause blocking forever
+              # in some cases.
+              results = IO.select([io], nil, nil, 1)
+              break if !results || results[0].empty?
+
+              # Read!
               data << io.readpartial(READ_CHUNK_SIZE)
             else
               # Do a simple non-blocking read on the IO object

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.9.7"
+  VERSION = "1.0.0"
 end

data/lib/vagrant/vm.rb

@@ -128,10 +128,12 @@ module Vagrant
       begin
         @driver = Driver::VirtualBox.new(@uuid)
       rescue Driver::VirtualBox::VMNotFound
-        # Clear the UUID since this VM doesn't exist. Note that this calls
-        # back into `reload!` but shouldn't ever result in infinite
-        # recursion since `@uuid` will be nil.
-        self.uuid = nil
+        # Clear the UUID since this VM doesn't exist.
+        @uuid = nil
+
+        # Reset the driver. This shouldn't raise a VMNotFound since we won't
+        # feed it a UUID.
+        @driver = Driver::VirtualBox.new
       end
     end
 
@@ -181,8 +183,6 @@ module Vagrant
       @_ui
     end
 
-    protected
-
     def run_action(name, options=nil)
       options = {
         :vm => self,

data/templates/commands/init/Vagrantfile.erb

@@ -20,7 +20,7 @@ Vagrant::Config.run do |config|
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  # config.vm.network :hostonly, "33.33.33.10"
+  # config.vm.network :hostonly, "192.168.33.10"
 
   # Assign this VM to a bridged network, allowing you to connect directly to a
   # network using the host's network device. This makes the VM appear as another

data/templates/guests/fedora/network_dhcp.erb

@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+BOOTPROTO=dhcp
+ONBOOT=yes
+DEVICE=p7p<%= options[:interface] %>
+#VAGRANT-END

data/templates/guests/fedora/network_static.erb

@@ -0,0 +1,13 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+NM_CONTROLLED=no
+BOOTPROTO=static
+ONBOOT=yes
+IPADDR=<%= options[:ip] %>
+NETMASK=<%= options[:netmask] %>
+DEVICE=p7p<%= options[:interface] %>
+<%= options[:gateway] ? "GATEWAY=#{options[:gateway]}" : '' %>
+<%= options[:mac_address] ? "HWADDR=#{options[:mac_address]}" : '' %>
+<%= options[:dns1] ? "DNS1=#{options[:dns1]}" : 'DNS1=8.8.4.4' %>
+<%= options[:dns2] ? "DNS2=#{options[:dns2]}" : 'DNS1=8.8.8.8' %>
+#VAGRANT-END

data/templates/guests/freebsd/network_dhcp.erb

@@ -0,0 +1,3 @@
+#VAGRANT-BEGIN
+ifconfig_em<%= options[:interface] %>="DHCP"
+#VAGRANT-END

data/templates/guests/freebsd/network_static.erb

@@ -0,0 +1,3 @@
+#VAGRANT-BEGIN
+ifconfig_em<%= options[:interface] %>="inet <%= options[:ip] %> netmask <%= options[:netmask] %>"
+#VAGRANT-END

data/templates/locales/en.yml

@@ -47,6 +47,12 @@ en:
         may run at any given time to avoid problems with VirtualBox inconsistencies
         occurring. Please wait for the other instance of Vagrant to end and then
         try again.
+      gem_command_in_bundler: |-
+        You cannot run the `vagrant gem` command while in a bundler environment.
+        Bundler messes around quite a bit with the RubyGem load paths and gems
+        installed via `vagrant gem` are excluded by Bundler.
+
+        Instead, please include your Vagrant plugins in your Gemfile itself.
       guest:
         invalid_class: |-
           The specified guest class does not inherit from `Vagrant::Guest::Base`.
@@ -225,6 +231,18 @@ en:
         vm_not_running: "VM is not currently running. Please bring it up to run this command."
       box:
         no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
+      destroy:
+        confirmation: "Are you sure you want to destroy the '%{name}' VM? [Y/N] "
+        will_not_destroy: |-
+          The VM '%{name}' will not be destroyed, since the confirmation
+          was declined.
+      gem:
+        help_preamble: |-
+          `vagrant gem` is used to install Vagrant plugins via the RubyGems
+          system. In fact, `vagrant gem` is just a frontend to the actual `gem`
+          interface, with the difference being that Vagrant sets up a custom
+          directory where gems are installed so that they are isolated from your
+          system gems.
       init:
         success: |-
           A `Vagrantfile` has been placed in this directory. You are now
@@ -237,6 +255,11 @@ en:
           stopped without properly closing the session. Run `vagrant up`
           to resume this virtual machine. If any problems persist, you may
           have to destroy and restart the virtual machine.
+        gurumeditation: |-
+          The VM is in the "guru meditation" state. This is a rare case which means
+          that an internal error in VitualBox caused the VM to fail. This is always
+          the sign of a bug in VirtualBox. You can try to bring your VM back online
+          with a `vagrant up`.
         inaccessible: |-
           The VM is inaccessible! This is a rare case which means that VirtualBox
           can't find your VM configuration. This usually happens when upgrading
@@ -522,6 +545,9 @@ en:
           output_exists: |-
             The specified file to save the package as already exists. Please
             remove this file or specify a different file name for outputting.
+          output_is_directory: |-
+            The specified output is a directory. Please specify a path including
+            a filename.
           requires_directory: |-
             A directory was not specified to package. This should never happen
             and is a result of an internal inconsistency.

data/templates/nfs/exports_linux.erb

@@ -1,5 +1,5 @@
 # VAGRANT-BEGIN: <%= uuid %>
 <% folders.each do |name, opts| %>
-"<%= opts[:hostpath] %>" <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)
+"<%= opts[:hostpath] %>" <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>,fsid=<%= opts[:uuid] %>)
 <% end %>
 # VAGRANT-END: <%= uuid %>

data/test/acceptance/networking/host_only_test.rb

@@ -26,12 +26,12 @@ describe "vagrant host only networking" do
       f.puts(<<VFILE)
 Vagrant::Config.run do |config|
   config.vm.box = "base"
-  config.vm.network :hostonly, "33.33.33.10"
+  config.vm.network :hostonly, "192.168.33.10"
 end
 VFILE
     end
 
     assert_execute("vagrant", "up")
-    assert_host_to_vm_network("http://33.33.33.10:8000/", 8000)
+    assert_host_to_vm_network("http://192.168.33.10:8000/", 8000)
   end
 end

data/test/unit/vagrant/config/vm_test.rb

@@ -34,15 +34,15 @@ describe Vagrant::Config::VMConfig do
 
   it "merges by appending networks" do
     a = described_class.new
-    a.network :hostonly, "33.33.33.10"
+    a.network :hostonly, "192.168.33.10"
 
     b = described_class.new
-    b.network :hostonly, "33.33.33.11"
+    b.network :hostonly, "192.168.33.11"
 
     c = a.merge(b)
     c.networks.length.should == 2
-    c.networks[0].should == [:hostonly, ["33.33.33.10"]]
-    c.networks[1].should == [:hostonly, ["33.33.33.11"]]
+    c.networks[0].should == [:hostonly, ["192.168.33.10"]]
+    c.networks[1].should == [:hostonly, ["192.168.33.11"]]
   end
 
   it "merges by appending provisioners" do

data/test/unit/vagrant/data_store_test.rb

@@ -64,4 +64,16 @@ describe Vagrant::DataStore do
     # The file should no longer exist
     db_file.should_not be_exist
   end
+
+  it "works if the DB file is nil" do
+    store = described_class.new(nil)
+    store[:foo] = "bar"
+    store[:foo].should == "bar"
+  end
+
+  it "throws an exception if attempting to commit a data store with no file" do
+    store = described_class.new(nil)
+    expect { store.commit }.
+      to raise_error(StandardError)
+  end
 end

data/test/unit/vagrant/environment_test.rb

@@ -86,6 +86,26 @@ describe Vagrant::Environment do
     end
   end
 
+  describe "primary VM" do
+    it "should be the only VM if not a multi-VM environment" do
+      instance.primary_vm.should == instance.vms.values.first
+    end
+
+    it "should be the VM marked as the primary" do
+      environment = isolated_environment do |env|
+        env.vagrantfile(<<-VF)
+Vagrant::Config.run do |config|
+  config.vm.define :foo
+  config.vm.define :bar, :primary => true
+end
+VF
+      end
+
+      env = environment.create_vagrant_env
+      env.primary_vm.should == env.vms[:bar]
+    end
+  end
+
   describe "loading configuration" do
     it "should load global configuration" do
       environment = isolated_environment do |env|

data/test/unit/vagrant/util/line_endings_helper_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path("../../../base", __FILE__)
+
+require "vagrant/util/line_ending_helpers"
+
+describe Vagrant::Util::LineEndingHelpers do
+  let(:klass) do
+    Class.new do
+      extend Vagrant::Util::LineEndingHelpers
+    end
+  end
+
+  it "should convert DOS to unix-style line endings" do
+    klass.dos_to_unix("foo\r\nbar\r\n").should == "foo\nbar\n"
+  end
+end
+

data/vagrant.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
   s.add_dependency "childprocess", "~> 0.3.1"
   s.add_dependency "erubis", "~> 2.7.0"
+  s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "log4r", "~> 1.1.9"
   s.add_dependency "net-ssh", "~> 2.2.2"
   s.add_dependency "net-scp", "~> 1.0.4"
-  s.add_dependency "i18n", "~> 0.6.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
-  - 7
-  version: 0.9.7
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -68,6 +68,22 @@ dependencies:
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  name: i18n
+  type: :runtime
+  prerelease: false
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,9 +97,9 @@ dependencies:
   name: json
   type: :runtime
   prerelease: false
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,9 +113,9 @@ dependencies:
   name: log4r
   type: :runtime
   prerelease: false
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,9 +129,9 @@ dependencies:
   name: net-ssh
   type: :runtime
   prerelease: false
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,22 +145,6 @@ dependencies:
   name: net-scp
   type: :runtime
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  name: i18n
-  type: :runtime
-  prerelease: false
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
@@ -291,6 +291,7 @@ files:
 - lib/vagrant/action/builtin.rb
 - lib/vagrant/action/env/set.rb
 - lib/vagrant/action/environment.rb
+- lib/vagrant/action/general/check_virtualbox.rb
 - lib/vagrant/action/general/package.rb
 - lib/vagrant/action/general/validate.rb
 - lib/vagrant/action/runner.rb
@@ -337,6 +338,7 @@ files:
 - lib/vagrant/command/box_remove.rb
 - lib/vagrant/command/box_repackage.rb
 - lib/vagrant/command/destroy.rb
+- lib/vagrant/command/gem.rb
 - lib/vagrant/command/halt.rb
 - lib/vagrant/command/init.rb
 - lib/vagrant/command/package.rb
@@ -380,6 +382,7 @@ files:
 - lib/vagrant/guest/arch.rb
 - lib/vagrant/guest/base.rb
 - lib/vagrant/guest/debian.rb
+- lib/vagrant/guest/fedora.rb
 - lib/vagrant/guest/freebsd.rb
 - lib/vagrant/guest/gentoo.rb
 - lib/vagrant/guest/linux.rb
@@ -397,6 +400,7 @@ files:
 - lib/vagrant/hosts/freebsd.rb
 - lib/vagrant/hosts/gentoo.rb
 - lib/vagrant/hosts/linux.rb
+- lib/vagrant/hosts/opensuse.rb
 - lib/vagrant/hosts/windows.rb
 - lib/vagrant/plugin.rb
 - lib/vagrant/provisioners.rb
@@ -418,6 +422,7 @@ files:
 - lib/vagrant/util/file_checksum.rb
 - lib/vagrant/util/file_mode.rb
 - lib/vagrant/util/hash_with_indifferent_access.rb
+- lib/vagrant/util/line_ending_helpers.rb
 - lib/vagrant/util/network_ip.rb
 - lib/vagrant/util/platform.rb
 - lib/vagrant/util/retryable.rb
@@ -437,6 +442,10 @@ files:
 - templates/guests/arch/network_static.erb
 - templates/guests/debian/network_dhcp.erb
 - templates/guests/debian/network_static.erb
+- templates/guests/fedora/network_dhcp.erb
+- templates/guests/fedora/network_static.erb
+- templates/guests/freebsd/network_dhcp.erb
+- templates/guests/freebsd/network_static.erb
 - templates/guests/gentoo/network_dhcp.erb
 - templates/guests/gentoo/network_static.erb
 - templates/guests/redhat/network_dhcp.erb
@@ -576,6 +585,7 @@ files:
 - test/unit/vagrant/util/ansi_escape_code_remover_test.rb
 - test/unit/vagrant/util/file_checksum_test.rb
 - test/unit/vagrant/util/hash_with_indifferent_access_test.rb
+- test/unit/vagrant/util/line_endings_helper_test.rb
 - test/unit/vagrant/util/network_ip_test.rb
 - test/unit/vagrant/util/retryable_test.rb
 - test/unit/vagrant_test.rb