vagrant-vsphere 0.8.0 → 0.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -0
- data/lib/vSphere/action/get_ssh_info.rb +2 -2
- data/lib/vSphere/version.rb +1 -1
- data/spec/connect_vsphere_spec.rb +3 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1c0af604e5112b1d81adfb81951b31f7b8d86c38
|
|
4
|
+
data.tar.gz: 18bdee1bbb0c156a9037df3d825de122579ae57e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 87322aa635a132bd6689c056e26355200d756e4e4ab3a84e0cb970d28747c813a9ed00eb757cb88c0d0c4af3313b79c21c1499a502841bc5d0fbd9a653d72ffd
|
|
7
|
+
data.tar.gz: 20b7ab964e5ecf4038f7bf8da89493d577ec8be76ebfb79b04c309c8dc55d4402a66226949a365364dfc4661b35702fb99dfa03550379c98b357f89826319a64
|
data/README.md
CHANGED
|
@@ -172,6 +172,7 @@ This plugin follows the principles of [Semantic Versioning 2.0.0](http://semver.
|
|
|
172
172
|
### Unit Tests
|
|
173
173
|
|
|
174
174
|
Please run the unit tests to verify your changes. To do this simply run `rake`.
|
|
175
|
+
If you want a quick merge, write a spec that fails before your changes are applied and that passes after.
|
|
175
176
|
|
|
176
177
|
|
|
177
178
|
If you don't have rake installed, first install [bundler](http://bundler.io/) and run `bundle install`.
|
|
@@ -26,7 +26,7 @@ module VagrantPlugins
|
|
|
26
26
|
vm = get_vm_by_uuid connection, machine
|
|
27
27
|
|
|
28
28
|
return nil if vm.nil?
|
|
29
|
-
|
|
29
|
+
return nil if vm.guest.ipAddress.nil? || vm.guest.ipAddress.empty?
|
|
30
30
|
return {
|
|
31
31
|
:host => vm.guest.ipAddress,
|
|
32
32
|
:port => 22
|
|
@@ -35,4 +35,4 @@ module VagrantPlugins
|
|
|
35
35
|
end
|
|
36
36
|
end
|
|
37
37
|
end
|
|
38
|
-
end
|
|
38
|
+
end
|
data/lib/vSphere/version.rb
CHANGED
|
@@ -11,6 +11,8 @@ describe VagrantPlugins::VSphere::Action::ConnectVSphere do
|
|
|
11
11
|
:user => @env[:machine].provider_config.user,
|
|
12
12
|
:password => @env[:machine].provider_config.password,
|
|
13
13
|
:insecure => @env[:machine].provider_config.insecure,
|
|
14
|
+
:proxyHost => @env[:machine].provider_config.proxy_host,
|
|
15
|
+
:proxyPort => @env[:machine].provider_config.proxy_port,
|
|
14
16
|
})
|
|
15
17
|
end
|
|
16
18
|
|
|
@@ -21,4 +23,4 @@ describe VagrantPlugins::VSphere::Action::ConnectVSphere do
|
|
|
21
23
|
it 'should call the next item in the middleware stack' do
|
|
22
24
|
@app.should have_received :call
|
|
23
25
|
end
|
|
24
|
-
end
|
|
26
|
+
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-vsphere
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Andrew Grauch
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-04-
|
|
11
|
+
date: 2014-04-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: nokogiri
|