vagrantup 0.6.8 → 0.6.9

data/lib/vagrant/environment.rb

@@ -31,9 +31,17 @@ module Vagrant
       # VirtualBox installed is high enough.
       def check_virtualbox!
         version = VirtualBox.version
-        raise Errors::VirtualBoxNotDetected.new if version.nil?
-        raise Errors::VirtualBoxInvalidVersion.new(:version => version.to_s) if version.to_f < 3.2
-        raise Errors::VirtualBoxInvalidOSE.new(:version => version.to_s) if version.to_s.downcase.include?("ose")
+        raise Errors::VirtualBoxNotDetected if version.nil?
+        raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 3.2
+        raise Errors::VirtualBoxInvalidOSE, :version => version.to_s if version.to_s.downcase.include?("ose")
+      rescue Errors::VirtualBoxNotDetected
+        # On 64-bit Windows, show a special error. This error is a subclass
+        # of VirtualBoxNotDetected, so libraries which use Vagrant can just
+        # rescue VirtualBoxNotDetected.
+        raise Errors::VirtualBoxNotDetected_Win64 if Util::Platform.windows? && Util::Platform.bit64?
+
+        # Otherwise, reraise the old error
+        raise
       end
     end
 
@@ -126,13 +134,21 @@ module Vagrant
 
     # Returns the VMs associated with this environment.
     #
-    # @return [Array<VM>]
+    # @return [Hash<Symbol,VM>]
     def vms
       return parent.vms if parent
       load! if !loaded?
       @vms ||= load_vms!
     end
 
+    # Returns the VMs associated with this environment, in the order
+    # that they were defined.
+    #
+    # @return [Array<VM>]
+    def vms_ordered
+      @vms_enum ||= config.vm.defined_vm_keys.map {|name| @vms[name]}
+    end
+
     # Returns the primary VM associated with this environment. This
     # method is only applicable for multi-VM environments. This can
     # potentially be nil if no primary VM is specified.
@@ -352,7 +368,7 @@ module Vagrant
 
       # For any VMs which aren't created, create a blank VM instance for
       # them
-      all_keys = config.vm.defined_vms.keys
+      all_keys = config.vm.defined_vm_keys
       all_keys = [DEFAULT_VM] if all_keys.empty?
       all_keys.each do |name|
         result[name] = Vagrant::VM.new(:name => name, :env => self) if !result.has_key?(name)

data/lib/vagrant/errors.rb

@@ -183,6 +183,13 @@ module Vagrant
       error_key(:not_found, "vagrant.actions.vm.network")
     end
 
+    # Note: This is a temporary error for Windows users while host-only
+    # networking doesn't quite work.
+    class NetworkNotImplemented < VagrantError
+      status_code(49)
+      error_key(:windows_not_implemented, "vagrant.actions.vm.network")
+    end
+
     class NFSHostRequired < VagrantError
       status_code(31)
       error_key(:host_required, "vagrant.actions.vm.nfs")
@@ -283,6 +290,15 @@ module Vagrant
       error_key(:virtualbox_not_detected)
     end
 
+    # Note that this is a subclass of VirtualBoxNotDetected, so developers
+    # who script Vagrant or use it as a library in any way can rescue from
+    # "VirtualBoxNotDetected" and catch both errors, which represent the
+    # same thing. This subclass simply has a specialized error message.
+    class VirtualBoxNotDetected_Win64 < VirtualBoxNotDetected
+      status_code(48)
+      error_key(:virtualbox_not_detected_win64)
+    end
+
     class VMBaseMacNotSpecified < VagrantError
       status_code(47)
       error_key(:no_base_mac, "vagrant.actions.vm.match_mac")

data/lib/vagrant/hosts/bsd.rb

@@ -42,7 +42,7 @@ module Vagrant
           if $?.to_i == 0
             # Use sed to just strip out the block of code which was inserted
             # by Vagrant
-            system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -i bak /etc/exports")
+            system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -ibak /etc/exports")
           end
         end
       end

data/lib/vagrant/provisioners/chef.rb

@@ -1,11 +1,11 @@
 module Vagrant
   module Provisioners
-    # This class is a base class where the common functinality shared between
+    # This class is a base class where the common functionality shared between
     # chef-solo and chef-client provisioning are stored. This is **not an actual
     # provisioner**. Instead, {ChefSolo} or {ChefServer} should be used.
     class Chef < Base
       def prepare
-        raise ChefError.new(:invalid_provisioner)
+        raise ChefError, :invalid_provisioner
       end
 
       def verify_binary(binary)

data/lib/vagrant/provisioners/chef_server.rb

@@ -6,9 +6,9 @@ module Vagrant
     # with a chef server.
     class ChefServer < Chef
       def prepare
-        raise ChefError.new(:server_validation_key_required) if env.config.chef.validation_key_path.nil?
-        raise ChefError.new(:server_validation_key_doesnt_exist) if !File.file?(validation_key_path)
-        raise ChefError.new(:server_url_required) if env.config.chef.chef_server_url.nil?
+        raise ChefError, :server_validation_key_required if env.config.chef.validation_key_path.nil?
+        raise ChefError, :server_validation_key_doesnt_exist if !File.file?(validation_key_path)
+        raise ChefError, :server_url_required if env.config.chef.chef_server_url.nil?
       end
 
       def provision!

data/lib/vagrant/provisioners/puppet.rb

@@ -0,0 +1,85 @@
+module Vagrant
+  module Provisioners
+
+  class PuppetError < Vagrant::Errors::VagrantError
+    error_namespace("vagrant.provisioners.puppet")
+  end
+
+  class PuppetConfig < Vagrant::Config::Base
+    configures :puppet
+
+    attr_accessor :manifest_file
+    attr_accessor :manifests_path
+    attr_accessor :pp_path
+    attr_accessor :options
+
+    def initialize
+      @manifest_file = ""
+      @manifests_path = "manifests"
+      @pp_path = "/tmp/vagrant-puppet"
+      @options = []
+    end
+  end
+
+  class Puppet < Base
+    def prepare
+      check_manifest_dir
+      share_manifests
+    end
+
+    def provision!
+      verify_binary("puppet")
+      create_pp_path
+      set_manifest
+      run_puppet_client
+    end
+
+    def check_manifest_dir
+      Dir.mkdir(env.config.puppet.manifests_path) unless File.directory?(env.config.puppet.manifests_path)
+    end
+
+    def share_manifests
+      env.config.vm.share_folder("manifests", env.config.puppet.pp_path, env.config.puppet.manifests_path)
+    end
+
+    def verify_binary(binary)
+      vm.ssh.execute do |ssh|
+        ssh.exec!("which #{binary}", :error_class => PuppetError, :_key => :puppet_not_detected, :binary => binary)
+      end
+    end
+
+    def create_pp_path
+      vm.ssh.execute do |ssh|
+        ssh.exec!("sudo mkdir -p #{env.config.puppet.pp_path}")
+        ssh.exec!("sudo chown #{env.config.ssh.username} #{env.config.puppet.pp_path}")
+      end
+    end
+
+    def set_manifest
+      @manifest = !env.config.puppet.manifest_file.empty? ? env.config.puppet.manifest_file : "#{env.config.vm.box}.pp"
+
+      if File.exists?("#{env.config.puppet.manifests_path}/#{@manifest}")
+         env.ui.info I18n.t("vagrant.provisioners.puppet.manifest_to_run", :manifest => @manifest)
+         return @manifest
+       else
+         raise PuppetError, :_key => :manifest_missing, :manifest => @manifest
+      end
+    end
+
+    def run_puppet_client
+      options = env.config.puppet.options
+      options = options.join(" ") if options.is_a?(Array)
+      command = "cd #{env.config.puppet.pp_path} && sudo -E puppet #{options} #{@manifest}"
+
+      env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet")
+
+      vm.ssh.execute do |ssh|
+        ssh.exec!(command) do |channel, type, data|
+          ssh.check_exit_status(data, command) if type == :exit_status
+          env.ui.info("#{data}: #{type}") if type != :exit_status
+        end
+      end
+    end
+  end
+ end
+end

data/lib/vagrant/ssh.rb

@@ -1,3 +1,4 @@
+require 'timeout'
 require 'net/ssh'
 require 'net/scp'
 require 'mario'
@@ -22,11 +23,11 @@ module Vagrant
     # of options which override the configuration values.
     def connect(opts={})
       if Mario::Platform.windows?
-        raise Errors::SSHUnavailableWindows.new(:key_path => env.config.ssh.private_key_path,
-                                                :ssh_port => port(opts))
+        raise Errors::SSHUnavailableWindows, :key_path => env.config.ssh.private_key_path,
+                                             :ssh_port => port(opts)
       end
 
-      raise Errors::SSHUnavailable.new if !Kernel.system("which ssh > /dev/null 2>&1")
+      raise Errors::SSHUnavailable if !Kernel.system("which ssh > /dev/null 2>&1")
 
       options = {}
       options[:port] = port(opts)
@@ -60,12 +61,12 @@ module Vagrant
       # Merge in any additional options
       opts = opts.dup
       opts[:forward_agent] = true if env.config.ssh.forward_agent
+      opts[:port] ||= port
 
       retryable(:tries => 5, :on => Errno::ECONNREFUSED) do
         Net::SSH.start(env.config.ssh.host,
                        env.config.ssh.username,
-                       opts.merge( :port => port,
-                                   :keys => [env.config.ssh.private_key_path],
+                       opts.merge( :keys => [env.config.ssh.private_key_path],
                                    :user_known_hosts_file => [],
                                    :paranoid => false,
                                    :config => false)) do |ssh|
@@ -73,7 +74,7 @@ module Vagrant
         end
       end
     rescue Errno::ECONNREFUSED
-      raise Errors::SSHConnectionRefused.new
+      raise Errors::SSHConnectionRefused
     end
 
     # Uploads a file from `from` to `to`. `from` is expected to be a filename
@@ -92,21 +93,22 @@ module Vagrant
     #
     # @return [Boolean]
     def up?
-      check_thread = Thread.new do
-        begin
-          Thread.current[:result] = false
-          execute(:timeout => env.config.ssh.timeout) do |ssh|
-            Thread.current[:result] = true
-          end
-        rescue Errno::ECONNREFUSED, Net::SSH::Disconnect, Errors::SSHConnectionRefused
-          # False, its defaulted above
-        end
+      # We have to determine the port outside of the block since it uses
+      # API calls which can only be used from the main thread in JRuby on
+      # Windows
+      ssh_port = port
+
+      Timeout.timeout(env.config.ssh.timeout) do
+        execute(:timeout => env.config.ssh.timeout,
+                :port => ssh_port) { |ssh| }
       end
 
-      check_thread.join(env.config.ssh.timeout)
-      return check_thread[:result]
+      true
     rescue Net::SSH::AuthenticationFailed
-      raise Errors::SSHAuthenticationFailed.new
+      raise Errors::SSHAuthenticationFailed
+    rescue Timeout::Error, Errno::ECONNREFUSED, Net::SSH::Disconnect,
+           Errors::SSHConnectionRefused, Net::SSH::AuthenticationFailed
+      return false
     end
 
     # Checks the file permissions for the private key, resetting them
@@ -120,12 +122,12 @@ module Vagrant
       if stat.owned? && file_perms(key_path) != "600"
         File.chmod(0600, key_path)
 
-        raise Errors::SSHKeyBadPermissions.new(:key_path => key_path) if file_perms(key_path) != "600"
+        raise Errors::SSHKeyBadPermissions, :key_path => key_path if file_perms(key_path) != "600"
       end
     rescue Errno::EPERM
       # This shouldn't happen since we verify we own the file, but just
       # in case.
-      raise Errors::SSHKeyBadPermissions.new(:key_path => key_path)
+      raise Errors::SSHKeyBadPermissions, :key_path => key_path
     end
 
     # Returns the file permissions of a given file. This is fairly unix specific
@@ -227,7 +229,7 @@ module Vagrant
             :command => command
           }.merge(options || {})
 
-          raise options[:_error_class].new(options)
+          raise options[:_error_class], options
         end
       end
     end

data/lib/vagrant/systems/linux.rb

@@ -106,7 +106,7 @@ module Vagrant
           break unless result
 
           attempts += 1
-          raise LinuxError.new(:mount_fail) if attempts >= 10
+          raise LinuxError, :mount_fail if attempts >= 10
           sleep sleeptime
         end
       end

data/lib/vagrant/systems/solaris.rb

@@ -13,10 +13,13 @@ module Vagrant
 
         attr_accessor :halt_timeout
         attr_accessor :halt_check_interval
+        # This sets the command to use to execute items as a superuser. sudo is default
+        attr_accessor :suexec_cmd
 
         def initialize
           @halt_timeout = 30
           @halt_check_interval = 1
+          @suexec_cmd = 'sudo'
         end
       end
 
@@ -33,7 +36,7 @@ module Vagrant
       def halt
         vm.env.ui.info I18n.t("vagrant.systems.solaris.attempting_halt")
         vm.ssh.execute do |ssh|
-          ssh.exec!("pfexec poweroff")
+          ssh.exec!("#{vm.env.config.solaris.suexec_cmd} /usr/sbin/poweroff")
         end
 
         # Wait until the VM's state is actually powered off. If this doesn't
@@ -49,10 +52,10 @@ module Vagrant
       end
 
       def mount_shared_folder(ssh, name, guestpath)
-        ssh.exec!("pfexec mkdir -p #{guestpath}")
+        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
         # Using a custom mount method here; could use improvement.
-        ssh.exec!("pfexec mount -F vboxfs v-root #{guestpath}")
-        ssh.exec!("pfexec chown #{vm.env.config.ssh.username} #{guestpath}")
+        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{name} #{guestpath}")
+        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} chown #{vm.env.config.ssh.username} #{guestpath}")
       end
     end
   end

data/lib/vagrant/util/hash_with_indifferent_access.rb

@@ -1,7 +1,7 @@
 module Vagrant
   module Util
     # A hash with indifferent access. Mostly taken from Thor/Rails (thanks).
-    # Normally I'm not a fan of using an indifferent access hash sine Symbols
+    # Normally I'm not a fan of using an indifferent access hash since Symbols
     # are basically memory leaks in Ruby, but since Vagrant is typically a quick
     # one-off binary run and it doesn't use too many hash keys where this is
     # used, the effect should be minimal.

data/lib/vagrant/util/platform.rb

@@ -1,3 +1,4 @@
+require 'rbconfig'
 require 'mario'
 
 module Vagrant
@@ -27,13 +28,29 @@ module Vagrant
           false
         end
 
+        # Returns boolean noting whether this is a 64-bit CPU. This
+        # is not 100% accurate and there could easily be false negatives.
+        #
+        # @return [Boolean]
+        def bit64?
+          ["x86_64", "amd64"].include?(RbConfig::CONFIG["host_cpu"])
+        end
+
+        # Returns boolean noting whether this is a 32-bit CPU. This
+        # can easily throw false positives since it relies on {#bit64?}.
+        #
+        # @return [Boolean]
+        def bit32?
+          !bit64?
+        end
+
         def tar_file_options
           # create, write only, fail if the file exists, binary if windows
           File::WRONLY|File::EXCL|File::CREAT|(Mario::Platform.windows? ? File::BINARY : 0)
         end
 
         def platform
-          RUBY_PLATFORM.to_s.downcase
+          RbConfig::CONFIG["host_os"].downcase
         end
       end
     end

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.6.8"
+  VERSION = "0.6.9"
 end

data/lib/vagrant/vm.rb

@@ -53,15 +53,15 @@ module Vagrant
 
       if system.is_a?(Class)
         @system = system.new(self)
-        raise Errors::VMSystemError.new(:_key => :invalid_class, :system => system.to_s) if !@system.is_a?(Systems::Base)
+        raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !@system.is_a?(Systems::Base)
       elsif system.is_a?(Symbol)
         # Hard-coded internal systems
-        mapping = { :linux => Systems::Linux }
+        mapping = { :linux => Systems::Linux, :solaris => Systems::Solaris }
 
-        raise Errors::VMSystemError.new(:_key => :unknown_type, :system => system.to_s) if !mapping.has_key?(system)
+        raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !mapping.has_key?(system)
         @system = mapping[system].new(self)
       else
-        raise Errors::VMSystemError.new(:unspecified)
+        raise Errors::VMSystemError, :unspecified
       end
     end
 

data/templates/locales/en.yml

@@ -13,6 +13,9 @@ en:
         The chef (either `chef-solo` or `chef-client`) binary was not found on
         the VM and is required for chef provisioning. Please verify that chef
         is installed and that the binary is available on the PATH.
+      puppet_not_detected: |-
+        The `puppet` binary was not found on the VM and is required for Puppet provisioning.
+        Please verify that Puppet is installed and that the binary is available on the PATH.
       cli_missing_env: This command requires that a Vagrant environment be properly passed in as the last parameter.
       config_validation: |-
         There was a problem with the configuration of Vagrant. The error message(s)
@@ -67,7 +70,7 @@ en:
 
         For a more detailed guide please consult:
 
-          http://vagrantup.com/docs/getting-started/windows.
+          http://vagrantup.com/docs/getting-started/windows
 
       system:
         invalid_class: |-
@@ -99,6 +102,18 @@ en:
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently
         requires VirtualBox 3.2.x. Please install the proper version to continue.
+      virtualbox_not_detected_win64: |-
+        Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed
+        with version 3.2.0 or higher.
+
+        Additionally, it appears you're on 64-bit Windows. If this is the case, and
+        VirtualBox is properly installed with the correct version, then please make
+        sure you're running Vagrant via JRuby on a 64-bit Java runtime. For more
+        information on how to set this up and how to verify it is properly setup,
+        please view the guide online at:
+
+          http://vagrantup.com/docs/getting-started/setup/windows_x64.html
+
       vm_creation_required: "VM must be created before running this command. Run `vagrant up` first."
       vm_not_found: "A VM by the name of %{name} was not found."
       vm_not_running: "VM must be running to open SSH connection."
@@ -289,14 +304,19 @@ en:
             This will cause your specified IP to be inaccessible. Please change
             the IP or name of your host only network to not match that of
             a bridged or non-hostonly network.
-          creating: Creating new host only network for environment...
-          enabling: Enabling host only network...
+          creating: "Creating new host only network for environment..."
+          enabling: "Enabling host only network..."
           not_found: |-
             The specified host network could not be found: '%{name}.'
             If the name specification is removed, Vagrant will create a new
             host only network for you. Alternatively, please create the
             specified network manually.
-          preparing: Preparing host only network...
+          preparing: "Preparing host only network..."
+          windows_not_implemented: |-
+            Host only networking is currently broken on Windows due to a bug
+            in jruby-win32ole. When the bug is fixed, a patch release for Vagrant
+            will be released to remove this error. Until then, please just use
+            forwarded ports.
         nfs:
           host_required: |-
             A host class is required for NFS shared folders. By default, these
@@ -416,6 +436,16 @@ en:
           The validation key set for `config.chef.validation_key_path` does not exist! This
           file needs to exist so it can be uploaded to the virtual machine.
 
+      puppet:
+        not_detected: |-
+          The `%{binary}` binary appears to not be in the PATH of the guest. This
+          could be because the PATH is not properly setup or perhaps Puppet is not
+          installed on this guest. Puppet provisioning can not continue without
+          Puppet properly installed.
+        running_puppet: "Running Puppet..."
+        manifest_to_run: "Puppet will use the %{manifest} manifest to configure your box."
+        manifest_missing: "The Puppet %{manifest} manifest is missing. You cannot configure this box."
+
     systems:
       linux:
         attempting_halt: "Attempting graceful shutdown of linux..."