tugboat 1.3.1 → 2.0.0.RC1

data/spec/cli/authorize_cli_spec.rb

@@ -7,28 +7,28 @@ describe Tugboat::CLI do
 
   describe "authorize" do
     before do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200)
+
     end
 
     it "asks the right questions and checks credentials" do
+      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 => {})
 
       expect($stdout).to receive(:print).exactly(6).times
-      expect($stdout).to receive(:print).with("Enter your client key: ")
-      expect($stdin).to receive(:gets).and_return(client_key)
-      expect($stdout).to receive(:print).with("Enter your API key: ")
-      expect($stdin).to receive(:gets).and_return(api_key)
+      expect($stdout).to receive(:print).with("Enter your access token: ")
+      expect($stdin).to receive(:gets).and_return(access_token)
       expect($stdout).to receive(:print).with("Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ")
       expect($stdin).to receive(:gets).and_return(ssh_key_path)
       expect($stdout).to receive(:print).with("Enter your SSH user (optional, defaults to root): ")
       expect($stdin).to receive(:gets).and_return(ssh_user)
       expect($stdout).to receive(:print).with("Enter your SSH port number (optional, defaults to 22): ")
       expect($stdin).to receive(:gets).and_return(ssh_port)
-      expect($stdout).to receive(:print).with("Enter your default region ID (optional, defaults to 8 (New York 3)): ")
+      expect($stdout).to receive(:print).with("Enter your default region (optional, defaults to nyc1): ")
       expect($stdin).to receive(:gets).and_return(region)
-      expect($stdout).to receive(:print).with("Enter your default image ID (optional, defaults to 9801950 (Ubuntu 14.04 x64)): ")
+      expect($stdout).to receive(:print).with("Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ")
       expect($stdin).to receive(:gets).and_return(image)
-      expect($stdout).to receive(:print).with("Enter your default size ID (optional, defaults to 66 (512MB)): ")
+      expect($stdout).to receive(:print).with("Enter your default size (optional, defaults to 512mb)): ")
       expect($stdin).to receive(:gets).and_return(size)
       expect($stdout).to receive(:print).with("Enter your default ssh key ID (optional, defaults to none): ")
       expect($stdin).to receive(:gets).and_return(ssh_key_id)
@@ -39,13 +39,10 @@ describe Tugboat::CLI do
 
       @cli.authorize
 
-      expect($stdout.string).to include("Note: You can get this information from https://cloud.digitalocean.com/api_access")
-      expect($stdout.string).to include("Also Note: Tugboat is setup to work with v1 of the Digital Ocean API (https://developers.digitalocean.com/v1/)")
+      expect($stdout.string).to include("Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new")
       expect($stdout.string).to include("To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.")
       expect($stdout.string).to include("Defaults can be changed at any time in your ~/.tugboat configuration file.")
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-
       config = YAML.load_file(tmp_path)
 
       expect(config["defaults"]["image"]).to eq image
@@ -60,23 +57,24 @@ describe Tugboat::CLI do
     end
 
     it "sets defaults if no input given" do
+      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/, 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
 
       expect($stdout).to receive(:print).exactly(6).times
-      expect($stdout).to receive(:print).with("Enter your client key: ")
-      expect($stdin).to receive(:gets).and_return(client_key)
-      expect($stdout).to receive(:print).with("Enter your API key: ")
-      expect($stdin).to receive(:gets).and_return(api_key)
+      expect($stdout).to receive(:print).with("Enter your access token: ")
+      expect($stdin).to receive(:gets).and_return('')
       expect($stdout).to receive(:print).with("Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ")
-      expect($stdin).to receive(:gets).and_return(ssh_key_path)
+      expect($stdin).to receive(:gets).and_return('')
       expect($stdout).to receive(:print).with("Enter your SSH user (optional, defaults to root): ")
       expect($stdin).to receive(:gets).and_return('')
       expect($stdout).to receive(:print).with("Enter your SSH port number (optional, defaults to 22): ")
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default region ID (optional, defaults to 8 (New York 3)): ")
+      expect($stdout).to receive(:print).with("Enter your default region (optional, defaults to nyc1): ")
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default image ID (optional, defaults to 9801950 (Ubuntu 14.04 x64)): ")
+      expect($stdout).to receive(:print).with("Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64): ")
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default size ID (optional, defaults to 66 (512MB)): ")
+      expect($stdout).to receive(:print).with("Enter your default size (optional, defaults to 512mb)): ")
       expect($stdin).to receive(:gets).and_return('')
       expect($stdout).to receive(:print).with("Enter your default ssh key ID (optional, defaults to none): ")
       expect($stdin).to receive(:gets).and_return('')
@@ -87,20 +85,17 @@ describe Tugboat::CLI do
 
       @cli.authorize
 
-      expect($stdout.string).to include("Note: You can get this information from https://cloud.digitalocean.com/api_access")
-      expect($stdout.string).to include("Also Note: Tugboat is setup to work with v1 of the Digital Ocean API (https://developers.digitalocean.com/v1/)")
+      expect($stdout.string).to include("Note: You can get your Access Token from https://cloud.digitalocean.com/settings/tokens/new")
       expect($stdout.string).to include("To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.")
       expect($stdout.string).to include("Defaults can be changed at any time in your ~/.tugboat configuration file.")
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-
       config = YAML.load_file(tmp_path)
 
-      expect(config["defaults"]["image"]).to eq "9801950"
-      expect(config["defaults"]["region"]).to eq "8"
-      expect(config["defaults"]["size"]).to eq "66"
+      expect(config["defaults"]["image"]).to eq "ubuntu-14-04-x64"
+      expect(config["defaults"]["region"]).to eq "nyc2"
+      expect(config["defaults"]["size"]).to eq "512mb"
       expect(config["ssh"]["ssh_user"]).to eq 'root'
-      expect(config["ssh"]["ssh_key_path"]).to eq "~/.ssh/id_rsa2"
+      expect(config["ssh"]["ssh_key_path"]).to eq "~/.ssh/id_rsa"
       expect(config["ssh"]["ssh_port"]).to eq "22"
       expect(config["defaults"]["ssh_key"]).to eq ""
     end

data/spec/cli/config_cli_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Tugboat::CLI do
+  include_context "spec"
+
+  describe "config" do
+    it "shows the full config" do
+
+      @cli.config
+
+      expect($stdout.string).to eq <<-eos
+Current Config\x20
+Path: #{Dir.pwd}/tmp/tugboat
+---
+authentication:
+  access_token: foo
+ssh:
+  ssh_user: baz
+  ssh_key_path: ~/.ssh/id_rsa2
+  ssh_port: '33'
+defaults:
+  region: nyc2
+  image: ubuntu-14-04-x64
+  size: 512mb
+  ssh_key: '1234'
+  private_networking: 'false'
+  backups_enabled: 'false'
+      eos
+    end
+
+    it "hides sensitive data if option given" do
+
+      @cli.options = @cli.options.merge(:hide => true)
+      @cli.config
+
+            expect($stdout.string).to eq <<-eos
+Current Config (Keys Redacted)
+Path: #{Dir.pwd}/tmp/tugboat
+---
+authentication:
+  access_token:\x20\x20[REDACTED]
+ssh:
+  ssh_user: baz
+  ssh_key_path: ~/.ssh/id_rsa2
+  ssh_port: '33'
+defaults:
+  region: nyc2
+  image: ubuntu-14-04-x64
+  size: 512mb
+  ssh_key: '1234'
+  private_networking: 'false'
+  backups_enabled: 'false'
+      eos
+    end
+  end
+end
+

data/spec/cli/create_cli_spec.rb

@@ -5,47 +5,35 @@ describe Tugboat::CLI do
 
   describe "create a droplet" do
     it "with a name, uses defaults from configuration" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=#{image}&name=#{droplet_name}&backups_enabled=#{backups_enabled}&private_networking=#{private_networking}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}").
