tugboat 2.2.2 → 2.2.3

data/lib/tugboat/middleware/rebuild_droplet.rb

@@ -4,20 +4,20 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queuing rebuild for droplet #{env["droplet_id"]} #{env["droplet_name"]} with image #{env["image_id"]} #{env["image_name"]}...", nil, false
+        say "Queuing rebuild for droplet #{env['droplet_id']} #{env['droplet_name']} with image #{env['image_id']} #{env['image_name']}...", nil, false
 
-        response = ocean.droplet.rebuild env["droplet_id"],
-        :image => env["image_id"]
+        response = ocean.droplet.rebuild env['droplet_id'],
+                                         image: env['image_id']
 
-        unless response.success?
+        if response.success?
+          say 'Rebuild complete', :green
+        else
           say "Failed to rebuild Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Rebuild complete", :green
         end
 
         @app.call(env)
       end
     end
   end
-end
+end

data/lib/tugboat/middleware/resize_droplet.rb

@@ -4,16 +4,16 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queuing resize for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
+        say "Queuing resize for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
 
-        response = ocean.droplet.resize env["droplet_id"],
-                                    :size => env["user_droplet_size"]
+        response = ocean.droplet.resize env['droplet_id'],
+                                        size: env['user_droplet_size']
 
-        unless response.success?
+        if response.success?
+          say 'Resize complete!', :green
+        else
           say "Failed to resize Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Resize complete!", :green
         end
 
         @app.call(env)
@@ -21,4 +21,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/restart_droplet.rb

@@ -4,19 +4,13 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        response = if env["user_droplet_hard"]
-          say "Queuing hard restart for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplet.power_cycle env["droplet_id"]
-        else
-          say "Queuing restart for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-          ocean.droplet.reboot env["droplet_id"]
-        end
+        response = restart_droplet(env['user_droplet_hard'], ocean, env['droplet_id'], env['droplet_name'])
 
-        unless response.success?
+        if response.success?
+          say 'Restart complete!', :green
+        else
           say "Failed to restart Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Restart complete!", :green
         end
 
         @app.call(env)
@@ -24,4 +18,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/snapshot_droplet.rb

@@ -6,18 +6,18 @@ module Tugboat
         # Right now, the digital ocean API doesn't return an error
         # when your droplet is not powered off and you try to snapshot.
         # This is a temporary measure to let the user know.
-        say "Warning: Droplet must be in a powered off state for snapshot to be successful", :yellow
+        say 'Warning: Droplet must be in a powered off state for snapshot to be successful', :yellow
 
-        say "Queuing snapshot '#{env["user_snapshot_name"]}' for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
+        say "Queuing snapshot '#{env['user_snapshot_name']}' for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
 
-        response = ocean.droplet.snapshot env["droplet_id"],
-                                :name => env["user_snapshot_name"]
+        response = ocean.droplet.snapshot env['droplet_id'],
+                                          name: env['user_snapshot_name']
 
-        unless response.success?
+        if response.success?
+          say 'Snapshot successful!', :green
+        else
           say "Failed to snapshot Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Snapshot successful!", :green
         end
 
         @app.call(env)
@@ -25,4 +25,3 @@ module Tugboat
     end
   end
 end
-

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -2,47 +2,47 @@ module Tugboat
   module Middleware
     class SSHDroplet < Base
       def call(env)
-        say "Executing SSH on Droplet #{env["droplet_name"]}..."
+        say "Executing SSH on Droplet #{env['droplet_name']}..."
 
         options = [
-          "-o", "LogLevel=ERROR",
-          "-o", "StrictHostKeyChecking=no",
-          "-o", "UserKnownHostsFile=/dev/null",
+          '-o', 'LogLevel=ERROR',
+          '-o', 'StrictHostKeyChecking=no',
+          '-o', 'UserKnownHostsFile=/dev/null'
         ]
 
-        if env["config"].ssh_key_path.nil? || env["config"].ssh_key_path.empty?
-          options.push("-o", "IdentitiesOnly=no")
+        if env['config'].ssh_key_path.nil? || env['config'].ssh_key_path.empty?
+          options.push('-o', 'IdentitiesOnly=no')
         else
-          options.push("-o", "IdentitiesOnly=yes")
-          options.push("-i", File.expand_path(env["config"].ssh_key_path.to_s))
+          options.push('-o', 'IdentitiesOnly=yes')
+          options.push('-i', File.expand_path(env['config'].ssh_key_path.to_s))
         end
 
