vagrant 0.7.3 → 0.7.4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.4 (May 12, 2011)
+
+  - Chef environments support (for Chef 0.10) [GH-358]
+  - Suppress the "added to known hosts" message for SSH [GH-354]
+  - Ruby 1.8.6 support [GH-352]
+  - Chef proxy settings now work for chef server [GH-335]
+
 ## 0.7.3 (April 19, 2011)
 
   - Retry all SSH on Net::SSH::Disconnect in case SSH is just restarting. [GH-313]

data/lib/vagrant/action/vm/nfs.rb

@@ -115,6 +115,7 @@ module Vagrant
 
           # Only mount the folders which have a guest path specified
           am_folders = folders.select { |name, folder| folder[:guestpath] }
+          am_folders = Hash[*am_folders.flatten] if am_folders.is_a?(Array)
           @env["vm"].system.mount_nfs(host_ip, Hash[am_folders])
         end
 

data/lib/vagrant/provisioners/chef_server.rb

@@ -14,6 +14,7 @@ module Vagrant
         attr_accessor :client_key_path
         attr_accessor :file_cache_path
         attr_accessor :file_backup_path
+        attr_accessor :environment
 
         def initialize
           super
@@ -71,7 +72,8 @@ module Vagrant
           :validation_key => guest_validation_key_path,
           :client_key => config.client_key_path,
           :file_cache_path => config.file_cache_path,
-          :file_backup_path => config.file_backup_path
+          :file_backup_path => config.file_backup_path,
+          :environment => config.environment
         })
       end
 

data/lib/vagrant/ssh.rb

@@ -42,7 +42,7 @@ module Vagrant
       # Command line options
       command_options = ["-p #{options[:port]}", "-o UserKnownHostsFile=/dev/null",
                          "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
-                         "-i #{options[:private_key_path]}"]
+                         "-i #{options[:private_key_path]}", "-o LogLevel=ERROR"]
       command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
 
       if env.config.ssh.forward_x11

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.7.3"
+  VERSION = "0.7.4"
 end

data/templates/chef_server_client.erb

@@ -10,9 +10,21 @@ validation_client_name "<%= validation_client_name %>"
 validation_key         "<%= validation_key %>"
 client_key             "<%= client_key %>"
 
+<% unless environment.nil? %>
+environment        "<%= environment %>"
+<% end %>
+
 file_cache_path    "<%= file_cache_path %>"
 file_backup_path   "<%= file_backup_path %>"
 
+http_proxy <%= http_proxy.inspect %>
+http_proxy_user <%= http_proxy_user.inspect %>
+http_proxy_pass <%= http_proxy_pass.inspect %>
+https_proxy <%= https_proxy.inspect %>
+https_proxy_user <%= https_proxy_user.inspect %>
+https_proxy_pass <%= https_proxy_pass.inspect %>
+no_proxy <%= no_proxy.inspect %>
+
 pid_file           "/var/run/chef/chef-client.pid"
 
 Mixlib::Log::Formatter.show_time = true

data/test/vagrant/action/vm/forward_ports_test.rb

@@ -169,7 +169,8 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
       end
 
       should "forward ports" do
-        name, opts = @env.env.config.vm.forwarded_ports.first
+        name = @env.env.config.vm.forwarded_ports.keys.first
+        opts = @env.env.config.vm.forwarded_ports[name]
 
         adapters = []
         adapter = mock("adapter")

data/test/vagrant/provisioners/chef_server_test.rb

@@ -161,7 +161,8 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
         :validation_key => @action.guest_validation_key_path,
         :client_key => @config.client_key_path,
         :file_cache_path => @config.file_cache_path,
-        :file_backup_path => @config.file_backup_path
+        :file_backup_path => @config.file_backup_path,
+        :environment => @config.environment
       })
 
       @action.setup_server_config

metadata

@@ -2,7 +2,7 @@
 name: vagrant
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -07:00
+date: 2011-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -423,7 +423,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1249069631573573223
+      hash: 957057207018250257
       segments: 
       - 0
       version: "0"