Merge pull request #235 from pearkes/fix_ssh_key_array_from_config

Fix to allow setting an array of keys in config

Author: petems

features/cassettes/config/Array_of_SSH_Keys_in_Config.yml

@@ -0,0 +1,6 @@
+require 'erb'
+
+Given(/^a '\.tugboat' config with data:$/) do |data_str|
+  data = ERB.new(data_str).result(binding)
+  File.write("#{Dir.pwd}/tmp/aruba/.tugboat", data)
+end

features/step_definitions/steps.rb

@@ -0,0 +1,28 @@
+Feature: config
+  In order to have an easier time connecting to droplets
+  As a user
+  I should be able to supply an array of ssh keys for a machine
+
+  @vcr
+  Scenario: Array of SSH Keys in Config
+    Given a '.tugboat' config with data:
+"""
+---
+authentication:
+  access_token: f8sazukxeh729ggxh9gjavvzw5cabdpq95txpzhz6ep6jvtquxztfkf2chyejcsg5
+ssh:
+  ssh_user: bobby_sousa
+  ssh_key_path: "~/.ssh/id_rsa"
+  ssh_port: '22'
+defaults:
+  region: nyc2
+  image: ubuntu-14-04-x64
+  size: 512mb
+  ssh_key: ['1234','5678']
+  private_networking: 'false'
+  backups_enabled: 'false'
+  ip6: 'false'
+"""
+    When I run `tugboat create droplet-with-array-of-keys`
+    Then the exit status should not be 1
+    And the output should contain "Queueing creation of droplet 'droplet-with-array-of-keys'...Droplet created!"

features/tugboat/config_array_of_ssh_keys.feature

@@ -47,10 +47,11 @@ def call(env)
         droplet_backups_enabled = env["create_droplet_backups_enabled"] :
         droplet_backups_enabled = env["config"].default_backups_enabled
 
-        droplet_key_array = droplet_ssh_key_ids.split(',')
-
-        droplet_key_array = nil if [droplet_key_array].empty?
-
+        if droplet_ssh_key_ids.kind_of?(Array)
+          droplet_key_array = droplet_ssh_key_ids
+        else
+          droplet_key_array = droplet_ssh_key_ids.split(',')
+        end
 
         create_opts = {
           :name               => env["create_droplet_name"],