vagrant-digitalocean 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWNjZTg3ZGQ4YmYyM2U3YTAxYjBkNDhiMWQxZjk1NzZkNWU4YmJiOQ==
-  data.tar.gz: !binary |-
-    MjUxMDgyZTdlNDg0MWQzMWQzZWIwYzJhY2ExNjcwNzk3MDQ3ZDJhNQ==
+SHA1:
+  metadata.gz: e7541cb9c846061aa891d33310cca80a8050157d
+  data.tar.gz: c804eb52850ffb127932dcb5337b35abd4edf500
 SHA512:
-  metadata.gz: !binary |-
-    NTBhNWYwYWU0NWM0OTY3MTY4ODk5NTVjNzdiOGQ5NTUzNzBhMGVkMDQ5M2Zm
-    ODU1OGZlNzc1ZjQ2NWNmNmM5YTU5ZmY0MWMxZDI0NjllZDM4Y2JlNzJhMDU3
-    MGYzZDAxOWE0ZjFjMGI0MjE5ZjJiNWNhMjQxYmFmNDFkNmM2MmU=
-  data.tar.gz: !binary |-
-    NjAxMzlkYzVlMDdiZGY2M2Y3ZDI2YzE2YTkzMDhjNmNmNzQ4ZTJmZDM3Yjll
-    Y2Q5YjE1YzVkNjQ2ZDg2OGFhMmYyNTYwOTc5MDZjNzY1YWU2MGI2MWE1ZTdl
-    M2E3OWNhOTNiYWRmMzQ5MGEyZDkzODNhMThiN2Q1ZTBjOTQzNzI=
+  metadata.gz: ec0c1de834854d1903f0cd97900729a0d36095c92d8bfb24508f4b107a0924f7b3382ed23a8247bc31c821ba29943a8ceb27d8643936c34a09d36ff429ac246d
+  data.tar.gz: 905bc72a941fb5d299d372dd42914894c462c4f66de51811c83577539b6f3cef98b9e4dad8a65ea204377972136cc27d10a9edcf84f5fa96a30e9ae9ee96f8ac

data/README.md

@@ -59,7 +59,7 @@ Vagrant.configure('2') do |config|
     override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
 
     provider.token = 'YOUR TOKEN'
-    provider.image = 'Ubuntu 14.04 x64'
+    provider.image = 'ubuntu-14-04-x64'
     provider.region = 'nyc2'
     provider.size = '512mb'
   end
@@ -77,14 +77,11 @@ 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 (e.g. `Debian 6.0 x64`). The available options may
-   be found on Digital Ocean's new droplet [form](https://cloud.digitalocean.com/droplets/new).
-   It defaults to `Ubuntu 14.04 x64`.
-- `provider.region` - A string representing the region to create the new
-   droplet in. It defaults to `nyc2`.
+- `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.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
-  new droplet (e.g. `1gb`). It defaults to `512mb`.
+  new droplet (e.g. `1gb`). It defaults to `512mb`. List available sizes with the `digitalocean-list sizes` command.
 - `provider.private_networking` - A boolean flag indicating whether to enable
   a private network interface (if the region supports private networking). It
   defaults to `false`.
@@ -101,34 +98,16 @@ The provider will create a new user account with the specified SSH key for
 authorization if `config.ssh.username` is set and the `provider.setup`
 attribute is `true`.
 
-### provider.region slug
+### image, region and size slugs
 
-Each region has been specify with slug name.  
-Current Region-slug table is:
-
-| slug | Region Name     |
-|:---- |:----------------|
-| nyc1 | New York 1      |
-| ams1 | Amsterdam 1     |
-| sfo1 | San Francisco 1 |
-| nyc2 | New York 2      |
-| ams2 | Amsterdam 2     |
-| sgp1 | Singapore 1     |
-| lon1 | London 1        |
-| nyc3 | New York 3      |
-
-You can find latest region slug name using DigitalOcean API V2 call.
-
-- example call.
+Images, regions and sizes have to be specified with the slug name. You can find the slug names with the `digitalocean-list` commands:
 
 ```
