kitchen-digitalocean 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 799bdf4032943a828a9e301f4627c041f5b1c53a446a9e3fc94a1e7c2857e9eb
-  data.tar.gz: bc667b0ec4efaef1e90a94330d5ed7605a98a5cf8dfe72664ed5f4326ef9cc31
+  metadata.gz: 57b24c201f1bc0b22c851d8d7ed316c6658af9a5eae401cc5656ed2de97e632e
+  data.tar.gz: 9ae18f394de58c969b81db50ed82fcf187be07a4419a490a228da7899a5da66c
 SHA512:
-  metadata.gz: 07bf2504e78e1ce84f3e09bdb1b566aad331553242792622317c01fc13d266611d596e106e26b437807e8a7e678bbbbc824a96abaecef5ea35dec2074b652453
-  data.tar.gz: 8b3d820d5ca6402ebc0d71861552af622d06ca468e33abed098246960f889303f202e0aae9204037fc6d7b9bdcdaaeb155b94689be1e5b2fec429c8592d3e6c3
+  metadata.gz: 2ab3ba2374832a91f659e881b2096a77045010a14c9eb571dcff691afe680bfb3044eab8156a148c2d1e1a08dc357d1bbd5980d008257c5b585cbffb0138df7f
+  data.tar.gz: faacfdc85d589fbe10e617558c8cbe8df7cbd49dd942fa51d032237f24ffe941af5738eee01b66992d782bf94122466b395c675bdd75f60a5cd2db088b5c0e07

data/lib/kitchen/driver/digitalocean.rb

@@ -17,13 +17,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'benchmark' unless defined?(Benchmark)
-require 'droplet_kit' unless defined?(DropletKit)
-require 'kitchen'
-require 'etc' unless defined?(Etc)
-require 'socket' unless defined?(Socket)
-require 'json' unless defined?(JSON)
-autoload :YAML, 'yaml'
+require "benchmark" unless defined?(Benchmark)
+require "droplet_kit" unless defined?(DropletKit)
+require "kitchen"
+require "etc" unless defined?(Etc)
+require "socket" unless defined?(Socket)
+require "json" unless defined?(JSON)
+autoload :YAML, "yaml"
 
 module Kitchen
   module Driver
@@ -31,9 +31,9 @@ module Kitchen
     #
     # @author Greg Fitzgerald <greg@gregf.org>
     class Digitalocean < Kitchen::Driver::SSHBase
-      default_config :username, 'root'
-      default_config :port, '22'
-      default_config :size, 's-1vcpu-1gb'
+      default_config :username, "root"
+      default_config :port, "22"
+      default_config :size, "s-1vcpu-1gb"
       default_config :monitoring, false
       default_config(:image, &:default_image)
       default_config(:server_name, &:default_name)
@@ -45,32 +45,32 @@ module Kitchen
       default_config :vpcs, nil
 
       default_config :region do
-        ENV['DIGITALOCEAN_REGION'] || 'nyc1'
+        ENV["DIGITALOCEAN_REGION"] || "nyc1"
       end
 
       default_config :digitalocean_access_token do
-        ENV['DIGITALOCEAN_ACCESS_TOKEN']
+        ENV["DIGITALOCEAN_ACCESS_TOKEN"]
       end
 
       default_config :ssh_key_ids do
-        ENV['DIGITALOCEAN_SSH_KEY_IDS'] || ENV['SSH_KEY_IDS']
+        ENV["DIGITALOCEAN_SSH_KEY_IDS"] || ENV["SSH_KEY_IDS"]
       end
 
       required_config :digitalocean_access_token
       required_config :ssh_key_ids
 
       PLATFORM_SLUG_MAP = {
-        'centos-7' => 'centos-7-x64',
-        'centos-8' => 'centos-8-x64',
-        'debian-9' => 'debian-9-x64',
-        'debian-10' => 'debian-10-x64',
-        'fedora-32' => 'fedora-32-x64',
-        'fedora-33' => 'fedora-33-x64',
-        'freebsd-11' => 'freebsd-11-x64-zfs',
-        'freebsd-12' => 'freebsd-12-x64-zfs',
-        'ubuntu-16' => 'ubuntu-16-04-x64',
-        'ubuntu-18' => 'ubuntu-18-04-x64',
-        'ubuntu-20' => 'ubuntu-20-04-x64'
+        "centos-7" => "centos-7-x64",
+        "centos-8" => "centos-8-x64",
+        "debian-9" => "debian-9-x64",
+        "debian-10" => "debian-10-x64",
+        "fedora-32" => "fedora-32-x64",
+        "fedora-33" => "fedora-33-x64",
+        "freebsd-11" => "freebsd-11-x64-zfs",
+        "freebsd-12" => "freebsd-12-x64-zfs",
+        "ubuntu-16" => "ubuntu-16-04-x64",
+        "ubuntu-18" => "ubuntu-18-04-x64",
+        "ubuntu-20" => "ubuntu-20-04-x64",
       }.freeze
 
       def create(state)
@@ -85,21 +85,21 @@ module Kitchen
           droplet = client.droplets.find(id: state[:server_id])
 
           break if droplet && droplet.networks[:v4] &&
-                   droplet.networks[:v4].any? { |n| n[:type] == 'public' }
+            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"]
 
         if config[:firewalls]
-          debug('trying to add the firewall by id')
+          debug("trying to add the firewall by id")
           fw_ids = if config[:firewalls].is_a?(String)
                      config[:firewalls].split(/\s+|,\s+|,+/)
                    elsif config[:firewalls].is_a?(Array)
                      config[:firewalls]
                    else
-                     warn('firewalls attribute is not string/array, ignoring')
+                     warn("firewalls attribute is not string/array, ignoring")
                      []
                    end
           debug("firewall : #{YAML.dump(fw_ids.inspect)}")
@@ -107,7 +107,7 @@ module Kitchen
             firewall = client.firewalls.find(id: fw_id)
             if firewall
               client.firewalls
-                    .add_droplets([droplet.id], id: firewall.id)
+                .add_droplets([droplet.id], id: firewall.id)
               debug("firewall added: #{firewall.id}")
             else
               warn("firewalls id: '#{fw_id}' was not found in api, ignoring")
@@ -129,7 +129,7 @@ module Kitchen
 
           break unless droplet
 
-          if droplet.status != 'new'
+          if droplet.status != "new"
             client.droplets.delete(id: state[:server_id])
             break
           end
@@ -162,11 +162,11 @@ module Kitchen
       # Total:        63
       def default_name
         [
-          instance.name.gsub(/\W/, '')[0..14],
-          (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
-          Socket.gethostname.gsub(/\W/, '')[0..22],
-          Array.new(7) { rand(36).to_s(36) }.join
-        ].join('-').tr('_', '-')
+          instance.name.gsub(/\W/, "")[0..14],
+          (Etc.getlogin || "nologin").gsub(/\W/, "")[0..14],
+          Socket.gethostname.gsub(/\W/, "")[0..22],
+          Array.new(7) { rand(36).to_s(36) }.join,
+        ].join("-").tr("_", "-")
       end
 
       private
@@ -201,8 +201,8 @@ module Kitchen
         resp = client.droplets.create(droplet)
 
         if resp.class != DropletKit::Droplet
-          error JSON.parse(resp)['message']
-          error 'Please check your access token is set correctly.'
+          error JSON.parse(resp)["message"]
+          error "Please check your access token is set correctly."
         else
           resp
         end

data/lib/kitchen/driver/digitalocean_version.rb

@@ -20,7 +20,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.12.0'
+    DIGITALOCEAN_VERSION = "0.13.0"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: droplet_kit
@@ -39,7 +39,7 @@ dependencies:
         version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +49,7 @@ dependencies:
         version: '1.17'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -135,19 +121,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement