kitchen-digitalocean 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70876d187f3362289af3456f71a1e31b268fee0
-  data.tar.gz: 2d440b38f1a7fb6a42986792023b5ffd7642f507
+  metadata.gz: a184ed0628c0c56d93f6e686da994bd9e73d99dd
+  data.tar.gz: 17ab01c615490ddef9b6e8c909acf7b25d9169c7
 SHA512:
-  metadata.gz: 14fae95e6efc2f644e44f9022eed7c944216d60de720fc65b77bd3a26b54aa5e701a63ea5a638178166e46732db80b561c2886ed8f7ebda6e69715b1dee9c3d9
-  data.tar.gz: ea678c283970baaa67f815d910b357741b9d5f38728038db712a52181e58509234d5caba86b0931a4d0a1d78d74a4da05e56371275862280d11b76de6202c16b
+  metadata.gz: d17976083ca86b7f51027f7797a98eb47c2597e0a3b080e6886c72fcd7f8f2cce5af406b2fffb0daf342c2d25876cf479ab55d816a370565e28cf7cd331f3222
+  data.tar.gz: 7dcd9d97dd88b92617d5ff6d3a8b4f8954896ae7fd386fc26a5914941152842872ad1c9506fb155a00af81baad65e0d4820915547dd5a2067c26eee465625804

data/README.md

@@ -46,7 +46,7 @@ At minimum, you'll need to tell test-kitchen to use the digitalocean driver.
 driver:
   name: digitalocean
 platforms:
-  - name: ubuntu-12-10-x64
+  - name: ubuntu-17
 ```
 
 You also have the option of providing your credentials from environment variables.
@@ -105,6 +105,46 @@ driver:
   - ipv6: true
 ```
 
