vagrantup 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e529f99213354edaf315e6be88a6ef7a32bda4a
-  data.tar.gz: 4fde23525e316f0e65e292efd1e355db168b90d5
+  metadata.gz: af5a4fbac1196e53c4539fa34d8680793d789245
+  data.tar.gz: 2c8ac719a48f962be8604775953f745003cad31a
 SHA512:
-  metadata.gz: 3faf9807304936dfad1b1cd93cf564a258bff5aa3550c5f0fbbe192feab854fb171acc566aad0d41c982ef6cd931eede18423e924d063635c0feab3bbbc54adf
-  data.tar.gz: 237d70baa1b562348b643c3bba83e4769a32d8c9dadd9a9bdf73400f2c11c50f6574273feaebf31ea93f312083be9ec3f05943c151442544c25097762efe9c93
+  metadata.gz: 1cc988d087d62e496054eccba11ce65ec7fe9f8dbce697ee83eafd0634d1f60ffb44863ac1210dd6a0012c6d78306896fc7d96a5c0bd17cc7a926da5068617c8
+  data.tar.gz: 66ac85e05e6c84c2cbf8413b4495b5502578bc736f244a2862f1601b1c1770a70b0c4bae75d19aed2c62efc5e28bcb19860cd28da2dc19677d949bcf0dbeae78

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"

data/vagrant.gemspecbak

@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -71,16 +71,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
@@ -708,6 +714,7 @@ files:
 - vagrantup-1.0.3.gem
 - vagrantup-1.0.4.gem
 - vagrantup-1.0.5.gem
+- vagrantup-1.0.6.gem
 - vagrantup-1.1.4.gem
 homepage: http://vagrantup.com
 licenses: []