kitchen-digitalocean 0.7.3 → 0.8.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f885cf0d249e949127b295ac1a215ed4b142ab1
-  data.tar.gz: 41022de5f7f10444d22aca593bfe2fab4c62d005
+  metadata.gz: ccc0c06837baf2d9f228b5415b1b8d663900b1e6
+  data.tar.gz: 7698c10da2f2b786a3d032273b452d2de1ea83c7
 SHA512:
-  metadata.gz: 30619cb5995d13eab48619ec4211232286cb2b958b813aaa2da7fa7c3489436f714f522dba43f29f7415a0dc4be0942d087297ad7500f2db8aaba8a1003f6602
-  data.tar.gz: d0acaf2b32e66fd016c56e9bcbf9968c3eaa8738aa122998d54ac4eef822c134e6b576b7e2167293f91c1dec080635b250cd0bc699f14c80b5efd06174b9e076
+  metadata.gz: 1a3f917e5742397efe95e9fa4c216dac32f4878961f9a43a32dd2fbdcb81003c39b851f8abdf72e5c54dcf793943b932a0511c5be882df855eae44a539504ca0
+  data.tar.gz: e389ffc4079832011843131960d752fa2d1dcebd95f0209f8b27e4465a821e61e77ff39f01953f6f9d631f84efe7ada31d32a22ebc567fb94310bdd9af8a8314

data/.rubocop.yml

@@ -3,6 +3,3 @@ Documentation:
 
 Semicolon:
   Enabled: false