-curl -X GET "https://api.digitalocean.com/v2/regions" \
-     -H "Authorization: Bearer $DIGITAL_OCEAN_TOKEN" \
-     2>/dev/null | jq '.regions [] | .slug,.name'
+vagrant digitalocean-list images $DIGITAL_OCEAN_TOKEN
+vagrant digitalocean-list regions $DIGITAL_OCEAN_TOKEN
+vagrant digitalocean-list sizes $DIGITAL_OCEAN_TOKEN
 ```
 
-More detail: [DigitalOcean API - Regions](https://developers.digitalocean.com/#regions)
-
 Run
 ---
 After creating your project's `Vagrantfile` with the required configuration

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

@@ -19,7 +19,7 @@ module VagrantPlugins
 
           image_id = @client
             .request('/v2/images')
-            .find_id(:images, :name => @machine.provider_config.image)
+            .find_id(:images, :slug => @machine.provider_config.image)
 
           # submit new droplet request
           result = @client.post('/v2/droplets', {
@@ -30,11 +30,12 @@ module VagrantPlugins
             :ssh_keys => ssh_key_id,
             :private_networking => @machine.provider_config.private_networking,
             :backups => @machine.provider_config.backups_enabled,
-            :ipv6 => @machine.provider_config.ipv6
+            :ipv6 => @machine.provider_config.ipv6,
+            :user_data => @machine.provider_config.user_data
           })
 
           # wait for request to complete
-          env[:ui].info I18n.t('vagrant_digital_ocean.info.creating') 
+          env[:ui].info I18n.t('vagrant_digital_ocean.info.creating')
           @client.wait_for_event(env, result['links']['actions'].first['id'])
 
           # assign the machine id for reference in other commands

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

@@ -18,7 +18,7 @@ module VagrantPlugins
           # look up image id
           image_id = @client
             .request('/v2/images')
-            .find_id(:images, :name => @machine.provider_config.image)
+            .find_id(:images, :slug => @machine.provider_config.image)
 
           # submit rebuild request
           result = @client.post("/v2/droplets/#{@machine.id}/actions", {

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

@@ -0,0 +1,89 @@
+require 'optparse'
+require 'vagrant-digitalocean/helpers/client'
+
+module VagrantPlugins
+  module DigitalOcean
+    module Commands
+      class List < Vagrant.plugin('2', :command)
+        def self.synopsis
+          "list available images and regions from Digital Ocean"
+        end
+
+        def execute
+          @token = nil
+
+          @opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant digitalocean-list [options] <images|regions|sizes> <token>'
+
+            o.on("-r", "--[no-]regions", "show the regions when listing images") do |r|
+              @regions = r
+            end
+          end
+
+          argv = parse_options(@opts)
+          @token = argv[1]
+
+          if @token.nil?
+            usage
+            return 1
+          end
+
+          case argv[0]
+          when "images"
+            result = query('/v2/images')
+            images = Array(result["images"])
+            if @regions
+              images_table = images.map do |image|
+                '%-50s %-30s %-50s' % ["#{image['distribution']} #{image['name']}", image['slug'], 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']]
+              end
+              @env.ui.info I18n.t('vagrant_digital_ocean.info.images', images: images_table.sort.join("\r\n"))
+            end
+          when "regions"
+            result = query('/v2/regions')
+            regions = Array(result["regions"])
+            regions_table = regions.map { |region| '%-30s %-12s' % [region['name'], region['slug']] }
+            @env.ui.info I18n.t('vagrant_digital_ocean.info.regions', regions: regions_table.sort.join("\r\n"))
+          when "sizes"
+            result = query('/v2/sizes')
+            sizes = Array(result["sizes"])
+            sizes_table = sizes.map { |size| '%-15s %-15s %-12s' % ["#{size['memory']}MB", size['vcpus'], size['slug']] }
+            @env.ui.info I18n.t('vagrant_digital_ocean.info.sizes', sizes: sizes_table.sort_by{|s| s['memory']}.join("\r\n"))
+          else
+            usage
+            return 1
+          end
+
+          0
+        rescue Faraday::Error::ConnectionFailed, RuntimeError => e
+          @env.ui.error I18n.t('vagrant_digital_ocean.info.list_error', message: e.message)
+          1
+        end
+
+        def query(path)
+          connection = Faraday.new({
+            :url => "https://api.digitalocean.com/"
+          })
+
+          result = connection.get(path, per_page: 100) do |req|
+            req.headers['Authorization'] = "Bearer #{@token}"
+          end
+
+          case result.status
+          when 200 then JSON.parse(result.body)
+          when 401 then raise("unauthorized access — is the token correct?")
+          else raise("call returned with status #{result.status}")
+          end
+        end
+
+        def usage
+          @env.ui.info(@opts)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-digitalocean/config.rb

@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :ca_path
       attr_accessor :ssh_key_name
       attr_accessor :setup
+      attr_accessor :user_data
 
       alias_method :setup?, :setup
 
@@ -25,11 +26,12 @@ module VagrantPlugins
         @ca_path            = UNSET_VALUE
         @ssh_key_name       = UNSET_VALUE
         @setup              = UNSET_VALUE
+        @user_data          = UNSET_VALUE
       end
 
       def finalize!
         @token              = ENV['DO_TOKEN'] if @token == UNSET_VALUE
-        @image              = 'Ubuntu 14.04 x64' if @image == UNSET_VALUE
+        @image              = 'ubuntu-14-04-x64' if @image == UNSET_VALUE
         @region             = 'nyc2' if @region == UNSET_VALUE
         @size               = '512mb' if @size == UNSET_VALUE
         @private_networking = false if @private_networking == UNSET_VALUE
@@ -38,6 +40,7 @@ module VagrantPlugins
         @ca_path            = nil if @ca_path == UNSET_VALUE
         @ssh_key_name       = 'Vagrant' if @ssh_key_name == UNSET_VALUE
         @setup              = true if @setup == UNSET_VALUE
+        @user_data          = nil if @user_data == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-digitalocean/plugin.rb

@@ -21,6 +21,11 @@ module VagrantPlugins
         require_relative 'commands/rebuild'
         Commands::Rebuild
       end
+
+      command("digitalocean-list", primary: false) do
+        require_relative 'commands/list'
+        Commands::List
+      end
     end
   end
 end

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

data/locales/en.yml

@@ -20,6 +20,11 @@ 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}"
+      regions: "Description                    Slug\n\n%{regions}"
+      sizes: "Memory          CPUs            Slug\n\n%{sizes}"
+      list_error: 'Could not contact the Digital Ocean API: %{message}'
     config:
       token: "Token is required"
       private_key: "SSH private key path is required"

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - John Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables Vagrant to manage Digital Ocean droplets
@@ -81,6 +81,7 @@ files:
 - 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/list.rb
 - lib/vagrant-digitalocean/commands/rebuild.rb
 - lib/vagrant-digitalocean/config.rb
 - lib/vagrant-digitalocean/errors.rb
@@ -106,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Digital Ocean droplets