kitchen-digitalocean 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78427c396eb24d16b2db9592aa9deaa0b224858c
-  data.tar.gz: b514d8afe3e1c558255adfc2236a3bb11aa5fecd
+  metadata.gz: 2fe7bdd3909e3ae69b7ba50a20c5e5b2ca191e41
+  data.tar.gz: 5f831d21a8ad796d97bf15893d819ac8701a5d49
 SHA512:
-  metadata.gz: 68800f8ffe2ebfb87b58b9cc2d40930156a32e8b51d0134cc151546cf3632ae690fc6a5f129ba9aba1704f55c3fa33436d5be05a775fcb4c64b26b0b2cb5ddbd
-  data.tar.gz: c31f73d02199d4b08c5bd83a0f2c58ed55577bdd8ee5d310f90264fbedbd231247034c50d1fdb014e0fa9bcbaa8ffb6b617563991bfd6b68167a72c54fc36e08
+  metadata.gz: 0dd3a4eba799d56a8c108d4ce00d059c7d3b348be9b4fc4ae58e7cd489eb4d52dfd211752405ba58318234d3f2be48631dec4b6618bfc92c638854e6e286cb0b
+  data.tar.gz: 42500ab5e6e2d158ccd477b1f2551198fc817367e1e044908e567d13bf8890759c79e471c94af0829ac21e0126279191b9830d39cd2dcbdb7a2e96d279b5f6ac

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.1 / 2015-06-19
+
+* [@olivielpeau](https://github.com/olivielpeau) [PR #40] Destroy properly droplets that are still "new"
+
 # 0.9.0 / 2015-04-17
 
 * [@juliandunn](https://github.com/juliandunn) [PR #37] Added the ability to pass user_data into droplet creation.

data/README.md

@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/kitchen-digitalocean.png)](http://badge.fury.io/rb/kitchen-digitalocean) 
 [![Build Status](https://travis-ci.org/test-kitchen/kitchen-digitalocean.png?branch=master)](https://travis-ci.org/test-kitchen/kitchen-digitalocean) 
 [![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-digitalocean.png)](https://codeclimate.com/github/test-kitchen/kitchen-digitalocean) 
+[![Coverage Status](https://coveralls.io/repos/test-kitchen/kitchen-digitalocean/badge.svg?branch=master)](https://coveralls.io/r/test-kitchen/kitchen-digitalocean?branch=master)
 [![Dependency Status](https://gemnasium.com/test-kitchen/kitchen-digitalocean.png)](https://gemnasium.com/test-kitchen/kitchen-digitalocean)
 
 # Kitchen::Digitalocean

data/kitchen-digitalocean.gemspec

@@ -21,16 +21,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'test-kitchen', '~> 1.2'
   spec.add_dependency 'droplet_kit', '~> 1.0'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'cane'
-  spec.add_development_dependency 'countloc'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'simplecov-console'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rubocop', '~> 0.30'
+  spec.add_development_dependency 'cane', '~> 2.6'
+  spec.add_development_dependency 'countloc', '~> 0.4'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'webmock', '~> 1.2'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'simplecov-console', '~> 0.2'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
 end
 
 # vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/lib/kitchen/driver/digitalocean.rb

@@ -57,12 +57,13 @@ module Kitchen
 
         info("Digital Ocean instance <#{state[:server_id]}> created.")
 
-        while true
+        loop do
           sleep 8
           droplet = client.droplets.find(id: state[:server_id])
 
           break if droplet && droplet.networks[:v4] && droplet.networks[:v4].any? { |n| n[:type] == 'public' }
         end
+        droplet ||= client.droplets.find(id: state[:server_id])
 
         state[:hostname] = droplet.networks[:v4]
                            .find { |n| n[:type] == 'public' }['ip_address']
@@ -74,7 +75,21 @@ module Kitchen
       def destroy(state)
         return if state[:server_id].nil?
 
-        client.droplets.delete(id: state[:server_id])
+        # A new droplet cannot be destroyed before it is active
+        # Retry destroying the droplet as long as its status is "new"
+        loop do
+          droplet = client.droplets.find(id: state[:server_id])
+
+          break if !droplet
+          if droplet.status != 'new'
+            client.droplets.delete(id: state[:server_id])
+            break
+          end
+
+          info("Waiting on Digital Ocean instance <#{state[:server_id]}> to be active to destroy it, retrying in 8 seconds")
+          sleep 8
+        end
+
         info("Digital Ocean instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)
         state.delete(:hostname)
@@ -127,7 +142,7 @@ module Kitchen
 
         if resp.class != DropletKit::Droplet
           error JSON.parse(resp)['message']
-          error "Please check your access token is set correctly."
+          error 'Please check your access token is set correctly.'
         else
           resp
         end

data/lib/kitchen/driver/digitalocean_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.9.0'
+    DIGITALOCEAN_VERSION = '0.9.1'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -51,7 +51,7 @@ describe Kitchen::Driver::Digitalocean do
 
   describe '#initialize'do
     context 'default options' do
-      it 'defaults to the smallest flavor size' do
+      it 'defaults to the smallest size' do
         expect(driver[:size]).to eq('512mb')
       end
 
@@ -88,7 +88,7 @@ describe Kitchen::Driver::Digitalocean do
     context 'overridden options' do
       config = {
         image: 'debian-7-0-x64',
-        flavor: '1gb',
+        size: '1gb',
         ssh_key_ids: '5678',
         username: 'admin',
         port: '2222',
@@ -174,6 +174,8 @@ describe Kitchen::Driver::Digitalocean do
 
     context 'a live server that needs to be destroyed' do
       it 'destroys the server' do
+        stub_request(:get, "https://api.digitalocean.com/v2/droplets/12345")
+          .to_return(find)
         stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/12345')
           .to_return(delete)
         expect(state).to receive(:delete).with(:server_id)
@@ -212,6 +214,8 @@ describe Kitchen::Driver::Digitalocean do
       end
 
       it 'does not try to destroy the server again' do
+        stub_request(:get, "https://api.digitalocean.com/v2/droplets/12345")
+          .to_return(find)
         stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/12345')
           .to_return(delete)
         allow_message_expectations_on_nil
@@ -220,40 +224,37 @@ describe Kitchen::Driver::Digitalocean do
     end
   end
 
-  # describe '#create_server' do
-  #   let(:config) do
-  #     {
-  #       server_name: 'test server',
-  #       image: 'debian-7-0-x64',
-  #       size: '2gb',
-  #       region: 'nyc3',
-  #       private_networking: true,
-  #       ssh_key_ids: '1234'
-  #     }
-  #   end
-  #   before(:each) do
-  #     @expected = config.merge(name: config[:server_name])
-  #     @expected.delete_if do |k, _v|
-  #       k == :server_name
-  #     end
-  #   end
-  #   let(:servers) do
-  #     s = double('servers')
-  #     allow(s).to receive(:create) { |arg| arg }
-  #     s
-  #   end
-  #   let(:create_server) { double(servers: servers) }
-  #   let(:driver) do
-  #     d = Kitchen::Driver::Digitalocean.new(config)
-  #     d.instance = instance
-  #     allow(d).to receive(:create_server).and_return(create_server)
-  #     d
-  #   end
-
-  #   it 'creates the server using a compute connection' do
-  #     expect(driver.send(:create_server)).to eq(@expected)
-  #   end
-  # end
+  describe '#create_server' do
+    let(:config) do
+      {
+        server_name: 'hello',
+        image: 'debian-7-0-x64',
+        size: '1gb',
+        region: 'nyc3'
+      }
+    end
+    before(:each) do
+      @expected = config.merge(name: config[:server_name])
+      @expected.delete_if do |k, _|
+        k == :server_name
+      end
+    end
+    let(:droplets) do
+      s = double('droplets')
+      allow(s).to receive(:create) { |arg| arg }
+      s
+    end
+    let(:client) { double(droplets: droplets) }
+
+    before(:each) do
+      allow_any_instance_of(described_class).to receive(:client)
+        .and_return(client)
+    end
+
+    it 'creates the server using a compute connection' do
+      expect(driver.send(:create_server).to_h).to include(@expected)
+    end
+  end
 
   describe '#default_name' do
     let(:login) { 'user' }

data/spec/mocks/find.txt

@@ -0,0 +1,81 @@
+HTTP/1.1 200 OK
+Server: cloudflare-nginx
+Date: Thu, 21 Aug 2014 23:51:40 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Set-Cookie: __cfduid=de2ed0d345ecce441bb505881fcf50d341408665100399; expires=Mon, 23-Dec-2019 23:50:00 GMT; path=/; domain=.digitalocean.com; HttpOnly
+Status: 200 OK
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+X-Content-Type-Options: nosniff
+RateLimit-Limit: 5000
+RateLimit-Remaining: 4983
+RateLimit-Reset: 1432053600
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 49ed05f3-328b-406c-99b0-e3a2ddadafa3
+X-Runtime: 0.236491
+CF-RAY: 1e90fbb7d41b0707-SJC
+
+{
+  "droplet": {
+    "id": 1234,
+    "name": "test-droplet",
+    "memory": 512,
+    "vcpus": 1,
+    "disk": 20,
+    "locked": false,
+    "status": "active",
+    "kernel": {
+      "id": 4703,
+      "name": "Ubuntu 14.04 x64 vmlinuz-3.13.0-52-generic",
+      "version": "3.13.0-52-generic"
+    },
+    "created_at": "2014-05-02T18:16:21Z",
+    "features": [
+      "virtio"
+    ],
+    "backup_ids": [],
+    "next_backup_window": null,
+    "snapshot_ids": [],
+    "image": {
+      "id": 11836690,
+      "name": "14.04 x64",
+      "distribution": "Ubuntu",
+      "slug": "ubuntu-14-04-x64",
+      "public": true,
+      "regions": ["nyc1", "ams1", "sfo1", "nyc2", "ams2", "sgp1", "lon1", "nyc3", "ams3", "fra1"],
+      "created_at": "2015-05-12T23:51:05Z",
+      "min_disk_size": 20,
+      "type": "snapshot"
+    },
+    "size": {
+      "slug": "512mb",
+      "memory": 512,
+      "vcpus": 1,
+      "disk": 20,
+      "transfer": 1.0,
+      "price_monthly": 5.0,
+      "price_hourly": 0.00744,
+      "regions": ["nyc1", "sgp1", "ams1", "sfo1", "nyc2", "lon1", "nyc3", "ams3", "ams2", "fra1"],
+      "available": true
+    },
+    "size_slug": "512mb",
+    "networks": {
+      "v4": [{
+        "ip_address": "45.55.141.244",
+        "netmask": "255.255.192.0",
+        "gateway": "45.55.128.1",
+        "type": "public"
+      }],
+      "v6": []
+    },
+    "region": {
+      "name": "New York 3",
+      "slug": "nyc3",
+      "sizes": ["32gb", "16gb", "2gb", "1gb", "4gb", "8gb", "512mb", "64gb", "48gb"],
+      "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"],
+      "available": true
+    }
+  }
+}

data/spec/spec_helper.rb

@@ -45,4 +45,8 @@ def auth_error
   File.read(File.join(File.dirname(__FILE__), 'mocks', 'auth_error.txt'))
 end
 
+def find
+  File.read(File.join(File.dirname(__FILE__), 'mocks', 'find.txt'))
+end
+
 # vim: ai et ts=2 sts=2 sw=2 ft=ruby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -42,142 +42,142 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: A Test Kitchen Driver for Digital Ocean
 email:
 - greg@gregf.org
@@ -200,6 +200,7 @@ files:
 - spec/mocks/auth_error.txt
 - spec/mocks/create.txt
 - spec/mocks/delete.txt
+- spec/mocks/find.txt
 - spec/spec_helper.rb
 homepage: https://github.com/test-kitchen/kitchen-digitalocean
 licenses:
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean
@@ -230,4 +231,5 @@ test_files:
 - spec/mocks/auth_error.txt
 - spec/mocks/create.txt
 - spec/mocks/delete.txt
+- spec/mocks/find.txt
 - spec/spec_helper.rb