kitchen-digitalocean 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14dcfc00a351fbdf44ec5e1c535ee7ed2936d6ab
-  data.tar.gz: 03363f835f621f45f9b3b32e94c428b32af7cbdc
+  metadata.gz: 78427c396eb24d16b2db9592aa9deaa0b224858c
+  data.tar.gz: b514d8afe3e1c558255adfc2236a3bb11aa5fecd
 SHA512:
-  metadata.gz: bcfdb2045d4a9b55076263f7461f5e5fb16dfd339a5468580b782492c06da36eb9650a8507e441708c39d02a75a7a5db9b60ec96997161c69cefae7daabbcfb8
-  data.tar.gz: 1e35c146df62423691e232076649843ee6bfd45192212b2931c5446b2047ee2f5e1e287d2d21dbccf5892e0678c022b744bdb453a6d4a39395774017b6371a1b
+  metadata.gz: 68800f8ffe2ebfb87b58b9cc2d40930156a32e8b51d0134cc151546cf3632ae690fc6a5f129ba9aba1704f55c3fa33436d5be05a775fcb4c64b26b0b2cb5ddbd
+  data.tar.gz: c31f73d02199d4b08c5bd83a0f2c58ed55577bdd8ee5d310f90264fbedbd231247034c50d1fdb014e0fa9bcbaa8ffb6b617563991bfd6b68167a72c54fc36e08

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.0 / 2015-04-17
+
+* [@juliandunn](https://github.com/juliandunn) [PR #37] Added the ability to pass user_data into droplet creation.
+
 # 0.8.3 / 2014-12-29
 
 * [@RoboticCheese](https://github.com/RoboticCheese) [PR #34] make key IDs always a String

data/lib/kitchen/driver/digitalocean.rb

@@ -37,6 +37,7 @@ module Kitchen
       default_config(:server_name) { |driver| driver.default_name }
       default_config :private_networking, true
       default_config :ipv6, false
+      default_config :user_data, nil
 
       default_config :digitalocean_access_token do
         ENV['DIGITALOCEAN_ACCESS_TOKEN']
@@ -60,13 +61,11 @@ 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
 
         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]}")
@@ -120,7 +119,8 @@ module Kitchen
           size: config[:size],
           ssh_keys: config[:ssh_key_ids].to_s.split(/, ?/),
           private_networking: config[:private_networking],
-          ipv6: config[:ipv6]
+          ipv6: config[:ipv6],
+          user_data: config[:user_data]
         )
 
         resp = client.droplets.create(droplet)

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.8.3'
+    DIGITALOCEAN_VERSION = '0.9.0'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -40,13 +40,11 @@ describe Kitchen::Driver::Digitalocean do
     )
   end
 
-  let(:driver) do
-    d = Kitchen::Driver::Digitalocean.new(config)
-    d.instance = instance
-    d
-  end
+  let(:driver) { described_class.new(config) }
 
   before(:each) do
+    allow_any_instance_of(described_class).to receive(:instance)
+       .and_return(instance)
     ENV['DIGITALOCEAN_ACCESS_TOKEN'] = 'access_token'
     ENV['DIGITALOCEAN_SSH_KEY_IDS'] = '1234'
   end
@@ -95,8 +93,7 @@ describe Kitchen::Driver::Digitalocean do
         username: 'admin',
         port: '2222',
         server_name: 'puppy',
-        region: 'ams1',
-        flavor: '1GB'
+        region: 'ams1'
       }
 
       let(:config) { config }
@@ -114,13 +111,17 @@ describe Kitchen::Driver::Digitalocean do
       double(id: '1234', wait_for: true,
              public_ip_address: '1.2.3.4')
     end
-    let(:driver) do
-      d = Kitchen::Driver::Digitalocean.new(config)
-      d.instance = instance
-      allow(d).to receive(:default_name).and_return('a_monkey!')
-      allow(d).to receive(:create_server).and_return(server)
-      allow(d).to receive(:wait_for_sshd).with('1.2.3.4').and_return(true)
-      d
+
+    let(:driver) { described_class.new(config) }
+
+    before(:each) do
+      {
+        default_name: 'a_monkey!',
+        create_server: server,
+        wait_for_sshd: '1.2.3.4'
+      }.each do |k, v|
+        allow_any_instance_of(described_class).to receive(k).and_return(v)
+      end
     end
 
     context 'username and API key only provided' do
@@ -161,11 +162,14 @@ describe Kitchen::Driver::Digitalocean do
     let(:servers) { double(get: server) }
     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
+    let(:driver) { described_class.new(config) }
+
+    before(:each) do
+      {
+        compute: compute
+      }.each do |k, v|
+        allow_any_instance_of(described_class).to receive(k).and_return(v)
+      end
     end
 
     context 'a live server that needs to be destroyed' do
@@ -196,11 +200,15 @@ describe Kitchen::Driver::Digitalocean do
         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
+
+      let(:driver) { described_class.new(config) }
+
+      before(:each) do
+        {
+          compute: compute
+        }.each do |k, v|
+          allow_any_instance_of(described_class).to receive(k).and_return(v)
+        end
       end
 
       it 'does not try to destroy the server again' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Digital Ocean