vagrant-simple_cloud 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b790ea47dcbbb09f249b74ef02d2b3996660e46
-  data.tar.gz: d2b81d154a650954572270b2aa0a6ecb448d44bd
+  metadata.gz: a641b4e0ec72e22f9dd841ef357c111a333c993c
+  data.tar.gz: e168c81888d9116b81358828378a6d182d5849c9
 SHA512:
-  metadata.gz: 22df6ac60ba4a1aadb4d977e36b23254cbd2dbd6bc9111bd44bcfe5c98cab278234926e2717f08842390666985051c20f2da734d477268a2efbaa707fffaa02b
-  data.tar.gz: f275bd242800b4d66b879d2cf36155f44b90a60a2cb48bb5ee464969c9c920fe35724ee09fb66a52b958a642dc8e0b5fbc908ec925709d7b173484105f9d95e3
+  metadata.gz: 99ca891e004ef6a97c438d9c5fce74df987657fee29a8af3a0dc00ecae9bd92223b82aaa60b422a9137076885de7e5e8613fe4c7d2e780f21ffe6d9828a95a47
+  data.tar.gz: f76525a025183c95a536fd3588e01c368321701d2ff0e82041cb5084f030dfe3c51428a53b61adad7473e3a3f6c116270502f0e28c918996436f1af9a7b5a66e

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+vagrant-simple_cloud.iml
+.idea

data/lib/vagrant-simple_cloud/actions/power_on.rb

@@ -26,6 +26,18 @@ module VagrantPlugins
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)
 
+          # wait for ssh to be ready
+          switch_user = @machine.provider_config.setup?
+          user = @machine.config.ssh.username
+          @machine.config.ssh.username = 'root' if switch_user
+
+          retryable(:tries => 120, :sleep => 10) do
+            next if env[:interrupted]
+            raise 'not ready' if !@machine.communicate.ready?
+          end
+
+          @machine.config.ssh.username = user
+
           @app.call(env)
         end
       end

data/lib/vagrant-simple_cloud/actions/reload.rb

@@ -23,6 +23,18 @@ module VagrantPlugins
           env[:ui].info I18n.t('vagrant_simple_cloud.info.reloading')
           @client.wait_for_event(env, result['action']['id'])
 
+          # wait for ssh to be ready
+          switch_user = @machine.provider_config.setup?
+          user = @machine.config.ssh.username
+          @machine.config.ssh.username = 'root' if switch_user
+
+          retryable(:tries => 120, :sleep => 10) do
+            next if env[:interrupted]
+            raise 'not ready' if !@machine.communicate.ready?
+          end
+
+          @machine.config.ssh.username = user
+
           @app.call(env)
         end
       end

data/lib/vagrant-simple_cloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SimpleCloud
-    VERSION = '0.0.6'
+    VERSION = '1.0.0'
   end
 end

data/test/Vagrantfile

@@ -1,24 +1,14 @@
 Vagrant.require_plugin('vagrant-simple_cloud')
 
 Vagrant.configure('2') do |config|
-
-  config.ssh.username = 'tester'
-  config.ssh.private_key_path = 'test_id_rsa'
-
-  config.vm.synced_folder '.', '/vagrant', :disabled => true
-
-  config.vm.provider :simple_cloud do |provider, override|
-    override.vm.box = 'simple_cloud'
-    provider.token = ENV['DO_TOKEN']
-    provider.serviceaddr = 'http://localhost/'
-    provider.ssh_key_name = 'Test Key'
-  end
-
-  config.vm.provision :shell, :path => 'scripts/provision.sh'
-
-  config.vm.define :ubuntu do |ubuntu|
-    ubuntu.vm.provider :simple_cloud do |provider|
-      provider.image = '26'
+  config.vm.define "test" do |t|
+    t.vm.provider :simple_cloud do |provider, override|
+      override.ssh.private_key_path = 'test_id_rsa'
+      override.vm.box = 'simple_cloud'
+      override.vm.hostname = 'test'
+      override.vm.provision :shell, :path => 'scripts/provision.sh'
+
+      provider.token = ENV['DO_TOKEN']
     end
   end
 end

data/test/test_id_rsa.pub

@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCbFlHJ++BcXGU9b2K+jF990r16uqkKnWiK2CFS0PFvM9IJs3CoGiIlyc9UD9O4LEyeu5Rw0RdiAp9MvyUPcDUeibw3WlMCFJ53mbioAapMy5tPXmxxJH5KcN2uJKESsH/1hJv0tWfVpHQywVLcf/7HWPjDl3qEFqzwGEN+5V3XqyG+hoA4rLTLDL40G68bL/oC7ere3sz3B16U4NGdgtJZapot5gTFErFZZztql76h25Ch7isE1XAaYg6NY4z1oU8Q9Ud0sY74tDI8TF165LStb3prf1TinwaMbOyuQ1wrNU4aMzekiwazeo6LtHMnfPjweIGP01PwjZ8WkYcRF6tt digital_ocean provider test key
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCbFlHJ++BcXGU9b2K+jF990r16uqkKnWiK2CFS0PFvM9IJs3CoGiIlyc9UD9O4LEyeu5Rw0RdiAp9MvyUPcDUeibw3WlMCFJ53mbioAapMy5tPXmxxJH5KcN2uJKESsH/1hJv0tWfVpHQywVLcf/7HWPjDl3qEFqzwGEN+5V3XqyG+hoA4rLTLDL40G68bL/oC7ere3sz3B16U4NGdgtJZapot5gTFErFZZztql76h25Ch7isE1XAaYg6NY4z1oU8Q9Ud0sY74tDI8TF165LStb3prf1TinwaMbOyuQ1wrNU4aMzekiwazeo6LtHMnfPjweIGP01PwjZ8WkYcRF6tt simple_cloud provider test key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-simple_cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - John Bender
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage SimpleCloud droplets. Based on https://github.com/devopsgroup-io/vagrant-digitalocean.