tugboat 0.2.0 → 1.0.0

data/spec/cli/rebuild_cli_spec.rb

@@ -6,15 +6,15 @@ describe Tugboat::CLI do
   describe "rebuild" do
     it "rebuilds a droplet with a fuzzy name based on an image with a fuzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"), :headers => {})
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.rebuild("foo", "NLP Final")
 
@@ -26,15 +26,15 @@ Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nImage
 
     it "rebuilds a droplet with an id based on an image with a fuzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
-          
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:id => droplet_id)
       @cli.rebuild("foo", "NLP Final")
@@ -47,15 +47,15 @@ Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)\nImage fuzzy name
 
     it "rebuilds a droplet with a name based on an image with a fuzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
-          
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:name => droplet_name)
       @cli.rebuild("foo", "NLP Final")
@@ -68,15 +68,15 @@ Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nImage fuzzy
 
     it "rebuilds a droplet with a fuzzy name based on an image with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"), :headers => {})
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images/478?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_image"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:image_id => 478)
       @cli.rebuild("foo", "NLP Final")
@@ -89,15 +89,15 @@ Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nImage
 
     it "rebuilds a droplet with an id based on an image with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
       stub_request(:get, "https://api.digitalocean.com/images/478?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_image"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:id => droplet_id, :image_id => 478)
       @cli.rebuild("foo", "NLP Final")
@@ -110,15 +110,15 @@ Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)\nImage id provide
 
     it "rebuilds a droplet with a name based on an image with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images/478?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_image"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:name => droplet_name, :image_id => 478)
       @cli.rebuild("foo", "NLP Final")
@@ -131,15 +131,15 @@ Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nImage id pr
 
     it "rebuilds a droplet with a fuzzy name based on an image with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"), :headers => {})
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:image_name => "NLP Final")
       @cli.rebuild("foo", "NLP Final")
@@ -152,15 +152,15 @@ Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nImage
 
     it "rebuilds a droplet with an id based on an image with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:id => droplet_id, :image_name => "NLP Final")
       @cli.rebuild("foo", "NLP Final")
@@ -173,15 +173,15 @@ Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)\nImage name provi
 
     it "rebuilds a droplet with a name based on an image with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
-      $stdin.should_receive(:gets).and_return("y")
+      expect($stdin).to receive(:gets).and_return("y")
 
       @cli.options = @cli.options.merge(:name => droplet_name, :image_name => "NLP Final")
       @cli.rebuild("foo", "NLP Final")
@@ -194,13 +194,13 @@ Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nImage name
 
     it "rebuilds a droplet with confirm flag set" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"), :headers => {})
-            
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+
       stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_images"), :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
 
       stub_request(:post, "https://api.digitalocean.com/droplets/100823/rebuild?api_key=#{api_key}&client_id=#{client_key}&image_id=478").
-           to_return(:status => 200, :body => '{ "status": "OK",  "event_id": 7504 }', :headers => {})
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{ "status": "OK",  "event_id": 7504 }')
 
       @cli.options = @cli.options.merge(:confirm => "no")
       @cli.rebuild("foo", "NLP Final")

data/spec/cli/regions_cli_spec.rb

@@ -6,15 +6,15 @@ describe Tugboat::CLI do
   describe "regions" do
     it "shows a list" do
       stub_request(:get, "https://api.digitalocean.com/regions?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_regions"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_regions"))
 
       @cli.regions
 
       expect($stdout.string).to eq <<-eos
 Regions:
-Region 1 (id: 1)
-Region 2 (id: 2)
-Region 3 (id: 3)
+Region 1 (id: 1) (slug: reg1)
+Region 2 (id: 2) (slug: reg2)
+Region 3 (id: 3) (slug: reg3)
       eos
 
       expect(a_request(:get, "https://api.digitalocean.com/regions?api_key=#{api_key}&client_id=#{client_key}")).

data/spec/cli/resize_cli_spec.rb

@@ -6,9 +6,9 @@ describe Tugboat::CLI do
   describe "resize" do
     it "resizes a droplet with a fuzzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:status => 200, :body => '{"status":"OK","event_id":456}')
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK","event_id":456}')
 
       @cli.options = @cli.options.merge(:size => 123)
       @cli.resize("foo")
@@ -26,9 +26,9 @@ Queuing resize for 100823 (foo)...done
 
     it "resizes a droplet with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets/100823?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplet"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:status => 200, :body => '{"status":"OK","event_id":456}')
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK","event_id":456}')
 
       @cli.options = @cli.options.merge(:size => 123, :id => 100823)
       @cli.resize
@@ -46,9 +46,9 @@ Queuing resize for 100823 (foo)...done
 
     it "resizes a droplet with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:status => 200, :body => '{"status":"OK","event_id":456}')
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK","event_id":456}')
 
       @cli.options = @cli.options.merge(:size => 123, :name => "foo")
       @cli.resize
@@ -66,9 +66,9 @@ Queuing resize for 100823 (foo)...done
 
     it "raises SystemExit when a request fails" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/resize?api_key=#{api_key}&client_id=#{client_key}&size_id=123").
-        to_return(:status => 500, :body => '{"status":"ERROR","message":"Some error"}')
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 500, :body => '{"status":"ERROR","message":"Some error"}')
 
       @cli.options = @cli.options.merge(:size => 123)
       expect { @cli.resize("foo") }.to raise_error(SystemExit)

data/spec/cli/restart_cli_spec.rb

@@ -6,10 +6,10 @@ describe Tugboat::CLI do
   describe "restarts a droplet" do
     it "with a fuzzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
 
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/reboot?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.restart("foo")
 
