Merge pull request #126 from tknerr/vagrant-1.7.4

Update to Vagrant 1.7.4
tknerr · Aug 7, 2015 · b90c613 · b90c613
2 parents 1ac47e7 + d22e8b5
commit b90c613
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
    * update to Terraform 0.6.1
    * update to Packer 0.8.2
    * update to Docker 1.7.1
+   * update to Vagrant 1.7.4
  * plugin updates:
    * update to vagrant-cachier 1.2.1 (with chef-zero support)
    * update to vagrant-proxyconf 1.5.1

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ The main tools for cooking with Chef / Vagrant:
 
 * [ChefDK](http://www.getchef.com/downloads/chef-dk/windows/) 0.6.0, with embedded [Ruby](http://rubyinstaller.org/downloads/) 2.1.5
 * [DevKit](http://rubyinstaller.org/add-ons/devkit/) 4.7.2
-* [Vagrant](http://vagrantup.com/) 1.7.2
+* [Vagrant](http://vagrantup.com/) 1.7.4
 * [Terraform](http://terraform.io/) 0.6.1
 * [Packer](http://packer.io/) 0.8.2
 * [Consul](http://consul.io/) 0.5.2

diff --git a/Rakefile b/Rakefile
@@ -127,7 +127,7 @@ def download_tools
         kdiff3.exe },
     %w{ the.earth.li/~sgtatham/putty/0.63/x86/putty.zip                                                     putty },
     %w{ www.itefix.net/dl/cwRsync_5.4.1_x86_Free.zip                                                        cwrsync },
-    %w{ dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2.msi                                                  vagrant },
+    %w{ dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4.msi                                                  vagrant },
     %w{ dl.bintray.com/mitchellh/terraform/terraform_0.6.1_windows_amd64.zip                                terraform },
     %w{ dl.bintray.com/mitchellh/packer/packer_0.8.2_windows_amd64.zip                                      packer },
     %w{ dl.bintray.com/mitchellh/consul/0.5.2_windows_386.zip                                               consul },
@@ -166,7 +166,7 @@ end
 
 # workaround for mitchellh/vagrant#4073
 def fix_vagrant
-  orig = "#{BUILD_DIR}/tools/vagrant/HashiCorp/Vagrant/embedded/gems/gems/vagrant-1.7.2/plugins/synced_folders/rsync/helper.rb"
+  orig = "#{BUILD_DIR}/tools/vagrant/HashiCorp/Vagrant/embedded/gems/gems/vagrant-1.7.4/plugins/synced_folders/rsync/helper.rb"
   patched = File.read(orig).gsub('hostpath = Vagrant::Util', 'hostpath = "/cygdrive" + Vagrant::Util')
   File.write(orig, patched)
 end

diff --git a/...plugins/providers/docker/action/create.rb → ...plugins/providers/docker/action/create.rb b/...plugins/providers/docker/action/create.rb → ...plugins/providers/docker/action/create.rb
diff --git a/...ocker/action/host_machine_port_checker.rb → ...ocker/action/host_machine_port_checker.rb b/...ocker/action/host_machine_port_checker.rb → ...ocker/action/host_machine_port_checker.rb
diff --git a/....7.2/plugins/providers/docker/provider.rb → ....7.4/plugins/providers/docker/provider.rb b/....7.2/plugins/providers/docker/provider.rb → ....7.4/plugins/providers/docker/provider.rb
@@ -89,6 +89,10 @@ def host_vm
             vagrantfile_name: vf_file,
           )
 
+          # If there is no root path, then the Vagrantfile wasn't found
+          # and it is an error...
+          raise Errors::VagrantfileNotFound if !host_env.root_path
+
           host_env.machine(
             host_machine_name,
             host_env.default_provider(
@@ -172,8 +176,14 @@ def ssh_info
       def state
         state_id = nil
         state_id = :not_created if !@machine.id
-        state_id = :host_state_unknown if !state_id && \
-          host_vm? && !host_vm.communicate.ready?
+
+        begin
+          state_id = :host_state_unknown if !state_id && \
+            host_vm? && !host_vm.communicate.ready?
+        rescue Errors::VagrantfileNotFound
+          state_id = :host_state_unknown
+        end
+
         state_id = :not_created if !state_id && \
           (!@machine.id || !driver.created?(@machine.id))
         state_id = driver.state(@machine.id) if @machine.id && !state_id

diff --git a/...plugins/providers/docker/synced_folder.rb → ...plugins/providers/docker/synced_folder.rb b/...plugins/providers/docker/synced_folder.rb → ...plugins/providers/docker/synced_folder.rb
diff --git a/spec/integration/bills_kitchen_spec.rb b/spec/integration/bills_kitchen_spec.rb
@@ -9,8 +9,8 @@
     it "installs ChefDK 0.6.0" do
       run_cmd("chef -v").should match('Chef Development Kit Version: 0.6.0')
     end
-    it "installs Vagrant 1.7.2" do
-      run_cmd("vagrant -v").should match('1.7.2')
+    it "installs Vagrant 1.7.4" do
+      run_cmd("vagrant -v").should match('1.7.4')
     end
     it "installs Terraform 0.6.1" do
       run_cmd("terraform --version").should match('0.6.1')