vagrant-digitalocean 0.5.4 → 0.5.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTJjOGFiNDlhMGIzMGM5ZWY5YTM1YWQ0ZGVmNzU0NjdjZjNlMGI5Yg==
+  data.tar.gz: !binary |-
+    NzAxZjc5OTNjMjdlZTE2YjgxYjFlNDBkN2NmNjNkNDg4M2M1ZTRlNQ==
+SHA512:
+  metadata.gz: !binary |-
+    OTBkZWU1MDJhNGVmZDA2NTNjZjhkMmVhODI3MmQwMDQ4ZGZjNzkyYTFjYjYx
+    NmMxMmQ0YWU1OTVmYjExM2MzNmEyMzExMzM1NTU2NWQ3ZWFlNTgxMWMzMTNj
+    NGYwZWQ2ZWVjOTA2MmUyMWZkNWZjYzc2YTdmNDM1NjE1NTk3ODc=
+  data.tar.gz: !binary |-
+    ODk4MTFkYTI3NTJhNjczYmFiMTNmZmU2OTRhYmE1ZGRkZDhiOThmYWNmMTEy
+    N2UwOGRhZjViZWNlMDk1ODUzNmMyNjA1YjA3ZmQ1MDQ4MDQxYWYyODg4ZmY4
+    NmIwZGNiMWY2OTYwOWFiMTQ2MmRjODY5ZDRlNDhlYzgzZmI4ZTg=

data/README.md

@@ -77,7 +77,7 @@ The following attributes are available to further configure the provider:
 - `provider.image` - A string representing the image to use when creating a
    new droplet (e.g. `Debian 6.0 x64`). The available options may
    be found on Digital Ocean's new droplet [form](https://www.digitalocean.com/droplets/new).
-   It defaults to `Ubuntu 12.04.3 x64`.
+   It defaults to `Ubuntu 14.04.3 x64`.
 - `provider.region` - A string representing the region to create the new
    droplet in. It defaults to `New York 2`.
 - `provider.size` - A string representing the size to use when creating a

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

@@ -5,7 +5,7 @@ module VagrantPlugins
     module Actions
       class Rebuild
         include Helpers::Client
-				include Vagrant::Util::Retryable
+        include Vagrant::Util::Retryable
 
         def initialize(app, env)
           @app = app

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

@@ -38,7 +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 = 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

@@ -44,7 +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 = 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

@@ -17,10 +17,15 @@ module VagrantPlugins
           @machine.config.vm.synced_folders.each do |id, data|
             next if data[:disabled]
 
-						unless Vagrant::Util::Which.which('rsync')
-							env[:ui].warn I18n.t('vagrant_digital_ocean.info.rsync_missing')
-							break
-						end
+            if @machine.guest.capability?(:rsync_installed)
+              installed = @machine.guest.capability(:rsync_installed)
+              if !installed
+                can_install = @machine.guest.capability?(:rsync_install)
+                raise Vagrant::Errors::RSyncNotInstalledInGuest if !can_install
+                @machine.ui.info I18n.t("vagrant.rsync_installing")
+                @machine.guest.capability(:rsync_install)
+              end
+            end
 
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
@@ -29,10 +34,10 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
-						# on windows rsync.exe requires cygdrive-style paths
-						if Vagrant::Util::Platform.windows?
-							hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
-						end
+            # on windows rsync.exe requires cygdrive-style paths
+            if Vagrant::Util::Platform.windows?
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+            end
 
             env[:ui].info I18n.t('vagrant_digital_ocean.info.rsyncing', {
               :hostpath => hostpath,
@@ -44,8 +49,8 @@ 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)
+            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 = [
@@ -54,11 +59,11 @@ module VagrantPlugins
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
-						# we need to fix permissions when using rsync.exe on windows, see
-					  # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
-						if Vagrant::Util::Platform.windows?
-							command.insert(1, "--chmod", "ugo=rwX")
-						end
+            # we need to fix permissions when using rsync.exe on windows, see
+            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+            if Vagrant::Util::Platform.windows?
+              command.insert(1, "--chmod", "ugo=rwX")
+            end
 
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0

data/lib/vagrant-digitalocean/config.rb

@@ -30,7 +30,7 @@ module VagrantPlugins
       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.3 x64' if @image == UNSET_VALUE
+        @image              = 'Ubuntu 14.04 x64' if @image == UNSET_VALUE
         @region             = 'New York 2' if @region == UNSET_VALUE
         @size               = '512MB' if @size == UNSET_VALUE
         @private_networking = false if @private_networking == UNSET_VALUE
@@ -46,7 +46,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)
+        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,7 +15,7 @@ module VagrantPlugins
         include Vagrant::Util::Retryable
 
         def initialize(machine)
-					@logger = Log4r::Logger.new('vagrant::digitalocean::apiclient')
+          @logger = Log4r::Logger.new('vagrant::digitalocean::apiclient')
           @config = machine.provider_config
           @client = Faraday.new({
             :url => 'https://api.digitalocean.com/',
@@ -27,7 +27,7 @@ module VagrantPlugins
 
         def request(path, params = {})
           begin
-						@logger.info "Request: #{path}"
+            @logger.info "Request: #{path}"
             result = @client.get(path, params = params.merge({
               :client_id => @config.client_id,
               :api_key => @config.api_key
@@ -48,7 +48,7 @@ module VagrantPlugins
 
           begin
             body = JSON.parse(result.body)
-						@logger.info "Response: #{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.5.4'
+    VERSION = '0.5.5'
   end
 end

data/locales/en.yml

@@ -19,6 +19,7 @@ en:
       creating_key: "Creating new SSH key: %{name}..."
       trying_rsync_install: "Rsync not found, attempting to install with yum..."
       rsyncing: "Rsyncing folder: %{hostpath} => %{guestpath}..."
+      rsync_missing: "The rsync executable was not found in the current path."
     config:
       client_id: "Client ID is required"
       api_key: "API key is required"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.5.4
-  prerelease: 
+  version: 0.5.5
 platform: ruby
 authors:
 - John Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -106,27 +99,26 @@ files:
 - vagrant-digitalocean.gemspec
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to manage Digital Ocean droplets
 test_files:
 - test/Vagrantfile