vagrant 0.7.3 → 0.7.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,10 @@
1
+ ## 0.7.4 (May 12, 2011)
2
+
3
+ - Chef environments support (for Chef 0.10) [GH-358]
4
+ - Suppress the "added to known hosts" message for SSH [GH-354]
5
+ - Ruby 1.8.6 support [GH-352]
6
+ - Chef proxy settings now work for chef server [GH-335]
7
+
1
8
  ## 0.7.3 (April 19, 2011)
2
9
 
3
10
  - Retry all SSH on Net::SSH::Disconnect in case SSH is just restarting. [GH-313]
@@ -115,6 +115,7 @@ module Vagrant
115
115
 
116
116
  # Only mount the folders which have a guest path specified
117
117
  am_folders = folders.select { |name, folder| folder[:guestpath] }
118
+ am_folders = Hash[*am_folders.flatten] if am_folders.is_a?(Array)
118
119
  @env["vm"].system.mount_nfs(host_ip, Hash[am_folders])
119
120
  end
120
121
 
@@ -14,6 +14,7 @@ module Vagrant
14
14
  attr_accessor :client_key_path
15
15
  attr_accessor :file_cache_path
16
16
  attr_accessor :file_backup_path
17
+ attr_accessor :environment
17
18
 
18
19
  def initialize
19
20
  super
@@ -71,7 +72,8 @@ module Vagrant
71
72
  :validation_key => guest_validation_key_path,
72
73
  :client_key => config.client_key_path,
73
74
  :file_cache_path => config.file_cache_path,
74
- :file_backup_path => config.file_backup_path
75
+ :file_backup_path => config.file_backup_path,
76
+ :environment => config.environment
75
77
  })
76
78
  end
77
79
 
@@ -42,7 +42,7 @@ module Vagrant
42
42
  # Command line options
43
43
  command_options = ["-p #{options[:port]}", "-o UserKnownHostsFile=/dev/null",
44
44
  "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
45
- "-i #{options[:private_key_path]}"]
45
+ "-i #{options[:private_key_path]}", "-o LogLevel=ERROR"]
46
46
  command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
47
47
 
48
48
  if env.config.ssh.forward_x11
@@ -2,5 +2,5 @@ module Vagrant
2
2
  # This will always be up to date with the current version of Vagrant,
3
3
  # since it is used to generate the gemspec and is also the source of
4
4
  # the version for `vagrant -v`
5
- VERSION = "0.7.3"
5
+ VERSION = "0.7.4"
6
6
  end
@@ -10,9 +10,21 @@ validation_client_name "<%= validation_client_name %>"
10
10
  validation_key "<%= validation_key %>"
11
11
  client_key "<%= client_key %>"
12
12
 
13
+ <% unless environment.nil? %>
14
+ environment "<%= environment %>"
15
+ <% end %>
16
+
13
17
  file_cache_path "<%= file_cache_path %>"
14
18
  file_backup_path "<%= file_backup_path %>"
15
19
 
20
+ http_proxy <%= http_proxy.inspect %>
21
+ http_proxy_user <%= http_proxy_user.inspect %>
22
+ http_proxy_pass <%= http_proxy_pass.inspect %>
23
+ https_proxy <%= https_proxy.inspect %>
24
+ https_proxy_user <%= https_proxy_user.inspect %>
25
+ https_proxy_pass <%= https_proxy_pass.inspect %>
26
+ no_proxy <%= no_proxy.inspect %>
27
+
16
28
  pid_file "/var/run/chef/chef-client.pid"
17
29
 
18
30
  Mixlib::Log::Formatter.show_time = true
@@ -169,7 +169,8 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
169
169
  end
170
170
 
171
171
  should "forward ports" do
172
- name, opts = @env.env.config.vm.forwarded_ports.first
172
+ name = @env.env.config.vm.forwarded_ports.keys.first
173
+ opts = @env.env.config.vm.forwarded_ports[name]
173
174
 
174
175
  adapters = []
175
176
  adapter = mock("adapter")
@@ -161,7 +161,8 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
161
161
  :validation_key => @action.guest_validation_key_path,
162
162
  :client_key => @config.client_key_path,
163
163
  :file_cache_path => @config.file_cache_path,
164
- :file_backup_path => @config.file_backup_path
164
+ :file_backup_path => @config.file_backup_path,
165
+ :environment => @config.environment
165
166
  })
166
167
 
167
168
  @action.setup_server_config
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: vagrant
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.7.3
5
+ version: 0.7.4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Mitchell Hashimoto
@@ -11,7 +11,7 @@ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
13
 
14
- date: 2011-04-19 00:00:00 -07:00
14
+ date: 2011-05-12 00:00:00 -07:00
15
15
  default_executable:
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
@@ -423,7 +423,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
423
423
  requirements:
424
424
  - - ">="
425
425
  - !ruby/object:Gem::Version
426
- hash: 1249069631573573223
426
+ hash: 957057207018250257
427
427
  segments:
428
428
  - 0
429
429
  version: "0"