vagrant-digitalocean 0.2.4 → 0.3.0

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2'
+gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7'
 gem 'vagrant-omnibus'
+gem 'rake'
 gemspec

data/README.md

@@ -7,10 +7,7 @@ management of [Digital Ocean](https://www.digitalocean.com/) droplets
 **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. The custom `rebuild` command will not work until a
-[pull request](https://github.com/schisamo/vagrant-omnibus/pull/21)
-is accepted within the `vagrant-omnibus` project. I will update the README
-when this is completed.
+to install.
 
 Current features include:
 - create and destroy droplets
@@ -20,7 +17,7 @@ Current features include:
 - 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
+The provider has been tested with Vagrant 1.1.5+ using Ubuntu 12.04 and
 CentOS 6.3 guest operating systems.
 
 Install
@@ -73,9 +70,6 @@ Please note the following:
   extension.
 - You *must* specify your Digital Ocean Client and API keys. These may be
   found on the control panel within the *My Settings > API Access* section.
-- The Chef provisioner is installed via the
-  [`vagrant-omnibus` plugin](https://github.com/schisamo/vagrant-omnibus).
-  Please see its documentation for details. 
 
 **Supported Configuration Attributes**
 
@@ -83,24 +77,21 @@ 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).
-   It defaults to `Ubuntu 12.04 x64 Server`.
+   It defaults to `Ubuntu 12.04 x64`.
 - `provider.region` - A string representing the region to create the new
-   droplet in. The available options are `New York 1` and `Amsterdam 1`. It
-   defaults to `New York 1`.
+   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.ssh_key_name` - A String representing the name to use when creating
+- `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`.
-
-By default, the provider will create a new user account, `vagrant`, and setup
-the specified SSH key for authentication. To change the user, set
-`config.ssh.username` to the name of the account to create. When Vagrant 1.2 is
-released, a new user account will only be created if `config.ssh.username` is
-set.
-
-*NOTE:* For those using a 0.0.x version of the provider,
-`provider.ssh_username` and `provider.ssh_private_key_path` have been removed
-in favor of the configuration options above.
+- `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`.
 
 Run
 ---

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

@@ -51,13 +51,16 @@ module VagrantPlugins
             :ip => droplet['ip_address']
           })
 
-          # wait for ssh to be ready using the root user account
+          # wait for ssh to be ready
+          switch_user = @machine.provider_config.setup?
           user = @machine.config.ssh.username
-          @machine.config.ssh.username = 'root'
+          @machine.config.ssh.username = 'root' if switch_user
+
           retryable(:tries => 120, :sleep => 10) do
             next if env[:interrupted]
             raise 'not ready' if !@machine.communicate.ready?
           end
+
           @machine.config.ssh.username = user
 
           @app.call(env)

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

@@ -9,7 +9,10 @@ module VagrantPlugins
         end
 
         def call(env)
-          # override ssh username to root temporarily
+          # check if setup is enabled
+          return @app.call(env) unless @machine.provider_config.setup?
+
+          # override ssh username to root
           user = @machine.config.ssh.username
           @machine.config.ssh.username = 'root'
 

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

@@ -9,8 +9,11 @@ module VagrantPlugins
         end
 
         def call(env)
+          # check if setup is enabled
+          return @app.call(env) unless @machine.provider_config.setup?
+
           # check if a username has been specified
-          return @app.call(env) if !@machine.config.ssh.username
+          return @app.call(env) unless @machine.config.ssh.username
 
           # override ssh username to root temporarily
           user = @machine.config.ssh.username

data/lib/vagrant-digitalocean/config.rb

@@ -8,6 +8,9 @@ module VagrantPlugins
       attr_accessor :size
       attr_accessor :ca_path
       attr_accessor :ssh_key_name
+      attr_accessor :setup
+
+      alias_method :setup?, :setup
 
       def initialize
         @client_id    = UNSET_VALUE
@@ -17,6 +20,7 @@ module VagrantPlugins
         @size         = UNSET_VALUE
         @ca_path      = UNSET_VALUE
         @ssh_key_name = UNSET_VALUE
+        @setup        = UNSET_VALUE
       end
 
       def finalize!
@@ -27,6 +31,7 @@ module VagrantPlugins
         @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
       end
 
       def validate(machine)

data/lib/vagrant-digitalocean/provider.rb

@@ -79,11 +79,10 @@ module VagrantPlugins
 
         return nil if droplet['status'].to_sym != :active
 
-        # TODO remove config.ssh.username reference when Vagrant 1.2 is released
         return {
           :host => droplet['ip_address'],
           :port => '22',
-          :username => @machine.config.ssh.username || 'root',
+          :username => 'root',
           :private_key_path => nil
         }
       end

data/lib/vagrant-digitalocean/version.rb

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

data/test/Vagrantfile

@@ -4,18 +4,16 @@ Vagrant.require_plugin('vagrant-omnibus')
 Vagrant.configure('2') do |config|
   config.omnibus.chef_version = :latest
 
-  config.vm.box = 'digital_ocean'
-
   config.ssh.username = 'tester'
   config.ssh.private_key_path = 'test_id_rsa'
 
   config.vm.synced_folder '.', '/vagrant', :disabled => true
 
-  config.vm.provider :digital_ocean do |provider|
+  config.vm.provider :digital_ocean do |provider, override|
+    override.vm.box = 'digital_ocean'
+    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.region = 'New York 1'
-    provider.size = '512MB'
     provider.ssh_key_name = 'Test Key'
   end
 
@@ -28,7 +26,7 @@ Vagrant.configure('2') do |config|
 
   config.vm.define :ubuntu do |ubuntu|
     ubuntu.vm.provider :digital_ocean do |provider|
-      provider.image = 'Ubuntu 12.04 x64 Server'
+      provider.image = 'Ubuntu 12.04 x64'
     end
   end
 

data/test/test.sh

@@ -1,6 +1,6 @@
-if ! vagrant box list | grep digital_ocean 1>/dev/null; then
-    vagrant box add digital_ocean box/digital_ocean.box
-fi
+# if ! vagrant box list | grep digital_ocean 1>/dev/null; then
+#     vagrant box add digital_ocean box/digital_ocean.box
+# fi
 
 cd test
 

metadata

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