vagrant-vcloud 0.1.1 → 0.1.2

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 029dca042c07fcb3034c6eba92c07f24d2f59c2e
4
- data.tar.gz: aa3429ccf19e966599bb4aa4812f5c8cdd194184
3
+ metadata.gz: 7d401c3fdff9b128ececdc4ee0ffbdf66f6210bc
4
+ data.tar.gz: 9a07a539ac1f386acb2a838e1c064cc6c64de25d
5
5
  SHA512:
6
- metadata.gz: 9dded16f1a7f486d507006b29f7d5e7d87c83eb45b912f464227f93d99647943f3ec17bf2309c1343d3d09887780ee953e6ea49c6f8677eea3161dd1182c3c83
7
- data.tar.gz: 83c9c33dc8d33a12f1dd2c16bb3a112f1f8b0bbcf32b529ddbbc9be8ea0c91b7478e99695e09cf2cb716ac699f745517b6ae392c2498ab73dfee0595f98b84ec
6
+ metadata.gz: fa540638ca6eb725d62349b305fe417da030d52ea7e74bb8d9307d01350ac89560e6a241ead5f3ef95dfc1d2d7e28f87d2f2df1adfd30083f7c0810c13df9c42
7
+ data.tar.gz: 8fa7216cba76bbfc9787bf8aa025f59c6c1f5851362aed47b3c9c6cad1b7a82dbb3142a71e0c98175ede4b7b78c628b741275cf53c3acec5210c97e0fdbd277a
@@ -83,12 +83,16 @@ module VagrantPlugins
83
83
  env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
84
84
  env[:machine].communicate.sudo(
85
85
  "chown #{ssh_info[:username]} '#{guestpath}'")
86
+
87
+ # Since Vagrant 1.4 the private key path may be an array
88
+ ssh_key_paths = ssh_info[:private_key_path].is_a?(Array) ? ssh_info[:private_key_path] : [ ssh_info[:private_key_path] ]
89
+ ssh_keys = ssh_key_paths.map {|p| "-i '#{p}'"}.join(" ")
86
90
 
87
91
  # Rsync over to the guest path using the SSH info
88
92
  command = [
89
93
  "rsync", "--verbose", "--archive", "-z",
90
94
  "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
91
- "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
95
+ "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_keys}",
92
96
  hostpath,
93
97
  "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
94
98
 
@@ -110,4 +114,4 @@ module VagrantPlugins
110
114
  end
111
115
  end
112
116
  end
113
- end
117
+ end
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module VCloud
3
- VERSION = "0.1.1"
3
+ VERSION = "0.1.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-vcloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fabio Rapposelli
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-01-20 00:00:00.000000000 Z
12
+ date: 2014-02-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: i18n