+# Image abbrevations we use
+
+This is a list of abbreviate image names we provide
+
+```
+centos-6
+centos-7
+coreos-stable
+oreos-beta
+coreos-alpha
+debian-7
+ebian-8
+debian-9
+fedora-24
+fedora-25
+fedora-26
+reebsd-11.1
+freebsd-11.0
+freebsd-10.3
+ubuntu-14
+ubuntu-16
+ubuntu-17
+```
+
+# Regions
+
+```
+nyc1    New York 1
+sfo1    San Francisco 1
+ams2    Amsterdam 2
+sgp1    Singapore 1
+lon1    London 1
+nyc3    New York 3
+ams3    Amsterdam 3
+fra1    Frankfurt 1
+tor1    Toronto 1
+sfo2    San Francisco 2
+blr1    Bangalore 1
+```
+
 # Development
 
 * Source hosted at [GitHub](https://github.com/test-kitchen/kitchen-digitalocean)

data/kitchen-digitalocean.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.2'
-  spec.add_dependency 'droplet_kit', '~> 2.0'
+  spec.add_dependency 'test-kitchen', '~> 1.17'
+  spec.add_dependency 'droplet_kit', '~> 2.2'
 
   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 'rubocop', '~> 0.49'
   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 'rspec', '~> 3.6'
   spec.add_development_dependency 'webmock', '~> 1.2'
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'simplecov-console', '~> 0.2'

data/lib/kitchen/driver/digitalocean.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Greg Fitzgerald (<greg@gregf.org>)
 #
@@ -33,8 +34,8 @@ module Kitchen
       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(:image, &:default_image)
+      default_config(:server_name, &:default_name)
       default_config :private_networking, true
       default_config :ipv6, false
       default_config :user_data, nil
@@ -61,12 +62,13 @@ module Kitchen
           sleep 8
           droplet = client.droplets.find(id: state[:server_id])
 
-          break if droplet && droplet.networks[:v4] && droplet.networks[:v4].any? { |n| n[:type] == 'public' }
+          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']
+                                  .find { |n| n[:type] == 'public' }['ip_address']
 
         wait_for_sshd(state[:hostname]); print "(ssh ready)\n"
         debug("digitalocean:create #{state[:hostname]}")
@@ -80,13 +82,14 @@ module Kitchen
         loop do
           droplet = client.droplets.find(id: state[:server_id])
 
-          break if !droplet
+          break unless 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")
+          info("Waiting on Digital Ocean instance <#{state[:server_id]}>
+               to be active to destroy it, retrying in 8 seconds")
           sleep 8
         end
 
@@ -117,7 +120,7 @@ module Kitchen
           (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
           Socket.gethostname.gsub(/\W/, '')[0..22],
           Array.new(7) { rand(36).to_s(36) }.join
-        ].join('-').gsub(/_/, '-')
+        ].join('-').tr('_', '-')
       end
 
       private
@@ -169,25 +172,23 @@ module Kitchen
 
       def platform_to_slug_mapping
         {
-          'centos-5.10'    => 'centos-5-8-x64',
-          'centos-6.7'     => 'centos-6-5-x64',
-          'centos-7.1'     => 'centos-7-0-x64',
-          'coreos-835.9.0' => 'coreos-stable-x64',
-          'coreos-877.1.0' => 'coreos-beta-x64',
-          'coreos-891.0.0' => 'coreos-alpha-x64',
-          'debian-6.0'     => 'debian-6-0-x64',
-          'debian-7.9'     => 'debian-7-0-x64',
-          'debian-8.2'     => 'debian-8-x64',
-          'fedora-21'      => 'fedora-21-x64',
-          'fedora-22'      => 'fedora-22-x64',
-          'fedora-23'      => 'fedora-23-x64',
-          'freebsd-10.1'   => 'freebsd-10-1-x64',
-          'freebsd-10.2'   => 'freebsd-10-2-x64',
-          'ubuntu-12.04'   => 'ubuntu-12-04-x64',
-          'ubuntu-14.04'   => 'ubuntu-14-04-x64',
-          'ubuntu-15.04'   => 'ubuntu-15-04-x64',
-          'ubuntu-15.10'   => 'ubuntu-15-10-x64',
-          'ubuntu-16.04'   => 'ubuntu-16-04-x64',
+          'centos-6'     => 'centos-6-x64',
+          'centos-7'     => 'centos-7-x64',
+          'coreos-stable' => 'coreos-stable-x64',
+          'coreos-beta' => 'coreos-beta-x64',
+          'coreos-alpha' => 'coreos-alpha-x64',
+          'debian-7'     => 'debian-7-x64',
+          'debian-8'     => 'debian-8-x64',
+          'debian-9'     => 'debian-9-x64',
+          'fedora-24'      => 'fedora-24-x64',
+          'fedora-25'      => 'fedora-25-x64',
+          'fedora-26'      => 'fedora-26-x64',
+          'freebsd-11.1'   => 'freebsd-11-1-x64-zfs',
+          'freebsd-11.0'   => 'freebsd-11-0-x64-zfs',
+          'freebsd-10.3'   => 'freebsd-10-3-x64-zfs',
+          'ubuntu-14'   => 'ubuntu-14-04-x64',
+          'ubuntu-16'   => 'ubuntu-16-04-x64',
+          'ubuntu-17'   => 'ubuntu-17-04-x64'
         }
       end
     end

data/lib/kitchen/driver/digitalocean_version.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Greg Fitzgerald (<greg@gregf.org>)
 #
@@ -19,7 +20,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.9.6'
+    DIGITALOCEAN_VERSION = '0.9.7'.freeze
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -86,10 +86,10 @@ describe Kitchen::Driver::Digitalocean do
     end
 
     context 'platform name matches a known platform => slug mapping' do
-      let(:platform_name) { 'ubuntu-14.04' }
+      let(:platform_name) { 'ubuntu-17' }
 
       it 'matches the correct image slug' do
-        expect(driver[:image]).to eq('ubuntu-14-04-x64')
+        expect(driver[:image]).to eq('ubuntu-17-04-x64')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean