vagrant-digitalocean 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b3f5eb95ee3301c21692d988e2a80d254cb368
-  data.tar.gz: 949878d9783b37fac398503ab1c66c3dc2046afc
+  metadata.gz: 197c341c3da97aa929fc86ed355e958d2f3c204f
+  data.tar.gz: d36e00bb323c039ff69373b63181e06c9f6bcf81
 SHA512:
-  metadata.gz: 9760c883463a9d6826856b3e0543425702268bd22c56720ed04bb1c75c71ceff84a430a34bf52f41e7dd99b4c336f0fd4364458a6d1343038f90c72870c67981
-  data.tar.gz: 6e2cffc6a7e95090d63971f9d30abb804812c8c4ee6c340e0015e80ca80cb51933f29096c4832e01e1ac982dbc66b9a1125e3b9056a96578c3093d073303d21d
+  metadata.gz: 61563549121759eaa3ca6b55e2ad32c780d67a73e1eedd7fa4ee901adf7f2d5db36fb7e652e704ac2014aec30388e2ef93488e4da354e8f698be0f265fc03c23
+  data.tar.gz: bc860f3242cd0e0c9d5798e42fd3c0c8afcd95ee1966a051393530d506e00230857cd97605af00b7e833658b3fbd7bbbb6398bd62f77c6b26853abadaeb0bebf

data/README.md

@@ -77,7 +77,10 @@ Please note the following:
 **Supported Configuration Attributes**
 
 The following attributes are available to further configure the provider:
-- `provider.image` - A string representing the image to use when creating a new droplet. It defaults to `ubuntu-14-04-x64`. List available images with the `digitalocean-list images` command.
+- `provider.image` - A string representing the image to use when creating a new
+   droplet. It defaults to `ubuntu-14-04-x64`. List available images with the
+   `digitalocean-list images` command. Like when using the DigitalOcean API
+   directly, [it can be an image ID or slug](https://developers.digitalocean.com/documentation/v2/#create-a-new-droplet).
 - `provider.ipv6` - A boolean flag indicating whether to enable IPv6
 - `provider.region` - A string representing the region to create the new droplet in. It defaults to `nyc2`. List available regions with the `digitalocean-list regions` command.
 - `provider.size` - A string representing the size to use when creating a

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

@@ -17,15 +17,11 @@ module VagrantPlugins
         def call(env)
           ssh_key_id = [env[:ssh_key_id]]
 
-          image_id = @client
-            .request('/v2/images')
-            .find_id(:images, :slug => @machine.provider_config.image)
-
           # submit new droplet request
           result = @client.post('/v2/droplets', {
             :size => @machine.provider_config.size,
             :region => @machine.provider_config.region,
-            :image => image_id,
+            :image => @machine.provider_config.image,
             :name => @machine.config.vm.hostname || @machine.name,
             :ssh_keys => ssh_key_id,
             :private_networking => @machine.provider_config.private_networking,

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

@@ -34,12 +34,12 @@ module VagrantPlugins
             images = Array(result["images"])
             if @regions
               images_table = images.map do |image|
-                '%-50s %-30s %-50s' % ["#{image['distribution']} #{image['name']}", image['slug'], image['regions'].join(', ')]
+                '%-50s %-20s %-20s %-50s' % ["#{image['distribution']} #{image['name']}", image['slug'], image['id'], image['regions'].join(', ')]
               end
               @env.ui.info I18n.t('vagrant_digital_ocean.info.images_with_regions', images: images_table.sort.join("\r\n"))
             else
               images_table = images.map do |image|
-                '%-50s %-30s' % ["#{image['distribution']} #{image['name']}", image['slug']]
+                '%-50s %-30s %-30s' % ["#{image['distribution']} #{image['name']}", image['slug'], image['id']]
               end
               @env.ui.info I18n.t('vagrant_digital_ocean.info.images', images: images_table.sort.join("\r\n"))
             end

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.7.3'
+    VERSION = '0.7.4'
   end
 end

data/locales/en.yml

@@ -20,8 +20,8 @@ en:
       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."
-      images: "Description                                        Slug\n\n%{images}"
-      images_with_regions: "Description                                        Slug                           Regions\n\n%{images}"
+      images: "Description                                        Slug                           ID\n\n%{images}"
+      images_with_regions: "Description                                        Slug                 ID                 Regions\n\n%{images}"
       regions: "Description                    Slug\n\n%{regions}"
       sizes: "Memory          CPUs            Slug\n\n%{sizes}"
       list_error: 'Could not contact the Digital Ocean API: %{message}'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - John Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Digital Ocean droplets
@@ -128,3 +128,4 @@ test_files:
 - test/test.sh
 - test/test_id_rsa
 - test/test_id_rsa.pub
+has_rdoc: