vagrant-digitalocean 0.4.1 → 0.5.0

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7'
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.4.0'
 gem 'vagrant-omnibus'
 gem 'rake'
 gemspec

data/lib/vagrant-digitalocean/actions/destroy.rb

@@ -17,9 +17,14 @@ module VagrantPlugins
           # submit destroy droplet request
           result = @client.request("/droplets/#{@machine.id}/destroy")
 
-          # wait for request to complete
-          env[:ui].info I18n.t('vagrant_digital_ocean.info.destroying')
-          @client.wait_for_event(env, result['event_id'])
+					env[:ui].info I18n.t('vagrant_digital_ocean.info.destroying')
+
+          # wait for destroy request to make progress before exiting 
+          @client.wait_for_event(env, result['event_id']) do |response|
+						if response['event']['percentage'] != nil
+							return
+						end
+					end
 
           # set the machine id to nil to cleanup local vagrant state
           @machine.id = nil

data/lib/vagrant-digitalocean/actions/rebuild.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
     module Actions
       class Rebuild
         include Helpers::Client
+				include Vagrant::Util::Retryable
 
         def initialize(app, env)
           @app = app
@@ -31,6 +32,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-digitalocean/actions/setup_key.rb

@@ -38,6 +38,7 @@ module VagrantPlugins
         def create_ssh_key(name, env)
           # assumes public key exists on the same path as private key with .pub ext
           path = @machine.config.ssh.private_key_path
+					path = path[0] if path.is_a?(Array)
           path = File.expand_path(path, @machine.env.root_path)
           pub_key = DigitalOcean.public_key(path)
 

data/lib/vagrant-digitalocean/actions/setup_user.rb

@@ -25,7 +25,7 @@ module VagrantPlugins
 
           # create user account
           @machine.communicate.execute(<<-BASH)
-            if ! (grep #{user} /etc/passwd); then
+            if ! (grep ^#{user}: /etc/passwd); then
               useradd -m -s /bin/bash #{user};
             fi
           BASH
@@ -34,6 +34,8 @@ module VagrantPlugins
           @machine.communicate.execute(<<-BASH)
             if ! (grep #{user} /etc/sudoers); then
               echo "#{user} ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers;
+            else
+              sed -i -e "/#{user}/ s/=.*/=(ALL:ALL) NOPASSWD: ALL/" /etc/sudoers;
             fi
           BASH
 
@@ -42,6 +44,7 @@ module VagrantPlugins
 
           # add the specified key to the authorized keys file
           path = @machine.config.ssh.private_key_path
+					path = path[0] if path.is_a?(Array)
           path = File.expand_path(path, @machine.env.root_path)
           pub_key = DigitalOcean.public_key(path)
           @machine.communicate.execute(<<-BASH)

data/lib/vagrant-digitalocean/actions/sync_folders.rb

@@ -44,10 +44,13 @@ module VagrantPlugins
             @machine.communicate.sudo(
               "chown -R #{ssh_info[:username]} #{guestpath}")
 
+						key = ssh_info[:private_key_path]
+						key = key[0] if key.is_a?(Array)
+
             # rsync over to the guest path using the ssh info
             command = [
               "rsync", "--verbose", "--archive", "-z", "--delete",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{key}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-digitalocean/config.rb

@@ -43,6 +43,7 @@ module VagrantPlugins
         errors << I18n.t('vagrant_digital_ocean.config.api_key') if !@api_key
 
         key = machine.config.ssh.private_key_path
+				key = key[0] if key.is_a?(Array)
         if !key
           errors << I18n.t('vagrant_digital_ocean.config.private_key')
         elsif !File.file?(File.expand_path("#{key}.pub", machine.env.root_path))

data/lib/vagrant-digitalocean/helpers/client.rb

@@ -15,6 +15,7 @@ module VagrantPlugins
         include Vagrant::Util::Retryable
 
         def initialize(machine)
+					@logger = Log4r::Logger.new('vagrant::digitalocean::apiclient')
           @config = machine.provider_config
           @client = Faraday.new({
             :url => 'https://api.digitalocean.com/',
@@ -26,6 +27,7 @@ module VagrantPlugins
 
         def request(path, params = {})
           begin
+						@logger.info "Request: #{path}"
             result = @client.get(path, params = params.merge({
               :client_id => @config.client_id,
               :api_key => @config.api_key
@@ -46,6 +48,7 @@ module VagrantPlugins
 
           begin
             body = JSON.parse(result.body)
+						@logger.info "Response: #{body}"
           rescue JSON::ParserError => e
             raise(Errors::JSONError, {
               :message => e.message,

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -115,12 +115,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3657554704749346690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3657554704749346690
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23