-         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK"}')
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
+         with(:body => "{\"name\":\"foo\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
 
       @cli.create(droplet_name)
 
       expect($stdout.string).to eq <<-eos
-Queueing creation of droplet '#{droplet_name}'...done
+Queueing creation of droplet '#{droplet_name}'...Droplet created!
       eos
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=#{image}&name=#{droplet_name}&backups_enabled=#{backups_enabled}&private_networking=#{private_networking}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}")).to have_been_made
     end
 
     it "with args does not use defaults from configuration" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=555&name=foo&backups_enabled=#{backups_enabled}&private_networking=#{private_networking}&region_id=3&size_id=666&ssh_key_ids=4321").
-         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK"}')
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
+         with(:body => "{\"name\":\"example.com\",\"size\":\"1gb\",\"image\":\"ubuntu-12-04-x64\",\"region\":\"nyc3\",\"ssh_keys\":[\"foo_bar_key\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
 
-      @cli.options = @cli.options.merge(:image => '555', :size => '666', :region => '3', :keys => '4321')
-      @cli.create(droplet_name)
+      @cli.options = @cli.options.merge(:image => 'ubuntu-12-04-x64', :size => '1gb', :region => 'nyc3', :keys => 'foo_bar_key')
+      @cli.create('example.com')
 
       expect($stdout.string).to eq <<-eos
-Queueing creation of droplet '#{droplet_name}'...done
+Queueing creation of droplet 'example.com'...Droplet created!
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=555&name=foo&backups_enabled=#{backups_enabled}&private_networking=#{private_networking}&region_id=3&size_id=666&ssh_key_ids=4321")).to have_been_made
     end
 
     it "doesn't create a droplet when mistyping help command" do
-      help_text = <<-eos
-Usage:
-  rspec create NAME
-
-Options:
-  -s, [--size=N]              # The size_id of the droplet
-  -i, [--image=N]             # The image_id of the droplet
-  -r, [--region=N]            # The region_id of the droplet
-  -k, [--keys=KEYS]           # A comma separated list of SSH key ids to add to the droplet
-  -p, [--private-networking]  # Enable private networking on the droplet
-  -b, [--backups-enabled]     # Enable backups on the droplet
-  -q, [--quiet]               
-
-Create a droplet.
-eos
+      help_text = "Usage:\n  rspec create NAME\n\nOptions:\n  -s, [--size=N]              # The size_id of the droplet\n  -i, [--image=N]             # The image_id of the droplet\n  -r, [--region=N]            # The region_id of the droplet\n  -k, [--keys=KEYS]           # A comma separated list of SSH key ids to add to the droplet\n  -p, [--private-networking]  # Enable private networking on the droplet\n  -b, [--backups-enabled]     # Enable backups on the droplet\n  -q, [--quiet]               \n\nCreate a droplet.\n"
 
       @cli.create('help')
       expect($stdout.string).to eq help_text
@@ -58,13 +46,15 @@ eos
     end
 
     it "does not clobber named droplets that contain the word help" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=#{image}&name=somethingblahblah--help&backups_enabled=#{backups_enabled}&private_networking=#{private_networking}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}").
-         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK"}')
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
+         with(:body => "{\"name\":\"somethingblahblah--help\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
 
       @cli.create('somethingblahblah--help')
 
       expect($stdout.string).to eq <<-eos
-Queueing creation of droplet 'somethingblahblah--help'...done
+Queueing creation of droplet 'somethingblahblah--help'...Droplet created!
       eos
     end
   end

data/spec/cli/debug_cli_spec.rb

@@ -11,14 +11,11 @@ describe Tugboat::CLI do
     end
 
     it "gives full faraday logs" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
-
+      pending 'Debug flag not avaliable yet'
+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 => {})
       @cli.droplets
-
-      expect($stdout.string).to include('Response from https://api.digitalocean.com/droplets?client_id=foo&api_key=bar; Status: 200;')
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
   end
 
@@ -30,14 +27,11 @@ describe Tugboat::CLI do
     end
 
     it "gives full faraday logs with redacted API keys" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
-
+      pending 'Debug flag not avaliable yet'
+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 => {})
       @cli.droplets
-
-      expect($stdout.string).to include('Response from https://api.digitalocean.com/droplets?client_id=[CLIENT-ID]&api_key=[API-KEY]; Status: 200;')
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
   end
 end

data/spec/cli/destroy_cli_spec.rb

@@ -5,103 +5,92 @@ describe Tugboat::CLI do
 
   describe "destroy" do
     it "destroys 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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      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 => {})
 
-      stub_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 204, :body => "", :headers => {})
 
       expect($stdin).to receive(:gets).and_return("y")
 
-      @cli.destroy("foo")
+      @cli.destroy("example.com")
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 100823 (foo)...done
-      eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 6918990 (example.com)...Deletion Successful!
+eos
     end
 
     it "destroys a droplet with an id" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      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(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 204, :body => "", :headers => {})
 
       expect($stdin).to receive(:gets).and_return("y")
 
-      @cli.options = @cli.options.merge(:id => droplet_id)
+      @cli.options = @cli.options.merge(:id => '6918990')
       @cli.destroy
 
       expect($stdout.string).to eq <<-eos
