tugboat 0.2.0 → 1.0.0

data/lib/tugboat/middleware/config.rb

@@ -0,0 +1,29 @@
+module Tugboat
+  module Middleware
+    # Check if the droplet in the environment is inactive, or "off"
+    class Config < Base
+      def call(env)
+
+        config = Tugboat::Configuration.instance
+
+        keys_retracted = ''
+
+        config_data = config.data.to_yaml
+
+        if env["user_hide_keys"]
+          keys_retracted = '(Keys Redacted)'
+          config_data = config_data.gsub(/(client_key: )([a-zA-Z0-9]+)/,'\1 [REDACTED]')
+          config_data = config_data.gsub(/(api_key: )([a-zA-Z0-9]+)/,'\1 [REDACTED]')
+        end
+
+        say "Current Config #{keys_retracted}", :green
+
+        say "Path: #{config.path}"
+        say config_data
+
+        @app.call(env)
+      end
+    end
+  end
+end
+

data/lib/tugboat/middleware/custom_logger.rb

@@ -7,7 +7,7 @@ module Tugboat
         @app = app
         @logger = options.fetch(:logger) {
           require 'logger'
-          ::Logger.new(STDOUT)
+          ::Logger.new($stdout)
         }
       end
 
@@ -26,7 +26,7 @@ module Tugboat
       private
 
       def filter(output)
-        unless ENV['DEBUG'] == '2'
+        if ENV['DEBUG'].to_i == 2
           output = output.to_s.gsub(/client_id=[a-zA-Z0-9]*/,'client_id=[CLIENT-ID]')
           output = output.to_s.gsub(/api_key=[a-zA-Z0-9]*/,'api_key=[API-KEY]')
           output = output.to_s.gsub(/_digitalocean2_session_v2=[a-zA-Z0-9%-]*/,'_digitalocean2_session_v2=[SESSION_COOKIE]')

data/lib/tugboat/middleware/find_droplet.rb

@@ -33,6 +33,7 @@ module Tugboat
           env["droplet_id"] = req.droplet.id
           env["droplet_name"] = "(#{req.droplet.name})"
           env["droplet_ip"] = req.droplet.ip_address
+          env["droplet_ip_private"] = req.droplet.private_ip_address
           env["droplet_status"] = req.droplet.status
         end
 
@@ -47,6 +48,7 @@ module Tugboat
               env["droplet_id"] = d.id
               env["droplet_name"] = "(#{d.name})"
               env["droplet_ip"] = d.ip_address
+              env["droplet_ip_private"] = d.private_ip_address
               env["droplet_status"] = d.status
             end
           end
@@ -83,6 +85,7 @@ module Tugboat
             env["droplet_id"] = found_droplets.first.id
             env["droplet_name"] = "(#{found_droplets.first.name})"
             env["droplet_ip"] = found_droplets.first.ip_address
+            env["droplet_ip_private"] = found_droplets.first.private_ip_address
             env["droplet_status"] = found_droplets.first.status
           elsif found_droplets.length > 1
             # Did we run the multiple questionairre?
@@ -99,6 +102,7 @@ module Tugboat
             env["droplet_id"] = found_droplets[choice.to_i].id
             env["droplet_name"] = found_droplets[choice.to_i].name
             env["droplet_ip"] = found_droplets[choice.to_i].ip_address
+            env["droplet_ip_private"] = found_droplets[choice.to_i].private_ip_address
             env["droplet_status"] = found_droplets[choice.to_i].status
           end
 

data/lib/tugboat/middleware/info_droplet.rb

@@ -24,6 +24,11 @@ module Tugboat
         say "ID:               #{droplet.id}"
         say "Status:           #{status_color}#{droplet.status}#{CLEAR}"
         say "IP:               #{droplet.ip_address}"
+
+        if droplet.private_ip_address
+	        say "Private IP:       #{droplet.private_ip_address}"
+	      end
+
         say "Region ID:        #{droplet.region_id}"
         say "Image ID:         #{droplet.image_id}"
         say "Size ID:          #{droplet.size_id}"

data/lib/tugboat/middleware/inject_client.rb

@@ -14,7 +14,7 @@ module Tugboat
           faraday.use CustomLogger if ENV['DEBUG']
           faraday.request  :url_encoded
           faraday.response :rashify
-          faraday.response :json
+          faraday.response :json, :content_type => /\b(json|json-home)$/
           faraday.adapter Faraday.default_adapter
         end
       end

data/lib/tugboat/middleware/list_droplets.rb

@@ -13,13 +13,17 @@ module Tugboat
         else
           droplet_list.each do |droplet|
 
+            if droplet.private_ip_address
+              private_ip = ", privateip: #{droplet.private_ip_address}"
+            end
+
             if droplet.status == "active"
               status_color = GREEN
             else
               status_color = RED
             end
 
-            say "#{droplet.name} (ip: #{droplet.ip_address}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region_id}, id: #{droplet.id})"
+            say "#{droplet.name} (ip: #{droplet.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region_id}, id: #{droplet.id})"
           end
         end
 

data/lib/tugboat/middleware/list_regions.rb

@@ -3,11 +3,11 @@ module Tugboat
     class ListRegions < Base
       def call(env)
         ocean = env["ocean"]
-        regions = ocean.regions.list.regions
+        regions = ocean.regions.list.regions.sort_by(&:name)
 
         say "Regions:"
         regions.each do |region|
-          say "#{region.name} (id: #{region.id})"
+          say "#{region.name} (id: #{region.id}) (slug: #{region.slug})"
         end
 
         @app.call(env)

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -9,7 +9,7 @@ module Tugboat
           "-o", "LogLevel=ERROR",
           "-o", "StrictHostKeyChecking=no",
           "-o", "UserKnownHostsFile=/dev/null",
-          "-i", env["config"].ssh_key_path.to_s]
+          "-i", File.expand_path(env["config"].ssh_key_path.to_s)]
 
         if env["user_droplet_ssh_port"]
           options.push("-p", env["user_droplet_ssh_port"].to_s)
@@ -24,7 +24,22 @@ module Tugboat
         end
 
         ssh_user = env["user_droplet_ssh_user"] || env["config"].ssh_user
-        host_string = "#{ssh_user}@#{env["droplet_ip"]}"
+
+        host_ip = env["droplet_ip"]
+
+        if env["droplet_ip_private"]
+          use_public_ip = env["config"].use_public_ip
+
+          if not env["user_droplet_use_public_ip"].nil?
+            use_public_ip = env["user_droplet_use_public_ip"]
+          end
+
+          if not use_public_ip
+            host_ip = env["droplet_ip_private"]
+          end
+        end
+
+        host_string = "#{ssh_user}@#{host_ip}"
 
         options << host_string
 

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/spec/cli/add_key_spec.rb

@@ -20,7 +20,7 @@ describe Tugboat::CLI do
     it "with a name and key string" do
 
       stub_request(:get, "https://api.digitalocean.com/ssh_keys/new?api_key=#{api_key}&client_id=#{client_key}&name=#{ssh_key_name}&ssh_pub_key=#{ssh_public_key}").
-      to_return(:status => 200, :body => fixture("create_ssh_key"))
+      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("create_ssh_key"))
 
       @cli.options = @cli.options.merge(:key => "#{ssh_public_key}")
       @cli.add_key(ssh_key_name)
@@ -33,21 +33,21 @@ Queueing upload of SSH key '#{ssh_key_name}'...done
     end
 
     before :each do
-      ENV.stub(:[]).with('HOME').and_return(fake_home)
-      ENV.stub(:[]).with('DEBUG').and_return(nil)
-      ENV.stub(:[]).with('http_proxy').and_return(nil)
+      allow(ENV).to receive(:[]).with('HOME').and_return(fake_home)
+      allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
       FileUtils.mkdir_p "#{fake_home}/.ssh"
       File.open("#{fake_home}/.ssh/id_rsa.pub", 'w') {|f| f.write("ssh-dss A456= user@host") }
     end
 
     it "with name, prompts from file folder" do
       stub_request(:get, "https://api.digitalocean.com/ssh_keys/new?api_key=#{api_key}&client_id=#{client_key}&name=#{ssh_key_name}&ssh_pub_key=ssh-dss%20A456=%20user@host").
-      to_return(:status => 200, :body => fixture("create_ssh_key"))
+      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => fixture("create_ssh_key"))
 
-      $stdout.should_receive(:print).exactly(4).times
-      $stdout.should_receive(:print).with("Enter the path to your SSH key: ")
-      $stdout.should_receive(:print).with("Queueing upload of SSH key '#{ssh_key_name}'...")
-      $stdin.should_receive(:gets).and_return("#{fake_home}/.ssh/id_rsa.pub")
+      expect($stdout).to receive(:print).exactly(4).times
+      expect($stdout).to receive(:print).with("Enter the path to your SSH key: ")
+      expect($stdout).to receive(:print).with("Queueing upload of SSH key '#{ssh_key_name}'...")
+      expect($stdin).to receive(:gets).and_return("#{fake_home}/.ssh/id_rsa.pub")
 
       @cli.add_key(ssh_key_name)
 

data/spec/cli/authorize_cli_spec.rb

@@ -8,77 +8,101 @@ 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(:status => 200)
+      to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200)
     end
 
     it "asks the right questions and checks credentials" do
 
-      $stdout.should_receive(:print).exactly(6).times
-      $stdout.should_receive(:print).with("Enter your client key: ")
-      $stdin.should_receive(:gets).and_return(client_key)
-      $stdout.should_receive(:print).with("Enter your API key: ")
-      $stdin.should_receive(:gets).and_return(api_key)
-      $stdout.should_receive(:print).with("Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ")
-      $stdin.should_receive(:gets).and_return(ssh_key_path)
-      $stdout.should_receive(:print).with("Enter your SSH user (optional, defaults to #{ENV['USER']}): ")
-      $stdin.should_receive(:gets).and_return(ssh_user)
-      $stdout.should_receive(:print).with("Enter your SSH port number (optional, defaults to 22): ")
-      $stdin.should_receive(:gets).and_return(ssh_port)
-      $stdout.should_receive(:print).with("Enter your default region ID (optional, defaults to 1 (New York)): ")
-      $stdin.should_receive(:gets).and_return(region)
-      $stdout.should_receive(:print).with("Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)): ")
-      $stdin.should_receive(:gets).and_return(image)
-      $stdout.should_receive(:print).with("Enter your default size ID (optional, defaults to 66 (512MB)): ")
-      $stdin.should_receive(:gets).and_return(size)
-      $stdout.should_receive(:print).with("Enter your default ssh key ID (optional, defaults to none): ")
-      $stdin.should_receive(:gets).and_return(ssh_key_id)
-      $stdout.should_receive(:print).with("Enter your default for private networking (optional, defaults to false): ")
-      $stdin.should_receive(:gets).and_return(private_networking)
-      $stdout.should_receive(:print).with("Enter your default for enabling backups (optional, defaults to false): ")
-      $stdin.should_receive(:gets).and_return(backups_enabled)
-
+      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 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($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($stdin).to receive(:gets).and_return(image)
+      expect($stdout).to receive(:print).with("Enter your default size ID (optional, defaults to 66 (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)
+      expect($stdout).to receive(:print).with("Enter your default for private networking (optional, defaults to false): ")
+      expect($stdin).to receive(:gets).and_return(private_networking)
+      expect($stdout).to receive(:print).with("Enter your default for enabling backups (optional, defaults to false): ")
+      expect($stdin).to receive(:gets).and_return(backups_enabled)
 
       @cli.authorize
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made
+      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("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.")
 
-      File.read(tmp_path).should include "image: '#{image}'", "region: '#{region}'", "size: '#{size}'", "ssh_user: #{ssh_user}", "ssh_key_path: #{ssh_key_path}", "ssh_port: '#{ssh_port}'", "ssh_key: '#{ssh_key_id}'", "private_networking: '#{private_networking}'", "backups_enabled: '#{backups_enabled}'"
+      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
+      expect(config["defaults"]["region"]).to eq region
+      expect(config["defaults"]["size"]).to eq size
+      expect(config["ssh"]["ssh_user"]).to eq ssh_user
+      expect(config["ssh"]["ssh_key_path"]).to eq ssh_key_path
+      expect(config["ssh"]["ssh_port"]).to eq ssh_port
+      expect(config["defaults"]["ssh_key"]).to eq ssh_key_id
+      expect(config["defaults"]["private_networking"]).to eq private_networking
+      expect(config["defaults"]["backups_enabled"]).to eq backups_enabled
     end
 
     it "sets defaults if no input given" do
 
-      $stdout.should_receive(:print).exactly(6).times
-      $stdout.should_receive(:print).with("Enter your client key: ")
-      $stdin.should_receive(:gets).and_return(client_key)
-      $stdout.should_receive(:print).with("Enter your API key: ")
-      $stdin.should_receive(:gets).and_return(api_key)
-      $stdout.should_receive(:print).with("Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa): ")
-      $stdin.should_receive(:gets).and_return(ssh_key_path)
-      $stdout.should_receive(:print).with("Enter your SSH user (optional, defaults to #{ENV['USER']}): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your SSH port number (optional, defaults to 22): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default region ID (optional, defaults to 1 (New York)): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default size ID (optional, defaults to 66 (512MB)): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default ssh key ID (optional, defaults to none): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default for private networking (optional, defaults to false): ")
-      $stdin.should_receive(:gets).and_return('')
-      $stdout.should_receive(:print).with("Enter your default for enabling backups (optional, defaults to false): ")
-      $stdin.should_receive(:gets).and_return('')
-
+      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 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('')
+      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($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($stdin).to receive(:gets).and_return('')
+      expect($stdout).to receive(:print).with("Enter your default size ID (optional, defaults to 66 (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('')
+      expect($stdout).to receive(:print).with("Enter your default for private networking (optional, defaults to false): ")
+      expect($stdin).to receive(:gets).and_return('')
+      expect($stdout).to receive(:print).with("Enter your default for enabling backups (optional, defaults to false): ")
+      expect($stdin).to receive(:gets).and_return('')
 
       @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("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
 
-      File.read(tmp_path).should include "image: '350076'", "region: '1'", "size: '66'", "ssh_user: #{ENV['USER']}", "ssh_key_path: ~/.ssh/id_rsa", "ssh_port: '22'", "ssh_key: ''"
+      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["ssh"]["ssh_user"]).to eq 'root'
+      expect(config["ssh"]["ssh_key_path"]).to eq "~/.ssh/id_rsa2"
+      expect(config["ssh"]["ssh_port"]).to eq "22"
+      expect(config["defaults"]["ssh_key"]).to eq ""
     end
   end
 

data/spec/cli/create_cli_spec.rb

@@ -6,7 +6,7 @@ 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(:status => 200, :body => '{"status":"OK"}')
+         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK"}')
 
       @cli.create(droplet_name)
 
@@ -18,7 +18,7 @@ Queueing creation of droplet '#{droplet_name}'...done
 
     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(:status => 200, :body => '{"status":"OK"}')
+         to_return(:headers => {'Content-Type' => 'application/json'}, :status => 200, :body => '{"status":"OK"}')
 
       @cli.options = @cli.options.merge(:image => '555', :size => '666', :region => '3', :keys => '4321')
       @cli.create(droplet_name)
@@ -29,8 +29,43 @@ Queueing creation of droplet '#{droplet_name}'...done
 
       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
-  end
 
+    it "doesn't create a droplet when mistyping help command" do
+      help_text = <<-eos
+Usage:
+  rspec create NAME
 
-end
+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
+
+      @cli.create('help')
+      expect($stdout.string).to eq help_text
+
+      @cli.create('--help')
+      expect($stdout.string).to eq help_text + help_text
+
+      @cli.create('-h')
+      expect($stdout.string).to eq help_text + help_text + help_text
+    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"}')
+
+      @cli.create('somethingblahblah--help')
+
+      expect($stdout.string).to eq <<-eos
+Queueing creation of droplet 'somethingblahblah--help'...done
+      eos
+    end
+  end
+end

data/spec/cli/debug_cli_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Tugboat::CLI do
+  include_context "spec"
+
+  describe "DEBUG=1" do
+    before(:each) do
+      allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
+      allow(ENV).to receive(:[]).with('DEBUG').and_return(1)
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+    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"))
+
+      @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
+
+  describe "DEBUG=2" do
+    before(:each) do
+      allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
+      allow(ENV).to receive(:[]).with('DEBUG').and_return(2)
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+    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"))
+
+      @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
+