vagrant-digitalocean 0.0.3 → 0.0.4

data/README.md

@@ -1,33 +1,47 @@
 # Vagrant Digital Ocean
 
-`vagrant-digitalocean` is a provider plugin for Vagrant that allows the management of [Digital Ocean](https://www.digitalocean.com/) droplets (instances).
+`vagrant-digitalocean` is a provider plugin for Vagrant that allows the
+management of [Digital Ocean](https://www.digitalocean.com/) droplets
+(instances).
 
-## SSH Key Support
+## SSH Authentication
 
-By default the provider will use the *insecure* vagrant key for SSH access. That means anyone with the vagrant key and the IP of your droplet has root on your machine. To ovvrride this behavior, define your SSH key name and public key path within the provider configuration:
+This provider does not support the use of Vagrant's insecure key for SSH
+access. You must specify your own SSH key. The key may be defined within
+the global config section, `config.ssh.private_key_path`, or within the
+provider config section, `provider.ssh_private_key_path`. The provider
+config will take precedence. Additionally, you may provide a name for
+the SSH key using the `ssh_key_name` attribute within the provider config
+section. This is useful for de-conflict SSH keys used by different
+individuals when creating machines on Digital Ocean.
 
 ```ruby
     config.vm.provider :digital_ocean do |provider|
         provider.ssh_key_name = "My Laptop"
-        provider.pub_ssh_key_path = "~/.ssh/id_rsa.pub"
+        provider.ssh_private_key_path = "~/.ssh/id_rsa.pub"
 
         # additional configuration here
     end
 ```
 
-The provider will assume the private key path is identical to the public key path without the *.pub* extention. If this is not the case, define the private key path using `config.ssh.private_key_path`. If an SSH key name is not set, it will default to *Vagrant*.
+The provider will assume the public key path is identical to the private
+key path with the *.pub* extention.
 
-## Status
-
-As of this writing the provider implementation is geared entirely toward a development workflow. That is, Digital Ocean droplets are meant to be used as a replacement for VirtualBox in a server developers workflow.
+By default, the provider uses the `root` account for SSH access. This is
+required for initial droplet creation and provisioning. You may specify
+an account that may be used for subsequent SSH access and provisioning
+by setting the `ssh_username` attribute within the provider config
+section.
 
 ## Supported Guests/Hosts
 
-This project is primarily to support my workflow which currently only involves Ubuntu and CentOS. It's likely that any unix host will work but I've not tested it. Guests require porting of the nfs, chef, and sudo setup scripts.
+The project is currently in alpha state and has been tested on the
+following hosts and guests:
 
 Hosts:
 
 * Ubuntu 12.04
+* Mac OS X
 
 Guests:
 
@@ -36,7 +50,9 @@ Guests:
 
 ## Supported Provisioners
 
-The shell provisioner is supported by default but other provisioners require bootstrapping on the server. Chef is currently the only supported provisioner. Adding support for puppet and others requires adding the install scripts.
+The shell provisioner is supported by default but other provisioners require
+bootstrapping on the server. Chef is currently the only supported provisioner.
+Adding support for puppet and others requires adding the install scripts.
 
 ## Installation
 
@@ -44,13 +60,16 @@ Installation is performed in the prescribed manner for Vagrant 1.1 plugins.
 
     vagrant plugin install vagrant-digitalocean
 
-In addition to installing the plugin the default box associated with the provider needs to be installed.
+In addition to installing the plugin the default box associated with the
+provider needs to be installed.
 
     vagrant box add digital_ocean https://raw.github.com/johnbender/vagrant-digitalocean/master/box/digital_ocean.box
 
 ## Usage
 
-To use the Digital Ocean provider you will need to visit the [API access page](https://www.digitalocean.com/api_access) to retrieve the client identifier and API key associated with your account.
+To use the Digital Ocean provider you will need to visit the
+[API access page](https://www.digitalocean.com/api_access) to retrieve
+the client identifier and API key associated with your account.
 
 ### Config
 
@@ -67,7 +86,8 @@ Vagrant.configure("2") do |config|
     vm.region = "New York 1"
     vm.size = "512MB"
     vm.ssh_key_name = "My Key"
-    vm.pub_ssh_key_path = "~/.ssh/id_rsa"
+    vm.ssh_private_key_path = "~/.ssh/id_rsa"
+    vm.ssh_username = "test"
 
     # optional config for SSL cert on OSX and others
     vm.ca_path = "/usr/local/etc/openssl/ca-bundle.crt"

data/bin/build.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# uninstall existing versions
+gem uninstall -a vagrant-digitalocean
+
+# clean old gem builds
+rm *.gem
+
 # build the gem
 gem build *.gemspec
 

data/bin/test_run.sh

@@ -1,7 +1,10 @@
 function run_test_for {
   cp Vagrantfile.$1 Vagrantfile
   vagrant up --provider=digital_ocean
+  vagrant up
   vagrant provision
+  vagrant rebuild
+  vagrant destroy
   vagrant destroy
 }
 

data/box/Vagrantfile

@@ -3,7 +3,7 @@
 
 Vagrant.configure("2") do |config|
   config.vm.box = "digital_ocean"
-  config.vm.synced_folder ".", "/vagrant", :nfs => true
+  config.ssh.private_key_path = "../test/test_id_rsa"
 
   config.vm.provider :digital_ocean do |vm|
     vm.client_id = ENV["DO_CLIENT_ID"]

data/lib/vagrant-digitalocean.rb

@@ -8,12 +8,5 @@ module VagrantPlugins
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
-
-    def self.vagrant_key
-      file = File.open(Vagrant.source_root + "keys/vagrant.pub")
-      key = file.read
-      file.close
-      key
-    end
   end
 end

data/lib/vagrant-digitalocean/action.rb

@@ -1,15 +1,19 @@
 require "vagrant-digitalocean/actions/destroy"
 require "vagrant-digitalocean/actions/read_state"
 require "vagrant-digitalocean/actions/setup_provisioner"
-require "vagrant-digitalocean/actions/setup_nfs"
 require "vagrant-digitalocean/actions/setup_sudo"
-require "vagrant-digitalocean/actions/setup_user"
 require "vagrant-digitalocean/actions/create"
+require "vagrant-digitalocean/actions/setup_ssh_key"
+require "vagrant-digitalocean/actions/sync_folders"
+require "vagrant-digitalocean/actions/rebuild"
+require "vagrant-digitalocean/actions/is_active"
+require "vagrant-digitalocean/actions/message_is_active"
+require "vagrant-digitalocean/actions/check_ssh_user"
+require "vagrant-digitalocean/actions/modify_provision_path"
 
 module VagrantPlugins
   module DigitalOcean
     class Action
-      # Include the built-in callable actions, eg SSHExec
       include Vagrant::Action::Builtin
 
       def action(name)
@@ -19,7 +23,13 @@ module VagrantPlugins
       def destroy
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
-          builder.use Actions::Destroy
+          builder.use Call, Actions::IsActive do |env, b|
+            if !env[:is_active]
+              b.use Actions::MessageIsActive
+              next
+            end
+            b.use Actions::Destroy
+          end
         end
       end
 
@@ -33,43 +43,61 @@ module VagrantPlugins
       def ssh
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
-          builder.use SSHExec
+          builder.use Call, Actions::IsActive do |env, b|
+            if !env[:is_active]
+              b.use Actions::MessageIsActive
+              next
+            end
+            b.use Actions::CheckSSHUser
+            b.use SSHExec
+          end
         end
       end
 
       def provision
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
-
-          # sort out sudo for redhat, etc
-          builder.use Actions::SetupSudo
-
-          # sort out sudo for redhat, etc
-          builder.use Actions::SetupUser
-
-          # execute provisioners
-          builder.use Provision
-
-          # setup provisioners, comes after Provision to force nfs folders
-          builder.use Actions::SetupProvisioner
-
-          # set the host and remote ips for NFS
-          builder.use Actions::SetupNFS
-
-          # mount the nfs folders which should be all shared folders
-          builder.use NFS
+          builder.use Call, Actions::IsActive do |env, b|
+            if !env[:is_active]
+              b.use Actions::MessageIsActive
+              next
+            end
+            b.use Actions::CheckSSHUser
+            b.use Actions::ModifyProvisionPath
+            b.use Provision
+            b.use Actions::SetupSudo
+            b.use Actions::SetupProvisioner
+            b.use Actions::SyncFolders
+          end
         end
       end
 
       def up
-        # TODO figure out when to exit if the vm is created
         return Vagrant::Action::Builder.new.tap do |builder|
           builder.use ConfigValidate
+          builder.use Call, Actions::IsActive do |env, b|
+            if env[:is_active]
+              b.use Actions::MessageIsActive
+              next
+            end
+            b.use Actions::SetupSSHKey
+            b.use Actions::Create
+            b.use provision
+          end
+        end
+      end
 
-          # build the vm if necessary
-          builder.use Actions::Create
-
-          builder.use provision
+      def rebuild
+        return Vagrant::Action::Builder.new.tap do |builder|
+          builder.use ConfigValidate
+          builder.use Call, Actions::IsActive do |env, b|
+            if !env[:is_active]
+              b.use Actions::MessageIsActive
+              next
+            end
+            b.use Actions::Rebuild
+            b.use provision
+          end
         end
       end
     end

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

@@ -0,0 +1,46 @@
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class CheckSSHUser
+        include Vagrant::Util::Counter
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @translator = Helpers::Translator.new("actions.check_ssh_user")
+        end
+
+        def call(env)
+          # return if the machine is set with the default ssh username
+          return @app.call(env) if @machine.ssh_info()[:username] == "root"
+
+          # check if ssh username account has been provisioned
+          begin
+            tries = @machine.config.ssh.max_tries
+            @machine.config.ssh.max_tries = 0
+            @machine.communicate.execute("echo")
+          rescue Vagrant::Errors::SSHAuthenticationFailed
+            original_username = @machine.ssh_info()[:username]
+            @machine.provider_config.ssh_username = "root"
+            env[:ui].info @translator.t('fallback', {
+              :user => original_username
+            })
+
+            # TODO remove when vagrant chef provisioning defect fixed
+            @machine.config.ssh.username = "root"
+          end
+
+          @machine.config.ssh.max_tries = tries
+
+          @app.call(env)
+
+          # reset ssh username
+          @machine.provider_config.ssh_username = original_username
+
+          # TODO remove when vagrant chef provisioning defect fixed
+          @machine.config.ssh.username = original_username
+        end
+      end
+    end
+  end
+end

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

@@ -14,28 +14,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          # if the machine state is created skip
-          if env[:machine].state.id == :active
-            env[:ui].info @translator.t("skip")
-            return @app.call(env)
-          end
-
-          # TODO check the content of the key to see if it has changed
-          ssh_key_name = env[:machine].provider_config.ssh_key_name
-          begin
-            ssh_key_id = @client
-              .request("/ssh_keys/")
-              .find_id(:ssh_keys, :name => ssh_key_name)
-          rescue Errors::ResultMatchError
-            env[:ui].info @translator.t("create_key")
-
-            result = @client.request("/ssh_keys/new", {
-              :name => ssh_key_name,
-              :ssh_pub_key => pub_ssh_key(env)
-            })
-
-            ssh_key_id = result["ssh_key"]["id"]
-          end
+          ssh_key_id = env[:ssh_key_id]
 
           size_id = @client
             .request("/sizes")
@@ -60,21 +39,11 @@ module VagrantPlugins
             :ssh_key_ids => ssh_key_id
           })
 
-          # assign the machine id for reference in other commands
-          env[:machine].id = result["droplet"]["id"].to_s
-
           env[:ui].info @translator.t("wait_active")
+          @client.wait_for_event(result["droplet"]["event_id"])
 
-          retryable(:tries => 30, :sleep => 10) do
-            # If we're interrupted don't worry about waiting
-            next if env[:interrupted]
-
-            # Wait for the server to be ready
-            raise "not ready" if env[:machine].state.id != :active
-          end
-
-          # signal that the machine has just been created, used in ReadState
-          env[:machine_just_created] = true
+          # assign the machine id for reference in other commands
+          env[:machine].id = result["droplet"]["id"].to_s
 
           @app.call(env)
         end
@@ -96,19 +65,6 @@ module VagrantPlugins
           destroy_env[:force_confirm_destroy] = true
           env[:action_runner].run(Action.new.destroy, destroy_env)
         end
-
-        private
-
-        def pub_ssh_key(env)
-          path = env[:machine].provider_config.pub_ssh_key_path
-          file = File.open(File.expand_path(path))
-          key = file.read
-          file.close
-          key
-        rescue
-          env[:ui].info @translator.t("key_not_found")
-          DigitalOcean.vagrant_key
-        end 
       end
     end
   end

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

@@ -14,28 +14,13 @@ module VagrantPlugins
         end
 
         def call(env)
-          # TODO remove the key associated with this machine
-          if [:active, :new].include?(env[:machine].state.id)
-            env[:ui].info @translator.t("destroying")
-            result = @client.request("/droplets/#{env[:machine].id}/destroy")
+          # submit destroy droplet request
+          env[:ui].info @translator.t("destroying")
+          result = @client.request("/droplets/#{env[:machine].id}/destroy")
 
-            env[:ui].info @translator.t("wait_off")
-
-            retryable(:tries => 30, :sleep => 10) do
-              # If we're interrupted don't worry about waiting
-              next if env[:interrupted]
-
-              # Wait for the server to be ready
-              raise "not off" if env[:machine].state.id != :off
-            end
-          else
-            env[:ui].info @translator.t("not_active_or_new")
-          end
-
-          # make sure to remove the export when the machine is destroyed
-          # private in some hosts and requires a send
-          env[:ui].info @translator.t("clean_nfs")
-          env[:host].send(:nfs_cleanup, env[:machine].id.to_s)
+          # wait for request to complete
+          env[:ui].info @translator.t("wait_off")
+          @client.wait_for_event(result["event_id"])
 
           @app.call(env)
         end

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class IsActive
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:is_active] = env[:machine].state.id == :active
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class MessageIsActive
+        def initialize(app, env)
+          @app = app
+          @translator = Helpers::Translator.new("actions.message_is_active")
+        end
+
+        def call(env)
+          msg = env[:is_active] ? "active" : "not_active"
+          env[:ui].info @translator.t(msg)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class ModifyProvisionPath
+        include Vagrant::Util::Counter
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @translator =
+            Helpers::Translator.new("actions.modify_provision_path")
+        end
+
+        def call(env)
+          username = @machine.ssh_info()[:username]
+          env[:ui].info @translator.t("modify", { :user => username })
+
+          # modify provisioning paths to enable different users to
+          # provision the same machine
+          #
+          # TODO submit patch to vagrant to set appropriate permissions
+          # based on ssh username
+          @machine.communicate.execute("mkdir -p /home/#{username}/tmp")
+          env[:global_config].vm.provisioners.each do |prov|
+            if prov.name == :shell
+              prov.config.upload_path =
+                prov.config.upload_path.prepend("/home/#{username}")
+            else
+              counter = get_and_update_counter(:provisioning_path)
+              path = "/home/#{username}/tmp/vagrant-chef-#{counter}"
+              prov.config.provisioning_path = path
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require "vagrant-digitalocean/helpers/client"
+
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class Rebuild
+        include Helpers::Client
+
+        def initialize(app, env)
+          @app, @env = app, env
+          @client = client
+          @translator = Helpers::Translator.new("actions.rebuild")
+        end
+
+        def call(env)
+          # look up image id
+          image_id = @client
+            .request("/images", { :filter => "global" })
+            .find_id(:images, :name => env[:machine].provider_config.image)
+
+          # submit rebuild request
+          env[:ui].info @translator.t("rebuild")
+          result = @client.request("/droplets/#{env[:machine].id}/rebuild", {
+            :image_id => image_id
+          })
+
+          # wait for request to complete
+          env[:ui].info @translator.t("wait")
+          @client.wait_for_event(result["event_id"])
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+require "vagrant-digitalocean/helpers/client"
+
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class SetupSSHKey
+        include Helpers::Client
+  
+        def initialize(app, env)
+          @app, @env = app, env
+          @client = client
+          @translator = Helpers::Translator.new("actions.setup_ssh_key")
+        end
+
+        # TODO check the content of the key to see if it has changed
+        def call(env)
+          ssh_key_name = env[:machine].provider_config.ssh_key_name
+
+          begin
+            # assigns existing ssh key id to env for use by other commands
+            env[:ssh_key_id] = @client
+              .request("/ssh_keys/")
+              .find_id(:ssh_keys, :name => ssh_key_name)
+
+            env[:ui].info @translator.t("existing_key", { :name => ssh_key_name })
+          rescue Errors::ResultMatchError
+            env[:ssh_key_id] = create_ssh_key(ssh_key_name, env)
+          end
+
+          @app.call(env)
+        end
+
+        private
+
+        def create_ssh_key(name, env)
+          # assumes public key exists on the same path as private key with .pub ext
+          path = env[:machine].provider_config.ssh_private_key_path
+          path = env[:machine].config.ssh.private_key_path if !path
+          path = File.expand_path("#{path}.pub", env[:machine].env.root_path)
+
+          env[:ui].info @translator.t("new_key", { :name => name, :path => path })
+          begin
+            file = File.open(path)
+            key = file.read
+            file.close
+          rescue
+            raise Errors::PublicKeyError,
+              :path => path
+          end
+
+          result = @client.request("/ssh_keys/new", {
+            :name => name,
+            :ssh_pub_key => key
+          })
+          result["ssh_key"]["id"]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+require "vagrant/util/subprocess"
+
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      # This middleware uses `rsync` to sync the folders over to the
+      # Digital Ocean instance. The implementation was lifted from the
+      # vagrant-aws provider plugin.
+      class SyncFolders
+        def initialize(app, env)
+          @app, @env = app, env
+          @translator = Helpers::Translator.new("actions.sync_folders")
+        end
+
+        def call(env)
+          @app.call(env)
+
+          ssh_info = env[:machine].ssh_info
+
+          env[:machine].config.vm.synced_folders.each do |id, data|
+            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
+            guestpath = data[:guestpath]
+
+            # Make sure there is a trailing slash on the host path to
+            # avoid creating an additional directory with rsync
+            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
+
+            env[:ui].info @translator.t("rsync_folder",
+                                        :hostpath => hostpath,
+                                        :guestpath => guestpath)
+
+            # Create the guest path
+            env[:machine].communicate.sudo("mkdir -p #{guestpath}")
+            env[:machine].communicate.sudo(
+              "chown -R #{ssh_info[:username]} #{guestpath}")
+
+            # Rsync over to the guest path using the SSH info
+            command = [
+              "rsync", "--verbose", "--archive", "-z",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              hostpath,
+              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+
+            r = Vagrant::Util::Subprocess.execute(*command)
+            if r.exit_code != 0
+              raise Errors::RsyncError,
+                :guestpath => guestpath,
+                :hostpath => hostpath,
+                :stderr => r.stderr
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'optparse'
+
+module VagrantPlugins
+  module DigitalOcean
+    module Commands
+      class Rebuild < Vagrant.plugin("2", :command)
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant rebuild [vm-name]"
+          end
+
+          argv = parse_options(opts)
+          return if !argv
+
+          with_target_vms(argv) do |machine|
+            machine.action(:rebuild)
+          end
+
+          0
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-digitalocean/config.rb

@@ -2,34 +2,49 @@ module VagrantPlugins
   module DigitalOcean
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :client_id, :api_key, :image, :region, :size, :ca_path,
-                    :ssh_key_name, :pub_ssh_key_path
+                    :ssh_key_name, :ssh_private_key_path, :ssh_username
 
       def initialize
-        @client_id        = UNSET_VALUE
-        @api_key          = UNSET_VALUE
-        @image            = UNSET_VALUE
-        @region           = UNSET_VALUE
-        @size             = UNSET_VALUE
-        @ca_path          = UNSET_VALUE
-        @ssh_key_name     = UNSET_VALUE
-        @pub_ssh_key_path = UNSET_VALUE
+        @client_id            = UNSET_VALUE
+        @api_key              = UNSET_VALUE
+        @image                = UNSET_VALUE
+        @region               = UNSET_VALUE
+        @size                 = UNSET_VALUE
+        @ca_path              = UNSET_VALUE
+        @ssh_key_name         = UNSET_VALUE
+        @ssh_private_key_path = UNSET_VALUE
+        @ssh_username         = UNSET_VALUE
+
+        @translator = Helpers::Translator.new("config")
       end
 
       def finalize!
-        @client_id         = ENV["DO_CLIENT_ID"] if @client_id == UNSET_VALUE
-        @api_key           = ENV["DO_API_KEY"] if @api_key == UNSET_VALUE
-        @image             = "Ubuntu 12.04 x32 Server" if @image == UNSET_VALUE
-        @region            = "New York 1" if @region == UNSET_VALUE
-        @size              = "512MB" if @size == UNSET_VALUE
-        @ca_path           = nil if @ca_path == UNSET_VALUE
-        @ssh_key_name      = "Vagrant" if @ssh_key_name == UNSET_VALUE
-        @pub_ssh_key_path  = nil if @pub_ssh_key_path == UNSET_VALUE
+        @client_id             = ENV["DO_CLIENT_ID"] if @client_id == UNSET_VALUE
+        @api_key               = ENV["DO_API_KEY"] if @api_key == UNSET_VALUE
+        @image                 = "Ubuntu 12.04 x32 Server" if @image == UNSET_VALUE
+        @region                = "New York 1" if @region == UNSET_VALUE
+        @size                  = "512MB" if @size == UNSET_VALUE
+        @ca_path               = nil if @ca_path == UNSET_VALUE
+        @ssh_key_name          = "Vagrant" if @ssh_key_name == UNSET_VALUE
+        @ssh_private_key_path  = nil if @ssh_private_key_path == UNSET_VALUE
+        @ssh_username          = "root" if @ssh_username == UNSET_VALUE
       end
 
       def validate(machine)
         errors = []
-        errors << "Client ID required" if !@client_id
-        errors << "API Key required" if !@api_key
+        errors << @translator.t(:client_id_required) if !@client_id
+        errors << @translator.t(:api_key_required) if !@api_key
+
+        key = @ssh_private_key_path
+        key = machine.config.ssh.private_key_path if !@ssh_private_key_path
+
+        if !key
+          errors << @translator.t(:private_key_required) if !key
+        elsif !File.file?(File.expand_path(key, machine.env.root_path))
+          errors << @translator.t(:private_key_missing, { :key => key })
+        elsif !File.file?(File.expand_path("#{key}.pub", machine.env.root_path))
+          errors << @translator.t(:public_key_missing, { :key => key })
+        end
 
         { "Digital Ocean Provider" => errors }
       end

data/lib/vagrant-digitalocean/errors.rb

@@ -26,6 +26,14 @@ module VagrantPlugins
       class LocalIPError < DigitalOceanError
         error_key(:local_ip)
       end
+
+      class PublicKeyError < DigitalOceanError
+        error_key(:public_key)
+      end
+
+      class RsyncError < DigitalOceanError
+        error_key(:rsync)
+      end
     end
   end
 end

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

@@ -7,17 +7,20 @@ module VagrantPlugins
     module Helpers
       module Client
         def client
-          @client ||= ApiClient.new(@env[:machine].provider_config)
+          @client ||= ApiClient.new(@env)
         end
       end
 
       class ApiClient
-        def initialize(config)
-          @config = config
+        include Vagrant::Util::Retryable
+
+        def initialize(env)
+          @env = env
+          @config = env[:machine].provider_config
           @client = Faraday.new({
             :url => "https://api.digitalocean.com/",
             :ssl => {
-              :ca_file => config.ca_path
+              :ca_file => @config.ca_path
             }
           })
         end
@@ -64,6 +67,20 @@ module VagrantPlugins
 
           Result.new(body)
         end
+
+        def wait_for_event(id)
+          retryable(:tries => 30, :sleep => 10) do
+            # stop waiting if interrupted
+            next if @env[:interrupted]
+
+
+            # check event status
+            result = self.request("/events/#{id}")
+
+            yield result if block_given?
+            raise "not ready" if result["event"]["action_status"] != "done"
+          end
+        end
       end
     end
   end

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

@@ -12,7 +12,7 @@ module VagrantPlugins
 
         def t(keys, opts = {})
           value = I18n.t("#{@@plugin_namespace}.#{@namespace}.#{keys}", opts)
-          opts[:progress] == false ? value : value + " ..."
+          opts[:progress] == false ? value : value + "..."
         end
       end
     end

data/lib/vagrant-digitalocean/plugin.rb

@@ -25,6 +25,11 @@ module VagrantPlugins
 
         Provider
       end
+
+      command(:rebuild) do
+        require_relative "commands/rebuild"
+        Commands::Rebuild
+      end
     end
   end
 end

data/lib/vagrant-digitalocean/provider.rb

@@ -57,19 +57,14 @@ module VagrantPlugins
 
         return nil if state["status"] == :not_created
 
-        if @machine.config.ssh.private_key_path
-          private_key_path = @machine.config.ssh.private_key_path
-        elsif @machine.provider_config.pub_ssh_key_path
-          private_key_path = @machine.provider_config.pub_ssh_key_path.chomp(".pub")
-        else
-          private_key_path = Vagrant.source_root + "keys/vagrant"
-        end
+        # TODO remove when defect in vagrant chef provisioner is fixed
+        @machine.config.ssh.username = @machine.provider_config.ssh_username
 
         return {
           :host => state["ip_address"],
           :port => "22",
-          :username => "root",
-          :private_key_path => private_key_path
+          :username => @machine.provider_config.ssh_username,
+          :private_key_path => @machine.provider_config.ssh_private_key_path
         }
       end
 

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
-  module Digitalocean
-    VERSION = "0.0.3"
+  module DigitalOcean
+    VERSION = "0.0.4"
   end
 end

data/locales/en.yml

@@ -1,6 +1,13 @@
 en:
   vagrant_digital_ocean:
+    config:
+      client_id_required: "Client ID required"
+      api_key_required: "API key required"
+      private_key_required: "SSH private key path required"
+      private_key_missing: "SSH private key is missing: %{key}"
+      public_key_missing: "SSH public key is missing: %{key}.pub"
     errors:
+      public_key: "Failed to read public key: %{path}"
       api_status: |-
         There was an issue with the request made to the Digital Ocean
         API at:
@@ -12,6 +19,15 @@ en:
 
         Status: %{status}
         Response: %{response}
+
+      rsync: |-
+        There was an error when attemping to rsync a share folder.
+        Please inspect the error message below for more info.
+
+        Host path: %{hostpath}
+        Guest path: %{guestpath}
+        Error: %{stderr}
+
       :json: |-
         There was an issue with the JSON response from the Digital Ocean
         API at:
@@ -48,26 +64,28 @@ en:
 
     actions:
       create:
-        skip: "Droplet is active, skipping creation"
-        create_key: "Adding key client account"
         create_droplet: "Creating the droplet"
         wait_active: "Waiting for the droplet to become active (>= 1 min)"
-        key_not_found: "Public SSH key not provided, using insecure Vagrant key"
+      rebuild:
+        rebuild: "Rebuilding the droplet"
+        wait: "Waiting for the droplet to rebuild (>= 1 min)"
       destroy:
         destroying: "Destroying droplet"
-        not_active_or_new: "Droplet not in the `active` or `new` state"
-        clean_nfs: "Cleaning up NFS exports, may require sudo password"
         wait_off: "Waiting for the droplet to be destroyed"
       setup_sudo:
         exec: "Making alterations to the sudoers file where necessary"
-      setup_nfs:
-        machine_ip: "Droplet IP: %{ip}"
-        host_ip: "Host IP: %{ip}"
-        install: "Installing NFS on the droplet"
-        force_shared_folders: "Forcing shared folders to use NFS where necessary"
       setup_provisioner:
         install: "Installing provisioner: %{provisioner} (>= 2 min)"
-      setup_user:
-        create: "Creating user '%{user}' and setting password"
-        sudo: "Enabling sudo for user '%{user}'"
-        key: "Adding public key to authorized_keys"
+      sync_folders:
+        rsync_folder: "Rsyncing folder: %{hostpath} => %{guestpath}"
+      setup_ssh_key:
+        existing_key: "Using existing SSH key: %{name}"
+        insecure_key: "Using default insecure vagrant SSH key"
+        new_key: "Creating new SSH key: %{name} (%{path})"
+      message_is_active:
+        active: "Droplet is already active"
+        not_active: "Droplet is not active"
+      check_ssh_user:
+        fallback: "Failed to authenticate with '%{user}', falling back to 'root'"
+      modify_provision_path:
+        modify: "Modifying provisioning path to '/home/%{user}/tmp'"

data/test/Vagrantfile.centos

@@ -1,5 +1,6 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "digital_ocean"
+  config.ssh.private_key_path = "test_id_rsa"
 
   config.vm.provider :digital_ocean do |vm|
     vm.client_id = ENV["DO_CLIENT_ID"]

data/test/Vagrantfile.ubuntu

@@ -8,10 +8,11 @@ Vagrant.configure("2") do |config|
     vm.region = "New York 1"
     vm.size = "512MB"
     vm.ssh_key_name = "Test Key"
-    vm.pub_ssh_key_path = "test_id_rsa.pub"
+    vm.ssh_private_key_path = "test_id_rsa"
+    vm.ssh_username = "tester"
   end
 
-  config.vm.provision :shell, :path => "provision.sh"
+  config.vm.provision :shell, :path => "scripts/setup_user.sh"
 
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"

data/test/scripts/setup_user.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if ! grep tester /etc/passwd; then
+    useradd -m -s /bin/bash tester
+fi
+
+if ! grep tester /etc/sudoers; then
+    echo "tester ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
+fi
+
+mkdir -p /home/tester/.ssh
+chown tester:tester /home/tester/.ssh
+
+pub_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCbFlHJ++BcXGU9b2K+jF990r16uqkKnWiK2CFS0PFvM9IJs3CoGiIlyc9UD9O4LEyeu5Rw0RdiAp9MvyUPcDUeibw3WlMCFJ53mbioAapMy5tPXmxxJH5KcN2uJKESsH/1hJv0tWfVpHQywVLcf/7HWPjDl3qEFqzwGEN+5V3XqyG+hoA4rLTLDL40G68bL/oC7ere3sz3B16U4NGdgtJZapot5gTFErFZZztql76h25Ch7isE1XAaYg6NY4z1oU8Q9Ud0sY74tDI8TF165LStb3prf1TinwaMbOyuQ1wrNU4aMzekiwazeo6LtHMnfPjweIGP01PwjZ8WkYcRF6tt digital_ocean provider test key"
+
+if ! [ -e /home/tester/.ssh/authorized_keys ]; then
+    echo "${pub_key}" > /home/tester/.ssh/authorized_keys
+fi

data/vagrant-digitalocean.gemspec

@@ -5,14 +5,13 @@ require 'vagrant-digitalocean/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "vagrant-digitalocean"
-  gem.version       = VagrantPlugins::Digitalocean::VERSION
+  gem.version       = VagrantPlugins::DigitalOcean::VERSION
   gem.authors       = ["John Bender"]
   gem.email         = ["john.m.bender@gmail.com"]
   gem.description   = %q{Enables Vagrant to manage Digital Ocean droplets}
   gem.summary       = gem.description
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -62,9 +62,7 @@ dependencies:
 description: Enables Vagrant to manage Digital Ocean droplets
 email:
 - john.m.bender@gmail.com
-executables:
-- build.sh
-- test_run.sh
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -81,13 +79,20 @@ files:
 - box/metadata.json
 - lib/vagrant-digitalocean.rb
 - lib/vagrant-digitalocean/action.rb
+- lib/vagrant-digitalocean/actions/check_ssh_user.rb
 - lib/vagrant-digitalocean/actions/create.rb
 - lib/vagrant-digitalocean/actions/destroy.rb
+- lib/vagrant-digitalocean/actions/is_active.rb
+- lib/vagrant-digitalocean/actions/message_is_active.rb
+- lib/vagrant-digitalocean/actions/modify_provision_path.rb
 - lib/vagrant-digitalocean/actions/read_state.rb
-- lib/vagrant-digitalocean/actions/setup_nfs.rb
+- lib/vagrant-digitalocean/actions/rebuild.rb
 - lib/vagrant-digitalocean/actions/setup_provisioner.rb
+- lib/vagrant-digitalocean/actions/setup_ssh_key.rb
 - lib/vagrant-digitalocean/actions/setup_sudo.rb
 - lib/vagrant-digitalocean/actions/setup_user.rb
+- lib/vagrant-digitalocean/actions/sync_folders.rb
+- lib/vagrant-digitalocean/commands/rebuild.rb
 - lib/vagrant-digitalocean/config.rb
 - lib/vagrant-digitalocean/errors.rb
 - lib/vagrant-digitalocean/helpers/client.rb
@@ -107,6 +112,7 @@ files:
 - test/Vagrantfile.ubuntu
 - test/cookbooks/test/recipes/default.rb
 - test/provision.sh
+- test/scripts/setup_user.sh
 - test/test_id_rsa
 - test/test_id_rsa.pub
 - vagrant-digitalocean.gemspec
@@ -139,5 +145,6 @@ test_files:
 - test/Vagrantfile.ubuntu
 - test/cookbooks/test/recipes/default.rb
 - test/provision.sh
+- test/scripts/setup_user.sh
 - test/test_id_rsa
 - test/test_id_rsa.pub

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

@@ -1,61 +0,0 @@
-require "socket"
-
-module VagrantPlugins
-  module DigitalOcean
-    module Actions
-      class SetupNFS
-        include Helpers::File
-
-        def initialize(app, env)
-          @app, @env = app, env
-          @translator = Helpers::Translator.new("actions.setup_nfs")
-        end
-
-        def call(env)
-          # set the nfs machine ip
-          env[:nfs_machine_ip] = env[:machine].provider.ssh_info[:host]
-          env[:ui].info @translator.t("machine_ip", :ip => env[:nfs_machine_ip])
-
-          # get the host ip from the local adapters
-          raise Errors::LocalIPError if !(host_ip = determine_host_ip)
-
-          env[:nfs_host_ip] = host_ip
-
-          env[:ui].info @translator.t("host_ip", :ip => env[:nfs_host_ip])
-
-          # make sure the nfs server is setup
-          env[:ui].info @translator.t("install")
-          env[:machine].communicate.execute(nfs_install(env[:machine].guest))
-
-          vm = env[:machine].config.vm
-
-          # force all shard folders to use nfs
-          env[:ui].warn @translator.t("force_shared_folders")
-          folders = vm.synced_folders.keys.each do |key|
-            vm.synced_folders[key][:nfs] = true
-          end
-
-          @app.call(env)
-        end
-
-        # TODO not thread safe :(
-        # TODO google ip seems like a bad idea
-        def determine_host_ip
-          # turn off reverse DNS resolution temporarily
-          orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
-
-          UDPSocket.open do |s|
-            s.connect '64.233.187.99', 1
-            s.addr.last
-          end
-        ensure
-          Socket.do_not_reverse_lookup = orig
-        end
-
-        def nfs_install(guest)
-          read_script("nfs", guest)
-        end
-      end
-    end
-  end
-end