vagrant-digitalocean 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d25d71a7736e890b2690c5f6da785e9ba9002de
-  data.tar.gz: 645d770371e722a0037bac2d3ef29860b7c9f6c7
+  metadata.gz: a7712f3d6c24ad17b4036e94c73407efc36d8f1e
+  data.tar.gz: 97936d9df0dd3fc5b25c1d35d86143d0c757e774
 SHA512:
-  metadata.gz: 879e4bb295023cc2fa52b8bda80f9b1ee774c62c6edfd5817a1fca8c24fa0ce538a603ad9f8a65ee43d0e620cf77f33315e153b6de32f2d2a31f929e4b3b2747
-  data.tar.gz: 9e6b1d61b080d828c2c593126a36ef3f3deea301e35de718f6e3b79ba89f6f2ab8ebdc5a0be68f2dca6090da53b20aeb227ae11507cc33d6ab743ec7ce4d9bf6
+  metadata.gz: 30fabe81907e9ecc94198cbb2bb397cb66408eaf3700b8f2cfa8e2564e845903671f0aada4771024c71f967a2c4c53a418ae915d4d18e773d248254e0be13433
+  data.tar.gz: cc3d5a10e27a06aee9f86c837329ff5d86c98dbee8976bebb8508dd316224da662b336d6b8d2bde0deaf98b44859d6a650ee03d004ae1af67d69d88954550667

data/README.md

@@ -1,6 +1,11 @@
-Digital Ocean Vagrant Provider
+DigitalOcean Vagrant Provider
 ==============================
-`vagrant-digitalocean` is a provider plugin for Vagrant that supports the management of [Digital Ocean](https://www.digitalocean.com/) droplets (instances).
+
+[![Gem](https://img.shields.io/gem/dt/vagrant-digitalocean.svg)](https://rubygems.org/gems/vagrant-digitalocean)
+[![Gem](https://img.shields.io/gem/dtv/vagrant-digitalocean.svg)](https://rubygems.org/gems/vagrant-digitalocean)
+[![Twitter](https://img.shields.io/twitter/url/https/github.com/smdahlen/vagrant-digitalocean.svg?style=social)](https://twitter.com/intent/tweet?text=Check%20out%20this%20awesome%20Vagrant%20plugin%21&url=https%3A%2F%2Fgithub.com%2Fsmdahlen%2Fvagrant-digitalocean&hashtags=vagrant%2Cdigitalocean&original_referer=)
+
+`vagrant-digitalocean` is a provider plugin for Vagrant that supports the management of [DigitalOcean](https://www.digitalocean.com/) droplets (instances).
 
 Features include:
 - create and destroy droplets
@@ -22,7 +27,7 @@ Install the provider plugin using the Vagrant command-line interface:
 
 Configure
 ---------
-Once the provider has been installed, you will need to configure your project to use it. The most basic `Vagrantfile` to create a droplet on Digital Ocean is shown below:
+Once the provider has been installed, you will need to configure your project to use it. The most basic `Vagrantfile` to create a droplet on DigitalOcean is shown below:
 
 ```ruby
 Vagrant.configure('2') do |config|
@@ -41,27 +46,27 @@ end
 ```
 
 **Configuration Requirements**
-- 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 at `provider.token`. This may be found on the control panel within the *Apps & API* section.
+- You *must* specify the `override.ssh.private_key_path` to enable authentication with the droplet. The provider will create a new DigitalOcean SSH key using your public key which is assumed to be the `private_key_path` with a *.pub* extension.
+- You *must* specify your DigitalOcean Personal Access Token at `provider.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. It defaults to `ubuntu-14-04-x64`.
-    List available images with the `digitalocean-list images $DIGITAL_OCEAN_TOKEN` command. Like when using the DigitalOcean API directly, [it can be an image ID or slug](https://developers.digitalocean.com/documentation/v2/#create-a-new-droplet).
+    List available images with the `vagrant digitalocean-list images $DIGITAL_OCEAN_TOKEN` command. Like when using the DigitalOcean API directly, [it can be an image ID or slug](https://developers.digitalocean.com/documentation/v2/#create-a-new-droplet).
 - `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 $DIGITAL_OCEAN_TOKEN` command.
+    * A string representing the region to create the new droplet in. It defaults to `nyc2`. List available regions with the `vagrant digitalocean-list regions $DIGITAL_OCEAN_TOKEN` command.
 - `provider.size`
-    * A string representing the size to use when creating a new droplet (e.g. `1gb`). It defaults to `512mb`. List available sizes with the `digitalocean-list sizes $DIGITAL_OCEAN_TOKEN` command.
+    * A string representing the size to use when creating a new droplet (e.g. `1gb`). It defaults to `512mb`. List available sizes with the `vagrant digitalocean-list sizes $DIGITAL_OCEAN_TOKEN` 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`.
 - `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`.
+    * A string representing the name to use when creating a DigitalOcean 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`.
 - `config.vm.synced_folder`
@@ -129,9 +134,10 @@ To release a new version of vagrant-digitalocean you will need to do the followi
 
 *(only contributors of the GitHub repo and owners of the project at RubyGems will have rights to do this)*
 
-1. First, create a tag and push:
-    * `git tag -a v0.7.6 -m 'v0.7.6'`
-2. Then, create a release on Github with the same versioning convention:
+1. First, bump the version in ~/lib/vagrant-digitalocean/version.rb:
+    * Follow [Semantic Versioning](http://semver.org/).
+2. Then, create a matching GitHub Release (this will also create a tag):
+    * Preface the version number with a `v`.
     * https://github.com/smdahlen/vagrant-digitalocean/releases
 3. You will then need to build and push the new gem to RubyGems:
     * `rake gem:build`

data/lib/vagrant-digitalocean/actions.rb

@@ -1,6 +1,7 @@
 require 'vagrant-digitalocean/actions/check_state'
 require 'vagrant-digitalocean/actions/create'
 require 'vagrant-digitalocean/actions/destroy'
+require 'vagrant-digitalocean/actions/shut_down'
 require 'vagrant-digitalocean/actions/power_off'
 require 'vagrant-digitalocean/actions/power_on'
 require 'vagrant-digitalocean/actions/rebuild'
@@ -112,7 +113,11 @@ module VagrantPlugins
           builder.use Call, CheckState do |env, b|
             case env[:machine_state]
             when :active
-              b.use PowerOff
+              if env[:force_halt] 
+                b.use PowerOff
+              else
+                b.use ShutDown
+              end
             when :off
               env[:ui].info I18n.t('vagrant_digital_ocean.info.already_off')
             when :not_created

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

@@ -15,15 +15,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          # look up image id
-          image_id = @client
-            .request('/v2/images')
-            .find_id(:images, :slug => @machine.provider_config.image)
 
           # submit rebuild request
           result = @client.post("/v2/droplets/#{@machine.id}/actions", {
             :type => 'rebuild',
-            :image => image_id
+            :image => @machine.provider_config.image
           })
 
           # wait for request to complete

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

@@ -0,0 +1,33 @@
+require 'vagrant-digitalocean/helpers/client'
+
+module VagrantPlugins
+  module DigitalOcean
+    module Actions
+      class ShutDown
+        include Helpers::Client
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+          @client = client
+          @logger = Log4r::Logger.new('vagrant::digitalocean::shut_down')
+        end
+
+        def call(env)
+          # submit shutdown droplet request
+          result = @client.request("/droplets/#{@machine.id}/shutdown")
+
+          # wait for request to complete
+          env[:ui].info I18n.t('vagrant_digital_ocean.info.shutting_down')
+          @client.wait_for_event(env, result['event_id'])
+
+          # refresh droplet state with provider
+          Provider.droplet(@machine, :refresh => true)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+

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

@@ -6,7 +6,7 @@ module VagrantPlugins
     module Commands
       class List < Vagrant.plugin('2', :command)
         def self.synopsis
-          "list available images and regions from Digital Ocean"
+          "list available images and regions from DigitalOcean"
         end
 
         def execute

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

@@ -4,6 +4,12 @@ module VagrantPlugins
   module DigitalOcean
     module Commands
       class Rebuild < Vagrant.plugin('2', :command)
+
+        # Show description when `vagrant list-commands` is triggered
+        def self.synopsis
+          "plugin: vagrant-digitalocean: destroys and ups the vm with the same ip address"
+        end
+
         def execute
           opts = OptionParser.new do |o|
             o.banner = 'Usage: vagrant rebuild [vm-name]'

data/lib/vagrant-digitalocean/config.rb

@@ -57,7 +57,7 @@ module VagrantPlugins
           })
         end
 
-        { 'Digital Ocean Provider' => errors }
+        { 'DigitalOcean Provider' => errors }
       end
     end
   end

data/lib/vagrant-digitalocean/provider.rb

@@ -5,7 +5,7 @@ module VagrantPlugins
     class Provider < Vagrant.plugin('2', :provider)
 
       # This class method caches status for all droplets within
-      # the Digital Ocean account. A specific droplet's status
+      # the DigitalOcean account. A specific droplet's status
       # may be refreshed by passing :refresh => true as an option.
       def self.droplet(machine, opts = {})
         client = Helpers::ApiClient.new(machine)

data/lib/vagrant-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DigitalOcean
-    VERSION = '0.7.7'
+    VERSION = '0.7.8'
   end
 end

data/locales/en.yml

@@ -9,6 +9,7 @@ en:
       droplet_ip: "Assigned IP address: %{ip}"
       droplet_private_ip: "Private IP address: %{ip}"
       destroying: "Destroying the droplet..."
+      shutting_down: "Shutting down the droplet..."
       powering_off: "Powering off the droplet..."
       powering_on: "Powering on the droplet..."
       rebuilding: "Rebuilding the droplet..."
@@ -24,7 +25,7 @@ en:
       images_with_regions: "Description                                        Slug                 ID                 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}'
+      list_error: 'Could not contact the DigitalOcean API: %{message}'
     config:
       token: "Token is required"
       private_key: "SSH private key path is required"
@@ -37,7 +38,7 @@ en:
 
         Please check the file's permissions.
       api_status: |-
-        There was an issue with the request made to the Digital Ocean
+        There was an issue with the request made to the DigitalOcean
         API at:
 
         Path: %{path}
@@ -55,7 +56,7 @@ en:
         Guest path: %{guestpath}
         Error: %{stderr}
       json: |-
-        There was an issue with the JSON response from the Digital Ocean
+        There was an issue with the JSON response from the DigitalOcean
         API at:
 
         Path: %{path}
@@ -74,7 +75,7 @@ en:
 
         Please ensure that the configured value exists in the collection.
       certificate: |-
-        The secure connection to the Digital Ocean API has failed. Please
+        The secure connection to the DigitalOcean API has failed. Please
         ensure that your local certificates directory is defined in the
         provider config.
 
@@ -86,4 +87,4 @@ en:
         with the Ruby install being unaware of the system specific ca
         certs.
       local_ip: |-
-        The Digital Ocean provider was unable to determine the host's IP.
+        The DigitalOcean provider was unable to determine the host's IP.

data/vagrant-digitalocean.gemspec

@@ -6,9 +6,9 @@ require 'vagrant-digitalocean/version'
 Gem::Specification.new do |gem|
   gem.name          = "vagrant-digitalocean"
   gem.version       = VagrantPlugins::DigitalOcean::VERSION
-  gem.authors       = ["John Bender"]
-  gem.email         = ["john.m.bender@gmail.com"]
-  gem.description   = %q{Enables Vagrant to manage Digital Ocean droplets}
+  gem.authors       = ["John Bender","Seth Reeser"]
+  gem.email         = ["john.m.bender@gmail.com","info@devopsgroup.io"]
+  gem.description   = %q{Enables Vagrant to manage DigitalOcean droplets}
   gem.summary       = gem.description
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - John Bender
+- Seth Reeser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,15 +53,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Enables Vagrant to manage Digital Ocean droplets
+description: Enables Vagrant to manage DigitalOcean droplets
 email:
 - john.m.bender@gmail.com
+- info@devopsgroup.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,6 +81,7 @@ files:
 - lib/vagrant-digitalocean/actions/setup_key.rb
 - lib/vagrant-digitalocean/actions/setup_sudo.rb
 - lib/vagrant-digitalocean/actions/setup_user.rb
+- lib/vagrant-digitalocean/actions/shut_down.rb
 - lib/vagrant-digitalocean/actions/sync_folders.rb
 - lib/vagrant-digitalocean/commands/list.rb
 - lib/vagrant-digitalocean/commands/rebuild.rb
@@ -120,7 +122,7 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Enables Vagrant to manage Digital Ocean droplets
+summary: Enables Vagrant to manage DigitalOcean droplets
 test_files:
 - test/Vagrantfile
 - test/cookbooks/test/recipes/default.rb

data/CHANGELOG.md

@@ -1,8 +0,0 @@
-Changelog
-=========
-
-0.5.1
------
-- added confirmation for `vagrant destroy` [tmatilai]
-- added `ProvisionerCleanup` middleware to destroy action [tmatilai]
-- fixed break from destroy action [tmatilai]