tugboat 2.2.2 → 2.2.3

data/spec/cli/droplets_cli_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "droplets" do
-    it "shows a list when droplets exist" 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 'droplets' do
+    it 'shows a list when droplets exist' 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 => {'Content-Type' => 'application/json'},)
+      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: { 'Content-Type' => 'application/json' })
 
-      @cli.droplets
+      cli.droplets
 
       expect($stdout.string).to eq <<-eos
 example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990)
@@ -21,19 +21,19 @@ example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3
 example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444)
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
     end
 
-    it "shows a private IP if droplet in list has private IP" 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 'shows a private IP if droplet in list has private IP' 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_private_ip"), :headers => {'Content-Type' => 'application/json'},)
+      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_private_ip'), headers: { 'Content-Type' => 'application/json' })
 
-      @cli.droplets
+      cli.droplets
 
       expect($stdout.string).to eq <<-eos
 exampleprivate.com (ip: 104.236.32.182, private_ip: 10.131.99.89, status: \e[32mactive\e[0m, region: nyc3, id: 6918990)
@@ -41,57 +41,57 @@ example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3
 example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444)
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
     end
 
-    it "returns an error message when no droplets exist" 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 'returns an error message when no droplets exist' 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_empty"), :headers => {'Content-Type' => 'application/json'},)
+      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_empty'), headers: { 'Content-Type' => 'application/json' })
 
-      @cli.droplets
+      cli.droplets
 
       expect($stdout.string).to eq <<-eos
 You don't appear to have any droplets.
 Try creating one with \e[32m`tugboat create`\e[0m
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
     end
 
-    it "shows no output when --quiet is 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 'shows no output when --quiet is 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 => {'Content-Type' => 'application/json'},)
+      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: { 'Content-Type' => 'application/json' })
 
-      @cli.options = @cli.options.merge(:quiet => true)
-      @cli.droplets
+      cli.options = cli.options.merge(quiet: true)
+      cli.droplets
 
       # Should be /dev/null not stringIO
       expect($stdout).to be_a File
 
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
     end
 
-    it "includes urls when --include-urls is 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 'includes urls when --include-urls is 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 => {'Content-Type' => 'application/json'},)
+      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: { 'Content-Type' => 'application/json' })
 
-      @cli.options = @cli.options.merge("include_urls" => true)
-      @cli.droplets
+      cli.options = cli.options.merge('include_urls' => true)
+      cli.droplets
 
       expect($stdout.string).to eq <<-eos
 example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990')
@@ -99,24 +99,24 @@ example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3
 example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444')
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
     end
 
-    it "paginates when multiple pages are returned" 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 'paginates when multiple pages are returned' 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_paginated_first"), :headers => {'Content-Type' => 'application/json'},)
+      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_paginated_first'), headers: { 'Content-Type' => 'application/json' })
 
-      stub_request(:get, "https://api.digitalocean.com/v2/droplets?page=2&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_paginated_last"), :headers => {'Content-Type' => 'application/json'},)
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=2&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_paginated_last'), headers: { 'Content-Type' => 'application/json' })
 
-      @cli.options = @cli.options.merge("include_urls" => true)
-      @cli.droplets
+      cli.options = cli.options.merge('include_urls' => true)
+      cli.droplets
 
       expect($stdout.string).to eq <<-eos
 page1example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990')
@@ -127,9 +127,7 @@ page2example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3,
 page2example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444')
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=200")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
     end
   end
-
 end
-

data/spec/cli/env_variable_spec.rb

@@ -1,38 +1,37 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "DO_API_TOKEN=foobar" do
-    it "verifies with the ENV variable DO_API_TOKEN" 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 env_variable', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
-         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+  describe 'DO_API_TOKEN=foobar' do
+    it 'verifies with the ENV variable DO_API_TOKEN' 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 env_variable', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.11.0' }).
+        to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('env_variable')
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
       allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
 
-      @cli.verify
+      cli.verify
       expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made
     end
 
-    it "does not use ENV variable DO_API_TOKEN if empty" 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 use ENV variable DO_API_TOKEN if empty' 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: {})
 
       allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
       allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('')
       allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
       allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
 
-      @cli.verify
+      cli.verify
       expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
-      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?page=1&per_page=1")).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made
     end
   end
 end