-
-Style/ClassLength:
-  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.8.0.pre1 / 2014-08-21
+
+***Breaking Changes***
+
+From this version on the driver uses API V2, the use of image_id, flavor_id, and region_id has been replaced
+with image, size, region. You can now rely on slugs instead of uses IDs. Please refer to the readme for additional information.
+
+* Upgrade to API V2
+* Drop Fog, for [droplet_kit](https://github.com/digitaloceancloud/droplet_kit)
+
 # 0.7.3 / 2014-08-19
 
 * Add id for New York 3

data/README.md

@@ -1,4 +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) [![Dependency Status](https://gemnasium.com/test-kitchen/kitchen-digitalocean.png)](https://gemnasium.com/test-kitchen/kitchen-digitalocean)
+[![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) 
+[![Dependency Status](https://gemnasium.com/test-kitchen/kitchen-digitalocean.png)](https://gemnasium.com/test-kitchen/kitchen-digitalocean)
 
 # Kitchen::Digitalocean
 
@@ -7,6 +10,13 @@ A Test Kitchen Driver for Digital Ocean
 Shamelessly copied from [RoboticCheese](https://github.com/RoboticCheese)'s
 awesome work on an [Rackspace driver](https://github.com/RoboticCheese/kitchen-rackspace).
 
+# Upgrading
+
+From this version forward the driver uses [API V2](https://developers.digitalocean.com/) only.
+Use of image_id, flavor_id, and region_id have been replaced with image, size, and region.
+You can now use slugs instead of relying on the old data.json to translate IDs. 
+Please refer to the examples below, and the API documentation for more information.
+
 # Requirements
 
 There are no external system requirements for this driver. However you will need access to an [DigitalOcean](https://digitalocean.com/) account.
@@ -35,14 +45,13 @@ At minimum, you'll need to tell test-kitchen to use the digitalocean driver.
 driver:
   - name: digitalocean
 platforms:
-  - name: ubuntu-12.10
+  - name: ubuntu-12-10-x64
 ```
 
 You also have the option of providing your credentials from environment variables.
 
 ```bash
-export DIGITALOCEAN_CLIENT_ID="1234"
-export DIGITALOCEAN_API_KEY="5678"
+export DIGITALOCEAN_ACCESS_TOKEN="1234"
 export DIGITALOCEAN_SSH_KEY_IDS="1234, 5678"
 ```
 
@@ -50,77 +59,49 @@ Note that your `SSH_KEY_ID` must be the numeric id of your ssh key, not the symb
 of your keys, use something like to following command to get them from the digital ocean API:
 
 ```bash
-curl -X GET https://api.digitalocean.com/v2/account/keys -H "Authorization: Bearer $DIGITALOCEAN_API_KEY"
+curl -X GET https://api.digitalocean.com/v2/account/keys -H "Authorization: Bearer $DIGITALOCEAN_ACCESS_TOKEN"
 ```
 
 Please refer to the [Getting Started Guide](http://kitchen.ci/) for any further documentation.
 
 # Default Configuration
 
-This driver can determine the image_id for a select number of platforms in each region. Currently, the following platform names are supported:
-
-```ruby
----
-platforms:
-- name: ubuntu-10.04
-- name: ubuntu-12.04
-- name: ubuntu-14.04
-- name: centos-5.8
-- name: centos-6.4
-- name: centos-6.5
-- name: centos-7.0
-- name: debian-6.0
-- name: debian-7.0
-- name: fedora-19
-- name: fedora-20
-```
+The driver now uses api v2 which provides slugs for image names, sizes, and regions.
 
-This will effectively generate a configuration similar to:
+Example configuration:
 
 ```ruby
 ---
 platforms:
-- name: ubuntu-10.04
-  driver_config:
-    image_id: 14097
-- name: ubuntu-12.04
+- name: debian-7-0-x64
   driver_config:
-    image_id: 3101045
-# ...
-- name: centos-5.8
+    region: ams1
+- name: centos-6-4-x64
   driver_config:
-    image_id: 1601
+    size: 2gb
 # ...
 ```
 
-`flavor_id` and `region_id` can be set from the more friendly options flavor, and region like so.
-
-```ruby
-driver:
-- region: amsterdam 2
-- flavor: 8GB
-```
+# Private Networking
 
-This will generate a configuration similiar to:
+Private networking is enabled by default, but will only work in certain regions. You can disable private networking by changing private_networking to
+false. Example below.
 
 ```ruby
 ---
 driver:
-- region_id: 5
-- flavor: 65
+  - private_networking: false
 ```
 
-For specific default values, please consult [digitalocean.json](https://github.com/test-kitchen/kitchen-digitalocean/blob/master/data/digitalocean.json).
+# IPv6
 
-# Private Networking
+IPv6 is disabled by default, you can enable this if needed. IPv6 is only available in limited regions.
 
-Private networking is enabled by default, but will only work in certain regions. You can disable private networking by changing private_networking to
-false. Example below.
 
 ```ruby
 ---
 driver:
-  - private_networking: false
+  - ipv6: true
 ```
 
 # Development
@@ -142,6 +123,10 @@ example:
 
 Created and maintained by [Greg Fitzgerald](https://github.com/gregf/) (<greg@gregf.org>)
 
+Special Thanks
+
+[Will Farrington](@https://github.com/wfarr/kitchen-digital_ocean), His fork was a help during the creation of my api v2 driver.
+
 # License
 
 Apache 2.0 (see [LICENSE](https://github.com/test-kitchen/kitchen-digitalocean/blob/master/LICENSE.txt))

data/kitchen-digitalocean.gemspec

@@ -18,14 +18,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.0'
-  spec.add_dependency 'fog'
+  spec.add_dependency 'test-kitchen', '~> 1.2'
+  spec.add_dependency 'droplet_kit', '~> 1.0'
 
-  spec.add_development_dependency 'rubocop'
+  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'
 end
 
 # vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/lib/kitchen/driver/digitalocean.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 require 'benchmark'
-require 'fog'
+require 'droplet_kit'
 require 'kitchen'
 require 'etc'
 require 'socket'
@@ -30,41 +30,22 @@ module Kitchen
     class Digitalocean < Kitchen::Driver::SSHBase
       default_config :username, 'root'
       default_config :port, '22'
+      default_config :region, 'nyc2'
+      default_config :size, '512mb'
+      default_config(:image) { |driver| driver.default_image }
+      default_config(:server_name) { |driver| driver.default_name }
+      default_config :private_networking, true
+      default_config :ipv6, false
 
-      default_config :private_networking do
-        true
-      end
-
-      default_config :region_id do |driver|
-        driver.default_region
-      end
-
-      default_config :flavor_id do |driver|
-        driver.default_flavor
-      end
-
-      default_config :image_id do |driver|
-        driver.default_image
-      end
-
-      default_config :server_name do |driver|
-        driver.default_name
-      end
-
-      default_config :digitalocean_client_id do
-        ENV['DIGITALOCEAN_CLIENT_ID']
-      end
-
-      default_config :digitalocean_api_key do
-        ENV['DIGITALOCEAN_API_KEY']
+      default_config :digitalocean_access_token do
+        ENV['DIGITALOCEAN_ACCESS_TOKEN']
       end
 
       default_config :ssh_key_ids do
         ENV['DIGITALOCEAN_SSH_KEY_IDS'] || ENV['SSH_KEY_IDS']
       end
 
-      required_config :digitalocean_client_id
-      required_config :digitalocean_api_key
+      required_config :digitalocean_access_token
       required_config :ssh_key_ids
 
       def create(state)
@@ -72,39 +53,34 @@ module Kitchen
         state[:server_id] = server.id
 
         info("Digital Ocean instance <#{state[:server_id]}> created.")
-        server.wait_for { print '.'; ready? }; print '(server ready)'
-        state[:hostname] = server.public_ip_address
+
+        while true
+          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
+
+        state[:hostname] = droplet.networks[:v4]
+          .find { |n| n[:type] == 'public' }['ip_address']
+
         wait_for_sshd(state[:hostname]); print "(ssh ready)\n"
         debug("digitalocean:create #{state[:hostname]}")
-      rescue Fog::Errors::Error, Excon::Errors::Error => ex
-        raise ActionFailed, ex.message
       end
 
       def destroy(state)
         return if state[:server_id].nil?
 
-        server = compute.servers.get(state[:server_id])
-        server.destroy unless server.nil?
+        client.droplets.delete(id: state[:server_id])
         info("Digital Ocean instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)
         state.delete(:hostname)
       end
 
-      def default_flavor
-        flavor = config[:flavor] ? config[:flavor].upcase : nil
-        data['flavors'].fetch(flavor) { '66' }
-      end
-
-      def default_region
-        regions = {}
-        data['regions'].each_pair do |key, value|
-          regions[key.upcase] = value
-        end
-        regions.fetch(config[:region] ? config[:region].upcase : nil) { '4' }
-      end
-
       def default_image
-        data['images'].fetch(instance.platform.name) { '473123' }
+        instance.platform.name
       end
 
       def default_name
@@ -118,53 +94,40 @@ module Kitchen
 
       private
 
-      def compute
-        debug_compute_config
+      def client
+        debug_client_config
 
-        server_def = {
-          provider:               'Digitalocean',
-          digitalocean_api_key:   config[:digitalocean_api_key],
-          digitalocean_client_id: config[:digitalocean_client_id]
-        }
-
-        Fog::Compute.new(server_def)
+        DropletKit::Client.new(access_token: config[:digitalocean_access_token])
       end
 
       def create_server
         debug_server_config
 
-        compute.servers.create(
-          name:               config[:server_name],
-          image_id:           config[:image_id],
-          flavor_id:          config[:flavor_id],
-          region_id:          config[:region_id],
-          ssh_key_ids:        config[:ssh_key_ids],
-          private_networking: config[:private_networking]
+        droplet = DropletKit::Droplet.new(
+          name: config[:server_name],
+          region: config[:region],
+          image: config[:image],
+          size: config[:size],
+          ssh_keys: config[:ssh_key_ids].split(' '),
+          private_networking: config[:private_networking],
+          ipv6: config[:ipv6]
         )
-      end
 
-      def data
-        @data ||= begin
-          json_file = File.expand_path(
-            File.join(%w(.. .. .. .. data digitalocean.json)),
-            __FILE__
-          )
-          JSON.load(IO.read(json_file))
-        end
+        client.droplets.create(droplet)
       end
 
       def debug_server_config
         debug("digitalocean:name #{config[:server_name]}")
-        debug("digitalocean:image_id #{config[:image_id]}")
-        debug("digitalocean:flavor_id #{config[:flavor_id]}")
-        debug("digitalocean:region_id #{config[:region_id]}")
+        debug("digitalocean:image#{config[:image]}")
+        debug("digitalocean:size #{config[:size]}")
+        debug("digitalocean:region #{config[:region]}")
         debug("digitalocean:ssh_key_ids #{config[:ssh_key_ids]}")
         debug("digitalocean:private_networking #{config[:private_networking]}")
+        debug("digitalocean:ipv6 #{config[:ipv6]}")
       end
 
-      def debug_compute_config
-        debug("digitalocean_api_key #{config[:digitalocean_api_key]}")
-        debug("digitalocean_client_id #{config[:digitalocean_client_id]}")
+      def debug_client_config
+        debug("digitalocean_api_key #{config[:digitalocean_access_token]}")
       end
     end
   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.7.3'
+    DIGITALOCEAN_VERSION = '0.8.0.pre1'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -46,15 +46,14 @@ describe Kitchen::Driver::Digitalocean do
   end
 
   before(:each) do
-    ENV['DIGITALOCEAN_CLIENT_ID'] = 'clientid'
-    ENV['DIGITALOCEAN_API_KEY'] = 'apikey'
+    ENV['DIGITALOCEAN_ACCESS_TOKEN'] = 'access_token'
     ENV['DIGITALOCEAN_SSH_KEY_IDS'] = '1234'
   end
 
   describe '#initialize'do
     context 'default options' do
       it 'defaults to the smallest flavor size' do
-        expect(driver[:flavor_id]).to eq('66')
+        expect(driver[:size]).to eq('512mb')
       end
 
       it 'defaults to SSH with root user on port 22' do
@@ -67,47 +66,35 @@ describe Kitchen::Driver::Digitalocean do
       end
 
       it 'defaults to region id 1' do
-        expect(driver[:region_id]).to eq('4')
+        expect(driver[:region]).to eq('nyc2')
       end
 
       it 'defaults to SSH Key Ids from $SSH_KEY_IDS' do
         expect(driver[:ssh_key_ids]).to eq('1234')
       end
 
-      it 'defaults to Client ID from $DIGITALOCEAN_CLIENT_ID' do
-        expect(driver[:digitalocean_client_id]).to eq('clientid')
-      end
-
-      it 'defaults to API key from $DIGITALOCEAN_API_KEY' do
-        expect(driver[:digitalocean_api_key]).to eq('apikey')
-      end
-    end
-
-    context 'name is ubuntu-12.10' do
-      let(:platform_name) { 'ubuntu-12.10' }
-
-      it 'defaults to the correct image ID' do
-        expect(driver[:image_id]).to eq('473123')
+      it 'defaults to Access Token from $DIGITALOCEAN_ACCESS_TOKEN' do
+        expect(driver[:digitalocean_access_token]).to eq('access_token')
       end
     end
 
-    context 'name is centos-6.4' do
-      let(:platform_name) { 'centos-6.4' }
+    context 'name is ubuntu-14-04-x64' do
+      let(:platform_name) { 'ubuntu-14-04-x64' }
 
       it 'defaults to the correct image ID' do
-        expect(driver[:image_id]).to eq('562354')
+        expect(driver[:image]).to eq('ubuntu-14-04-x64')
       end
     end
 
     context 'overridden options' do
       config = {
-        image_id: '22',
-        flavor_id: '63',
+        image: 'debian-7-0-x64',
+        flavor: '1gb',
         ssh_key_ids: '5678',
         username: 'admin',
         port: '2222',
         server_name: 'puppy',
-        region_id: '1',
+        region: 'ams1',
         flavor: '1GB'
       }
 
@@ -123,7 +110,7 @@ describe Kitchen::Driver::Digitalocean do
 
   describe '#create' do
     let(:server) do
-      double(id: 'test123', wait_for: true,
+      double(id: '1234', wait_for: true,
              public_ip_address: '1.2.3.4')
     end
     let(:driver) do
@@ -138,22 +125,27 @@ describe Kitchen::Driver::Digitalocean do
     context 'username and API key only provided' do
       let(:config) do
         {
-          digitalocean_client_id: 'hello',
-          digitalocean_api_key: 'world'
+          digitalocean_access_token: 'access_token'
         }
       end
 
       it 'generates a server name in the absence of one' do
+        stub_request(:get, 'https://api.digitalocean.com/v2/droplets/1234')
+          .to_return(create)
         driver.create(state)
         expect(driver[:server_name]).to eq('a_monkey!')
       end
 
       it 'gets a proper server ID' do
+        stub_request(:get, 'https://api.digitalocean.com/v2/droplets/1234')
+          .to_return(create)
         driver.create(state)
-        expect(state[:server_id]).to eq('test123')
+        expect(state[:server_id]).to eq('1234')
       end
 
       it 'gets a proper hostname (IP)' do
+        stub_request(:get, 'https://api.digitalocean.com/v2/droplets/1234')
+          .to_return(create)
         driver.create(state)
         expect(state[:hostname]).to eq('1.2.3.4')
       end
@@ -177,6 +169,8 @@ describe Kitchen::Driver::Digitalocean do
 
     context 'a live server that needs to be destroyed' do
       it 'destroys the server' do
+        stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/12345')
+          .to_return(delete)
         expect(state).to receive(:delete).with(:server_id)
         expect(state).to receive(:delete).with(:hostname)
         driver.destroy(state)
@@ -209,102 +203,48 @@ describe Kitchen::Driver::Digitalocean do
       end
 
       it 'does not try to destroy the server again' do
+        stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/12345')
+          .to_return(delete)
         allow_message_expectations_on_nil
         driver.destroy(state)
       end
     end
   end
 
-  describe '#compute' do
-    let(:config) do
-      {
-        digitalocean_client_id: 'monkey',
-        digitalocean_api_key: 'potato'
-      }
-    end
-
-    context 'all requirements provided' do
-      it 'creates a new compute connection' do
-        allow(Fog::Compute).to receive(:new) { |arg| arg }
-        expect(driver.send(:compute)).to be_a(Hash)
-      end
-    end
-
-    context 'no username provided' do
-      let(:config) do
-        { digitalocean_client_id: nil, digitalocean_api_key: '1234' }
-      end
-
-      it 'raises an error' do
-        expect { driver.send(:compute) }.to raise_error(ArgumentError)
-      end
-    end
-
-    context 'no API key provided' do
-      let(:config) do
-        { digitalocean_client_id: 'monkey', digitalocean_api_key: nil }
-      end
-
-      it 'raises an error' do
-        expect { driver.send(:compute) }.to raise_error(ArgumentError)
-      end
-    end
-  end
-
-  describe '#create_server' do
-    let(:config) do
-      {
-        server_name: 'hello',
-        image_id: 'there',
-        flavor_id: '68',
-        region_id: '3',
-        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(:compute) { double(servers: servers) }
-    let(:driver) do
-      d = Kitchen::Driver::Digitalocean.new(config)
-      d.instance = instance
-      allow(d).to receive(:compute).and_return(compute)
-      d
-    end
-
-    it 'creates the server using a compute connection' do
-      expect(driver.send(:create_server)).to eq(@expected)
-    end
-  end
-
-  describe 'Region and Flavor names should be converted to IDs' do
-    let(:config) do
-      {
-        server_name: 'hello',
-        image_id: 'there',
-        flavor: '2gb',
-        region: 'amsterdam 2',
-        ssh_key_ids: '1234'
-      }
-    end
-
-    it 'defaults to the correct flavor ID' do
-      expect(driver[:flavor_id]).to eq('62')
-    end
-
-    it 'defaults to the correct region ID' do
-      expect(driver[:region_id]).to eq('5')
-    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 '#default_name' do
     before(:each) do

data/spec/mocks/auth_error.txt

@@ -0,0 +1,17 @@
+HTTP/1.1 401 Unauthorized
+Server: cloudflare-nginx
+Date: Fri, 22 Aug 2014 00:23:51 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: keep-alive
+Set-Cookie: __cfduid=de33405f4e3dfe14da3bc8fa075f282161408667031739; expires=Mon, 23-Dec-2019 23:50:00 GMT; path=/; domain=.digitalocean.com; HttpOnly
+Status: 401 Unauthorized
+Cache-Control: no-store
+Pragma: no-cache
+WWW-Authenticate: Bearer realm="DigitalOcean", error="invalid_token", error_description="The access token is invalid"
+X-Request-Id: 1da2bd7f00ee6102f4a105592ce7c5ba
+X-Runtime: 0.008179
+X-Rack-Cache: invalidate, pass
+CF-RAY: 15daec945b0d0ed9-EWR
+
+{"id":"unauthorized","message":"Unable to authenticate you."}

data/spec/mocks/create.txt

@@ -0,0 +1,132 @@
+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
+RateLimit-Limit: 1200
+RateLimit-Remaining: 1191
+RateLimit-Reset: 1408667389
+Cache-Control: must-revalidate, private, max-age=0
+X-Request-Id: 0018d68e007a1ddf51190a3f85746740
+X-Runtime: 0.175303
+X-Rack-Cache: miss
+CF-RAY: 15dabd6d78ac00af-EWR
+
+{
+  "droplet":{
+    "id":"1234",
+    "name":"test-1234",
+    "memory":512,
+    "vcpus":1,
+    "disk":20,
+    "region":{
+      "slug":"nyc2",
+      "name":"New York 2",
+      "sizes":[
+        "1gb",
+        "2gb",
+        "4gb",
+        "8gb",
+        "32gb",
+        "64gb",
+        "512mb",
+        "16gb",
+        "48gb"
+      ],
+      "available":true,
+      "features":[
+        "virtio",
+        "private_networking",
+        "backups"
+      ]
+    },
+    "image":{
+      "id":3445812,
+      "name":"Debian 7.0 x64",
+      "distribution":"Debian",
+      "slug":null,
+      "public":false,
+      "regions":[
+        "nyc1",
+        "ams1",
+        "sfo1",
+        "nyc2",
+        "ams2",
+        "sgp1",
+        "lon1",
+        "nyc3"
+      ],
+      "created_at":"2014-05-02T18:16:21Z",
+      "action_ids":[
+        23178598,
+        23179182,
+        23179643,
+        23179647,
+        23179652,
+        23179657,
+        23179662,
+        23187797,
+        23188844,
+        23189209,
+        23190072,
+        23190271,
+        23190972,
+        23191081,
+        23192889,
+        23192901,
+        23193176,
+        23193805,
+        23193991,
+        23194165,
+        23194334,
+        23195135,
+        23196883,
+        23199694,
+        23200447
+      ]
+    },
+    "size":{
+      "slug":"512mb",
+      "transfer":1,
+      "price_monthly":5.0,
+      "price_hourly":0.00744
+    },
+    "locked":false,
+    "status":"active",
+    "networks":{
+      "v4":[
+        {
+          "ip_address":"10.128.210.209",
+          "netmask":"255.255.0.0",
+          "gateway":"10.128.1.1",
+          "type":"private"
+        },
+        {
+          "ip_address":"1.2.3.4",
+          "netmask":"255.255.255.0",
+          "gateway":"162.243.243.1",
+          "type":"public"
+        }
+      ],
+      "v6":[]
+    },
+    "kernel":{
+      "id":952,
+      "name":"* Debian 7.0 x64 vmlinuz-3.2.0-4-amd64 (3.2.54-2)",
+      "version":"3.2.0-4-amd64"
+    },
+    "created_at":"2014-08-05T01:54:38Z",
+    "features":[
+      "private_networking",
+      "virtio"
+    ],
+    "backup_ids":[],
+    "snapshot_ids":[],
+    "action_ids":[
+      30176699
+    ]
+  }
+}

data/spec/mocks/delete.txt

@@ -0,0 +1,16 @@
+HTTP/1.1 204 No Content
+Server: cloudflare-nginx
+Date: Fri, 22 Aug 2014 00:08:34 GMT
+Content-Type: application/octet-stream
+Connection: keep-alive
+Set-Cookie: __cfduid=da9e671d485a710cdacdfab0537c9c5371408666113766; expires=Mon, 23-Dec-2019 23:50:00 GMT; path=/; domain=.digitalocean.com; HttpOnly
+Status: 204 No Content
+RateLimit-Limit: 1200
+RateLimit-Remaining: 1186
+RateLimit-Reset: 1408667389
+Cache-Control: no-cache
+X-Request-Id: b1916109f4827d5df75311055b476205
+X-Runtime: 0.426074
+X-Rack-Cache: invalidate, pass
+CF-RAY: 15dad62b0cfe00af-EWR
+

data/spec/spec_helper.rb

@@ -17,11 +17,33 @@
 # limitations under the License.
 
 require 'rspec'
+require 'webmock/rspec'
+require 'simplecov'
+require 'simplecov-console'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  Coveralls::SimpleCov::Formatter,
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::Console
+]
+SimpleCov.minimum_coverage 90
+SimpleCov.start
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
 require_relative '../lib/kitchen/driver/digitalocean'
 
-RSpec.configure do |config|
-  config.tty = true
-  config.color = true
+def create
+  File.read(File.join(File.dirname(__FILE__), 'mocks', 'create.txt'))
+end
+
+def delete
+  File.read(File.join(File.dirname(__FILE__), 'mocks', 'delete.txt'))
+end
+
+def auth_error
+  File.read(File.join(File.dirname(__FILE__), 'mocks', 'auth_error.txt'))
 end
 
 # vim: ai et ts=2 sts=2 sw=2 ft=ruby

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0.pre1
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +122,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Test Kitchen Driver for Digital Ocean
 email:
 - greg@gregf.org
@@ -123,11 +193,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- data/digitalocean.json
 - kitchen-digitalocean.gemspec
 - lib/kitchen/driver/digitalocean.rb
 - lib/kitchen/driver/digitalocean_version.rb
 - spec/kitchen/driver/digitalocean_spec.rb
+- spec/mocks/auth_error.txt
+- spec/mocks/create.txt
+- spec/mocks/delete.txt
 - spec/spec_helper.rb
 homepage: https://github.com/test-kitchen/kitchen-digitalocean
 licenses:
@@ -144,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1
@@ -155,4 +227,7 @@ specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean
 test_files:
 - spec/kitchen/driver/digitalocean_spec.rb
+- spec/mocks/auth_error.txt
+- spec/mocks/create.txt
+- spec/mocks/delete.txt
 - spec/spec_helper.rb

data/data/digitalocean.json

@@ -1,35 +0,0 @@
-{
-  "images": {
-    "ubuntu-10.04": "5566812",
-    "ubuntu-12.04": "5588928",
-    "ubuntu-14.04": "5141286",
-    "centos-5.8": "1601",
-    "centos-6.5": "3448641",
-    "centos-7.0": "4856048",
-    "centos-6.4": "562354",
-    "debian-6.0": "5563026",
-    "debian-7.0": "5562742",
-    "fedora-19": "3102879",
-    "fedora-20": "3243145"
-  },
-  "flavors": {
-    "512MB": "66",
-    "1GB": "63",
-    "2GB": "62",
-    "4GB": "64",
-    "8GB": "65",
-    "16GB": "61",
-    "32GB": "60",
-    "48GB": "70",
-    "64GB": "69"
-  },
-  "regions": {
-    "New York 1": "1",
-    "New York 2": "4",
-    "New York 3": "8",
-    "Amsterdam 1": "2",
-    "Amsterdam 2": "5",
-    "San Francisco 1": "3",
-    "Singapore 1": "6"
-  }
-}