vagrant-digitalocean 0.3.0 → 0.4.0

data/README.md

@@ -82,6 +82,9 @@ The following attributes are available to further configure the provider:
    droplet in. It defaults to `New York 2`.
 - `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.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

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

@@ -35,7 +35,8 @@ module VagrantPlugins
             :region_id => region_id,
             :image_id => image_id,
             :name => @machine.config.vm.hostname || @machine.name,
-            :ssh_key_ids => ssh_key_id
+            :ssh_key_ids => ssh_key_id,
+            :private_networking => @machine.provider_config.private_networking
           })
 
           # wait for request to complete
@@ -50,6 +51,11 @@ module VagrantPlugins
           env[:ui].info I18n.t('vagrant_digital_ocean.info.droplet_ip', {
             :ip => droplet['ip_address']
           })
+          if droplet['private_ip_address']
+            env[:ui].info I18n.t('vagrant_digital_ocean.info.droplet_private_ip', {
+              :ip => droplet['private_ip_address']
+            })
+          end
 
           # wait for ssh to be ready
           switch_user = @machine.provider_config.setup?

data/lib/vagrant-digitalocean/config.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
       attr_accessor :image
       attr_accessor :region
       attr_accessor :size
+      attr_accessor :private_networking
       attr_accessor :ca_path
       attr_accessor :ssh_key_name
       attr_accessor :setup
@@ -13,25 +14,27 @@ module VagrantPlugins
       alias_method :setup?, :setup
 
       def initialize
-        @client_id    = UNSET_VALUE
-        @api_key      = UNSET_VALUE
-        @image        = UNSET_VALUE
-        @region       = UNSET_VALUE
-        @size         = UNSET_VALUE
-        @ca_path      = UNSET_VALUE
-        @ssh_key_name = UNSET_VALUE
-        @setup        = UNSET_VALUE
+        @client_id          = UNSET_VALUE
+        @api_key            = UNSET_VALUE
+        @image              = UNSET_VALUE
+        @region             = UNSET_VALUE
+        @size               = UNSET_VALUE
+        @private_networking = UNSET_VALUE
+        @ca_path            = UNSET_VALUE
+        @ssh_key_name       = UNSET_VALUE
+        @setup              = 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 x64' if @image == UNSET_VALUE
-        @region       = 'New York 2' if @region == UNSET_VALUE
-        @size         = '512MB' if @size == 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
+        @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 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
+        @ca_path            = nil if @ca_path == UNSET_VALUE
+        @ssh_key_name       = 'Vagrant' if @ssh_key_name == UNSET_VALUE
+        @setup              = true if @setup == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/locales/en.yml

@@ -7,6 +7,7 @@ en:
       already_off: "Droplet is already off"
       creating: "Creating a new droplet..."
       droplet_ip: "Assigned IP address: %{ip}"
+      droplet_private_ip: "Private IP address: %{ip}"
       destroying: "Destroying the droplet..."
       powering_off: "Powering off the droplet..."
       powering_on: "Powering on the droplet..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &17944820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *17944820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17944260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17944260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &17943140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17943140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables Vagrant to manage Digital Ocean droplets
 email:
 - john.m.bender@gmail.com
@@ -108,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Enables Vagrant to manage Digital Ocean droplets