vagrant-digitalocean 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGJlMDI2MjE0N2UzMTQwMDY5MjYzNThkNDg0OGRmOTY0NzJjNTNlOA==
-  data.tar.gz: !binary |-
-    OGJlZTgwZGM2NzU1M2I3ZmQ2YTBkZmZhM2UzZTQxM2I3MDM0OWFiZQ==
+SHA1:
+  metadata.gz: 6b505b44641b6c612ed3f9415a063788a97697ed
+  data.tar.gz: cd483c6ca13e403373dbda1436d866c586f4c7a4
 SHA512:
-  metadata.gz: !binary |-
-    NmUwMWI4ZjMyMTA3Y2U4NzE3MDk4M2M4Nzk2YTYyYjU0MzAxZjQ3MjcyZmZh
-    ODVlOGNlYTQ1ODUzZmIzZTI5NWFmODU4YjIwZjYzZDBiMGY3ZjVkZDY2ODAz
-    YzUxZmU5ZTkzMjBmNzk5NzM3MzhiY2QyNWNiMzU2MTljMjJjYzU=
-  data.tar.gz: !binary |-
-    NGE0ZWEzMTA2MDgyMjQ1MmNiNzI2OTgzYjMxM2YxMjdiYWYwMzUwZmJkZTY4
-    YjUyZmY5ZGY1MTdmYjUxMmNmZjQ2ZDMzZGFjOTk1OTZjODI2ZTJiYzZmMzJk
-    NGE2ZWFhZTdmYzU3MzgwYmM1MWYwOGNiZjVlZmEzYzUxYzBlNWI=
+  metadata.gz: 6a4dcfbb3dde87819cf34839d28fcbb3f8af6f2e622b1cf1cbc753e137e6ab099ade9323f703896d79149985bd88078616783113da279bb7c02c6fabe6e9f0ee
+  data.tar.gz: 665a616d3bf05643c7d95abfbf739141bc9b7d33d607d46752be5da6e1192c9f2fbd29ee383184fdb4d9fa9b239775f95be821537f1b5c1b37bc0fe6ef96afb9

data/README.md

@@ -78,7 +78,7 @@ Please note the following:
 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).
+   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`.

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

@@ -29,7 +29,7 @@ module VagrantPlugins
             :name => @machine.config.vm.hostname || @machine.name,
             :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
           })
 
           # wait for request to complete
@@ -41,12 +41,14 @@ module VagrantPlugins
 
           # 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-digitalocean/helpers/client.rb

@@ -60,8 +60,9 @@ module VagrantPlugins
               next_page = body["links"]["pages"]["next"] rescue nil
               unless next_page.nil?
                 uri = URI.parse(next_page)
-                next_result = self.request("#{path}?#{uri.query}")
-                req_target = path.split("/")[-1]
+                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

data/lib/vagrant-digitalocean/provider.rb

@@ -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['networks']['v4'].first['ip_address'],
+          :host => public_network['ip_address'],
           :port => '22',
           :username => 'root',
           :private_key_path => nil

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - John Bender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-07-31 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
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -106,17 +106,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.3.0
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Digital Ocean droplets