tugboat 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: acb3d5fff3be496ee45a238c9219bea4c159ca4e
+  data.tar.gz: a88aea864325b1d5b0e7d37642b42418e79ed905
+SHA512:
+  metadata.gz: e53bbe9b2bf1e3bd5bef1f748249857045da696f57e250b2819aa7261db9bdd769ed53b21e60258de6f1c5090e05de8906b0f47de4f313cacf62c20c74357c9a
+  data.tar.gz: 0806ce448db80b8a5436c647f56e144a4b94394fbc866bc4a676cea6f45bed21d4b1649339c1b3f55ca13c462fa89b08f251b539ab92d3b4358405162a69181a

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: 1.8.7

data/CHANGELOG.md

@@ -1,6 +1,26 @@
-## 0.0.7 (unreleased)
+## 0.0.8 (Unreleased)
+
+FEATURES:
+
+  - [Pete](https://github.com/petems) added configuration defaults
+  that you can set. [GH-61]
+  - [Pete](https://github.com/petems) added log filtering to debug output.
+  `DEBUG=1` now gives you filtered logs, `DEBUG=2`, raw. [GH-58]
 
 IMPROVEMENTS:
+
+  - Error messages are now caught at the Faraday level and displayed
+  back to the user.
+
+BUG FIXES:
+
+  - [Ørjan](https://github.com/blom) added a color reset on the `list`
+  command. [GH-57]
+
+## 0.0.7 (August 2, 2013)
+
+IMPROVEMENTS:
+
   - [Pete](https://github.com/petems) made it clearer to the user
   if they don't have any droplets or images. [GH-48], [GH-49]
 

data/README.md

@@ -19,6 +19,15 @@ Run the configuration utility, `tugboat authorize`. You can grab your keys
     Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa):
     Enter your SSH user (optional, defaults to jack):
     Enter your SSH port number (optional, defaults to 22):
+
+    To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`.
+    Defaults can be changed at any time in your ~/.tugboat configuration file.
+
+    Enter your default region ID (optional, defaults to 1 (New York)):
+    Enter your default image ID (optional, defaults to 284203 (Ubuntu 12.04 x64)):
+    Enter your default size ID (optional, defaults to 66 (512MB)):
+    Enter your default ssh key ID (optional, defaults to none):
+
     Authentication with DigitalOcean was successful!
 
 ## Usage
@@ -180,6 +189,15 @@ For a complete overview of all of the available commands, run:
 
     $ tugboat help
 
+## Reporting Bugs
+
+Yes, please!
+
+It's very helpful if you can run `DEBUG=1 tugboat ...` with the command
+that is causing you issues, and then include that in the issue.
+
+You can create a new issue [here](https://github.com/pearkes/tugboat/issues/new). Thank you!
+
 ## Contributing
 
 See the [contributing guide](CONTRIBUTING.md).

data/lib/tugboat/cli.rb

@@ -36,6 +36,15 @@ module Tugboat
       Middleware.sequence_authorize.call({})
     end
 
+    desc "verify", "Check your DigitalOcean credentials"
+    long_desc "This tests that your credentials created by the \`authorize\`
+    command that are stored in ~/.tugboat are correct and allow you to connect
+    to the API without errors.
+    "
+    def verify
+      Middleware.sequence_verify.call({})
+    end
+
     desc "droplets", "Retrieve a list of your droplets"
     def droplets
       Middleware.sequence_list_droplets.call({})
@@ -89,17 +98,14 @@ module Tugboat
     method_option  "size",
                    :type => :numeric,
                    :aliases => "-s",
-                   :default => 66,
                    :desc => "The size_id of the droplet"
     method_option  "image",
                    :type => :numeric,
                    :aliases => "-i",
-                   :default => 284203,
                    :desc => "The image_id of the droplet"
     method_option  "region",
                    :type => :numeric,
                    :aliases => "-r",
-                   :default => 1,
                    :desc => "The region_id of the droplet"
     method_option  "keys",
                    :type => :string,

data/lib/tugboat/config.rb

@@ -12,6 +12,10 @@ module Tugboat
     FILE_NAME = '.tugboat'
     DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'
     DEFAULT_SSH_PORT = '22'
+    DEFAULT_REGION = '1'
+    DEFAULT_IMAGE = '284203'
+    DEFAULT_SIZE = '66'
+    DEFAULT_SSH_KEY = ''
 
     def initialize
       @path = ENV["TUGBOAT_CONFIG_PATH"] || File.join(File.expand_path("~"), FILE_NAME)
@@ -42,11 +46,27 @@ module Tugboat
     def ssh_user
       @data['ssh']['ssh_user']
     end
-    
+
     def ssh_port
       @data['ssh']['ssh_port']
     end
 
+    def default_region
+      @data['defaults'].nil? ? DEFAULT_REGION : @data['defaults']['region']
+    end
+
+    def default_image
+      @data['defaults'].nil? ? DEFAULT_IMAGE : @data['defaults']['image']
+    end
+
+    def default_size
+      @data['defaults'].nil? ? DEFAULT_SIZE : @data['defaults']['size']
+    end
+
+    def default_ssh_key
+      @data['defaults'].nil? ? DEFAULT_SSH_KEY : @data['defaults']['ssh_key']
+    end
+
     # Re-runs initialize
     def reset!
       self.send(:initialize)
@@ -58,7 +78,7 @@ module Tugboat
     end
 
     # Writes a config file
-    def create_config_file(client, api, ssh_key_path, ssh_user, ssh_port)
+    def create_config_file(client, api, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key)
       # Default SSH Key path
       if ssh_key_path.empty?
         ssh_key_path = File.join(File.expand_path("~"), DEFAULT_SSH_KEY_PATH)
@@ -72,10 +92,29 @@ module Tugboat
         ssh_port = DEFAULT_SSH_PORT
       end
 
+      if region.empty?
+        region = DEFAULT_REGION
+      end
+
+      if image.empty?
+        image = DEFAULT_IMAGE
+      end
+
+      if size.empty?
+        size = DEFAULT_SIZE
+      end
+
+      if ssh_key.empty?
+        default_ssh_key = DEFAULT_SSH_KEY
+      end
+
       require 'yaml'
       File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |file|
-        data = {"authentication" => { "client_key" => client, "api_key" => api },
-                "ssh" => { "ssh_user" => ssh_user, "ssh_key_path" => ssh_key_path , "ssh_port" => ssh_port}}
+        data = {
+                "authentication" => { "client_key" => client, "api_key" => api },
+                "ssh" => { "ssh_user" => ssh_user, "ssh_key_path" => ssh_key_path , "ssh_port" => ssh_port},
+                "defaults" => { "region" => region, "image" => image, "size" => size, "ssh_key" => ssh_key }
+              }
         file.write data.to_yaml
       end
     end

data/lib/tugboat/middleware.rb

@@ -42,6 +42,16 @@ module Tugboat
       end
     end
 
+    # This checks that the credentials in ~/.tugboat are valid
+    def self.sequence_verify
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use CheckCredentials
+      end
+    end
+
     # Display a list of droplets
     def self.sequence_list_droplets
       ::Middleware::Builder.new do

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -10,9 +10,17 @@ module Tugboat
         ssh_key_path = ask "Enter your SSH key path (optional, defaults to ~/.ssh/id_rsa):"
         ssh_user = ask "Enter your SSH user (optional, defaults to #{ENV['USER']}):"
         ssh_port = ask "Enter your SSH port number (optional, defaults to 22):"
+        say
+        say "To retrieve region, image, size and key ID's, you can use the corresponding tugboat command, such as `tugboat images`."
+        say "Defaults can be changed at any time in your ~/.tugboat configuration file."
+        say
+        region   = ask "Enter your default region ID (optional, defaults to 1 (New York)):"
+        image    = ask "Enter your default image ID (optional, defaults to 284203 (Ubuntu 12.04 x64)):"
+        size     = ask "Enter your default size ID (optional, defaults to 66 (512MB)):"
+        ssh_key  = ask "Enter your default ssh key ID (optional, defaults to none):"
 
         # Write the config file.
-        env['config'].create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port)
+        env['config'].create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key)
         env['config'].reload!
 
         @app.call(env)

data/lib/tugboat/middleware/authentication_middleware.rb

@@ -0,0 +1,40 @@
+module Tugboat
+  class AuthenticationMiddleware < Faraday::Middleware
+    extend Forwardable
+    def_delegators :'Faraday::Utils', :parse_query, :build_query
+    RED        = "\e[31m"
+    CLEAR      = "\e[0m"
+
+    def initialize(app, client_id, api_key)
+      @client_id = client_id
+      @api_key   = api_key
+
+      super(app)
+    end
+
+    def call(env)
+      params = { 'client_id' => @client_id, 'api_key' => @api_key }.update query_params(env[:url])
+
+      env[:url].query = build_query params
+
+      begin
+        @app.call(env)
+      rescue Faraday::Error::ClientError => e
+        puts "#{RED}#{e}!#{CLEAR}\n"
+        if env[:body].status == "ERROR"
+          puts "\n#{RED}#{env[:body].error_message}#{CLEAR}\n\n"
+        end
+        puts "Double-check your parameters and configuration (in your ~/.tugboat file)"
+        exit 1
+      end
+    end
+
+    def query_params(url)
+      if url.query.nil? or url.query.empty?
+        {}
+      else
+        parse_query url.query
+      end
+    end
+  end
+end

data/lib/tugboat/middleware/check_credentials.rb

@@ -9,7 +9,7 @@ module Tugboat
         # work.
         begin
           env["ocean"].droplets.list
-        rescue Faraday::Error::ParsingError
+        rescue Faraday::Error::ClientError => e
           say "Authentication with DigitalOcean failed. Run `tugboat authorize`", :red
           exit 1
         end

data/lib/tugboat/middleware/create_droplet.rb

@@ -6,11 +6,27 @@ module Tugboat
 
         say "Queueing creation of droplet '#{env["create_droplet_name"]}'...", nil, false
 
-        req = ocean.droplets.create :name   => env["create_droplet_name"],
-                                 :size_id   => env["create_droplet_size_id"],
-                                 :image_id  => env["create_droplet_image_id"],
-                                 :region_id => env["create_droplet_region_id"],
-                                 :ssh_key_ids => env["create_droplet_ssh_key_ids"]
+        env["create_droplet_region_id"] ?
+            droplet_region_id = env["create_droplet_region_id"] :
+            droplet_region_id = env["config"].default_region
+
+        env["create_droplet_image_id"] ?
+            droplet_image_id = env["create_droplet_image_id"] :
+            droplet_image_id = env["config"].default_image
+
+        env["create_droplet_size_id"] ?
+            droplet_size_id = env["create_droplet_size_id"] :
+            droplet_size_id = env["config"].default_size
+
+        env["create_droplet_ssh_key_ids"] ?
+            droplet_ssh_key_id = env["create_droplet_ssh_key_ids"] :
+            droplet_ssh_key_id = env["config"].default_ssh_key
+
+        req = ocean.droplets.create :name        => env["create_droplet_name"],
+                                    :size_id     => droplet_size_id,
+                                    :image_id    => droplet_image_id,
+                                    :region_id   => droplet_region_id,
+                                    :ssh_key_ids => droplet_ssh_key_id
 
         if req.status == "ERROR"
           say req.error_message, :red

data/lib/tugboat/middleware/custom_logger.rb

@@ -0,0 +1,72 @@
+module Tugboat
+  class CustomLogger < Faraday::Middleware
+      extend Forwardable
+      def_delegators :@logger, :debug, :info, :warn, :error, :fatal
+
+      def initialize(app, options = {})
+        @app = app
+        @logger = options.fetch(:logger) {
+          require 'logger'
+          ::Logger.new(STDOUT)
+        }
+      end
+
+      def call(env)
+        start_time = Time.now
+        info  { request_info(env) }
+        debug { request_debug(env) }
+        @app.call(env).on_complete do
+          end_time = Time.now
+          response_time = end_time - start_time
+          info  { response_info(env, response_time) }
+          debug { response_debug(env) }
+        end
+      end
+
+      private
+
+      def filter(output)
+        unless ENV['DEBUG'] == '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]')
+        else
+          output
+        end
+      end
+
+      def request_info(env)
+        "Started %s request to: %s" % [ env[:method].to_s.upcase, filter(env[:url]) ]
+      end
+
+      def response_info(env, response_time)
+        "Response from %s; Status: %d; Time: %.1fms" % [ filter(env[:url]), env[:status], (response_time * 1_000.0) ]
+      end
+
+      def request_debug(env)
+        debug_message("Request", env[:request_headers], env[:body])
+      end
+
+      def response_debug(env)
+        debug_message("Response", env[:response_headers], env[:body])
+      end
+
+      def debug_message(name, headers, body)
+        <<-MESSAGE.gsub(/^ +([^ ])/m, '\\1')
+        #{name} Headers:
+        ----------------
+        #{format_headers(headers)}
+
+        #{name} Body:
+        -------------
+        #{body}
+        MESSAGE
+      end
+
+      def format_headers(headers)
+        length = headers.map {|k,v| k.to_s.size }.max
+        headers.map { |name, value| "#{name.to_s.ljust(length)} : #{filter(value)}" }.join("\n")
+      end
+
+  end
+end

data/lib/tugboat/middleware/inject_client.rb

@@ -1,15 +1,34 @@
 require 'digital_ocean'
+require File.expand_path('../authentication_middleware', __FILE__)
+require File.expand_path('../custom_logger', __FILE__)
+
 module Tugboat
   module Middleware
     # Inject the digital ocean client into the environment
     class InjectClient < Base
+
+      def tugboat_faraday
+        Faraday.new(:url => 'https://api.digitalocean.com/') do |faraday|
+          faraday.use AuthenticationMiddleware, @client_id, @api_key
+          faraday.use Faraday::Response::RaiseError
+          faraday.use CustomLogger if ENV['DEBUG']
+          faraday.request  :url_encoded
+          faraday.response :rashify
+          faraday.response :json
+          faraday.adapter Faraday.default_adapter
+        end
+      end
+
         def call(env)
           # Sets the digital ocean client into the environment for use
           # later.
+          @client_id = env["config"].client_key
+          @api_key   = env["config"].api_key
+
           env["ocean"]  = DigitalOcean::API.new \
-                             :client_id => env["config"].client_key,
-                             :api_key   => env["config"].api_key,
-                             :debug => ENV['DEBUG'] || false
+                             :client_id => @client_id,
+                             :api_key   => @api_key,
+                             :faraday => tugboat_faraday
 
           @app.call(env)
         end

data/lib/tugboat/middleware/list_droplets.rb

@@ -9,7 +9,7 @@ module Tugboat
 
         if droplet_list.empty?
           say "You don't appear to have any droplets.", :red
-          say "Try creating one with #{GREEN}\`tugboat create\`"
+          say "Try creating one with #{GREEN}\`tugboat create\`#{CLEAR}"
         else
           droplet_list.each do |droplet|
 

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/cli/authorize_cli_spec.rb

@@ -3,10 +3,12 @@ require 'spec_helper'
 describe Tugboat::CLI do
   include_context "spec"
 
+  let(:tmp_path)             { project_path + "/tmp/tugboat" }
+
   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(:status => 200)
     end
 
     it "asks the right questions and checks credentials" do
@@ -22,10 +24,51 @@ describe Tugboat::CLI do
       $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 284203 (Ubuntu 12.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)
 
       @cli.authorize
 
       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: '#{image}'", "region: '#{region}'", "size: '#{size}'", "ssh_user: #{ssh_user}", "ssh_key_path: #{ssh_key_path}", "ssh_port: '#{ssh_port}'", "ssh_key: '#{ssh_key_id}'"
+
+    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 284203 (Ubuntu 12.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('')
+
+      @cli.authorize
+
+      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: '284203'", "region: '1'", "size: '66'", "ssh_user: #{ENV['USER']}", "ssh_key_path: ~/.ssh/id_rsa", "ssh_port: '22'", "ssh_key: ''"
+
     end
   end
 

data/spec/cli/create_cli_spec.rb

@@ -4,8 +4,8 @@ describe Tugboat::CLI do
   include_context "spec"
 
   describe "create a droplet" do
-    it "with a name" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id&name=#{droplet_name}&region_id&size_id&ssh_key_ids").
+    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}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}").
          to_return(:status => 200, :body => '{"status":"OK"}')
 
       @cli.create(droplet_name)
@@ -13,21 +13,21 @@ describe Tugboat::CLI do
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet '#{droplet_name}'...done
       eos
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id&name=#{droplet_name}&region_id&size_id&ssh_key_ids")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=#{image}&name=#{droplet_name}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}")).to have_been_made
     end
 
-    it "with args" do
-      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=2672&name=#{droplet_name}&region_id=2&size_id=64&ssh_key_ids=1234").
+    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&region_id=3&size_id=666&ssh_key_ids=4321").
          to_return(:status => 200, :body => '{"status":"OK"}')
 
-      @cli.options = @cli.options.merge(:image => 2672, :size => 64, :region => 2, :keys => "1234")
+      @cli.options = @cli.options.merge(:image => '555', :size => '666', :region => '3', :keys => '4321')
       @cli.create(droplet_name)
 
       expect($stdout.string).to eq <<-eos
 Queueing creation of droplet '#{droplet_name}'...done
       eos
 
-      expect(a_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=2672&name=foo&region_id=2&size_id=64&ssh_key_ids=1234")).to have_been_made
+      expect(a_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=555&name=foo&region_id=3&size_id=666&ssh_key_ids=4321")).to have_been_made
     end
   end
 

data/spec/cli/droplets_cli_spec.rb

@@ -27,7 +27,7 @@ foo (ip: 33.33.33.10, status: \e[32mactive\e[0m, region: 1, id: 100823)
 
       expect($stdout.string).to eq <<-eos
 You don't appear to have any droplets.
-Try creating one with \e[32m`tugboat create`
+Try creating one with \e[32m`tugboat create`\e[0m
       eos
 
       expect(a_request(:get, "https://api.digitalocean.com/droplets?api_key=#{api_key}&client_id=#{client_key}")).to have_been_made

data/spec/cli/verify_cli_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Tugboat::CLI do
+  include_context "spec"
+
+  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)
+      @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
+    end
+
+    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"}')
+      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
+
+  end
+
+end
+

data/spec/config_spec.rb

@@ -29,12 +29,16 @@ describe Tugboat::Configuration do
     let(:ssh_key_path)     { "~/.ssh/id_rsa2" }
     let(:ssh_key_path)     { "~/.ssh/id_rsa2.pub" }
     let(:ssh_port)         { "22" }
+    let(:region)           { "2" }
+    let(:image)            { "345791" }
+    let(:size)             { "66" }
+    let(:ssh_key_id)       { '1234' }
 
     let(:config)           { config = Tugboat::Configuration.instance }
 
     before :each do
       # Create a temporary file
-      config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port)
+      config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id)
     end
 
     it "can be created" do
@@ -47,39 +51,89 @@ describe Tugboat::Configuration do
     end
 
     describe "the file format"
-      let(:data)  { YAML.load_file(tmp_path) }
-
-      it "should have authentication at the top level" do
-        expect(data).to have_key("authentication")
-      end
-
-      it "should have ssh at the top level" do
-        expect(data).to have_key("ssh")
-      end
-
-      it "should have a client key" do
-        auth = data["authentication"]
-        expect(auth).to have_key("client_key")
-      end
-
-      it "should have an api key" do
-        auth = data["authentication"]
-        expect(auth).to have_key("api_key")
-      end
-
-      it "should have an ssh key path" do
-        ssh = data["ssh"]
-        expect(ssh).to have_key("ssh_key_path")
-      end
-
-      it "should have an ssh user" do
-        ssh = data["ssh"]
-        expect(ssh).to have_key("ssh_user")
-      end
-
-      it "should have an ssh port" do
-        ssh = data["ssh"]
-        expect(ssh).to have_key("ssh_port")
-      end
+    let(:data)  { YAML.load_file(tmp_path) }
+
+    it "should have authentication at the top level" do
+      expect(data).to have_key("authentication")
+    end
+
+    it "should have ssh at the top level" do
+      expect(data).to have_key("ssh")
+    end
+
+    it "should have a client key" do
+      auth = data["authentication"]
+      expect(auth).to have_key("client_key")
+    end
+
+    it "should have an api key" do
+      auth = data["authentication"]
+      expect(auth).to have_key("api_key")
+    end
+
+    it "should have an ssh key path" do
+      ssh = data["ssh"]
+      expect(ssh).to have_key("ssh_key_path")
+    end
+
+    it "should have an ssh user" do
+      ssh = data["ssh"]
+      expect(ssh).to have_key("ssh_user")
+    end
+
+    it "should have an ssh port" do
+      ssh = data["ssh"]
+      expect(ssh).to have_key("ssh_port")
+    end
+  end
+  describe "backwards compatible" do
+    let(:client_key)       { "foo" }
+    let(:api_key)          { "bar" }
+    let(:ssh_user)         { "baz" }
+    let(:ssh_key_path)     { "~/.ssh/id_rsa2" }
+    let(:ssh_key_path)     { "~/.ssh/id_rsa2.pub" }
+    let(:ssh_port)         { "22" }
+
+    let(:config)                 { config = Tugboat::Configuration.instance }
+    let(:config_default_region)  { Tugboat::Configuration::DEFAULT_REGION }
+    let(:config_default_image)   { Tugboat::Configuration::DEFAULT_IMAGE }
+    let(:config_default_size)    { Tugboat::Configuration::DEFAULT_SIZE }
+    let(:config_default_ssh_key) { Tugboat::Configuration::DEFAULT_SSH_KEY }
+    let(:backwards_config) {
+      {
+                "authentication" => { "client_key" => client_key, "api_key" => api_key },
+                "ssh" => { "ssh_user" => ssh_user, "ssh_key_path" => ssh_key_path , "ssh_port" => ssh_port},
+      }
+    }
+
+    before :each do
+      config.instance_variable_set(:@data, backwards_config)
+    end
+
+    it "should load a backwards compatible config file" do
+      data_file = config.instance_variable_get(:@data)
+      expect(data_file).to eql backwards_config
+    end
+
+    it "should use default region if not in configuration" do
+      region = config.default_region
+      expect(region).to eql config_default_region
+    end
+
+    it "should use default image if not in configuration" do
+      image = config.default_image
+      expect(image).to eql config_default_image
+    end
+
+    it "should use default size if not in configuration" do
+      size = config.default_size
+      expect(size).to eql config_default_size
+    end
+
+    it "should use default ssh key if not in configuration" do
+      ssh_key = config.default_ssh_key
+      expect(ssh_key).to eql config_default_ssh_key
+    end
+
   end
 end

data/spec/middleware/ssh_droplet_spec.rb

@@ -4,7 +4,7 @@ describe Tugboat::Middleware::SSHDroplet do
   include_context "spec"
 
   before do
-    Kernel.stub!(:exec)
+    Kernel.stub(:exec)
   end
 
   describe ".call" do

data/spec/shared/environment.rb

@@ -6,11 +6,15 @@ shared_context "spec" do
   let(:client_key)       { "foo" }
   let(:api_key)          { "bar" }
   let(:ssh_user)         { "baz" }
-  let(:ssh_port)         { "22" }
+  let(:ssh_port)         { "33" }
   let(:ssh_key_path)     { "~/.ssh/id_rsa2" }
   let(:droplet_name)     { "foo" }
   let(:droplet_ip)       { "33.33.33.10" }
   let(:droplet_id)       { 1234 }
+  let(:region)           { '3' }
+  let(:image)            { '345791'}
+  let(:size)             { '67'}
+  let(:ssh_key_id)       { '1234' }
   let(:ocean)            { DigitalOcean::API.new :client_id => client_key, :api_key =>api_key }
   let(:app)              { lambda { |env| } }
   let(:env)              { {} }
@@ -22,7 +26,7 @@ shared_context "spec" do
     @cli = Tugboat::CLI.new
 
     # Set a temprary project path and create fake config.
-    config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port)
+    config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id)
     config.reload!
 
     # Keep track of the old stderr / out

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Jack Pearkes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: digital_ocean
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -177,6 +158,7 @@ files:
 - lib/tugboat/config.rb
 - lib/tugboat/middleware.rb
 - lib/tugboat/middleware/ask_for_credentials.rb
+- lib/tugboat/middleware/authentication_middleware.rb
 - lib/tugboat/middleware/base.rb
 - lib/tugboat/middleware/check_configuration.rb
 - lib/tugboat/middleware/check_credentials.rb
@@ -184,6 +166,7 @@ files:
 - lib/tugboat/middleware/check_droplet_inactive.rb
 - lib/tugboat/middleware/confirm_action.rb
 - lib/tugboat/middleware/create_droplet.rb
+- lib/tugboat/middleware/custom_logger.rb
 - lib/tugboat/middleware/destroy_droplet.rb
 - lib/tugboat/middleware/find_droplet.rb
 - lib/tugboat/middleware/halt_droplet.rb
@@ -220,6 +203,7 @@ files:
 - spec/cli/snapshot_cli_spec.rb
 - spec/cli/ssh_cli_spec.rb
 - spec/cli/start_cli_spec.rb
+- spec/cli/verify_cli_spec.rb
 - spec/cli/version_cli_spec.rb
 - spec/cli/wait_cli_spec.rb
 - spec/config_spec.rb
@@ -249,27 +233,26 @@ files:
 - tugboat.gemspec
 homepage: https://github.com/pearkes/tugboat
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command line tool for interacting with your DigitalOcean droplets.
 test_files:
 - spec/cli/authorize_cli_spec.rb
@@ -289,6 +272,7 @@ test_files:
 - spec/cli/snapshot_cli_spec.rb
 - spec/cli/ssh_cli_spec.rb
 - spec/cli/start_cli_spec.rb
+- spec/cli/verify_cli_spec.rb
 - spec/cli/version_cli_spec.rb
 - spec/cli/wait_cli_spec.rb
 - spec/config_spec.rb
@@ -314,3 +298,4 @@ test_files:
 - spec/middleware/ssh_droplet_spec.rb
 - spec/shared/environment.rb
 - spec/spec_helper.rb
+has_rdoc: