vagrant 1.0.6 → 1.0.7

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-## 1.0.6 (unreleased)
+## 1.0.7 (March 13, 2013)
+
+  - Detect if a newer version of Vagrant ran and error if it did,
+    because we're not forward-compatible.
+  - Check for guest additions version AFTER booting. [GH-1179]
+  - Quote IdentityFile in `ssh-config` so private keys with spaces in
+    the path work. [GH-1322]
+  - Fix issue where multiple Puppet module paths can be re-ordered [GH-964]
+  - Shell provisioner won't hang on Windows anymore due to unclosed
+    tempfile. [GH-1040]
+  - Retry setting default VM name, since it sometimes fails first time. [GH-1368]
+  - Support setting hostname on Suse [GH-1063]
+
+## 1.0.6 (December 21, 2012)
 
   - Shell provisioner outputs proper line endings on Windows [GH-1164]
   - SSH upload opens file to stream which fixes strange upload issues.

data/lib/vagrant/action/builtin.rb

@@ -49,6 +49,7 @@ module Vagrant
             use VM::SaneDefaults
             use VM::Customize
             use VM::Boot
+            use VM::CheckGuestAdditions
           end
         end
 
@@ -104,7 +105,6 @@ module Vagrant
             use VM::CheckAccessible
             use VM::CheckBox
             use VM::Import
-            use VM::CheckGuestAdditions
             use VM::DefaultName
             use VM::MatchMACAddress
             use registry.get(:start)

data/lib/vagrant/driver/virtualbox_4_2.rb

@@ -427,7 +427,7 @@ module Vagrant
       end
 
       def set_name(name)
-        execute("modifyvm", @uuid, "--name", name)
+        execute("modifyvm", @uuid, "--name", name, :retryable => true)
       end
 
       def share_folders(folders)

data/lib/vagrant/environment.rb

@@ -446,6 +446,11 @@ module Vagrant
                                                  DEFAULT_HOME))
       @logger.info("Home path: #{@home_path}")
 
+      # If the setup_version file exists, then we can't load because we're
+      # not forward compatible. It means they ran a future version of Vagrant.
+      raise Errors::IncompatibleWithFutureVersion, :path => @home_path.to_s if \
+        @home_path.join("setup_version").file?
+
       # Setup the array of necessary home directories
       dirs = [@home_path]
       dirs += HOME_SUBDIRS.collect { |subdir| @home_path.join(subdir) }

data/lib/vagrant/errors.rb

@@ -198,6 +198,10 @@ module Vagrant
       error_key(:home_dir_not_accessible)
     end
 
+    class IncompatibleWithFutureVersion < VagrantError
+      error_key(:incompatible_with_future_version)
+    end
+
     class ForwardPortAutolistEmpty < VagrantError
       status_code(27)
       error_key(:auto_empty, "vagrant.actions.vm.forward_ports")

data/lib/vagrant/guest/suse.rb

@@ -4,6 +4,14 @@ module Vagrant
       def network_scripts_dir
         '/etc/sysconfig/network/'
       end
+      def change_host_name(name)
+        # Only do this if the hostname is not already set
+        if !vm.channel.test("sudo hostname | grep '#{name}'")
+          vm.channel.sudo("echo #{name} > /etc/HOSTNAME")
+          vm.channel.sudo("hostname #{name}")
+          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+        end
+      end
     end
   end
 end

data/lib/vagrant/provisioners/puppet.rb

@@ -117,9 +117,9 @@ module Vagrant
       end
 
       def set_module_paths
-        @module_paths = {}
+        @module_paths = []
         @expanded_module_paths.each_with_index do |path, i|
-          @module_paths[path] = File.join(config.pp_path, "modules-#{i}")
+          @module_paths << [path, File.join(config.pp_path, "modules-#{i}")]
         end
       end
 
@@ -136,7 +136,8 @@ module Vagrant
 
       def run_puppet_client
         options = [config.options].flatten
-        options << "--modulepath '#{@module_paths.values.join(':')}'" if !@module_paths.empty?
+        module_paths = @module_paths.map { |_, to| to }
+        options << "--modulepath '#{module_paths.join(':')}'" if !@module_paths.empty?
         options << @manifest_file
         options = options.join(" ")
 

data/lib/vagrant/provisioners/shell.rb

@@ -68,6 +68,7 @@ module Vagrant
         begin
           file.write(config.inline)
           file.fsync
+          file.close
           yield file.path
         ensure
           file.close

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 = "1.0.6"
+  VERSION = "1.0.7"
 end

data/templates/commands/ssh_config/config.erb

@@ -5,7 +5,7 @@ Host <%= host_key %>
   UserKnownHostsFile /dev/null
   StrictHostKeyChecking no
   PasswordAuthentication no
-  IdentityFile <%= private_key_path %>
+  IdentityFile "<%= private_key_path %>"
   IdentitiesOnly yes
 <% if forward_agent -%>
   ForwardAgent yes

data/templates/locales/en.yml

@@ -74,6 +74,18 @@ en:
         directory that Vagrant uses must be both readable and writable.
 
         You specified: %{home_path}
+      incompatible_with_future_version: |-
+        It appears that you've ran a newer version of Vagrant on this
+        computer. Unfortunately, newer versions of Vagrant change internal
+        directory layouts that cause older versions to break. This version
+        of Vagrant cannot properly run.
+
+        If you'd like to start from a clean state, please remove the
+        Vagrant state directory: %{path}
+
+        Warning that this will remove all your boxes and potentially corrupt
+        existing Vagrant environments that were running based on the future
+        version.
       interrupted: |-
         Vagrant exited after cleanup due to external interrupt.
       multi_vm_required: |-

data/vagrant.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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 "json", ">= 1.5.1", "< 1.8.0"
   s.add_dependency "log4r", "~> 1.1.9"
   s.add_dependency "net-ssh", "~> 2.2.2"
   s.add_dependency "net-scp", "~> 1.0.4"

metadata

@@ -1,271 +1,273 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.0.7
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 6
-  version: 1.0.6
 platform: ruby
-authors: 
+authors:
 - Mitchell Hashimoto
 - John Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-24 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.5.2
-  version_requirements: *id001
-  name: archive-tar-minitar
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.3.1
-  version_requirements: *id002
-  name: childprocess
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
   name: erubis
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  version_requirements: *id004
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 1
-        - 9
+      - !ruby/object:Gem::Version
         version: 1.1.9
-  version_requirements: *id006
-  name: log4r
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
-        version: 1.0.4
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
   name: net-scp
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
-  version_requirements: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: contest
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.5.1
-  version_requirements: *id011
-  name: minitest
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id012
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+- !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
-  version_requirements: *id013
-  name: rspec-core
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
-  version_requirements: *id014
+- !ruby/object:Gem::Dependency
   name: rspec-expectations
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
-  version_requirements: *id015
+- !ruby/object:Gem::Dependency
   name: rspec-mocks
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-description: Vagrant is a tool for building and distributing virtualized development environments.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+description: Vagrant is a tool for building and distributing virtualized development
+  environments.
+email:
 - mitchell.hashimoto@gmail.com
 - john.m.bender@gmail.com
-executables: 
+executables:
 - vagrant
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/vagrant
 - CHANGELOG.md
 - config/default.rb
@@ -678,41 +680,31 @@ files:
 - vagrant.gemspec
 - .gitignore
 - .yardopts
-has_rdoc: true
 homepage: http://vagrantup.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4595047100771247865
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: vagrant
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Build and distribute virtualized development environments.
 test_files: []
-