@@ -24,9 +24,9 @@ Queuing restart for 100823 (foo)...done
 
     it "restarts a droplet hard when the hard option is used" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_cycle?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplet"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:hard => true)
       @cli.restart("foo")
@@ -42,10 +42,10 @@ Queuing hard restart for 100823 (foo)...done
 
     it "with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/reboot?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:id => droplet_id)
       @cli.restart
@@ -62,10 +62,10 @@ Queuing restart for 100823 (foo)...done
 
     it "with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
 
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/reboot?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:name => droplet_name)
       @cli.restart

data/spec/cli/sizes_cli_spec.rb

@@ -6,7 +6,7 @@ describe Tugboat::CLI do
   describe "sizes" do
     it "shows a list" do
       stub_request(:get, "https://api.digitalocean.com/sizes?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_sizes"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_sizes"))
 
       @cli.sizes
 

data/spec/cli/snapshot_cli_spec.rb

@@ -8,10 +8,10 @@ describe Tugboat::CLI do
   describe "snapshots a droplet" do
     it "with a fuzzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets_inactive"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
 
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.snapshot(snapshot_name, "foo")
 
@@ -27,10 +27,10 @@ Queuing snapshot 'foo-snapshot' for 100823 (foo)...done
 
     it "with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplet_inactive"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet_inactive"))
 
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:id => droplet_id)
       @cli.snapshot(snapshot_name)
@@ -48,10 +48,10 @@ Queuing snapshot 'foo-snapshot' for 100823 (foo)...done
 
     it "with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets_inactive"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
 
       stub_request(:get, "https://api.digitalocean.com/droplets/100823/snapshot?api_key=#{api_key}&client_id=#{client_key}&name=#{snapshot_name}").
-           to_return(:status => 200, :body => fixture("show_droplet"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:name => droplet_name)
       @cli.snapshot(snapshot_name)
@@ -68,7 +68,7 @@ Queuing snapshot 'foo-snapshot' for 100823 (foo)...done
 
     it "does not snaphshot a droplet that is active" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
 
       @cli.options = @cli.options.merge(:name => droplet_name)
       expect {@cli.snapshot(snapshot_name)}.to raise_error(SystemExit)

data/spec/cli/ssh_cli_spec.rb

@@ -6,8 +6,8 @@ describe Tugboat::CLI do
   describe "ssh" do
     it "tries to fetch the droplet's IP from the API" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets"))
-      Kernel.stub(:exec)
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      allow(Kernel).to receive(:exec)
 
       @cli.ssh("test222")
 
@@ -17,9 +17,9 @@ describe Tugboat::CLI do
 
     it "does not allow ssh into a droplet that is inactive" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets_inactive"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
 
-      Kernel.stub(:exec)
+      allow(Kernel).to receive(:exec)
 
       @cli.options = @cli.options.merge(:name => droplet_name)
 

data/spec/cli/start_cli_spec.rb

@@ -6,9 +6,9 @@ describe Tugboat::CLI do
   describe "start" do
     it "starts the droplet with a fuzzy name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets_inactive"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplet"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.start("foo")
 
@@ -23,9 +23,9 @@ Queuing start for 100823 (foo)...done
 
     it "starts the droplet with an id" do
       stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-       to_return(:status => 200, :body => fixture("show_droplet_inactive"))
+       to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet_inactive"))
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}").
-       to_return(:status => 200, :body => fixture("show_droplet"))
+       to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:id => droplet_id)
       @cli.start
@@ -42,9 +42,9 @@ Queuing start for 100823 (foo)...done
 
     it "starts the droplet with a name" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplets_inactive"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets_inactive"))
       stub_request(:put, "https://api.digitalocean.com/droplets/100823/power_on?api_key=#{api_key}&client_id=#{client_key}").
-        to_return(:status => 200, :body => fixture("show_droplet"))
+        to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
 
       @cli.options = @cli.options.merge(:name => droplet_name)
       @cli.start
@@ -60,7 +60,7 @@ Queuing start for 100823 (foo)...done
 
     it "does not start a droplet that is inactive" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200, :body => fixture("show_droplets"))
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
 
       @cli.options = @cli.options.merge(:name => droplet_name)
       expect {@cli.start}.to raise_error(SystemExit)

data/spec/cli/verify_cli_spec.rb

@@ -6,7 +6,7 @@ describe Tugboat::CLI do
   describe "verify" do
     it "returns confirmation text when verify passes" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 200)
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200)
       @cli.verify
       expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
       expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
@@ -14,12 +14,20 @@ describe Tugboat::CLI do
 
     it "returns error string when verify fails" do
       stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:status => 401, :body => '{"status":"ERROR", "error_message":"Access Denied"}')
+           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 401, :body => '{"status":"ERROR", "error_message":"Access Denied"}')
       expect { @cli.verify }.to raise_error(SystemExit)
       expect($stdout.string).to eq "\e[31mthe server responded with status 401!\e[0m\n\n\e[31mAccess Denied\e[0m\n\nDouble-check your parameters and configuration (in your ~/.tugboat file)\n"
       expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
+    it "returns error string when verify fails and a non-json reponse is given" do
+      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
+           to_return(:headers => {'Content-Type' => 'text/html'}, :status => 500, :body => fixture('500','html'))
+      expect { @cli.verify }.to raise_error(SystemExit)
+      expect($stdout.string).to eq "\e[31mthe server responded with status 500!\e[0m\n"
+      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+    end
+
   end
 
 end