tugboat 3.1.0 → 4.0.0

data/spec/cli/config_cli_spec.rb

@@ -5,14 +5,14 @@ describe Tugboat::CLI do
 
   describe 'config' do
     it 'shows the full config' do
-      cli.config
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Current Config\x20
 Path: #{Dir.pwd}/tmp/tugboat
 ---
 authentication:
   access_token: foo
+connection:
+  timeout: '15'
 ssh:
   ssh_user: baz
   ssh_key_path: ~/.ssh/id_rsa2
@@ -26,18 +26,21 @@ defaults:
   backups_enabled: 'false'
   ip6: 'false'
       eos
+
+      expect { cli.config }.to output(expected_string).to_stdout
     end
 
     it 'hides sensitive data if option given' do
       cli.options = cli.options.merge(hide: true)
-      cli.config
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Current Config (Keys Redacted)
 Path: #{Dir.pwd}/tmp/tugboat
 ---
 authentication:
   access_token:\x20\x20[REDACTED]
+connection:
+  timeout: '15'
 ssh:
   ssh_user: baz
   ssh_key_path: ~/.ssh/id_rsa2
@@ -51,6 +54,8 @@ defaults:
   backups_enabled: 'false'
   ip6: 'false'
       eos
+
+      expect { cli.config }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/create_cli_spec.rb

@@ -10,11 +10,11 @@ describe Tugboat::CLI do
              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: {})
 
-      cli.create(droplet_name)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Queueing creation of droplet '#{droplet_name}'...Droplet created! Droplet ID is 3164494
       eos
+
+      expect { cli.create(droplet_name) }.to output(expected_string).to_stdout
     end
 
     it 'with args does not use defaults from configuration' do
@@ -24,11 +24,12 @@ Queueing creation of droplet '#{droplet_name}'...Droplet created! Droplet ID is
         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')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Queueing creation of droplet 'example.com'...Droplet created! Droplet ID is 3164494
       eos
+
+      expect { cli.create('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'with ip6 enable args' do
@@ -38,11 +39,12 @@ Queueing creation of droplet 'example.com'...Droplet created! Droplet ID is 3164
         to_return(status: 200, body: fixture('create_droplet'), headers: {})
 
       cli.options = cli.options.merge(ip6: 'true')
-      cli.create('example.com')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Queueing creation of droplet 'example.com'...Droplet created! Droplet ID is 3164494
       eos
+
+      expect { cli.create('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'with user data args' do
@@ -52,26 +54,28 @@ Queueing creation of droplet 'example.com'...Droplet created! Droplet ID is 3164
         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')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Queueing creation of droplet 'example.com'...Droplet created! Droplet ID is 3164494
       eos
+
+      expect { cli.create('example.com') }.to output(expected_string).to_stdout
     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)
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Queueing creation of droplet 'example.com'...Could not find file: /foo/bar/baz.sh, check your user_data setting
       eos
+
+      expect { expect { cli.create('example.com') }.to raise_error(SystemExit) }.to output(expected_string).to_stdout
     end
 
     context "doesn't create a droplet when mistyping help command" do
       ['help', '--help', '-h'].each do |help_attempt|
         it "tugboat create #{help_attempt}" do
-          help_text = <<-eos
+          expected_string = <<-eos
 Usage:
   rspec create NAME
 
@@ -89,8 +93,7 @@ Options:
 Create a droplet.
 eos
 
-          cli.create(help_attempt)
-          expect($stdout.string).to eq help_text
+          expect { cli.create(help_attempt) }.to output(expected_string).to_stdout
         end
       end
     end
@@ -101,11 +104,11 @@ eos
              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: {})
 
-      cli.create('somethingblahblah--help')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Queueing creation of droplet 'somethingblahblah--help'...Droplet created! Droplet ID is 3164494
       eos
+
+      expect { cli.create('somethingblahblah--help') }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/debug_cli_spec.rb

@@ -17,16 +17,15 @@ describe Tugboat::CLI do
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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
+      debug_droplets_expectation = expect { 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 'Bearer foo'
+      debug_droplets_expectation.to output(%r{DEBUG -- : Request Headers:}).to_stdout
+      debug_droplets_expectation.to output(%r{Bearer foo}).to_stdout
+      debug_droplets_expectation.to output(%r{Started GET request to}).to_stdout
     end
   end
 
@@ -44,15 +43,15 @@ describe Tugboat::CLI do
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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
-
-      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).not_to include 'Bearer foo'
+      debug_droplets_expectation    = expect { cli.droplets }
+      debug_droplets_expectation.to output(%r{Started GET request to}).to_stdout
+      debug_droplets_expectation.to output(%r{DEBUG -- : Request Headers:}).to_stdout
+      debug_droplets_expectation.to output(%r{Bearer \[TOKEN REDACTED\]}).to_stdout
+      debug_droplets_expectation.not_to output(%r{Bearer foo}).to_stdout
     end
   end
 end

data/spec/cli/destroy_cli_spec.rb

@@ -19,11 +19,11 @@ describe Tugboat::CLI do
 
       expect($stdin).to receive(:gets).and_return('y')
 
-      cli.destroy('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-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
+
+      expect { cli.destroy('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'destroys a droplet with an id' do
@@ -38,11 +38,12 @@ eos
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(id: '6918990')
-      cli.destroy
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-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
+
+      expect { cli.destroy }.to output(expected_string).to_stdout
     end
 
     it 'destroys a droplet with a name' do
@@ -61,11 +62,12 @@ Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)\nWarning
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(name: 'example.com')
-      cli.destroy
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-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
+
+      expect { cli.destroy }.to output(expected_string).to_stdout
     end
 
     it 'destroys a droplet with confirm flag set' do
@@ -82,12 +84,13 @@ Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)\nWa
         to_return(status: 204, body: '', headers: {})
 
       cli.options = cli.options.merge(name: 'example.com', confirm: true)
-      cli.destroy
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing destroy for 6918990 (example.com)...Deletion Successful!
       eos
+
+      expect { cli.destroy }.to output(expected_string).to_stdout
     end
 
     it 'does not destroy a droplet if no is chosen' do
@@ -101,11 +104,31 @@ Queuing destroy for 6918990 (example.com)...Deletion Successful!
 
       expect($stdin).to receive(:gets).and_return('n')
 
-      expect { cli.destroy('example.com') }.to raise_error(SystemExit)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-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
+
+      expect { cli.destroy('example.com') }.to raise_error(SystemExit).and output(expected_string).to_stdout
+    end
+
+    it 'raises SystemExit when a request fails' 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: {})
+
+      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(headers: { 'Content-Type' => 'application/json' }, status: 500, body: '{"status":"ERROR","message":"Some error"}')
+
+      expect($stdin).to receive(:gets).and_return('y')
+
+      cli.options = cli.options.merge(name: 'example.com')
+
+      expect { cli.destroy }.to raise_error(SystemExit).and output(%r{Failed to destroy Droplet: Some error}).to_stdout
     end
   end
 end

data/spec/cli/destroy_image_cli_spec.rb

@@ -15,11 +15,11 @@ describe Tugboat::CLI do
 
       expect($stdin).to receive(:gets).and_return('y')
 
-      cli.destroy_image('My application image')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-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
+
+      expect { cli.destroy_image('My application image') }.to output(expected_string).to_stdout
     end
 
     it 'destroys an image with an id' do
@@ -34,11 +34,12 @@ Image fuzzy name provided. Finding image ID...done\e[0m, 6376601 (My application
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(id: 6_376_601)
-      cli.destroy_image
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-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
+
+      expect { cli.destroy_image }.to output(expected_string).to_stdout
     end
 
     it 'destroys an image with a name' do
@@ -52,10 +53,10 @@ Image id provided. Finding Image...done\e[0m, 6376601 (My application image)\nWa
 
       expect($stdin).to receive(:gets).and_return('y')
 
-      cli.options = cli.options.merge(name: 'My application image')
-      cli.destroy_image
+      expected_string = "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"
 
-      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"
+      cli.options = cli.options.merge(name: 'My application image')
+      expect { cli.destroy_image }.to output(expected_string).to_stdout
     end
 
     it 'destroys an image with confirm flag set' do
@@ -69,11 +70,12 @@ Image id provided. Finding Image...done\e[0m, 6376601 (My application image)\nWa
 
       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
+      expected_string = <<-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
+
+      expect { cli.destroy_image('NLP Final') }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/droplets_cli_spec.rb

@@ -9,19 +9,20 @@ describe Tugboat::CLI do
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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' })
 
-      cli.droplets
-
-      expect($stdout.string).to eq <<-eos
-example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990)
-example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956)
-example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444)
+      expected_string =   <<-eos
+example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990)
+example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956)
+example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444)
       eos
 
-      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
+      expect { cli.droplets }.to output(expected_string).to_stdout
+
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made.twice
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20')).to have_been_made
     end
 
     it 'shows a private IP if droplet in list has private IP' do
@@ -29,19 +30,21 @@ example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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' })
 
-      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)
-example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956)
-example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444)
+      expected_string =   <<-eos
+exampleprivate.com (ip: 104.236.32.182, private_ip: 10.131.99.89, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990)
+example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956)
+example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444)
       eos
 
-      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
+      expect { cli.droplets }.to output(expected_string).to_stdout
+
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made.twice
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20')).to have_been_made
     end
 
     it 'returns an error message when no droplets exist' do
@@ -49,18 +52,19 @@ example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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' })
 
-      cli.droplets
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-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 { cli.droplets }.to output(expected_string).to_stdout
+
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made.twice
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20')).to have_been_made
     end
 
     it 'shows no output when --quiet is set' do
@@ -68,17 +72,15 @@ Try creating one with \e[32m`tugboat create`\e[0m
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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' })
 
       cli.options = cli.options.merge(quiet: true)
-      cli.droplets
+      expect { cli.droplets }.not_to output.to_stderr
 
-      # 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=1')).to have_been_made.twice
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20')).to have_been_made
     end
 
     it 'includes urls when --include-urls is set' do
@@ -86,48 +88,72 @@ Try creating one with \e[32m`tugboat create`\e[0m
         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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20').
         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' })
 
       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')
-example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956')
-example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444')
+      expected_string = <<-eos
+example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990')
+example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956')
+example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, 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 { cli.droplets }.to output(expected_string).to_stdout
+
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made.twice
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=20')).to have_been_made
     end
 
-    it 'paginates when multiple pages are returned' do
+    it 'allows specifying per_page' 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').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=3').
         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' })
+        to_return(status: 200, body: fixture('show_droplets_paginated_first'), headers: {})
 
-      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=2&per_page=200').
+      stub_request(:get, 'https://api.digitalocean.com/v2/droplets?page=2&per_page=3').
         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' })
 
-      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')
-page1example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956')
-page1example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444')
-page2example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990')
-page2example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956')
-page2example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444')
+
+      cli.options = cli.options.merge('per_page' => '3')
+
+      expected_string = <<-eos
+page1example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990)
+page1example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956)
+page1example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444)
+page2example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 6918990)
+page2example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, size: 512mb, id: 3164956)
+page2example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, size: 512mb, id: 3164444)
       eos
 
-      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=200')).to have_been_made
+      expect { cli.droplets }.to output(expected_string).to_stdout
+
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=3')).to have_been_made
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=2&per_page=3')).to have_been_made
     end
+
+    it 'shows error on failure in initial stage' 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(headers: { 'Content-Type' => 'text/html' }, status: 401, body: fixture('401'))
+
+      expected_string = <<-eos
+Failed to connect to DigitalOcean. Reason given from API:
+401: {
+  \"id\": \"unauthorized\",
+  \"message\": \"Unable to authenticate you.\"
+}
+      eos
+
+      expect { cli.droplets }.to raise_error(SystemExit).and output(expected_string).to_stdout
+
+      expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made.once
+    end
+
   end
 end