-

data/spec/cli/halt_cli_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "halt" do
-    it "halts 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 'halt' do
+    it 'halts 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(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
-         with(:body => "{\"type\":\"shutdown\"}",
-              :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('shutdown_response'), :headers => {})
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets/6918990/actions').
+        with(body: '{"type":"shutdown"}',
+             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('shutdown_response'), headers: {})
 
-      @cli.halt("example.com")
+      cli.halt('example.com')
 
       expect($stdout.string).to eq <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
@@ -26,22 +26,22 @@ Queuing shutdown for 6918990 (example.com)...Halt successful!
       eos
     end
 
-    it "halts a droplet hard when the hard option is used" 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 'halts a droplet hard when the hard option is used' 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(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
-         with(:body => "{\"type\":\"power_off\"}",
-              :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 => "", :headers => {})
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets/6918990/actions').
+        with(body: '{"type":"power_off"}',
+             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: '', headers: {})
 
-      @cli.options = @cli.options.merge(:hard => true)
-      @cli.halt("example.com")
+      cli.options = cli.options.merge(hard: true)
+      cli.halt('example.com')
 
       expect($stdout.string).to eq <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
@@ -49,26 +49,26 @@ Queuing hard shutdown for 6918990 (example.com)...Halt successful!
       eos
     end
 
-    it "halts a droplet with an id" 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 'halts a droplet with an id' 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/?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 => {'Content-Type' => 'application/json'},)
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets/?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: { 'Content-Type' => 'application/json' })
 
-      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 => {})
+      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(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
-         with(:body => "{\"type\":\"shutdown\"}",
-              :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('shutdown_response'), :headers => {})
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets/6918990/actions').
+        with(body: '{"type":"shutdown"}',
+             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('shutdown_response'), headers: {})
 
-      @cli.options = @cli.options.merge(:id => '6918990')
-      @cli.halt
+      cli.options = cli.options.merge(id: '6918990')
+      cli.halt
 
       expect($stdout.string).to eq <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
@@ -76,23 +76,22 @@ Queuing shutdown for 6918990 (example.com)...Halt successful!
       eos
     end
 
+    it 'halts 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 "halts 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: { 'Content-Type' => 'application/json' })
 
-      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 => {'Content-Type' => 'application/json'},)
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets/6918990/actions').
+        with(body: '{"type":"shutdown"}',
+             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('shutdown_response'), headers: {})
 
-      stub_request(:post, "https://api.digitalocean.com/v2/droplets/6918990/actions").
-         with(:body => "{\"type\":\"shutdown\"}",
-              :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('shutdown_response'), :headers => {})
-
-      @cli.options = @cli.options.merge(:name => 'example.com')
-      @cli.halt
+      cli.options = cli.options.merge(name: 'example.com')
+      cli.halt
 
       expect($stdout.string).to eq <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
@@ -100,25 +99,22 @@ Queuing shutdown for 6918990 (example.com)...Halt successful!
       eos
     end
 
+    it 'does not halt a droplet that is off' 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 "does not halt a droplet that is off" 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.9.2'}).
-         to_return(:status => 200, :body => fixture("show_droplets"), :headers => {'Content-Type' => 'application/json'},)
+      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: { 'Content-Type' => 'application/json' })
 
-      @cli.options = @cli.options.merge(:name => 'example3.com')
-      expect {@cli.halt}.to raise_error(SystemExit)
+      cli.options = cli.options.merge(name: 'example3.com')
+      expect { cli.halt }.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Droplet must be on for this operation to be successful.
       eos
     end
-
   end
-
 end

data/spec/cli/help_cli_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
 describe Tugboat::CLI do
-  include_context "spec"
+  include_context 'spec'
 
-  describe "help" do
-    it "shows a help message" do
-      @cli.help
-      expect($stdout.string).to match("Commands:")
+  describe 'help' do
+    it 'shows a help message' do
+      cli.help
+      expect($stdout.string).to match('Commands:')
     end
 
-    it "shows a help message for specific commands" do
-      @cli.help "sizes"
-      expect($stdout.string).to match("Usage:")
+    it 'shows a help message for specific commands' do
+      cli.help 'sizes'
+      expect($stdout.string).to match('Usage:')
     end
   end
 end