-        if env["user_droplet_ssh_port"]
-          options.push("-p", env["user_droplet_ssh_port"].to_s)
-        elsif env["config"].ssh_port
-          options.push("-p", env["config"].ssh_port.to_s)
+        if env['user_droplet_ssh_port']
+          options.push('-p', env['user_droplet_ssh_port'].to_s)
+        elsif env['config'].ssh_port
+          options.push('-p', env['config'].ssh_port.to_s)
         else
-          options.push("-p", "22")
+          options.push('-p', '22')
         end
 
-        if env["user_droplet_ssh_opts"]
-          options.concat env["user_droplet_ssh_opts"].split
+        if env['user_droplet_ssh_opts']
+          options.concat env['user_droplet_ssh_opts'].split
         end
 
-        ssh_user = env["user_droplet_ssh_user"] || env["config"].ssh_user
+        ssh_user = env['user_droplet_ssh_user'] || env['config'].ssh_user
 
-        host_ip = env["droplet_ip"]
+        host_ip = env['droplet_ip']
 
-        if env["user_droplet_use_private_ip"] && env["droplet_ip_private"].nil?
-          say "You asked to ssh to the private IP, but no Private IP found!", :red
+        if env['user_droplet_use_private_ip'] && env['droplet_ip_private'].nil?
+          say 'You asked to ssh to the private IP, but no Private IP found!', :red
           exit 1
         end
 
-        if env["droplet_ip_private"]
-          say "This droplet has a private IP, checking if you asked to use the Private IP..."
-          if env["user_droplet_use_private_ip"]
-            say "You did! Using private IP for ssh...", :yellow
-            host_ip = env["droplet_ip_private"]
+        if env['droplet_ip_private']
+          say 'This droplet has a private IP, checking if you asked to use the Private IP...'
+          if env['user_droplet_use_private_ip']
+            say 'You did! Using private IP for ssh...', :yellow
+            host_ip = env['droplet_ip_private']
           else
             say "You didn't! Using public IP for ssh...", :yellow
           end
@@ -51,25 +51,24 @@ module Tugboat
         host_string = "#{ssh_user}@#{host_ip}"
 
         if env['user_droplet_ssh_wait']
-          say "Wait flag given, waiting for droplet to become active"
-          wait_for_state(env["droplet_id"],'active',env['barge'])
+          say 'Wait flag given, waiting for droplet to become active'
+          wait_for_state(env['droplet_id'], 'active', env['barge'])
         end
 
         say "Attempting SSH: #{host_string}"
 
         options << host_string
 
-        if env["user_droplet_ssh_command"]
-          options.push(env["user_droplet_ssh_command"])
+        if env['user_droplet_ssh_command']
+          options.push(env['user_droplet_ssh_command'])
         end
 
-        say "SShing with options: #{options.join(" ")}"
+        say "SShing with options: #{options.join(' ')}"
 
-        Kernel.exec("ssh", *options)
+        Kernel.exec('ssh', *options)
 
         @app.call(env)
       end
     end
   end
 end
-

data/lib/tugboat/middleware/start_droplet.rb

@@ -4,14 +4,14 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Queuing start for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
-        response = ocean.droplet.power_on env["droplet_id"]
+        say "Queuing start for #{env['droplet_id']} #{env['droplet_name']}...", nil, false
+        response = ocean.droplet.power_on env['droplet_id']
 
-        unless response.success?
+        if response.success?
+          say 'Start complete!', :green
+        else
           say "Failed to start Droplet: #{response.message}", :red
           exit 1
-        else
-          say "Start complete!", :green
         end
 
         @app.call(env)

data/lib/tugboat/middleware/wait_for_state.rb

@@ -4,13 +4,12 @@ module Tugboat
       def call(env)
         ocean = env['barge']
 
-        say "Waiting for droplet to become #{env["user_droplet_desired_state"]}.", nil, false
+        say "Waiting for droplet to become #{env['user_droplet_desired_state']}.", nil, false
 
-        wait_for_state(env["droplet_id"],env["user_droplet_desired_state"],ocean)
+        wait_for_state(env['droplet_id'], env['user_droplet_desired_state'], ocean)
 
         @app.call(env)
       end
     end
   end
 end
-

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "2.2.2"
+  VERSION = '2.2.3'.freeze
 end

data/spec/cli/add_key_spec.rb

@@ -2,29 +2,28 @@ require 'spec_helper'
 require 'fileutils'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  let(:tmp_path) { project_path + "/tmp/tugboat" }
+  let(:tmp_path) { project_path + '/tmp/tugboat' }
   let(:fake_home) { "#{project_path}/tmp" }
 
-  before :each do
-    File.open("id_dsa.pub", 'w') {|f| f.write("ssh-dss A456= user@host") }
+  before do
+    File.open('id_dsa.pub', 'w') { |f| f.write('ssh-dss A456= user@host') }
   end
 
-  after :each do
-    File.delete("id_dsa.pub") if File.exist?("id_dsa.pub")
+  after do
+    File.delete('id_dsa.pub') if File.exist?('id_dsa.pub')
     File.delete("#{fake_home}/.ssh/id_rsa.pub") if File.exist?("#{fake_home}/.ssh/id_rsa.pub")
   end
 
-  describe "add-key" do
-    it "with a name and key string" do
+  describe 'add-key' do
+    it 'with a name and key string' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/account/keys').
+        with(body: '{"name":"macbook_pro","public_key":"ssh-dss A123= user@host"}').
+        to_return(status: 201, body: fixture('create_ssh_key'), headers: {})
 
-      stub_request(:post, "https://api.digitalocean.com/v2/account/keys").
-         with(:body => "{\"name\":\"macbook_pro\",\"public_key\":\"ssh-dss A123= user@host\"}").
-         to_return(:status => 201, :body => fixture('create_ssh_key'), :headers => {})
-
-      @cli.options = @cli.options.merge(:key => "#{ssh_public_key}")
-      @cli.add_key(ssh_key_name)
+      cli.options = cli.options.merge(key: ssh_public_key.to_s)
+      cli.add_key(ssh_key_name)
 
       expect($stdout.string).to eq <<-eos
 Queueing upload of SSH key 'macbook_pro'...SSH Key uploaded
@@ -33,31 +32,31 @@ Name: macbook_pro
 ID: 3
       eos
 
-      expect(a_request(:post, "https://api.digitalocean.com/v2/account/keys")).to have_been_made
+      expect(a_request(:post, 'https://api.digitalocean.com/v2/account/keys')).to have_been_made
     end
 
-    before :each do
+    before do
       allow(ENV).to receive(:[]).with('HOME').and_return(fake_home)
       allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return(nil)
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
 
       FileUtils.mkdir_p "#{fake_home}/.ssh"
-      File.open("#{fake_home}/.ssh/id_rsa.pub", 'w') {|f| f.write("ssh-dss A456= user@host") }
+      File.open("#{fake_home}/.ssh/id_rsa.pub", 'w') { |f| f.write('ssh-dss A456= user@host') }
     end
 
-    it "with name, prompts from file folder" do
-      stub_request(:post, "https://api.digitalocean.com/v2/account/keys").
-         with(:body => "{\"name\":\"macbook_pro\",\"public_key\":\"ssh-dss A456= user@host\"}",
-              :headers => {'Accept'=>'*/*', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json'}).
-         to_return(:status => 201, :body => fixture('create_ssh_key_from_file'), :headers => {})
+    it 'with name, prompts from file folder' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/account/keys').
+        with(body: '{"name":"macbook_pro","public_key":"ssh-dss A456= user@host"}',
+             headers: { 'Accept' => '*/*', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json' }).
+        to_return(status: 201, body: fixture('create_ssh_key_from_file'), headers: {})
 
       expect($stdout).to receive(:print).exactly(4).times
-      expect($stdout).to receive(:print).with("Enter the path to your SSH key: ")
+      expect($stdout).to receive(:print).with('Enter the path to your SSH key: ')
       expect($stdout).to receive(:print).with("Queueing upload of SSH key '#{ssh_key_name}'...")
       expect($stdin).to receive(:gets).and_return("#{fake_home}/.ssh/id_rsa.pub")
 
-      @cli.add_key(ssh_key_name)
+      cli.add_key(ssh_key_name)
 
       expect($stdout.string).to eq <<-eos
 Possible public key paths from #{fake_home}/.ssh:
@@ -71,11 +70,9 @@ ID: 5
       eos
     end
 
-    after :each do
-      File.delete("id_dsa.pub") if File.exist?("id_dsa.pub")
+    after do
+      File.delete('id_dsa.pub') if File.exist?('id_dsa.pub')
       FileUtils.rm_rf("#{fake_home}/.ssh/") if File.exist?("#{fake_home}/.ssh/")
     end
-
   end
 end
-

data/spec/cli/authorize_cli_spec.rb

@@ -1,113 +1,110 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  let(:tmp_path)             { project_path + "/tmp/tugboat" }
+  let(:tmp_path) { project_path + '/tmp/tugboat' }
 
-  describe "authorize" do
+  describe 'authorize' do
     before do
-
     end
 
-    it "asks the right questions and checks credentials" do
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1").
-         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
-         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+    it 'asks the right questions and checks credentials' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1').
+        with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.11.0' }).
+        to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
       expect($stdout).to receive(:print).exactly(6).times
-      expect($stdout).to receive(:print).with("Enter your access token: ")
+      expect($stdout).to receive(:print).with('Enter your access token: ')
       expect($stdin).to receive(:gets).and_return(access_token)
-      expect($stdout).to receive(:print).with("Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ")
+      expect($stdout).to receive(:print).with('Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ')
       expect($stdin).to receive(:gets).and_return(ssh_key_path)
-      expect($stdout).to receive(:print).with("Enter your SSH user (optional, defaults to root): ")
+      expect($stdout).to receive(:print).with('Enter your SSH user (optional, defaults to root): ')
       expect($stdin).to receive(:gets).and_return(ssh_user)
-      expect($stdout).to receive(:print).with("Enter your SSH port number (optional, defaults to 22): ")
+      expect($stdout).to receive(:print).with('Enter your SSH port number (optional, defaults to 22): ')
       expect($stdin).to receive(:gets).and_return(ssh_port)
-      expect($stdout).to receive(:print).with("Enter your default region (optional, defaults to nyc1): ")
+      expect($stdout).to receive(:print).with('Enter your default region (optional, defaults to nyc1): ')
       expect($stdin).to receive(:gets).and_return(region)
-      expect($stdout).to receive(:print).with("Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ")
+      expect($stdout).to receive(:print).with('Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ')
       expect($stdin).to receive(:gets).and_return(image)
-      expect($stdout).to receive(:print).with("Enter your default size (optional, defaults to 512mb)): ")
+      expect($stdout).to receive(:print).with('Enter your default size (optional, defaults to 512mb)): ')
       expect($stdin).to receive(:gets).and_return(size)
       expect($stdout).to receive(:print).with("Enter your default ssh key IDs (optional, defaults to none, array of IDs of ssh keys eg. ['1234']): ")
       expect($stdin).to receive(:gets).and_return(ssh_key_id)
-      expect($stdout).to receive(:print).with("Enter your default for private networking (optional, defaults to false): ")
+      expect($stdout).to receive(:print).with('Enter your default for private networking (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return(private_networking)
-      expect($stdout).to receive(:print).with("Enter your default for enabling backups (optional, defaults to false): ")
+      expect($stdout).to receive(:print).with('Enter your default for enabling backups (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return(backups_enabled)
-      expect($stdout).to receive(:print).with("Enter your default for IPv6 (optional, defaults to false): ")
+      expect($stdout).to receive(:print).with('Enter your default for IPv6 (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return(ip6)
 
-      @cli.authorize
+      cli.authorize
 
-      expect($stdout.string).to include("Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new")
+      expect($stdout.string).to include('Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new')
       expect($stdout.string).to include("To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.")
-      expect($stdout.string).to include("Defaults can be changed at any time in your ~/.tugboat configuration file.")
+      expect($stdout.string).to include('Defaults can be changed at any time in your ~/.tugboat configuration file.')
 
       config = YAML.load_file(tmp_path)
 
-      expect(config["defaults"]["image"]).to eq image
-      expect(config["defaults"]["region"]).to eq region
-      expect(config["defaults"]["size"]).to eq size
-      expect(config["ssh"]["ssh_user"]).to eq ssh_user
-      expect(config["ssh"]["ssh_key_path"]).to eq ssh_key_path
-      expect(config["ssh"]["ssh_port"]).to eq ssh_port
-      expect(config["defaults"]["ssh_key"]).to eq ssh_key_id
-      expect(config["defaults"]["private_networking"]).to eq private_networking
-      expect(config["defaults"]["backups_enabled"]).to eq backups_enabled
-      expect(config["defaults"]["ip6"]).to eq ip6
+      expect(config['defaults']['image']).to eq image
+      expect(config['defaults']['region']).to eq region
+      expect(config['defaults']['size']).to eq size
+      expect(config['ssh']['ssh_user']).to eq ssh_user
+      expect(config['ssh']['ssh_key_path']).to eq ssh_key_path
+      expect(config['ssh']['ssh_port']).to eq ssh_port
+      expect(config['defaults']['ssh_key']).to eq ssh_key_id
+      expect(config['defaults']['private_networking']).to eq private_networking
+      expect(config['defaults']['backups_enabled']).to eq backups_enabled
+      expect(config['defaults']['ip6']).to eq ip6
     end
 
-    it "sets defaults if no input given" do
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1").
-         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>/Bearer/, 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
-         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+    it 'sets defaults if no input given' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1').
+        with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => %r{Bearer}, 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.11.0' }).
+        to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
       expect($stdout).to receive(:print).exactly(6).times
-      expect($stdout).to receive(:print).with("Enter your access token: ")
+      expect($stdout).to receive(:print).with('Enter your access token: ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ")
+      expect($stdout).to receive(:print).with('Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your SSH user (optional, defaults to root): ")
+      expect($stdout).to receive(:print).with('Enter your SSH user (optional, defaults to root): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your SSH port number (optional, defaults to 22): ")
+      expect($stdout).to receive(:print).with('Enter your SSH port number (optional, defaults to 22): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default region (optional, defaults to nyc1): ")
+      expect($stdout).to receive(:print).with('Enter your default region (optional, defaults to nyc1): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ")
+      expect($stdout).to receive(:print).with('Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default size (optional, defaults to 512mb)): ")
+      expect($stdout).to receive(:print).with('Enter your default size (optional, defaults to 512mb)): ')
       expect($stdin).to receive(:gets).and_return('')
       expect($stdout).to receive(:print).with("Enter your default ssh key IDs (optional, defaults to none, array of IDs of ssh keys eg. ['1234']): ")
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default for private networking (optional, defaults to false): ")
+      expect($stdout).to receive(:print).with('Enter your default for private networking (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default for enabling backups (optional, defaults to false): ")
+      expect($stdout).to receive(:print).with('Enter your default for enabling backups (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default for IPv6 (optional, defaults to false): ")
+      expect($stdout).to receive(:print).with('Enter your default for IPv6 (optional, defaults to false): ')
       expect($stdin).to receive(:gets).and_return('')
 
-      @cli.authorize
+      cli.authorize
 
-      expect($stdout.string).to include("Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new")
+      expect($stdout.string).to include('Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new')
       expect($stdout.string).to include("To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.")
-      expect($stdout.string).to include("Defaults can be changed at any time in your ~/.tugboat configuration file.")
+      expect($stdout.string).to include('Defaults can be changed at any time in your ~/.tugboat configuration file.')
 
       config = YAML.load_file(tmp_path)
 
-      expect(config["defaults"]["image"]).to eq "ubuntu-14-04-x64"
-      expect(config["defaults"]["region"]).to eq "nyc2"
-      expect(config["defaults"]["size"]).to eq "512mb"
-      expect(config["ssh"]["ssh_user"]).to eq 'root'
-      expect(config["ssh"]["ssh_key_path"]).to eq "~/.ssh/id_rsa"
-      expect(config["ssh"]["ssh_port"]).to eq "22"
-      expect(config["defaults"]["ssh_key"]).to eq ""
-      expect(config["defaults"]["private_networking"]).to eq 'false'
-      expect(config["defaults"]["backups_enabled"]).to eq 'false'
-      expect(config["defaults"]["ip6"]).to eq 'false'
+      expect(config['defaults']['image']).to eq 'ubuntu-14-04-x64'
+      expect(config['defaults']['region']).to eq 'nyc2'
+      expect(config['defaults']['size']).to eq '512mb'
+      expect(config['ssh']['ssh_user']).to eq 'root'
+      expect(config['ssh']['ssh_key_path']).to eq '~/.ssh/id_rsa'
+      expect(config['ssh']['ssh_port']).to eq '22'
+      expect(config['defaults']['ssh_key']).to eq ''
+      expect(config['defaults']['private_networking']).to eq 'false'
+      expect(config['defaults']['backups_enabled']).to eq 'false'
+      expect(config['defaults']['ip6']).to eq 'false'
     end
   end
-
 end
-