tugboat 2.2.2 → 2.2.3

data/spec/cli/config_cli_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "config" do
-    it "shows the full config" do
-
-      @cli.config
+  describe 'config' do
+    it 'shows the full config' do
+      cli.config
 
       expect($stdout.string).to eq <<-eos
 Current Config\x20
@@ -29,12 +28,11 @@ defaults:
       eos
     end
 
-    it "hides sensitive data if option given" do
-
-      @cli.options = @cli.options.merge(:hide => true)
-      @cli.config
+    it 'hides sensitive data if option given' do
+      cli.options = cli.options.merge(hide: true)
+      cli.config
 
-            expect($stdout.string).to eq <<-eos
+      expect($stdout.string).to eq <<-eos
 Current Config (Keys Redacted)
 Path: #{Dir.pwd}/tmp/tugboat
 ---
@@ -56,4 +54,3 @@ defaults:
     end
   end
 end
-

data/spec/cli/create_cli_spec.rb

@@ -1,82 +1,76 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "create a droplet" do
-    it "with a name, uses defaults from configuration" do
-      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"foo\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":null}",
-              :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('create_droplet'), :headers => {})
+  describe 'create a droplet' do
+    it 'with a name, uses defaults from configuration' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets').
+        with(body: '{"name":"foo","size":"512mb","image":"ubuntu-14-04-x64","region":"nyc2","ssh_keys":["1234"],"private_networking":"false","backups_enabled":"false","ipv6":"false","user_data":null}',
+             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('create_droplet'), headers: {})
 
-      @cli.create(droplet_name)
+      cli.create(droplet_name)
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet '#{droplet_name}'...Droplet created!
       eos
     end
 
-    it "with args does not use defaults from configuration" do
-      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"example.com\",\"size\":\"1gb\",\"image\":\"ubuntu-12-04-x64\",\"region\":\"nyc3\",\"ssh_keys\":[\"foo_bar_key\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":null}",
-              :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('create_droplet'), :headers => {})
+    it 'with args does not use defaults from configuration' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets').
+        with(body: '{"name":"example.com","size":"1gb","image":"ubuntu-12-04-x64","region":"nyc3","ssh_keys":["foo_bar_key"],"private_networking":"false","backups_enabled":"false","ipv6":"false","user_data":null}',
+             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('create_droplet'), headers: {})
 
-      @cli.options = @cli.options.merge(:image => 'ubuntu-12-04-x64', :size => '1gb', :region => 'nyc3', :keys => 'foo_bar_key')
-      @cli.create('example.com')
+      cli.options = cli.options.merge(image: 'ubuntu-12-04-x64', size: '1gb', region: 'nyc3', keys: 'foo_bar_key')
+      cli.create('example.com')
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet 'example.com'...Droplet created!
       eos
-
     end
 
-    it "with ip6 enable args" do
-      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"example.com\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"true\",\"user_data\":null}",
-              :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('create_droplet'), :headers => {})
+    it 'with ip6 enable args' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets').
+        with(body: '{"name":"example.com","size":"512mb","image":"ubuntu-14-04-x64","region":"nyc2","ssh_keys":["1234"],"private_networking":"false","backups_enabled":"false","ipv6":"true","user_data":null}',
+             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('create_droplet'), headers: {})
 
-      @cli.options = @cli.options.merge(:ip6 => 'true')
-      @cli.create('example.com')
+      cli.options = cli.options.merge(ip6: 'true')
+      cli.create('example.com')
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet 'example.com'...Droplet created!
       eos
-
     end
 
-    it "with user data args" do
-      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"example.com\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":\"#!/bin/bash\\n\\necho \\\"Hello world\\\"\"}",
-              :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('create_droplet'), :headers => {})
+    it 'with user data args' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets').
+        with(body: '{"name":"example.com","size":"512mb","image":"ubuntu-14-04-x64","region":"nyc2","ssh_keys":["1234"],"private_networking":"false","backups_enabled":"false","ipv6":"false","user_data":"#!/bin/bash\\n\\necho \\"Hello world\\""}',
+             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('create_droplet'), headers: {})
 
-      @cli.options = @cli.options.merge(:user_data => project_path + "/spec/fixtures/user_data.sh")
-      @cli.create('example.com')
+      cli.options = cli.options.merge(user_data: project_path + '/spec/fixtures/user_data.sh')
+      cli.create('example.com')
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet 'example.com'...Droplet created!
       eos
-
     end
 
-    it "fails when user data file does not exist" do
-      @cli.options = @cli.options.merge(:user_data => "/foo/bar/baz.sh")
-      expect {@cli.create("example.com")}.to raise_error(SystemExit)
+    it 'fails when user data file does not exist' do
+      cli.options = cli.options.merge(user_data: '/foo/bar/baz.sh')
+      expect { cli.create('example.com') }.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet 'example.com'...Could not find file: /foo/bar/baz.sh, check your user_data setting
       eos
-
     end
 
     context "doesn't create a droplet when mistyping help command" do
-
-      ['help','--help','-h'].each do |help_attempt|
+      ['help', '--help', '-h'].each do |help_attempt|
         it "tugboat create #{help_attempt}" do
-
           help_text = <<-eos
 Usage:
   rspec create NAME
@@ -95,19 +89,19 @@ Options:
 Create a droplet.
 eos
 
-          @cli.create(help_attempt)
+          cli.create(help_attempt)
           expect($stdout.string).to eq help_text
         end
       end
     end
 
-    it "does not clobber named droplets that contain the word help" do
-      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"somethingblahblah--help\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"false\",\"user_data\":null}",
-              :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('create_droplet'), :headers => {})
+    it 'does not clobber named droplets that contain the word help' do
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets').
+        with(body: '{"name":"somethingblahblah--help","size":"512mb","image":"ubuntu-14-04-x64","region":"nyc2","ssh_keys":["1234"],"private_networking":"false","backups_enabled":"false","ipv6":"false","user_data":null}',
+             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('create_droplet'), headers: {})
 
-      @cli.create('somethingblahblah--help')
+      cli.create('somethingblahblah--help')
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet 'somethingblahblah--help'...Droplet created!

data/spec/cli/debug_cli_spec.rb

@@ -1,58 +1,58 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "DEBUG=1" do
-    before(:each) do
+  describe 'DEBUG=1' do
+    before do
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DEBUG').and_return(1)
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return(nil)
+      allow(ENV).to receive(:[]).with('THOR_SHELL').and_return(nil)
     end
 
-    it "gives full faraday logs" 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 'gives full faraday logs' 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: {})
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-        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 => {})
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200').
+        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: {})
 
-      @cli.droplets
+      cli.droplets
 
-      expect($stdout.string).to include "Started GET request to: https://api.digitalocean.com/v2/droplets?page=1&per_page=200"
-      expect($stdout.string).to include "DEBUG -- : Request Headers:"
+      expect($stdout.string).to include 'Started GET request to: https://api.digitalocean.com/v2/droplets?page=1&per_page=200'
+      expect($stdout.string).to include 'DEBUG -- : Request Headers:'
 
-      expect($stdout.string).to include "Bearer foo"
+      expect($stdout.string).to include 'Bearer foo'
     end
   end
 
-  describe "DEBUG=2" do
-    before(:each) do
+  describe 'DEBUG=2' do
+    before do
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DEBUG').and_return(2)
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return(nil)
+      allow(ENV).to receive(:[]).with('THOR_SHELL').and_return(nil)
     end
 
-    it "gives full faraday logs with redacted API keys" 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 'gives full faraday logs with redacted API keys' 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: {})
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-         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 => {})
-      @cli.droplets
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200').
+        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: {})
+      cli.droplets
 
-      expect($stdout.string).to include "Started GET request to: https://api.digitalocean.com/v2/droplets?page=1&per_page=200"
-      expect($stdout.string).to include "DEBUG -- : Request Headers:"
+      expect($stdout.string).to include 'Started GET request to: https://api.digitalocean.com/v2/droplets?page=1&per_page=200'
+      expect($stdout.string).to include 'DEBUG -- : Request Headers:'
 
-      expect($stdout.string).to_not include "Bearer foo"
+      expect($stdout.string).not_to include 'Bearer foo'
     end
   end
-
 end
-

data/spec/cli/destroy_cli_spec.rb

@@ -1,89 +1,88 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "destroy" do
-    it "destroys a droplet with a fuzzy name" 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 => {})
+  describe 'destroy' do
+    it 'destroys a droplet with a fuzzy name' 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: {})
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-         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 => {})
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200').
+        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: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
-         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 => 204, :body => "", :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/6918990').
+        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: 204, body: '', headers: {})
 
-      expect($stdin).to receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return('y')
 
-      @cli.destroy("example.com")
+      cli.destroy('example.com')
 
       expect($stdout.string).to eq <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 6918990 (example.com)...Deletion Successful!
 eos
     end
 
-    it "destroys a droplet with an id" do
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
-         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_droplet'), :headers => {})
+    it 'destroys a droplet with an id' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets/6918990?per_page=200').
+        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_droplet'), headers: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
-         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 => 204, :body => "", :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/6918990').
+        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: 204, body: '', headers: {})
 
-      expect($stdin).to receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return('y')
 
-      @cli.options = @cli.options.merge(:id => '6918990')
-      @cli.destroy
+      cli.options = cli.options.merge(id: '6918990')
+      cli.destroy
 
       expect($stdout.string).to eq <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 6918990 (example.com)...Deletion Successful!
       eos
     end
 
+    it 'destroys a droplet with a name' 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: {})
 
-    it "destroys a droplet with a name" 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 => {})
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200').
+        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: {})
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-      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 => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/6918990').
+        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: 204, body: '', headers: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
-      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 => 204, :body => "", :headers => {})
+      expect($stdin).to receive(:gets).and_return('y')
 
-      expect($stdin).to receive(:gets).and_return("y")
-
-      @cli.options = @cli.options.merge(:name => 'example.com')
-      @cli.destroy
+      cli.options = cli.options.merge(name: 'example.com')
+      cli.destroy
 
       expect($stdout.string).to eq <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 6918990 (example.com)...Deletion Successful!
       eos
     end
 
-    it "destroys a droplet with confirm flag set" 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 'destroys a droplet with confirm flag set' 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: {})
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-        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 => {})
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200').
+        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: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
-        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 => 204, :body => "", :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/droplets/6918990').
+        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: 204, body: '', headers: {})
 
-      @cli.options = @cli.options.merge(:name => 'example.com', :confirm => true)
-      @cli.destroy
+      cli.options = cli.options.merge(name: 'example.com', confirm: true)
+      cli.destroy
 
       expect($stdout.string).to eq <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
@@ -91,23 +90,22 @@ Queuing destroy for 6918990 (example.com)...Deletion Successful!
       eos
     end
 
-    it "does not destroy a droplet if no is chosen" 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 'does not destroy a droplet if no is chosen' 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: {})
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200").
-        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 => {})
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200').
+        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: {})
 
-      $stdin.should_receive(:gets).and_return("n")
+      $stdin.should_receive(:gets).and_return('n')
 
-      expect {@cli.destroy("example.com")}.to raise_error(SystemExit)
+      expect { cli.destroy('example.com') }.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)\nWarning! Potentially destructive action. Please confirm [y/n]: Aborted due to user request.
       eos
     end
   end
-
 end

data/spec/cli/destroy_image_cli_spec.rb

@@ -1,82 +1,79 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "destroy image" do
-    it "destroys an image with a fuzzy name" do
-      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200").
-         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_images_global'), :headers => {})
+  describe 'destroy image' do
+    it 'destroys an image with a fuzzy name' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/images?per_page=200').
+        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_images_global'), headers: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
-         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 => 204, :body => "", :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/images/6376601').
+        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: 204, body: '', headers: {})
 
-      expect($stdin).to receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return('y')
 
-      @cli.destroy_image("My application image")
+      cli.destroy_image('My application image')
 
       expect($stdout.string).to eq <<-eos
 Image fuzzy name provided. Finding image ID...done\e[0m, 6376601 (My application image)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 6376601 (My application image)...Image deletion successful!
       eos
     end
 
-    it "destroys an image with an id" do
-      stub_request(:get, "https://api.digitalocean.com/v2/images/6376601?per_page=200").
-         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_image'), :headers => {})
+    it 'destroys an image with an id' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/images/6376601?per_page=200').
+        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_image'), headers: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
-         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 => 204, :body => "", :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/images/6376601').
+        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: 204, body: '', headers: {})
 
-      expect($stdin).to receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return('y')
 
-      @cli.options = @cli.options.merge(:id => 6376601)
-      @cli.destroy_image
+      cli.options = cli.options.merge(id: 6_376_601)
+      cli.destroy_image
 
       expect($stdout.string).to eq <<-eos
 Image id provided. Finding Image...done\e[0m, 6376601 (My application image)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 6376601 (My application image)...Image deletion successful!
       eos
-   end
-
+    end
 
-    it "destroys an image with a name" do
-      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200").
-         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_images_global'), :headers => {})
+    it 'destroys an image with a name' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/images?per_page=200').
+        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_images_global'), headers: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
-         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 => 204, :body => "", :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/images/6376601').
+        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: 204, body: '', headers: {})
 
-      expect($stdin).to receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return('y')
 
-      @cli.options = @cli.options.merge(:name => "My application image")
-      @cli.destroy_image
+      cli.options = cli.options.merge(name: 'My application image')
+      cli.destroy_image
 
       expect($stdout.string).to eq "Image name provided. Finding Image...done\e[0m, 6376601 (My application image)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 6376601 (My application image)...Image deletion successful!\n"
     end
 
+    it 'destroys an image with confirm flag set' do
+      stub_request(:get, 'https://api.digitalocean.com/v2/images?per_page=200').
+        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_images_global'), headers: {})
 
-    it "destroys an image with confirm flag set" do
-            stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200").
-         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_images_global'), :headers => {})
+      stub_request(:delete, 'https://api.digitalocean.com/v2/images/6376601').
+        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: 204, body: '', headers: {})
 
-      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
-         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 => 204, :body => "", :headers => {})
-
-      @cli.options = @cli.options.merge(:name => "My application image")
-      @cli.options = @cli.options.merge(:confirm => true)
-      @cli.destroy_image("NLP Final")
+      cli.options = cli.options.merge(name: 'My application image')
+      cli.options = cli.options.merge(confirm: true)
+      cli.destroy_image('NLP Final')
 
       expect($stdout.string).to eq <<-eos
 Image name provided. Finding Image...done\e[0m, 6376601 (My application image)\nQueuing destroy image for 6376601 (My application image)...Image deletion successful!
       eos
     end
   end
-
 end