-Droplet id provided. Finding Droplet...done\e[0m, 100823 (foo)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 100823 (foo)...done
+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(a_request(:get, "https://api.digitalocean.com/droplets/#{droplet_id}?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
 
     it "destroys a droplet with a name" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      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 => {})
 
-      stub_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
+      with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+      to_return(:status => 204, :body => "", :headers => {})
 
       expect($stdin).to receive(:gets).and_return("y")
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
+      @cli.options = @cli.options.merge(:name => 'example.com')
       @cli.destroy
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy for 100823 (foo)...done
+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(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
-
     it "destroys 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(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
+      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 => {})
 
-      stub_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/droplets/6918990").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+        to_return(:status => 204, :body => "", :headers => {})
 
-      @cli.options = @cli.options.merge(:name => droplet_name)
-      @cli.options = @cli.options.merge(:confirm => true)
+      @cli.options = @cli.options.merge(:name => 'example.com', :confirm => true)
       @cli.destroy
 
       expect($stdout.string).to eq <<-eos
-Droplet name provided. Finding droplet ID...done\e[0m, 100823 (foo)
-Queuing destroy for 100823 (foo)...done
+Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
+Queuing destroy for 6918990 (example.com)...Deletion Successful!
       eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "does not destroy a droplet if no is chosen" do
-      stub_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplets"))
-
-      stub_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_droplet"))
+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 => {})
 
       $stdin.should_receive(:gets).and_return("n")
 
-      expect {@cli.destroy("foo")}.to raise_error(SystemExit)
+      expect {@cli.destroy("example.com")}.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
-Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 100823 (foo)\nWarning! Potentially destructive action. Please confirm [y/n]: Aborted due to user request.
+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(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:delete, "https://api.digitalocean.com/droplets/100823/destroy?api_key=#{api_key}&client_id=#{client_key}")).to_not have_been_made
     end
   end
 

data/spec/cli/destroy_image_cli_spec.rb

@@ -5,83 +5,77 @@ describe Tugboat::CLI do
 
   describe "destroy image" do
     it "destroys an image with a fuzzy name" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
+      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_images_global'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 204, :body => "", :headers => {})
 
       expect($stdin).to receive(:gets).and_return("y")
 
-      @cli.destroy_image("NLP Final")
+      @cli.destroy_image("My application image")
 
       expect($stdout.string).to eq <<-eos
-Image fuzzy name provided. Finding image ID...done\e[0m, 478 (NLP Final)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 478 (NLP Final)...done
+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(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
 
     it "destroys an image with an id" do
-      stub_request(:get, "https://api.digitalocean.com/images/478?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
+      stub_request(:get, "https://api.digitalocean.com/v2/images/6376601?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_image'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 204, :body => "", :headers => {})
 
       expect($stdin).to receive(:gets).and_return("y")
 
-      @cli.options = @cli.options.merge(:id => 478)
+      @cli.options = @cli.options.merge(:id => 6376601)
       @cli.destroy_image
 
       expect($stdout.string).to eq <<-eos
-Image id provided. Finding Image...done\e[0m, 478 (NLP Final)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 478 (NLP Final)...done
+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(a_request(:get, "https://api.digitalocean.com/images/478?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-    end
+   end
 
 
     it "destroys an image with a name" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
+      stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_images_global'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 204, :body => "", :headers => {})
 
       expect($stdin).to receive(:gets).and_return("y")
 
-      @cli.options = @cli.options.merge(:name => "NLP Final")
+      @cli.options = @cli.options.merge(:name => "My application image")
       @cli.destroy_image
 
-      expect($stdout.string).to eq <<-eos
-Image name provided. Finding image ID...done\e[0m, 478 (NLP Final)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 478 (NLP Final)...done
-      eos
-
-      expect(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      expect($stdout.string).to eq "Image name provided. Finding Image...done\e[0m, 6376601 (My application image)\nWarning! Potentially destructive action. Please confirm [y/n]: Queuing destroy image for 6376601 (My application image)...Image deletion successful!\n"
     end
 
 
     it "destroys an image with confirm flag set" do
-      stub_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_images"))
+            stub_request(:get, "https://api.digitalocean.com/v2/images?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_images_global'), :headers => {})
 
-      stub_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}").
-           to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("show_image"))
+      stub_request(:delete, "https://api.digitalocean.com/v2/images/6376601").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 204, :body => "", :headers => {})
 
-      @cli.options = @cli.options.merge(:name => "NLP Final")
+      @cli.options = @cli.options.merge(:name => "My application image")
       @cli.options = @cli.options.merge(:confirm => true)
       @cli.destroy_image("NLP Final")
 
       expect($stdout.string).to eq <<-eos
-Image name provided. Finding image ID...done\e[0m, 478 (NLP Final)\nQueuing destroy image for 478 (NLP Final)...done
+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(a_request(:get, "https://api.digitalocean.com/images?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
-      expect(a_request(:get, "https://api.digitalocean.com/images/478/destroy?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
     end
   end