vagrant-chassis-digitalocean 1.0.3 → 2.0.0

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 test/.vagrant
 tmp
+.vagrant
 .idea/

data/Gemfile

@@ -1,6 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.4.0'
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.3'
 gem 'vagrant-omnibus'
 gem 'rake'
+
+group :plugins do
+  gem 'vagrant-digitalocean', :path => '.'
+end
+
 gemspec

data/README.md

@@ -4,19 +4,19 @@ Digital Ocean Vagrant Provider For Chassis
 management of [Digital Ocean](https://www.digitalocean.com/) droplets
 (instances) that setup WordPress using [Chassis](https://github.com/Chassis/Chassis/).
 
-**NOTE:** This plugin is based on the amazing work of the [vagrant-digitalocean
-](https://github.com/smdahlen/vagrant-digitalocean) plugin
+**NOTE:** The Chef provisioner is no longer supported by default (as of 0.2.0).
+Please use the `vagrant-omnibus` plugin to install Chef on Vagrant-managed
+machines. This plugin provides control over the specific version of Chef
+to install.
 
 Current features include:
 - create and destroy droplets
 - power on and off droplets
 - rebuild a droplet
+- provision a droplet with the shell or Chef provisioners
 - setup a SSH public key for authentication
 - create a new user account during droplet creation
 
-The provider has been tested with Vagrant 1.1.5+ using Ubuntu 12.04 and
-CentOS 6.3 guest operating systems.
-
 Install
 -------
 Installation of the provider requires two steps:
@@ -37,7 +37,7 @@ Once the bundle is installed, add the following environment variable to your
 `.bash_profile` script and `source` it:
 
 ```bash
-export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
+export SSL_CERT_FILE=/usr/local/etc/openssl/cert.pem
 ```
 
 Configure
@@ -46,13 +46,97 @@ Once the provider has been installed, you will need to configure your [Chassis](
 to use it. You can use your we recommend adding your Digital Ocean details in your projects `config.yaml` or `config.local.yaml` file:
 ```bash
 digitalocean:
-  client_id: YOUR_CLIENT_ID
-  api_key: YOUR_API_KEY
-  region: 'Singapore 1'
-  size: '512MB'
-  image: 'Ubuntu 12.10 x32'
+  token: 'YOUR TOKEN'
+  region: 'sgp1'
+  size: '512mbB'
+  image: 'Ubuntu 14.04 x64'
+```
+
+You must also add the following to your project `VagrantFile`
+```
+  config.vm.provider :chassis_digitalocean do |provider, override|
+    override.ssh.private_key_path = '~/.ssh/id_rsa'
+    override.vm.box_url = 'https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digitalocean.box'
+
+    provider.token = CONF['digitalocean']['token']
+    provider.image = CONF['digitalocean']['image']
+    provider.region = CONF['digitalocean']['region']
+    provider.size = CONF['digitalocean']['size']
+
+    end
 ```
 
+**Optionally,** you can remove exclude your .git folder from the rsync by including the following line after you've specified your
+`config.vm.synced_folder`
+
+```
+    rsync__exclude: ".git/"
+```
+
+Please note the following:
+- You *must* specify the `override.ssh.private_key_path` to enable authentication
+  with the droplet. The provider will create a new Digital Ocean SSH key using
+  your public key which is assumed to be the `private_key_path` with a *.pub*
+  extension.
+- You *must* specify your Digital Ocean Personal Access Token. This may be
+  found on the control panel within the *Apps & API* section.
+
+**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.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`.
+- `provider.size` - A string representing the size to use when creating a
+  new droplet (e.g. `1gb`). It defaults to `512mb`.
+- `provider.private_networking` - A boolean flag indicating whether to enable
+  a private network interface (if the region supports private networking). It
+  defaults to `false`.
+- `provider.backups_enabled` - A boolean flag indicating whether to enable backups for
+   the droplet. It defaults to `false`.
+- `provider.ssh_key_name` - A string representing the name to use when creating
+  a Digital Ocean SSH key for droplet authentication. It defaults to `Vagrant`.
+- `provider.setup` - A boolean flag indicating whether to setup a new user
+  account and modify sudo to disable tty requirement. It defaults to `true`.
+  If you are using a tool like [packer](https://packer.io) to create
+  reusable snapshots with user accounts already provisioned, set to `false`.
+
+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
+
+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.
+
+```
+curl -X GET "https://api.digitalocean.com/v2/regions" \
+     -H "Authorization: Bearer $DIGITAL_OCEAN_TOKEN" \
+     2>/dev/null | jq '.regions [] | .slug,.name'
+```
+
+More detail: [DigitalOcean API - Regions](https://developers.digitalocean.com/#regions)
+
 Run
 ---
 After creating your project's `Vagrantfile` with the required configuration

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

@@ -15,46 +15,42 @@ module VagrantPlugins
         end
 
         def call(env)
-          ssh_key_id = env[:ssh_key_id]
-
-          size_id = @client
-            .request('/sizes')
-            .find_id(:sizes, :name => @machine.provider_config.size)
+          ssh_key_id = [env[:ssh_key_id]]
 
           image_id = @client
-            .request('/images')
+            .request('/v2/images')
             .find_id(:images, :name => @machine.provider_config.image)
 
-          region_id = @client
-            .request('/regions')
-            .find_id(:regions, :name => @machine.provider_config.region)
-
           # submit new droplet request
-          result = @client.request('/droplets/new', {
-            :size_id => size_id,
-            :region_id => region_id,
-            :image_id => image_id,
+          result = @client.post('/v2/droplets', {
+            :size => @machine.provider_config.size,
+            :region => @machine.provider_config.region,
+            :image => image_id,
             :name => @machine.config.vm.hostname || @machine.name,
-            :ssh_key_ids => ssh_key_id,
+            :ssh_keys => ssh_key_id,
             :private_networking => @machine.provider_config.private_networking,
-            :backups_enabled => @machine.provider_config.backups_enabled
+            :backups => @machine.provider_config.backups_enabled,
+            :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') 
-          @client.wait_for_event(env, result['droplet']['event_id'])
+          @client.wait_for_event(env, result['links']['actions'].first['id'])
 
           # assign the machine id for reference in other commands
           @machine.id = result['droplet']['id'].to_s
 
           # refresh droplet state with provider and output ip address
           droplet = Provider.droplet(@machine, :refresh => true)
+          public_network = droplet['networks']['v4'].find { |network| network['type'] == 'public' }
+          private_network = droplet['networks']['v4'].find { |network| network['type'] == 'private' }
           env[:ui].info I18n.t('vagrant_digital_ocean.info.droplet_ip', {
-            :ip => droplet['ip_address']
+            :ip => public_network['ip_address']
           })
-          if droplet['private_ip_address']
+          if private_network
             env[:ui].info I18n.t('vagrant_digital_ocean.info.droplet_private_ip', {
-              :ip => droplet['private_ip_address']
+              :ip => private_network['ip_address']
             })
           end
 

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

@@ -15,15 +15,10 @@ module VagrantPlugins
 
         def call(env)
           # submit destroy droplet request
-          result = @client.request("/droplets/#{@machine.id}/destroy")
+          @client.delete("/v2/droplets/#{@machine.id}")
 
           env[:ui].info I18n.t('vagrant_digital_ocean.info.destroying')
 
-          # wait for the destroy progress to start
-          @client.wait_for_event(env, result['event_id']) do |response|
-            break if response['event']['percentage'] != nil
-          end
-
           # set the machine id to nil to cleanup local vagrant state
           @machine.id = nil
 

data/lib/vagrant-chassis-digitalocean/actions/power_off.rb

@@ -1,5 +1,5 @@
-require 'vagrant-chassis-digitalocean/helpers/client'
-
+require 'vagrant-digitalocean/helpers/client'
+#TODO: --force
 module VagrantPlugins
   module DigitalOcean
     module Actions
@@ -15,11 +15,13 @@ module VagrantPlugins
 
         def call(env)
           # submit power off droplet request
-          result = @client.request("/droplets/#{@machine.id}/power_off")
+          result = @client.post("/v2/droplets/#{@machine.id}/actions", {
+            :type => 'power_off'
+          })
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_digital_ocean.info.powering_off')
-          @client.wait_for_event(env, result['event_id'])
+          @client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-chassis-digitalocean/actions/power_on.rb

@@ -15,11 +15,13 @@ module VagrantPlugins
 
         def call(env)
           # submit power on droplet request
-          result = @client.request("/droplets/#{@machine.id}/power_on")
+          result = @client.post("/v2/droplets/#{@machine.id}/actions", {
+            :type => 'power_on'
+          })
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_digital_ocean.info.powering_on') 
-          @client.wait_for_event(env, result['event_id'])
+          @client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-chassis-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
@@ -17,17 +17,18 @@ module VagrantPlugins
         def call(env)
           # look up image id
           image_id = @client
-            .request('/images')
+            .request('/v2/images')
             .find_id(:images, :name => @machine.provider_config.image)
 
           # submit rebuild request
-          result = @client.request("/droplets/#{@machine.id}/rebuild", {
-            :image_id => image_id
+          result = @client.post("/v2/droplets/#{@machine.id}/actions", {
+            :type => 'rebuild',
+            :image => image_id
           })
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_digital_ocean.info.rebuilding')
-          @client.wait_for_event(env, result['event_id'])
+          @client.wait_for_event(env, result['action']['id'])
 
           # refresh droplet state with provider
           Provider.droplet(@machine, :refresh => true)

data/lib/vagrant-chassis-digitalocean/actions/reload.rb

@@ -15,11 +15,13 @@ module VagrantPlugins
 
         def call(env)
           # submit reboot droplet request
-          result = @client.request("/droplets/#{@machine.id}/reboot")
+          result = @client.post("/v2/droplets/#{@machine.id}/actions", {
+            :type => 'reboot'
+          })
 
           # wait for request to complete
           env[:ui].info I18n.t('vagrant_digital_ocean.info.reloading')
-          @client.wait_for_event(env, result['event_id'])
+          @client.wait_for_event(env, result['action']['id'])
 
           @app.call(env)
         end

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

@@ -20,7 +20,7 @@ module VagrantPlugins
           begin
             # assigns existing ssh key id to env for use by other commands
             env[:ssh_key_id] = @client
-              .request('/ssh_keys/')
+              .request('/v2/account/keys')
               .find_id(:ssh_keys, :name => ssh_key_name)
 
             env[:ui].info I18n.t('vagrant_digital_ocean.info.using_key', {
@@ -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)
 
@@ -46,9 +46,9 @@ module VagrantPlugins
             :name => name
           }) 
 
-          result = @client.request('/ssh_keys/new', {
+          result = @client.post('/v2/account/keys', {
             :name => name,
-            :ssh_pub_key => pub_key
+            :public_key => pub_key
           })
           result['ssh_key']['id']
         end

data/lib/vagrant-chassis-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-chassis-digitalocean/actions/sync_folders.rb

@@ -17,9 +17,14 @@ 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
+            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])
@@ -47,21 +52,12 @@ module VagrantPlugins
             key = ssh_info[:private_key_path]
             key = key[0] if key.is_a?(Array)
 
-		
-            # build exclude rules
-            excludes = ['.vagrant/']
-            excludes += Array(data[:rsync__exclude]).map(&:to_s) if data[:rsync__exclude]
-            excludes.uniq!
-
-
-
             # rsync over to the guest path using the ssh info
             command = [
-              "rsync", "--verbose", "--progress", "--archive", "-z", "--delete", excludes.map { |e| "--exclude=#{e}" },
+              "rsync", "--verbose", "--archive", "-z", "--delete",
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{key}'",
               hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}",
-              { :notify => [:stdout, :stderr] } ].flatten
+              "#{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
@@ -69,12 +65,7 @@ module VagrantPlugins
               command.insert(1, "--chmod", "ugo=rwX")
             end
 
-            r = Vagrant::Util::Subprocess.execute(*command) do |type, data|
-              if type == :stdout || type == :stderr
-                @machine.env.ui.info(data, :new_line => false, :prefix => false)
-              end
-            end
-
+            r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
               raise Errors::RsyncError,
                 :guestpath => guestpath,
@@ -88,4 +79,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vagrant-chassis-digitalocean/config.rb

@@ -1,52 +1,54 @@
 module VagrantPlugins
   module DigitalOcean
     class Config < Vagrant.plugin('2', :config)
-      attr_accessor :client_id
-      attr_accessor :api_key
+      attr_accessor :token
       attr_accessor :image
       attr_accessor :region
       attr_accessor :size
       attr_accessor :private_networking
+      attr_accessor :ipv6
       attr_accessor :backups_enabled
       attr_accessor :ca_path
       attr_accessor :ssh_key_name
       attr_accessor :setup
+      attr_accessor :user_data
 
       alias_method :setup?, :setup
 
       def initialize
-        @client_id          = UNSET_VALUE
-        @api_key            = UNSET_VALUE
+        @token              = UNSET_VALUE
         @image              = UNSET_VALUE
         @region             = UNSET_VALUE
         @size               = UNSET_VALUE
         @private_networking = UNSET_VALUE
+        @ipv6               = UNSET_VALUE
         @backups_enable     = UNSET_VALUE
         @ca_path            = UNSET_VALUE
         @ssh_key_name       = UNSET_VALUE
         @setup              = UNSET_VALUE
+        @user_data          = UNSET_VALUE
       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.3 x64' if @image == UNSET_VALUE
-        @region             = 'New York 2' if @region == UNSET_VALUE
-        @size               = '512MB' if @size == UNSET_VALUE
+        @token              = ENV['DO_TOKEN'] if @token == 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
+        @ipv6               = false if @ipv6 == UNSET_VALUE
         @backups_enabled    = false if @backups_enabled == UNSET_VALUE
         @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)
         errors = []
-        errors << I18n.t('vagrant_digital_ocean.config.client_id') if !@client_id
-        errors << I18n.t('vagrant_digital_ocean.config.api_key') if !@api_key
+        errors << I18n.t('vagrant_digital_ocean.config.token') if !@token
 
         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-chassis-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/',
@@ -25,13 +25,23 @@ module VagrantPlugins
           })
         end
 
-        def request(path, params = {})
+        def delete(path, params = {}, method = :delete)
+          @client.request :url_encoded
+          request(path, params, :delete)
+        end
+
+        def post(path, params = {}, method = :post)
+          @client.headers['Content-Type'] = 'application/json'
+          request(path, params, :post)
+        end
+
+        def request(path, params = {}, method = :get)
           begin
-						@logger.info "Request: #{path}"
-            result = @client.get(path, params = params.merge({
-              :client_id => @config.client_id,
-              :api_key => @config.api_key
-            }))
+            @logger.info "Request: #{path}"
+            result = @client.send(method) do |req|
+              req.url path, params
+              req.headers['Authorization'] = "Bearer #{@config.token}"
+            end
           rescue Faraday::Error::ConnectionFailed => e
             # TODO this is suspect but because farady wraps the exception
             #      in something generic there doesn't appear to be another
@@ -43,26 +53,33 @@ module VagrantPlugins
             raise e
           end
 
-          # remove the api key in case an error gets dumped to the console
-          params[:api_key] = 'REMOVED'
-
-          begin
-            body = JSON.parse(result.body)
-						@logger.info "Response: #{body}"
-          rescue JSON::ParserError => e
-            raise(Errors::JSONError, {
-              :message => e.message,
-              :path => path,
-              :params => params,
-              :response => result.body
-            })
+          unless method == :delete
+            begin
+              body = JSON.parse(result.body)
+              @logger.info "Response: #{body}"
+              next_page = body["links"]["pages"]["next"] rescue nil
+              unless next_page.nil?
+                uri = URI.parse(next_page)
+                new_path = path.split("?")[0]
+                next_result = self.request("#{new_path}?#{uri.query}")
+                req_target = new_path.split("/")[-1]
+                body["#{req_target}"].concat(next_result["#{req_target}"])
+              end
+            rescue JSON::ParserError => e
+              raise(Errors::JSONError, {
+                :message => e.message,
+                :path => path,
+                :params => params,
+                :response => result.body
+              })
+            end
           end
 
-          if body['status'] != 'OK'
+          unless /^2\d\d$/ =~ result.status.to_s
             raise(Errors::APIStatusError, {
               :path => path,
               :params => params,
-              :status => body['status'],
+              :status => result.status,
               :response => body.inspect
             })
           end
@@ -75,11 +92,11 @@ module VagrantPlugins
             # stop waiting if interrupted
             next if env[:interrupted]
 
-            # check event status
-            result = self.request("/events/#{id}")
+            # check action status
+            result = self.request("/v2/actions/#{id}")
 
             yield result if block_given?
-            raise 'not ready' if result['event']['action_status'] != 'done'
+            raise 'not ready' if result['action']['status'] != 'completed'
           end
         end
       end

data/lib/vagrant-chassis-digitalocean/helpers/result.rb

@@ -10,14 +10,14 @@ module VagrantPlugins
           @result[key.to_s]
         end
 
-        def find_id(sub_obj, search)
+        def find_id(sub_obj, search) #:ssh_keys, {:name => 'ijin (vagrant)'}
           find(sub_obj, search)["id"]
         end
 
         def find(sub_obj, search)
-          key = search.keys.first
-          value = search[key].to_s
-          key = key.to_s
+          key = search.keys.first #:slug
+          value = search[key].to_s #sfo1
+          key = key.to_s #slug
 
           result = @result[sub_obj.to_s].inject(nil) do |result, obj|
             obj[key] == value ? obj : result

data/lib/vagrant-chassis-digitalocean/provider.rb

@@ -12,14 +12,14 @@ module VagrantPlugins
 
         # load status of droplets if it has not been done before
         if !@droplets
-          result = client.request('/droplets')
+          result = client.request('/v2/droplets')
           @droplets = result['droplets']
         end
 
         if opts[:refresh] && machine.id
           # refresh the droplet status for the given machine
           @droplets.delete_if { |d| d['id'].to_s == machine.id }
-          result = client.request("/droplets/#{machine.id}")
+          result = client.request("/v2/droplets/#{machine.id}")
           @droplets << droplet = result['droplet']
         else
           # lookup droplet status for the given machine
@@ -79,8 +79,10 @@ module VagrantPlugins
 
         return nil if droplet['status'].to_sym != :active
 
+        public_network = droplet['networks']['v4'].find { |network| network['type'] == 'public' }
+
         return {
-          :host => droplet['ip_address'],
+          :host => public_network['ip_address'],
           :port => '22',
           :username => 'root',
           :private_key_path => nil

data/lib/vagrant-chassis-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '1.0.3'
+    VERSION = '2.0.0'
   end
 end

data/locales/en.yml

@@ -19,9 +19,9 @@ 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"
+      token: "Token is required"
       private_key: "SSH private key path is required"
       public_key: "SSH public key not found: %{key}"
     errors:

data/test/Vagrantfile

@@ -1,4 +1,4 @@
-Vagrant.require_plugin('vagrant-chassis-digitalocean')
+Vagrant.require_plugin('vagrant-digitalocean')
 Vagrant.require_plugin('vagrant-omnibus')
 
 Vagrant.configure('2') do |config|
@@ -12,8 +12,7 @@ Vagrant.configure('2') do |config|
   config.vm.provider :chassis_digitalocean do |provider, override|
     override.vm.box = 'chassis_digitalocean'
     override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
-    provider.client_id = ENV['DO_CLIENT_ID']
-    provider.api_key = ENV['DO_API_KEY']
+    provider.token = ENV['DO_TOKEN']
     provider.ssh_key_name = 'Test Key'
   end
 
@@ -25,8 +24,8 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.define :ubuntu do |ubuntu|
-    ubuntu.vm.provider :chassis_digitalocean do |provider|
-      provider.image = 'Ubuntu 12.04.4 x64'
+    ubuntu.vm.provider :digital_ocean do |provider|
+      provider.image = 'Ubuntu 14.04 x64'
     end
   end
 

data/test/test.sh

@@ -1,14 +1,14 @@
-# if ! vagrant box list | grep chassis_digitalocean 1>/dev/null; then
-#     vagrant box add chassis_digitalocean box/chassis_digitalocean.box
+# if ! bundle exec vagrant box list | grep digital_ocean 1>/dev/null; then
+#     bundle exec vagrant box add digital_ocean box/digital_ocean.box
 # fi
 
 cd test
 
-vagrant up --provider=chassis_digitalocean
-vagrant up
-vagrant provision
-vagrant rebuild
-vagrant halt
-vagrant destroy
+bundle exec vagrant up --provider=digital_ocean
+bundle exec vagrant up
+bundle exec vagrant provision
+bundle exec vagrant rebuild
+bundle exec vagrant halt
+bundle exec vagrant destroy
 
 cd ..

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chassis-digitalocean
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday