vagrantup 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5706bfea6f6e245dad4f0d14273def52e00968e
-  data.tar.gz: dc4d88b8301f749d5ca14848ff4b5614648552c2
+  metadata.gz: af927382eaead2363e3871f7aaf0320a518fadb0
+  data.tar.gz: a682a141ebf2c1a9103845c5a42b61c12cb1cdce
 SHA512:
-  metadata.gz: b53c3f4a8bf846a9e975f86b0026f0819b78fda92e8a3edee4c36f5089c3efa66db3df8728652aa643589cae89bafbfb20f6006c84f33bae95f7e45c8b8798c6
-  data.tar.gz: 1aa2d1992525b8a01deeb7ba6ce94e9b378ba0ab5d01c3c282cfe6c367286886d8cab61830e6621dcec0d34e2ceea9c757be55b163d67a36ce5a37a975663d8a
+  metadata.gz: 8fde20ba01e9cd1e2d4786efd0f79495dd86182ec8f9c6596ea326f1dd3fd8044ec86e88419a663fe334074011125269df11261622b11fc91cbe8d4ba3d06e3c
+  data.tar.gz: bb7f3ee7e718ce7feb1b12004cf7a753ea2563615d7fa8bed174ee1c0cee656eae99a7f35cdadb78770528d62960c1ab63ea93496fda9dc7f6690c9d370ae1f8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1.2 (March 18, 2013)
+
+BUG FIXES:
+
+  - When not specifying a cookbooks_path for chef-solo, an error won't
+    be shown if "cookbooks" folder is missing.
+  - Fix typo for exception when no host-only network with NFS. [GH-1448]
+  - Use UNSET_VALUE/nil with args on shell provisioner by default since
+    `[]` was too truthy. [GH-1447]
+
 ## 1.1.1 (March 18, 2013)
 
 IMPROVEMENTS:

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.1.1"
+  VERSION = "1.1.2"
 end

data/plugins/providers/virtualbox/action/prepare_nfs_settings.rb

@@ -10,10 +10,21 @@ module VagrantPlugins
         def call(env)
           @app.call(env)
 
-          env[:nfs_host_ip]    = read_host_ip(env[:machine])
-          env[:nfs_machine_ip] = read_machine_ip(env[:machine])
+          using_nfs = false
+          env[:machine].config.vm.synced_folders.each do |id, opts|
+            if opts[:nfs]
+              using_nfs = true
+              break
+            end
+          end
 
-          raise Errors::NFSNoHostonlyNetwork if !env[:nfs_machine_ip]
+          if using_nfs
+            @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
+            env[:nfs_host_ip]    = read_host_ip(env[:machine])
+            env[:nfs_machine_ip] = read_machine_ip(env[:machine])
+
+            raise Vagrant::Errors::NFSNoHostonlyNetwork if !env[:nfs_machine_ip]
+          end
         end
 
         # Returns the IP address of the first host only network adapter

data/plugins/provisioners/chef/config/chef_solo.rb

@@ -22,11 +22,14 @@ module VagrantPlugins
           @encrypted_data_bag_secret = UNSET_VALUE
           @encrypted_data_bag_secret_key_path = UNSET_VALUE
           @nfs                       = UNSET_VALUE
+
+          @__defaulted_cookbooks_path = false
         end
 
         def finalize!
           if @cookbooks_path == UNSET_VALUE
             @cookbooks_path = [[:host, "cookbooks"], [:vm, "cookbooks"]]
+            @__defaulted_cookbooks_path = true
           end
 
           @data_bags_path = [] if @data_bags_path == UNSET_VALUE
@@ -52,13 +55,15 @@ module VagrantPlugins
           errors << I18n.t("vagrant.config.chef.run_list_empty") if \
             !run_list || run_list.empty?
 
-          @cookbooks_path.each do |type, path|
-            next if type != :host
-            expanded_path = File.expand_path(path, machine.env.root_path)
+          if !@__defaulted_cookbooks_path
+            @cookbooks_path.each do |type, path|
+              next if type != :host
+              expanded_path = File.expand_path(path, machine.env.root_path)
 
-            if !File.exist?(expanded_path)
-              errors << I18n.t("vagrant.config.chef.cookbooks_path_missing",
-                              :path => expanded_path)
+              if !File.exist?(expanded_path)
+                errors << I18n.t("vagrant.config.chef.cookbooks_path_missing",
+                                 :path => expanded_path)
+              end
             end
           end
 

data/plugins/provisioners/shell/config.rb

@@ -7,13 +7,14 @@ module VagrantPlugins
       attr_accessor :args
 
       def initialize
-        @args        = []
+        @args        = UNSET_VALUE
         @inline      = UNSET_VALUE
         @path        = UNSET_VALUE
         @upload_path = UNSET_VALUE
       end
 
       def finalize!
+        @args        = nil if @args == UNSET_VALUE
         @inline      = nil if @inline == UNSET_VALUE
         @path        = nil if @path == UNSET_VALUE
         @upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mitchell Hashimoto