vagrant-digitalocean 0.1.1 → 0.1.2

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

@@ -5,7 +5,7 @@ module VagrantPlugins
     module Actions
       class SetupKey
         include Helpers::Client
-  
+
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
@@ -37,8 +37,9 @@ module VagrantPlugins
 
         def create_ssh_key(name, env)
           # assumes public key exists on the same path as private key with .pub ext
-          private_key_path = @machine.config.ssh.private_key_path
-          pub_key = DigitalOcean.public_key(private_key_path)
+          path = @machine.config.ssh.private_key_path
+          path = File.expand_path(path, @machine.env.root_path)
+          pub_key = DigitalOcean.public_key(path)
 
           env[:ui].info I18n.t('vagrant_digital_ocean.info.creating_key', {
             :name => name

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

@@ -38,8 +38,9 @@ module VagrantPlugins
           @machine.communicate.execute("su #{user} -c 'mkdir -p ~/.ssh'")
 
           # add the specified key to the authorized keys file
-          private_key_path = @machine.ssh_info()[:private_key_path]
-          pub_key = DigitalOcean.public_key(private_key_path)
+          path = @machine.config.ssh.private_key_path
+          path = File.expand_path(path, @machine.env.root_path)
+          pub_key = DigitalOcean.public_key(path)
           @machine.communicate.execute(<<-BASH)
             if ! grep '#{pub_key}' /home/#{user}/.ssh/authorized_keys; then
               echo '#{pub_key}' >> /home/#{user}/.ssh/authorized_keys;

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday