tugboat 3.1.0 → 4.0.0

data/spec/cli/restart_cli_spec.rb

@@ -18,12 +18,12 @@ 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('restart_response'), headers: {})
 
-      cli.restart('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing restart for 6918990 (example.com)...Restart complete!
       eos
+
+      expect { cli.restart('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'restarts a droplet hard when the hard option is used' do
@@ -41,12 +41,13 @@ Queuing restart for 6918990 (example.com)...Restart complete!
         to_return(status: 200, body: '', headers: {})
 
       cli.options = cli.options.merge(hard: true)
-      cli.restart('example.com')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing hard restart for 6918990 (example.com)...Restart complete!
       eos
+
+      expect { cli.restart('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'with an id' do
@@ -64,12 +65,13 @@ Queuing hard restart for 6918990 (example.com)...Restart complete!
         to_return(status: 200, body: fixture('restart_response'), headers: {})
 
       cli.options = cli.options.merge(id: '6918990')
-      cli.restart
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Queuing restart for 6918990 (example.com)...Restart complete!
       eos
+
+      expect { cli.restart }.to output(expected_string).to_stdout
     end
 
     it 'with a name' do
@@ -86,13 +88,32 @@ Queuing restart for 6918990 (example.com)...Restart complete!
              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('restart_response'), headers: {})
 
-      cli.options = cli.options.merge(name: 'example.com')
-      cli.restart
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing restart for 6918990 (example.com)...Restart complete!
       eos
+
+      cli.options = cli.options.merge(name: 'example.com')
+      expect { cli.restart }.to 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: { 'Content-Type' => 'application/json' })
+
+      stub_request(:post, 'https://api.digitalocean.com/v2/droplets/6918990/actions').
+        with(body: '{"type":"reboot"}',
+             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"}')
+
+      cli.options = cli.options.merge(name: 'example.com')
+
+      expect { cli.restart }.to raise_error(SystemExit).and output(%r{Failed to restart Droplet: Some error}).to_stdout
     end
   end
 end

data/spec/cli/sizes_cli_spec.rb

@@ -9,9 +9,7 @@ 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(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_sizes'))
 
-      cli.sizes
-
-      expect($stdout.string).to eq <<-eos
+      cli_sizes_output = <<-eos
 Sizes:
 Disk: 20GB, Memory: 512MB (slug: 512mb)
 Disk: 30GB, Memory: 1024MB (slug: 1gb)
@@ -23,6 +21,8 @@ Disk: 320GB, Memory: 32768MB (slug: 32gb)
 Disk: 480GB, Memory: 49152MB (slug: 48gb)
 Disk: 640GB, Memory: 65536MB (slug: 64gb)
       eos
+
+      expect { cli.sizes }.to output(cli_sizes_output).to_stdout
     end
   end
 end

data/spec/cli/snapshot_cli_spec.rb

@@ -6,6 +6,19 @@ describe Tugboat::CLI do
   let(:snapshot_name) { 'foo-snapshot' }
 
   describe 'snapshots a droplet' do
+    it 'without a droplet parameter' 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: {})
+
+      snapshot_no_droplet_parameter_stdout = <<-eos
+You must provide a snapshot name followed by the droplet's name.
+For example: `tugboat snapshot foo-snapshot example-node.com`
+      eos
+
+      expect { cli.snapshot(snapshot_name) }.to raise_error(SystemExit).and output(snapshot_no_droplet_parameter_stdout).to_stdout
+    end
+
     it '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' }).
@@ -20,13 +33,13 @@ 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('snapshot_response'), headers: {})
 
-      cli.snapshot(snapshot_name, 'example3.com')
-
-      expect($stdout.string).to eq <<-eos
+      snapshot_fuzzy_stdout = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Warning: Droplet must be in a powered off state for snapshot to be successful
 Queuing snapshot 'foo-snapshot' for 3164444 (example3.com)...Snapshot successful!
       eos
+
+      expect { cli.snapshot(snapshot_name, 'example3.com') }.to output(snapshot_fuzzy_stdout).to_stdout
     end
 
     it 'with an id' do
@@ -44,13 +57,14 @@ Queuing snapshot 'foo-snapshot' for 3164444 (example3.com)...Snapshot successful
         to_return(status: 200, body: fixture('snapshot_response'), headers: {})
 
       cli.options = cli.options.merge(id: '3164444')
-      cli.snapshot(snapshot_name)
 
-      expect($stdout.string).to eq <<-eos
+      snapshot_id_stdout = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 3164494 (example.com)
 Warning: Droplet must be in a powered off state for snapshot to be successful
 Queuing snapshot 'foo-snapshot' for 3164494 (example.com)...Snapshot successful!
       eos
+
+      expect { cli.snapshot(snapshot_name) }.to output(snapshot_id_stdout).to_stdout
     end
 
     it 'with a name' do
@@ -68,13 +82,14 @@ Queuing snapshot 'foo-snapshot' for 3164494 (example.com)...Snapshot successful!
         to_return(status: 200, body: fixture('snapshot_response'), headers: {})
 
       cli.options = cli.options.merge(name: 'example3.com')
-      cli.snapshot(snapshot_name)
 
-      expect($stdout.string).to eq <<-eos
+      snapshot_name_stdout = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Warning: Droplet must be in a powered off state for snapshot to be successful
 Queuing snapshot 'foo-snapshot' for 3164444 (example3.com)...Snapshot successful!
       eos
+
+      expect { cli.snapshot(snapshot_name) }.to output(snapshot_name_stdout).to_stdout
     end
 
     it 'does not snapshot a droplet that is active' do
@@ -87,12 +102,13 @@ Queuing snapshot 'foo-snapshot' for 3164444 (example3.com)...Snapshot successful
         to_return(status: 200, body: fixture('show_droplets'), headers: {})
 
       cli.options = cli.options.merge(name: 'example.com')
-      expect { cli.snapshot(snapshot_name) }.to raise_error(SystemExit)
 
-      expect($stdout.string).to eq <<-eos
+      snapshot_active_error_stdout = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Droplet must be off for this operation to be successful.
       eos
+
+      expect { cli.snapshot(snapshot_name) }.to raise_error(SystemExit).and output(snapshot_active_error_stdout).to_stdout
     end
   end
 end

data/spec/cli/ssh_cli_spec.rb

@@ -13,7 +13,7 @@ describe Tugboat::CLI do
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_droplets'))
       allow(Kernel).to receive(:exec).with('ssh', anything, anything, anything, anything, anything, anything, anything, anything, anything, anything, anything, anything, anything)
 
-      cli.ssh('example.com')
+      expect { cli.ssh('example.com') }.to output(%r{Attempting SSH: baz@104.236.32.182}).to_stdout
     end
 
     it "wait's until droplet active if -w command is given and droplet already active" do
@@ -31,9 +31,7 @@ describe Tugboat::CLI do
 
       cli.options = cli.options.merge(wait: true)
 
-      cli.ssh('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Executing SSH on Droplet (example.com)...
 Wait flag given, waiting for droplet to become active
@@ -41,6 +39,8 @@ Wait flag given, waiting for droplet to become active
 Attempting SSH: baz@104.236.32.182
 SShing with options: -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -i #{Dir.home}/.ssh/id_rsa2 -p 33 baz@104.236.32.182
       eos
+
+      expect { cli.ssh('example.com') }.to output(expected_string).to_stdout
     end
 
     it "wait's until droplet active if -w command is given and droplet eventually active" do
@@ -61,9 +61,7 @@ SShing with options: -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownH
 
       cli.options = cli.options.merge(wait: true)
 
-      cli.ssh('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Executing SSH on Droplet (example.com)...
 Wait flag given, waiting for droplet to become active
@@ -71,6 +69,8 @@ Wait flag given, waiting for droplet to become active
 Attempting SSH: baz@104.236.32.182
 SShing with options: -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -i #{Dir.home}/.ssh/id_rsa2 -p 33 baz@104.236.32.182
       eos
+
+      expect { cli.ssh('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'does not allow ssh into a droplet that is inactive' do
@@ -82,12 +82,12 @@ SShing with options: -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownH
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_droplets'))
       allow(Kernel).to receive(:exec)
 
-      expect { cli.ssh('example3.com') }.to raise_error(SystemExit)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Droplet must be on for this operation to be successful.
       eos
+
+      expect { expect { cli.ssh('example3.com') }.to raise_error(SystemExit) }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/start_cli_spec.rb

@@ -18,12 +18,12 @@ 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('droplet_start_response'), headers: {})
 
-      cli.start('example3.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Queuing start for 3164444 (example3.com)...Start complete!
       eos
+
+      expect { cli.start('example3.com') }.to output(expected_string).to_stdout
     end
 
     it 'starts the droplet with an id' do
@@ -39,13 +39,13 @@ Queuing start for 3164444 (example3.com)...Start complete!
         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: 200, body: fixture('show_droplet_inactive'))
 
-      cli.options = cli.options.merge(id: '3164494')
-      cli.start
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 3164494 (example.com)
 Queuing start for 3164494 (example.com)...Start complete!
       eos
+
+      cli.options = cli.options.merge(id: '3164494')
+      expect { cli.start }.to output(expected_string).to_stdout
     end
 
     it 'starts the droplet with a name' do
@@ -62,13 +62,13 @@ Queuing start for 3164494 (example.com)...Start complete!
              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('droplet_start_response'), headers: {})
 
-      cli.options = cli.options.merge(name: 'example3.com')
-      cli.start
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 3164444 (example3.com)
 Queuing start for 3164444 (example3.com)...Start complete!
       eos
+
+      cli.options = cli.options.merge(name: 'example3.com')
+      expect { cli.start }.to output(expected_string).to_stdout
     end
 
     it 'does not start a droplet that is inactive' do
@@ -80,13 +80,13 @@ Queuing start for 3164444 (example3.com)...Start complete!
         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.options = cli.options.merge(name: 'example.com')
-      expect { cli.start }.to raise_error(SystemExit)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =  <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Droplet must be off for this operation to be successful.
       eos
+
+      cli.options = cli.options.merge(name: 'example.com')
+      expect { cli.start }.to raise_error(SystemExit).and output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/verify_cli_spec.rb

@@ -9,8 +9,7 @@ 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: {})
 
-      cli.verify
-      expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
+      expect { cli.verify }.to output("Authentication with DigitalOcean was successful.\n").to_stdout
       expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made
     end
 
@@ -19,8 +18,7 @@ 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(headers: { 'Content-Type' => 'text/html' }, status: 401, body: fixture('401'))
 
-      expect { cli.verify }.to raise_error(SystemExit)
-      expect($stdout.string).to include 'Failed to connect to DigitalOcean. Reason given from API: unauthorized - Unable to authenticate you.'
+      expect { cli.verify }.to raise_error(SystemExit).and output(%r{Failed to connect to DigitalOcean. Reason given from API: unauthorized - Unable to authenticate you.}).to_stdout
       expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made
     end
 
@@ -29,9 +27,8 @@ 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(headers: { 'Content-Type' => 'text/html' }, status: 500, body: fixture('500', 'html'))
 
-      expect { cli.verify }.to raise_error(SystemExit)
-      expect($stdout.string).to include 'Authentication with DigitalOcean failed at an early stage'
-      expect($stdout.string).to include "<title>DigitalOcean - Seems we've encountered a problem!</title>"
+      expect { cli.verify }.to raise_error(SystemExit).and output(%r{<title>DigitalOcean - Seems we've encountered a problem!}).to_stdout
+
       # TODO: Make it so this doesnt barf up a huge HTML file...
       expect(a_request(:get, 'https://api.digitalocean.com/v2/droplets?page=1&per_page=1')).to have_been_made
     end

data/spec/cli/version_cli_spec.rb

@@ -6,9 +6,8 @@ describe Tugboat::CLI do
   describe 'version' do
     it 'shows the correct version' do
       cli.options = cli.options.merge(version: true)
-      cli.version
 
-      expect($stdout.string.chomp).to eq("Tugboat #{Tugboat::VERSION}")
+      expect { cli.version }.to output("Tugboat #{Tugboat::VERSION}\n").to_stdout
     end
   end
 end

data/spec/cli/wait_cli_spec.rb

@@ -17,13 +17,13 @@ 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_droplet'), headers: {})
 
-      cli.options = cli.options.merge(state: 'active')
-      cli.wait('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active..done\e[0m (0s)
 eos
+
+      cli.options = cli.options.merge(state: 'active')
+      expect { cli.wait('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'loops whilst it waits for state' do
@@ -42,13 +42,13 @@ eos
           status: 200, body: fixture('show_droplet'), headers: {}
         )
 
-      cli.options = cli.options.merge(state: 'active')
-      cli.wait('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active...done\e[0m (2s)
 eos
+
+      cli.options = cli.options.merge(state: 'active')
+      expect { cli.wait('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'waits for a droplet with an id' do
@@ -60,13 +60,13 @@ eos
         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: {})
 
-      cli.options = cli.options.merge(id: '6918990', state: 'active')
-      cli.wait
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active..done\e[0m (0s)
       eos
+
+      cli.options = cli.options.merge(id: '6918990', state: 'active')
+      expect { cli.wait }.to output(expected_string).to_stdout
     end
 
     it 'waits for a droplet with a name' do
@@ -82,13 +82,13 @@ Waiting for droplet to become active..done\e[0m (0s)
         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: {})
 
-      cli.options = cli.options.merge(name: 'example.com', state: 'active')
-      cli.wait
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Waiting for droplet to become active..done\e[0m (0s)
 eos
+
+      cli.options = cli.options.merge(name: 'example.com', state: 'active')
+      expect { cli.wait }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/config_spec.rb

@@ -34,12 +34,13 @@ describe Tugboat::Configuration do
     let(:private_networking) { 'false' }
     let(:backups_enabled)    { 'false' }
     let(:ip6)                { 'false' }
+    let(:timeout)            { '30' }
 
     let(:config) { described_class.instance }
 
     before do
       # Create a temporary file
-      config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled, ip6)
+      config.create_config_file(access_token, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking, backups_enabled, ip6, timeout)
     end
 
     it 'can be created' do
@@ -91,6 +92,11 @@ describe Tugboat::Configuration do
       backups_enabled = data['defaults']
       expect(backups_enabled).to have_key('backups_enabled')
     end
+
+    it 'has timeout set' do
+      timeout_set = data['connection']
+      expect(timeout_set).to have_key('timeout')
+    end
   end
   describe 'backwards compatible' do
     let(:client_key)       { 'foo' }