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
data/_patches-20160113/eng-12301
DELETED
@@ -1,50 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 7bf28b483ba4495c173d9316aee2d8482d9705ab
|
3
|
-
ENG-12301 release machine lock
|
4
|
-
|
5
|
-
diff -r 7bf28b483ba4 lib/vagrant-skytap/action/mixin_machine_index.rb
|
6
|
-
--- a/lib/vagrant-skytap/action/mixin_machine_index.rb Thu Dec 03 19:36:57 2015 -0800
|
7
|
-
+++ b/lib/vagrant-skytap/action/mixin_machine_index.rb Mon Dec 07 14:42:07 2015 -0800
|
8
|
-
@@ -14,6 +14,7 @@
|
9
|
-
# NOTE: #get locks the machine. Make sure to #release(entry)
|
10
|
-
# when finished.
|
11
|
-
def machine_index_entry
|
12
|
-
+ @logger.debug("Locking machine #{index_uuid}") if @logger
|
13
|
-
entry = machine_index.get(env[:machine].index_uuid)
|
14
|
-
end
|
15
|
-
end
|
16
|
-
diff -r 7bf28b483ba4 lib/vagrant-skytap/action/store_extra_data.rb
|
17
|
-
--- a/lib/vagrant-skytap/action/store_extra_data.rb Thu Dec 03 19:36:57 2015 -0800
|
18
|
-
+++ b/lib/vagrant-skytap/action/store_extra_data.rb Mon Dec 07 14:42:07 2015 -0800
|
19
|
-
@@ -17,6 +17,7 @@
|
20
|
-
|
21
|
-
def call(env)
|
22
|
-
entry = machine_index_entry
|
23
|
-
+ puts "Machine locked. Pausing 5 seconds so you can kill me"
|
24
|
-
entry.extra_data.merge!(provider_extra_data)
|
25
|
-
entry = machine_index.set(entry)
|
26
|
-
machine_index.release(entry)
|
27
|
-
diff -r 7bf28b483ba4 lib/vagrant-skytap/provider.rb
|
28
|
-
--- a/lib/vagrant-skytap/provider.rb Thu Dec 03 19:36:57 2015 -0800
|
29
|
-
+++ b/lib/vagrant-skytap/provider.rb Mon Dec 07 14:42:07 2015 -0800
|
30
|
-
@@ -6,6 +6,7 @@
|
31
|
-
class Provider < Vagrant.plugin("2", :provider)
|
32
|
-
def initialize(machine)
|
33
|
-
@machine = machine
|
34
|
-
+ @logger = Log4r::Logger.new("vagrant_skytap::plugin::provider")
|
35
|
-
end
|
36
|
-
|
37
|
-
def action(name)
|
38
|
-
@@ -26,10 +27,11 @@
|
39
|
-
end
|
40
|
-
|
41
|
-
def state
|
42
|
-
+ @logger.debug("Entered Provider#state")
|
43
|
-
# Run a custom action we define called "read_state" which does
|
44
|
-
# what it says. It puts the state in the `:machine_state_id`
|
45
|
-
# key in the environment.
|
46
|
-
- env = @machine.action("read_state")
|
47
|
-
+ env = @machine.action("read_state", lock: false) # can't be this easy
|
48
|
-
|
49
|
-
state_id = env[:machine_state_id]
|
50
|
-
|
data/_patches-20160113/eng-12720
DELETED
@@ -1,47 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 0f0cb39f96fbe679003e72deeabb4238f94bbf1d
|
3
|
-
ENG-12720 add forwarded_ports provider cap for "port" command
|
4
|
-
|
5
|
-
diff -r 0f0cb39f96fb lib/vagrant-skytap/cap/forwarded_ports.rb
|
6
|
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
7
|
-
+++ b/lib/vagrant-skytap/cap/forwarded_ports.rb Wed Jan 13 12:50:02 2016 -0800
|
8
|
-
@@ -0,0 +1,24 @@
|
9
|
-
+module VagrantPlugins
|
10
|
-
+ module Skytap
|
11
|
-
+ module Cap
|
12
|
-
+ module ForwardedPorts
|
13
|
-
+ # Reads the forwarded ports that currently exist on the machine
|
14
|
-
+ # itself. This raises an exception if the machine isn't running.
|
15
|
-
+ #
|
16
|
-
+ # This also may not match up with configured forwarded ports, because
|
17
|
-
+ # Vagrant auto port collision fixing may have taken place.
|
18
|
-
+ #
|
19
|
-
+ # @return [Hash<Integer, Integer>] Host => Guest port mappings.
|
20
|
-
+ def self.forwarded_ports(machine)
|
21
|
-
+ return nil if machine.state.id != :running
|
22
|
-
+
|
23
|
-
+ {}.tap do |result|
|
24
|
-
+# machine.provider.driver.read_forwarded_ports.each do |_, _, h, g|
|
25
|
-
+# result[h] = g
|
26
|
-
+# end
|
27
|
-
+ end
|
28
|
-
+ end
|
29
|
-
+ end
|
30
|
-
+ end
|
31
|
-
+ end
|
32
|
-
+end
|
33
|
-
diff -r 0f0cb39f96fb lib/vagrant-skytap/plugin.rb
|
34
|
-
--- a/lib/vagrant-skytap/plugin.rb Wed Jan 13 12:24:25 2016 -0800
|
35
|
-
+++ b/lib/vagrant-skytap/plugin.rb Wed Jan 13 12:50:02 2016 -0800
|
36
|
-
@@ -49,6 +49,11 @@
|
37
|
-
Cap::PublicAddress
|
38
|
-
end
|
39
|
-
|
40
|
-
+ provider_capability(:skytap, :forwarded_ports) do
|
41
|
-
+ require_relative "cap/forwarded_ports"
|
42
|
-
+ Cap::ForwardedPorts
|
43
|
-
+ end
|
44
|
-
+
|
45
|
-
%w[start_ssh_tunnel kill_ssh_tunnel kill_forwarded_ports read_used_ports read_forwarded_ports].each do |cap|
|
46
|
-
host_capability("bsd", cap) do
|
47
|
-
require_relative "hosts/bsd/cap/ssh_tunnel"
|
data/_patches-20160113/eng-12843
DELETED
@@ -1,95 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent d12ff92a5f45243523ff63f49b559dd3793fe41e
|
3
|
-
ENG-12843 make Up command work without hacking a copy of the command
|
4
|
-
|
5
|
-
diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/action.rb
|
6
|
-
--- a/lib/vagrant-skytap/action.rb Mon Dec 28 10:54:14 2015 -0800
|
7
|
-
+++ b/lib/vagrant-skytap/action.rb Tue Jan 05 13:21:52 2016 -0800
|
8
|
-
@@ -190,6 +190,16 @@
|
9
|
-
# and initial states for all machines to be run, potentially
|
10
|
-
# with a single REST call.
|
11
|
-
|
12
|
-
+ def self.action_up
|
13
|
-
+ Vagrant::Action::Builder.new.tap do |b|
|
14
|
-
+ b.use HandleBox
|
15
|
-
+ #b.use action_fetch_environment
|
16
|
-
+ b.use ConfigValidate
|
17
|
-
+# b.use InitializeAPIClient
|
18
|
-
+# b.use FetchEnvironment
|
19
|
-
+ end
|
20
|
-
+ end
|
21
|
-
+
|
22
|
-
def self.action_create
|
23
|
-
Vagrant::Action::Builder.new.tap do |b|
|
24
|
-
b.use HandleBox
|
25
|
-
@@ -320,6 +330,7 @@
|
26
|
-
autoload :MessageEnvironmentUrl, action_root.join("message_environment_url")
|
27
|
-
autoload :MessageResuming, action_root.join("message_resuming")
|
28
|
-
autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
|
29
|
-
+ autoload :PostActionUp, action_root.join("post_action_up")
|
30
|
-
autoload :PrepareForwardedPortCollisionParams, action_root.join("prepare_forwarded_port_collision_params")
|
31
|
-
autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings")
|
32
|
-
autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids")
|
33
|
-
diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/action/post_action_up.rb
|
34
|
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
35
|
-
+++ b/lib/vagrant-skytap/action/post_action_up.rb Tue Jan 05 13:21:52 2016 -0800
|
36
|
-
@@ -0,0 +1,26 @@
|
37
|
-
+require 'byebug'
|
38
|
-
+require_relative "mixin_machine_index"
|
39
|
-
+
|
40
|
-
+module VagrantPlugins
|
41
|
-
+ module Skytap
|
42
|
-
+ module Action
|
43
|
-
+ # This can be used with "Call" built-in to check if the action
|
44
|
-
+ # is being performed as part of a parallel operation.
|
45
|
-
+ class PostActionUp
|
46
|
-
+ include MixinMachineIndex
|
47
|
-
+ def initialize(app, env)
|
48
|
-
+ @app = app
|
49
|
-
+ @logger = Log4r::Logger.new("vagrant_skytap::action::post_action_up")
|
50
|
-
+ end
|
51
|
-
+
|
52
|
-
+ def call(env)
|
53
|
-
+ @logger.info env[:action_name]
|
54
|
-
+ @logger.info env[:machine].try(:name)
|
55
|
-
+ debugger
|
56
|
-
+
|
57
|
-
+ @app.call(env)
|
58
|
-
+ end
|
59
|
-
+ end
|
60
|
-
+ end
|
61
|
-
+ end
|
62
|
-
+end
|
63
|
-
diff -r d12ff92a5f45 -r 52e7dd5125d7 lib/vagrant-skytap/plugin.rb
|
64
|
-
--- a/lib/vagrant-skytap/plugin.rb Mon Dec 28 10:54:14 2015 -0800
|
65
|
-
+++ b/lib/vagrant-skytap/plugin.rb Tue Jan 05 13:21:52 2016 -0800
|
66
|
-
@@ -3,7 +3,7 @@
|
67
|
-
rescue LoadError
|
68
|
-
raise "The Vagrant Skytap plugin must be run within Vagrant."
|
69
|
-
end
|
70
|
-
-
|
71
|
-
+require 'byebug'
|
72
|
-
# This is a sanity check to make sure no one is attempting to install
|
73
|
-
# this into an early Vagrant version.
|
74
|
-
if Vagrant::VERSION < "1.2.0"
|
75
|
-
@@ -34,9 +34,17 @@
|
76
|
-
Provider
|
77
|
-
end
|
78
|
-
|
79
|
-
- command("up", primary: true) do
|
80
|
-
- require_relative "command/up"
|
81
|
-
- Skytap::Command::Up
|
82
|
-
+# command("up", primary: true) do
|
83
|
-
+# require_relative "command/up"
|
84
|
-
+# Skytap::Command::Up
|
85
|
-
+# end
|
86
|
-
+
|
87
|
-
+ action_hook(:post_up_behavior1, :environment_unload) do |hook|
|
88
|
-
+ hook.prepend(VagrantPlugins::Skytap::Action::PostActionUp)
|
89
|
-
+ end
|
90
|
-
+
|
91
|
-
+ action_hook(:post_up_behavior4, :machine_action_up) do |hook|
|
92
|
-
+ hook.append(VagrantPlugins::Skytap::Action::PostActionUp)
|
93
|
-
end
|
94
|
-
|
95
|
-
command("publish-url", primary: true) do
|
@@ -1,112 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 2d0352ab9e88823add32c339d95d9782c00fba51
|
3
|
-
ENG-11604 support using environment vms (this is impossible without an API change)
|
4
|
-
|
5
|
-
diff -r 2d0352ab9e88 Vagrantfile
|
6
|
-
--- a/Vagrantfile Wed Nov 04 16:26:46 2015 -0800
|
7
|
-
+++ b/Vagrantfile Wed Nov 04 16:28:24 2015 -0800
|
8
|
-
@@ -39,7 +39,7 @@
|
9
|
-
config.vm.define "vm1" do |ubuntu|
|
10
|
-
ubuntu.vm.hostname = "vm1"
|
11
|
-
ubuntu.vm.provider :skytap do |box|
|
12
|
-
- box.vm_url = UBUNTU1#GENERIC_UBUNTU
|
13
|
-
+ box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A#GENERIC_UBUNTU
|
14
|
-
#box.cpus = 1
|
15
|
-
#box.cpuspersocket = 1
|
16
|
-
#box.ram = 1024
|
17
|
-
@@ -64,7 +64,7 @@
|
18
|
-
config.vm.define "vm3" do |ubuntu|
|
19
|
-
ubuntu.vm.hostname = "vm3"
|
20
|
-
ubuntu.vm.provider :skytap do |box|
|
21
|
-
- box.vm_url = UBUNTU2#GENERIC_UBUNTU
|
22
|
-
+ box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B#GENERIC_UBUNTU
|
23
|
-
end
|
24
|
-
ubuntu.vm.communicator = :ssh
|
25
|
-
ubuntu.ssh.username = "skytap"
|
26
|
-
diff -r 2d0352ab9e88 lib/vagrant-skytap/api/environment.rb
|
27
|
-
--- a/lib/vagrant-skytap/api/environment.rb Wed Nov 04 16:26:46 2015 -0800
|
28
|
-
+++ b/lib/vagrant-skytap/api/environment.rb Wed Nov 04 16:28:24 2015 -0800
|
29
|
-
@@ -18,8 +18,27 @@
|
30
|
-
vm = Vm.fetch(env, vm_url)
|
31
|
-
check_vm_before_adding(env, vm)
|
32
|
-
|
33
|
-
- resp = env[:api_client].post(RESOURCE_ROOT, JSON.dump(template_id: vm.template_id, vm_ids: [vm.id]))
|
34
|
-
- fetch(env, resp['Location'])
|
35
|
-
+ params = {
|
36
|
-
+ vm_ids: [vm.id]
|
37
|
-
+ }.tap do |params|
|
38
|
-
+ if vm.from_template?
|
39
|
-
+ params[:template_id] = vm.template_id
|
40
|
-
+ else
|
41
|
-
+ params[:configuration_id] = vm.environment_id
|
42
|
-
+ end
|
43
|
-
+ end
|
44
|
-
+
|
45
|
-
+ puts params
|
46
|
-
+ debugger
|
47
|
-
+
|
48
|
-
+ resp = env[:api_client].post(RESOURCE_ROOT, JSON.dump(params))#_for_add(vm)))
|
49
|
-
+ if resp['Location']
|
50
|
-
+ puts "Redirected to #{resp['Location']}"
|
51
|
-
+ fetch(env, resp['Location'])
|
52
|
-
+ else
|
53
|
-
+ puts "call returned #{resp.body}"
|
54
|
-
+ new(JSON.load(resp.body), env)
|
55
|
-
+ end
|
56
|
-
end
|
57
|
-
|
58
|
-
def fetch(env, url)
|
59
|
-
@@ -31,6 +50,16 @@
|
60
|
-
EnvironmentProperties.read(env[:machine].env.local_data_path)
|
61
|
-
end
|
62
|
-
|
63
|
-
+ def params_for_add(vm)
|
64
|
-
+ {
|
65
|
-
+ vm_ids: [vm.id]
|
66
|
-
+ }.tap do |params|
|
67
|
-
+ unless params[:merge_configuration] = vm.environment_id
|
68
|
-
+ params[:template_id] = vm.template_id
|
69
|
-
+ end
|
70
|
-
+ end
|
71
|
-
+ end
|
72
|
-
+
|
73
|
-
def check_vm_before_adding(env, vm)
|
74
|
-
raise Errors::NotTemplateVm, url: vm.url unless vm.from_template?
|
75
|
-
raise Errors::SourceVmNotStopped, name: env[:machine].name, url: vm.url unless vm.stopped?
|
76
|
-
@@ -90,7 +119,20 @@
|
77
|
-
check_vm_before_adding(env, vm)
|
78
|
-
vm_ids = vms.collect(&:id)
|
79
|
-
|
80
|
-
- update_with_retry(template_id: vm.template_id, vm_ids: [vm.id])
|
81
|
-
+ params = {
|
82
|
-
+ vm_ids: [vm.id]
|
83
|
-
+ }.tap do |params|
|
84
|
-
+ if vm.from_template?
|
85
|
-
+ params[:template_id] = vm.template_id
|
86
|
-
+ else
|
87
|
-
+ params[:merge_configuration] = vm.environment_id
|
88
|
-
+ end
|
89
|
-
+ end
|
90
|
-
+
|
91
|
-
+
|
92
|
-
+ puts params
|
93
|
-
+ debugger
|
94
|
-
+ update_with_retry(params)#self.class.params_for_add(vm))
|
95
|
-
new_vm_ids = vms.collect(&:id) - vm_ids
|
96
|
-
get_vm_by_id(new_vm_ids.last)
|
97
|
-
end
|
98
|
-
diff -r 2d0352ab9e88 lib/vagrant-skytap/api/vm.rb
|
99
|
-
--- a/lib/vagrant-skytap/api/vm.rb Wed Nov 04 16:26:46 2015 -0800
|
100
|
-
+++ b/lib/vagrant-skytap/api/vm.rb Wed Nov 04 16:28:24 2015 -0800
|
101
|
-
@@ -60,6 +60,11 @@
|
102
|
-
!!get_api_attribute('template_url')
|
103
|
-
end
|
104
|
-
|
105
|
-
+ def environment_id
|
106
|
-
+ get_api_attribute('configuration_url') =~ /configurations\/(\d+)/
|
107
|
-
+ $1
|
108
|
-
+ end
|
109
|
-
+
|
110
|
-
def template_id
|
111
|
-
get_api_attribute('template_url') =~ /templates\/(\d+)/
|
112
|
-
$1
|
@@ -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-20160113/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
|