vagrant-skytap 0.2.2 → 0.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/vagrant-skytap/action/add_vm_to_environment.rb +4 -4
- data/lib/vagrant-skytap/action/compose_environment.rb +131 -0
- data/lib/vagrant-skytap/action/create_environment.rb +3 -1
- data/lib/vagrant-skytap/action/initialize_api_client.rb +6 -5
- data/lib/vagrant-skytap/action/set_up_vm.rb +3 -1
- data/lib/vagrant-skytap/action/store_extra_data.rb +4 -2
- data/lib/vagrant-skytap/action.rb +4 -17
- data/lib/vagrant-skytap/api/environment.rb +53 -25
- data/lib/vagrant-skytap/api/vm.rb +9 -3
- data/lib/vagrant-skytap/command/up.rb +46 -30
- data/lib/vagrant-skytap/errors.rb +4 -0
- data/lib/vagrant-skytap/version.rb +1 -1
- data/locales/en.yml +5 -1
- data/spec/unit/actions/compose_environment_spec.rb +101 -0
- data/spec/unit/environment_spec.rb +26 -45
- data/spec/unit/support/shared/skytap_context.rb +5 -0
- data/vagrant-skytap.gemspec +3 -3
- metadata +9 -311
- data/.byebug_history +0 -256
- data/.project +0 -11
- data/_patches-20160112/0 +0 -388
- data/_patches-20160112/1 +0 -82
- data/_patches-20160112/2 +0 -239
- data/_patches-20160112/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160112/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160112/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160112/acceptance-test-runner +0 -29
- data/_patches-20160112/ansible-1 +0 -92
- data/_patches-20160112/cache-api-client-in-up +0 -40
- data/_patches-20160112/dead-code-in-actions +0 -44
- data/_patches-20160112/debug-changes +0 -42
- data/_patches-20160112/demo-rails-app +0 -1276
- data/_patches-20160112/eng-10166-halt-spec +0 -40
- data/_patches-20160112/eng-10256 +0 -527
- data/_patches-20160112/eng-10256-2 +0 -162
- data/_patches-20160112/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160112/eng-10269-test-stuff +0 -87
- data/_patches-20160112/eng-10269-wtf +0 -119
- data/_patches-20160112/eng-10369 +0 -143
- data/_patches-20160112/eng-10369-tmp +0 -60
- data/_patches-20160112/eng-10919 +0 -56
- data/_patches-20160112/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160112/eng-11442 +0 -4
- data/_patches-20160112/eng-11616 +0 -403
- data/_patches-20160112/eng-11616-2 +0 -67
- data/_patches-20160112/eng-11616-actual +0 -184
- data/_patches-20160112/eng-11625a +0 -4
- data/_patches-20160112/eng-11711 +0 -85
- data/_patches-20160112/eng-12232-command-spec +0 -236
- data/_patches-20160112/eng-12235 +0 -83
- data/_patches-20160112/eng-12235-override-refactor +0 -140
- data/_patches-20160112/eng-12240 +0 -103
- data/_patches-20160112/eng-12249 +0 -40
- data/_patches-20160112/eng-12301 +0 -50
- data/_patches-20160112/eng-12843 +0 -95
- data/_patches-20160112/env-source +0 -112
- data/_patches-20160112/frickin-vagrant-spec +0 -163
- data/_patches-20160112/gem-pre-version +0 -14
- data/_patches-20160112/gems-old +0 -9
- data/_patches-20160112/googles-specs +0 -713
- data/_patches-20160112/local-configs-ignore +0 -61
- data/_patches-20160112/misc +0 -79
- data/_patches-20160112/network-unreachable +0 -31
- data/_patches-20160112/new-boxfile +0 -288
- data/_patches-20160112/parallelization-maybe +0 -198
- data/_patches-20160112/read-state +0 -23
- data/_patches-20160112/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160112/series +0 -60
- data/_patches-20160112/status +0 -12
- data/_patches-20160112/test-move-env-data +0 -231
- data/_patches-20160112/test-vagrantfile-vm1 +0 -167
- data/_patches-20160112/the_version_in_0.1.13.pre1 +0 -598
- data/_patches-20160112/vagrant-spec-mock-api +0 -137
- data/_patches-20160112/vagrant-vmware-plugin +0 -233
- data/_patches-20160112/vagrantfile +0 -403
- data/_patches-20160112/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160112/vagrantfile-for-nick +0 -95
- data/_patches-20160112/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160112/vm-vanished +0 -42
- data/_patches-20160112a/01 +0 -148
- data/_patches-20160112a/2 +0 -239
- data/_patches-20160112a/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112a/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160112a/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112a/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160112a/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112a/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160112a/acceptance-test-runner +0 -29
- data/_patches-20160112a/ansible-1 +0 -92
- data/_patches-20160112a/cache-api-client-in-up +0 -40
- data/_patches-20160112a/dead-code-in-actions +0 -44
- data/_patches-20160112a/debug-changes +0 -42
- data/_patches-20160112a/demo-rails-app +0 -1276
- data/_patches-20160112a/eng-10166-halt-spec +0 -40
- data/_patches-20160112a/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160112a/eng-10269-test-stuff +0 -87
- data/_patches-20160112a/eng-10269-wtf +0 -119
- data/_patches-20160112a/eng-10369 +0 -143
- data/_patches-20160112a/eng-10369-tmp +0 -60
- data/_patches-20160112a/eng-10919 +0 -56
- data/_patches-20160112a/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160112a/eng-11442 +0 -4
- data/_patches-20160112a/eng-11616 +0 -403
- data/_patches-20160112a/eng-11616-2 +0 -67
- data/_patches-20160112a/eng-11616-actual +0 -184
- data/_patches-20160112a/eng-11625a +0 -4
- data/_patches-20160112a/eng-11711 +0 -85
- data/_patches-20160112a/eng-12232-command-spec +0 -236
- data/_patches-20160112a/eng-12235 +0 -83
- data/_patches-20160112a/eng-12235-override-refactor +0 -140
- data/_patches-20160112a/eng-12240 +0 -103
- data/_patches-20160112a/eng-12249 +0 -40
- data/_patches-20160112a/eng-12301 +0 -50
- data/_patches-20160112a/eng-12843 +0 -95
- data/_patches-20160112a/env-source +0 -112
- data/_patches-20160112a/frickin-vagrant-spec +0 -163
- data/_patches-20160112a/gem-pre-version +0 -14
- data/_patches-20160112a/gems-old +0 -9
- data/_patches-20160112a/googles-specs +0 -713
- data/_patches-20160112a/local-configs-ignore +0 -61
- data/_patches-20160112a/misc +0 -79
- data/_patches-20160112a/network-unreachable +0 -31
- data/_patches-20160112a/new-boxfile +0 -288
- data/_patches-20160112a/parallelization-maybe +0 -198
- data/_patches-20160112a/read-state +0 -23
- data/_patches-20160112a/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160112a/series +0 -58
- data/_patches-20160112a/status +0 -14
- data/_patches-20160112a/test-move-env-data +0 -231
- data/_patches-20160112a/test-vagrantfile-vm1 +0 -167
- data/_patches-20160112a/the_version_in_0.1.13.pre1 +0 -612
- data/_patches-20160112a/then-copy-the-newer-files +0 -632
- data/_patches-20160112a/vagrant-spec-mock-api +0 -137
- data/_patches-20160112a/vagrant-vmware-plugin +0 -233
- data/_patches-20160112a/vagrantfile +0 -403
- data/_patches-20160112a/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160112a/vagrantfile-for-nick +0 -95
- data/_patches-20160112a/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160112a/vm-vanished +0 -42
- data/_patches-20160113/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160113/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160113/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160113/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160113/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160113/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160113/acceptance-test-runner +0 -29
- data/_patches-20160113/ansible-1 +0 -92
- data/_patches-20160113/cache-api-client-in-up +0 -40
- data/_patches-20160113/dead-code-in-actions +0 -44
- data/_patches-20160113/debug-changes +0 -55
- data/_patches-20160113/demo-rails-app +0 -1276
- data/_patches-20160113/eng-10166-halt-spec +0 -40
- data/_patches-20160113/eng-10256 +0 -543
- data/_patches-20160113/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160113/eng-10269-test-stuff +0 -87
- data/_patches-20160113/eng-10269-wtf +0 -119
- data/_patches-20160113/eng-10369 +0 -143
- data/_patches-20160113/eng-10369-tmp +0 -60
- data/_patches-20160113/eng-10919 +0 -56
- data/_patches-20160113/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160113/eng-11442 +0 -4
- data/_patches-20160113/eng-11616 +0 -403
- data/_patches-20160113/eng-11616-2 +0 -67
- data/_patches-20160113/eng-11616-actual +0 -184
- data/_patches-20160113/eng-11625a +0 -4
- data/_patches-20160113/eng-11711 +0 -85
- data/_patches-20160113/eng-12232-command-spec +0 -236
- data/_patches-20160113/eng-12235 +0 -83
- data/_patches-20160113/eng-12235-override-refactor +0 -140
- data/_patches-20160113/eng-12240 +0 -103
- data/_patches-20160113/eng-12249 +0 -40
- data/_patches-20160113/eng-12301 +0 -50
- data/_patches-20160113/eng-12720 +0 -47
- data/_patches-20160113/eng-12843 +0 -95
- data/_patches-20160113/env-source +0 -112
- data/_patches-20160113/frickin-vagrant-spec +0 -163
- data/_patches-20160113/gem-pre-version +0 -14
- data/_patches-20160113/gems-old +0 -9
- data/_patches-20160113/googles-specs +0 -713
- data/_patches-20160113/local-configs-ignore +0 -61
- data/_patches-20160113/misc +0 -79
- data/_patches-20160113/network-unreachable +0 -31
- data/_patches-20160113/new-boxfile +0 -288
- data/_patches-20160113/parallelization-maybe +0 -198
- data/_patches-20160113/read-state +0 -23
- data/_patches-20160113/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160113/series +0 -56
- data/_patches-20160113/status +0 -14
- data/_patches-20160113/test-move-env-data +0 -231
- data/_patches-20160113/test-vagrantfile-vm1 +0 -167
- data/_patches-20160113/vagrant-spec-mock-api +0 -137
- data/_patches-20160113/vagrant-vmware-plugin +0 -233
- data/_patches-20160113/vagrantfile +0 -403
- data/_patches-20160113/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160113/vagrantfile-for-nick +0 -95
- data/_patches-20160113/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160113/vm-vanished +0 -42
- data/_patches-20160118/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160118/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160118/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160118/acceptance-test-runner +0 -29
- data/_patches-20160118/ansible-1 +0 -92
- data/_patches-20160118/cache-api-client-in-up +0 -40
- data/_patches-20160118/dead-code-in-actions +0 -44
- data/_patches-20160118/debug-changes +0 -55
- data/_patches-20160118/demo-rails-app +0 -1276
- data/_patches-20160118/eng-10166-halt-spec +0 -40
- data/_patches-20160118/eng-10256 +0 -554
- data/_patches-20160118/eng-10256-cr +0 -314
- data/_patches-20160118/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160118/eng-10269-test-stuff +0 -87
- data/_patches-20160118/eng-10269-wtf +0 -119
- data/_patches-20160118/eng-10369 +0 -143
- data/_patches-20160118/eng-10369-tmp +0 -60
- data/_patches-20160118/eng-10919 +0 -56
- data/_patches-20160118/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160118/eng-11442 +0 -4
- data/_patches-20160118/eng-11616 +0 -403
- data/_patches-20160118/eng-11616-2 +0 -67
- data/_patches-20160118/eng-11616-actual +0 -184
- data/_patches-20160118/eng-11625a +0 -4
- data/_patches-20160118/eng-11711 +0 -85
- data/_patches-20160118/eng-12232-command-spec +0 -236
- data/_patches-20160118/eng-12235 +0 -83
- data/_patches-20160118/eng-12235-override-refactor +0 -140
- data/_patches-20160118/eng-12240 +0 -103
- data/_patches-20160118/eng-12249 +0 -40
- data/_patches-20160118/eng-12301 +0 -50
- data/_patches-20160118/eng-12720 +0 -74
- data/_patches-20160118/eng-12843 +0 -95
- data/_patches-20160118/eng-13040 +0 -291
- data/_patches-20160118/env-source +0 -112
- data/_patches-20160118/frickin-vagrant-spec +0 -163
- data/_patches-20160118/gem-pre-version +0 -14
- data/_patches-20160118/gems-old +0 -9
- data/_patches-20160118/googles-specs +0 -713
- data/_patches-20160118/local-configs-ignore +0 -61
- data/_patches-20160118/misc +0 -79
- data/_patches-20160118/network-unreachable +0 -31
- data/_patches-20160118/new-boxfile +0 -288
- data/_patches-20160118/parallelization-maybe +0 -198
- data/_patches-20160118/port-forwarding-processes +0 -87
- data/_patches-20160118/read-state +0 -23
- data/_patches-20160118/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160118/series +0 -59
- data/_patches-20160118/status +0 -13
- data/_patches-20160118/test-move-env-data +0 -231
- data/_patches-20160118/test-vagrantfile-vm1 +0 -167
- data/_patches-20160118/vagrant-spec-mock-api +0 -137
- data/_patches-20160118/vagrant-vmware-plugin +0 -233
- data/_patches-20160118/vagrantfile +0 -403
- data/_patches-20160118/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160118/vagrantfile-for-nick +0 -95
- data/_patches-20160118/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160118/vm-vanished +0 -42
- data/_patches-20160118a/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118a/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160118a/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118a/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160118a/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118a/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160118a/acceptance-test-runner +0 -29
- data/_patches-20160118a/ansible-1 +0 -92
- data/_patches-20160118a/bar +0 -189
- data/_patches-20160118a/cache-api-client-in-up +0 -40
- data/_patches-20160118a/dead-code-in-actions +0 -44
- data/_patches-20160118a/debug-changes +0 -55
- data/_patches-20160118a/demo-rails-app +0 -1276
- data/_patches-20160118a/eng-10166-halt-spec +0 -40
- data/_patches-20160118a/eng-10256 +0 -554
- data/_patches-20160118a/eng-10256-cr +0 -314
- data/_patches-20160118a/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160118a/eng-10269-test-stuff +0 -87
- data/_patches-20160118a/eng-10269-wtf +0 -119
- data/_patches-20160118a/eng-10369 +0 -143
- data/_patches-20160118a/eng-10369-tmp +0 -60
- data/_patches-20160118a/eng-10919 +0 -56
- data/_patches-20160118a/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160118a/eng-11442 +0 -4
- data/_patches-20160118a/eng-11616 +0 -403
- data/_patches-20160118a/eng-11616-2 +0 -67
- data/_patches-20160118a/eng-11616-actual +0 -184
- data/_patches-20160118a/eng-11625a +0 -4
- data/_patches-20160118a/eng-11711 +0 -85
- data/_patches-20160118a/eng-12232-command-spec +0 -236
- data/_patches-20160118a/eng-12235 +0 -83
- data/_patches-20160118a/eng-12235-override-refactor +0 -140
- data/_patches-20160118a/eng-12240 +0 -103
- data/_patches-20160118a/eng-12249 +0 -40
- data/_patches-20160118a/eng-12301 +0 -50
- data/_patches-20160118a/eng-12720 +0 -74
- data/_patches-20160118a/eng-12843 +0 -95
- data/_patches-20160118a/eng-13040 +0 -291
- data/_patches-20160118a/env-source +0 -112
- data/_patches-20160118a/foo +0 -169
- data/_patches-20160118a/frickin-vagrant-spec +0 -163
- data/_patches-20160118a/gem-pre-version +0 -14
- data/_patches-20160118a/gems-old +0 -9
- data/_patches-20160118a/googles-specs +0 -713
- data/_patches-20160118a/guestport-madness +0 -59
- data/_patches-20160118a/local-configs-ignore +0 -61
- data/_patches-20160118a/misc +0 -79
- data/_patches-20160118a/network-unreachable +0 -31
- data/_patches-20160118a/new-boxfile +0 -288
- data/_patches-20160118a/parallelization-maybe +0 -198
- data/_patches-20160118a/port-forwarding-processes +0 -87
- data/_patches-20160118a/read-state +0 -23
- data/_patches-20160118a/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160118a/series +0 -62
- data/_patches-20160118a/status +0 -14
- data/_patches-20160118a/test-move-env-data +0 -231
- data/_patches-20160118a/test-vagrantfile-vm1 +0 -167
- data/_patches-20160118a/vagrant-spec-mock-api +0 -137
- data/_patches-20160118a/vagrant-vmware-plugin +0 -233
- data/_patches-20160118a/vagrantfile +0 -403
- data/_patches-20160118a/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160118a/vagrantfile-for-nick +0 -95
- data/_patches-20160118a/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160118a/vm-vanished +0 -42
@@ -1,163 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 02c7d9d9d39e1ec55dfd0636c2b043b1837782d2
|
3
|
-
imported patch frickin-vagrant-spec
|
4
|
-
|
5
|
-
diff --git a/boxes/acceptance/README.md b/boxes/acceptance/README.md
|
6
|
-
new file mode 100644
|
7
|
-
--- /dev/null
|
8
|
-
+++ b/boxes/acceptance/README.md
|
9
|
-
@@ -0,0 +1,13 @@
|
10
|
-
+# Vagrant Skytap Example Box
|
11
|
-
+
|
12
|
-
+Vagrant providers each require a custom provider-specific box format.
|
13
|
-
+This folder shows the example contents of a box for the `skytap` provider.
|
14
|
-
+To turn this into a box:
|
15
|
-
+
|
16
|
-
+```
|
17
|
-
+$ tar cvzf skytap.box ./metadata.json ./Vagrantfile
|
18
|
-
+```
|
19
|
-
+
|
20
|
-
+This box works by using Vagrant's built-in Vagrantfile merging to setup
|
21
|
-
+defaults for Skytap. These defaults can easily be overwritten by higher-level
|
22
|
-
+Vagrantfiles (such as project root Vagrantfiles).
|
23
|
-
diff --git a/boxes/acceptance/Vagrantfile b/boxes/acceptance/Vagrantfile
|
24
|
-
new file mode 100644
|
25
|
-
--- /dev/null
|
26
|
-
+++ b/boxes/acceptance/Vagrantfile
|
27
|
-
@@ -0,0 +1,8 @@
|
28
|
-
+# -*- mode: ruby -*-
|
29
|
-
+# vi: set ft=ruby :
|
30
|
-
+
|
31
|
-
+Vagrant.configure(2) do |config|
|
32
|
-
+ config.vm.provider :skytap do |skytap|
|
33
|
-
+ skytap.vm_url = "https://cloud.skytap.com/vms/3157858"
|
34
|
-
+ end
|
35
|
-
+end
|
36
|
-
diff --git a/boxes/acceptance/empty.box b/boxes/acceptance/empty.box
|
37
|
-
new file mode 100644
|
38
|
-
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64bf34aa4fd03ff9c06c88f1dd7c6a992a0005c8
|
39
|
-
GIT binary patch
|
40
|
-
literal 166
|
41
|
-
zc$|~(=3pq7bPQu)etX`L>yUv!>%(=`T@#qEc=ihJ@m-*~BEx$Ym(snv83$Vv%3WLj
|
42
|
-
z-`>MH^XTlXQm&Kcc0XSklsr%3RC=@~^!y#G?_MjHe^1#PxU6jJm1A8Js>hx!4A|r`
|
43
|
-
zoB#2InlqtJUCA?Up3cs-{%jw+=-yBDyrri~<aeLm#~Jv3id^6IC)Kg{PRCDYW<Ult
|
44
|
-
PUm51x&704l!N33jadS%=
|
45
|
-
|
46
|
-
diff --git a/boxes/acceptance/metadata.json b/boxes/acceptance/metadata.json
|
47
|
-
new file mode 100644
|
48
|
-
--- /dev/null
|
49
|
-
+++ b/boxes/acceptance/metadata.json
|
50
|
-
@@ -0,0 +1,3 @@
|
51
|
-
+{
|
52
|
-
+ "provider": "skytap"
|
53
|
-
+}
|
54
|
-
diff --git a/spec/acceptance/provider/up_spec.rb b/spec/acceptance/provider/up_spec.rb
|
55
|
-
--- a/spec/acceptance/provider/up_spec.rb
|
56
|
-
+++ b/spec/acceptance/provider/up_spec.rb
|
57
|
-
@@ -16,25 +16,46 @@
|
58
|
-
assert_execute('vagrant', 'destroy', '--force')
|
59
|
-
end
|
60
|
-
|
61
|
-
- it 'should bring up the machine and halt it' do
|
62
|
-
- status("Test: machine can be brought up, parallel by default")
|
63
|
-
- up_result = execute("vagrant", "up")
|
64
|
-
+ it 'should bring up the machine' do
|
65
|
-
+ status("Test: machine can be brought up")
|
66
|
-
+ up_result = execute("vagrant", "up", "vm1")
|
67
|
-
expect(up_result).to exit_with(0)
|
68
|
-
|
69
|
-
status("Test: machine is running after up")
|
70
|
-
- echo_result = execute("vagrant", "ssh", "-c", "echo foo")
|
71
|
-
+ echo_result = execute("vagrant", "ssh", "vm1", "-c", "echo foo")
|
72
|
-
expect(echo_result).to exit_with(0)
|
73
|
-
expect(echo_result.stdout).to match(/foo\n$/)
|
74
|
-
end
|
75
|
-
-
|
76
|
-
- it 'should bring up the machine and halt it' do
|
77
|
-
- status("Test: machine can be brought up no parallel")
|
78
|
-
- up_result = execute("vagrant", "up", "--no-parallel")
|
79
|
-
- expect(up_result).to exit_with(0)
|
80
|
-
-
|
81
|
-
- status("Test: machine is running after up")
|
82
|
-
- echo_result = execute("vagrant", "ssh", "-c", "echo foo")
|
83
|
-
- expect(echo_result).to exit_with(0)
|
84
|
-
- expect(echo_result.stdout).to match(/foo\n$/)
|
85
|
-
- end
|
86
|
-
+#
|
87
|
-
+# it 'should bring up 2 machines in parallel' do
|
88
|
-
+# status("Test: 2 machines can be brought up, parallel by default")
|
89
|
-
+# up_result = execute("vagrant", "up")
|
90
|
-
+# expect(up_result).to exit_with(0)
|
91
|
-
+#
|
92
|
-
+# status("Test: machine vm1 is running after up")
|
93
|
-
+# echo_result = execute("vagrant", "ssh", "vm1", "-c", "echo foo")
|
94
|
-
+# expect(echo_result).to exit_with(0)
|
95
|
-
+# expect(echo_result.stdout).to match(/foo\n$/)
|
96
|
-
+#
|
97
|
-
+# status("Test: machine vm2 is running after up")
|
98
|
-
+# echo_result = execute("vagrant", "ssh", "vm2", "-c", "echo foo")
|
99
|
-
+# expect(echo_result).to exit_with(0)
|
100
|
-
+# expect(echo_result.stdout).to match(/foo\n$/)
|
101
|
-
+# end
|
102
|
-
+#
|
103
|
-
+# it 'should bring up 2 machines in no-parallel mode' do
|
104
|
-
+# status("Test: 2 machines can be brought up, no-parallel")
|
105
|
-
+# up_result = execute("vagrant", "up", "--no-parallel")
|
106
|
-
+# expect(up_result).to exit_with(0)
|
107
|
-
+#
|
108
|
-
+# status("Test: machine vm1 is running after up")
|
109
|
-
+# echo_result = execute("vagrant", "ssh", "vm1", "-c", "echo foo")
|
110
|
-
+# expect(echo_result).to exit_with(0)
|
111
|
-
+# expect(echo_result.stdout).to match(/foo\n$/)
|
112
|
-
+#
|
113
|
-
+# status("Test: machine vm2 is running after up")
|
114
|
-
+# echo_result = execute("vagrant", "ssh", "vm2", "-c", "echo foo")
|
115
|
-
+# expect(echo_result).to exit_with(0)
|
116
|
-
+# expect(echo_result.stdout).to match(/foo\n$/)
|
117
|
-
+# end
|
118
|
-
end
|
119
|
-
diff --git a/spec/acceptance/skeletons/generic/Vagrantfile b/spec/acceptance/skeletons/generic/Vagrantfile
|
120
|
-
--- a/spec/acceptance/skeletons/generic/Vagrantfile
|
121
|
-
+++ b/spec/acceptance/skeletons/generic/Vagrantfile
|
122
|
-
@@ -1,3 +1,7 @@
|
123
|
-
+BASE_BOX_URL = "https://cloud.skytap.com/vms/6869434"
|
124
|
-
+BASE_BOX_USERNAME = "skytap"
|
125
|
-
+BASE_BOX_PASSWORD = "ChangeMe!"
|
126
|
-
+
|
127
|
-
Vagrant.configure("2") do |config|
|
128
|
-
config.vm.box = "skytap/empty"
|
129
|
-
|
130
|
-
@@ -6,13 +10,16 @@
|
131
|
-
skytap.username = "etrue"
|
132
|
-
skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
|
133
|
-
skytap.vpn_url = "https://cloud.skytap.com/vpns/vpn-711360"
|
134
|
-
+ skytap.vm_url = BASE_BOX_URL
|
135
|
-
end
|
136
|
-
|
137
|
-
- config.vm.define "vm1" do |ubuntu|
|
138
|
-
- ubuntu.vm.provider :skytap do |box|
|
139
|
-
- box.vm_url = "https://cloud.skytap.com/vms/6869434" # golden!
|
140
|
-
- end
|
141
|
-
- ubuntu.ssh.username = "skytap"
|
142
|
-
- ubuntu.ssh.password = "ChangeMe!"
|
143
|
-
+ config.vm.define "vm1" do |vm|
|
144
|
-
+ vm.ssh.username = BASE_BOX_USERNAME
|
145
|
-
+ vm.ssh.password = BASE_BOX_PASSWORD
|
146
|
-
+ end
|
147
|
-
+
|
148
|
-
+ config.vm.define "vm" do |vm|
|
149
|
-
+ vm.ssh.username = "skytap"
|
150
|
-
+ vm.ssh.password = "ChangeMe!"
|
151
|
-
end
|
152
|
-
end
|
153
|
-
diff --git a/vagrant-spec.config.rb b/vagrant-spec.config.rb
|
154
|
-
--- a/vagrant-spec.config.rb
|
155
|
-
+++ b/vagrant-spec.config.rb
|
156
|
-
@@ -5,6 +5,6 @@
|
157
|
-
c.skeleton_paths << File.expand_path("../spec/acceptance/skeletons", __FILE__)
|
158
|
-
|
159
|
-
c.provider "skytap",
|
160
|
-
- box: File.expand_path("../skytap-dummy.box", __FILE__),
|
161
|
-
+ box: File.expand_path("../boxes/empty.box", __FILE__),
|
162
|
-
contexts: ["provider-context/skytap"]
|
163
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent f88c782b6f8e9de2c1f55ca0df98756ba64b928a
|
3
|
-
current pre-version
|
4
|
-
|
5
|
-
diff -r f88c782b6f8e lib/vagrant-skytap/version.rb
|
6
|
-
--- a/lib/vagrant-skytap/version.rb Mon Dec 28 10:53:44 2015 -0800
|
7
|
-
+++ b/lib/vagrant-skytap/version.rb Mon Dec 28 10:54:12 2015 -0800
|
8
|
-
@@ -1,5 +1,5 @@
|
9
|
-
module VagrantPlugins
|
10
|
-
module Skytap
|
11
|
-
- VERSION = "0.1.12"
|
12
|
-
+ VERSION = "0.1.13.pre1"
|
13
|
-
end
|
14
|
-
end
|
data/_patches-20160112/gems-old
DELETED
@@ -1,9 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 14d9041ca24e43e3ae413a68bc6de659fa9b79ba
|
3
|
-
imported patch gems-old
|
4
|
-
|
5
|
-
diff -r 14d9041ca24e gems/README
|
6
|
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
7
|
-
+++ b/gems/README Mon Nov 09 14:00:30 2015 -0800
|
8
|
-
@@ -0,0 +1,1 @@
|
9
|
-
+There are some old gems missing. Hope that's okay
|