tugboat 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb3d5fff3be496ee45a238c9219bea4c159ca4e
-  data.tar.gz: a88aea864325b1d5b0e7d37642b42418e79ed905
+  metadata.gz: 2d849915ab2227a3a3ffa08de72535a611cfbd84
+  data.tar.gz: 62a801c0f5e32a631d290e05528f2805813d7f58
 SHA512:
-  metadata.gz: e53bbe9b2bf1e3bd5bef1f748249857045da696f57e250b2819aa7261db9bdd769ed53b21e60258de6f1c5090e05de8906b0f47de4f313cacf62c20c74357c9a
-  data.tar.gz: 0806ce448db80b8a5436c647f56e144a4b94394fbc866bc4a676cea6f45bed21d4b1649339c1b3f55ca13c462fa89b08f251b539ab92d3b4358405162a69181a
+  metadata.gz: 0248ef0e63f0b8d62ab68027740fc5ba22b31f5c9c20d7df711d51f6f4e3a35aa69369bf6dbaa677b3e3b0f421865133ea0bdca13e84a530f0c5520393d4a547
+  data.tar.gz: c1afc811c11f657f3821b2407164a63616368546c67f88f3eb67d14138c3eaf1ea00244132d0aa409f882467bf3f01a096ab6d7410ef12cb2efec8f51eb3d778

data/CHANGELOG.md

@@ -1,4 +1,23 @@
-## 0.0.8 (Unreleased)
+## 0.0.9 (December 24, 2013)
+
+FEATURES:
+
+  - [Pete](https://github.com/petems) added the ability to add an
+  ssh key to your account. [GH-64]
+  - [Caleb](https://github.com/calebreach) gave us an easy way
+  to pass a command through to a machine with the `-c` command. [GH-73]
+
+IMPROVEMENTS:
+
+  - [Andrew](https://github.com/4n3w) added a private networking option. [GH-75]
+
+BUG FIXES:
+
+  - [Zo](https://github.com/obradovic) made our default image 13.04 [GH-76]
+  - Issues with the JSON dependency in 2.0.0 were resolved. [GH-80]
+
+
+## 0.0.8 (September 7, 2013)
 
 FEATURES:
 

data/README.md

@@ -24,7 +24,7 @@ Run the configuration utility, `tugboat authorize`. You can grab your keys
     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 image ID (optional, defaults to 350076 (Ubuntu 13.04 x64)):
     Enter your default size ID (optional, defaults to 66 (512MB)):
     Enter your default ssh key ID (optional, defaults to none):
 
@@ -188,6 +188,15 @@ ask tugboat about it.
 For a complete overview of all of the available commands, run:
 
     $ tugboat help
+    
+
+Depending on your local configuration, you may need to install a CA bundle (OS X only) using [homebrew](http://brew.sh/) to commmunicate with DigitalOcean through SSL/TLS:
+
+    $ brew install curl-ca-bundle
+
+After installation, source the bundle path in your `.bash_profile`/`.bashrc`:
+
+    export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
 
 ## Reporting Bugs
 

data/lib/tugboat.rb

@@ -1,6 +1,7 @@
 require 'tugboat/cli'
 require "tugboat/config"
 require "tugboat/version"
+require 'json'
 
 module Tugboat
 end

data/lib/tugboat/cli.rb

@@ -83,6 +83,10 @@ module Tugboat
                   :type => :string,
                   :aliases => "-o",
                   :desc => "Custom SSH options"
+    method_option "ssh_command",
+                  :type => :string,
+                  :aliases => "-c",
+                  :desc => "Command to run on the droplet"
     def ssh(name=nil)
       Middleware.sequence_ssh_droplet.call({
         "user_droplet_id" => options[:id],
@@ -90,7 +94,8 @@ module Tugboat
         "user_droplet_fuzzy_name" => name,
         "user_droplet_ssh_port" => options[:ssh_port],
         "user_droplet_ssh_user" => options[:ssh_user],
-        "user_droplet_ssh_opts" => options[:ssh_opts]
+        "user_droplet_ssh_opts" => options[:ssh_opts],
+        "user_droplet_ssh_command" => options[:ssh_command]
       })
     end
 
@@ -111,12 +116,18 @@ module Tugboat
                    :type => :string,
                    :aliases => "-k",
                    :desc => "A comma separated list of SSH key ids to add to the droplet"
+    method_option  "private_networking",
+                  :type => :boolean,
+                  :aliases => "-p",
+                  :desc => "Enable private networking on the droplet"
+
     def create(name)
       Middleware.sequence_create_droplet.call({
         "create_droplet_size_id" => options[:size],
         "create_droplet_image_id" => options[:image],
         "create_droplet_region_id" => options[:region],
         "create_droplet_ssh_key_ids" => options[:keys],
+        "create_droplet_private_networking" => options[:private_networking],
         "create_droplet_name" => name
       })
     end
@@ -227,6 +238,23 @@ module Tugboat
       Middleware.sequence_ssh_keys.call({})
     end
 
+    desc "add-key NAME", "Upload an ssh public key."
+    method_option  "key",
+                   :type => :string,
+                   :aliases => "-k",
+                   :desc => "The string of the key"                   
+    method_option "path",
+                  :type => :string,
+                  :aliases => "-p",
+                  :desc => "The path to the ssh key"
+    def add_key(name)
+      Middleware.sequence_add_key.call({
+        "add_key_name" => name,
+        "add_key_pub_key" => options[:key],
+        "add_key_file_path" => options[:path],
+      })
+    end
+
     desc "regions", "Show regions"
     def regions
       Middleware.sequence_regions.call({})

data/lib/tugboat/config.rb

@@ -13,9 +13,10 @@ module Tugboat
     DEFAULT_SSH_KEY_PATH = '.ssh/id_rsa'
     DEFAULT_SSH_PORT = '22'
     DEFAULT_REGION = '1'
-    DEFAULT_IMAGE = '284203'
+    DEFAULT_IMAGE = '350076'
     DEFAULT_SIZE = '66'
     DEFAULT_SSH_KEY = ''
+    DEFAULT_PRIVATE_NETWORKING = 'false'
 
     def initialize
       @path = ENV["TUGBOAT_CONFIG_PATH"] || File.join(File.expand_path("~"), FILE_NAME)
@@ -67,6 +68,10 @@ module Tugboat
       @data['defaults'].nil? ? DEFAULT_SSH_KEY : @data['defaults']['ssh_key']
     end
 
+    def default_private_networking
+      @data['defaults'].nil? ? DEFAULT_PRIVATE_NETWORKING : @data['defaults']['private_networking']
+    end
+
     # Re-runs initialize
     def reset!
       self.send(:initialize)
@@ -78,7 +83,7 @@ module Tugboat
     end
 
     # Writes a config file
-    def create_config_file(client, api, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key)
+    def create_config_file(client, api, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking)
       # Default SSH Key path
       if ssh_key_path.empty?
         ssh_key_path = File.join(File.expand_path("~"), DEFAULT_SSH_KEY_PATH)
@@ -108,13 +113,28 @@ module Tugboat
         default_ssh_key = DEFAULT_SSH_KEY
       end
 
+      if private_networking.empty?
+        private_networking = DEFAULT_PRIVATE_NETWORKING
+      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},
-                "defaults" => { "region" => region, "image" => image, "size" => size, "ssh_key" => ssh_key }
-              }
+                "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,
+                  "private_networking" => private_networking
+                }
+        }
         file.write data.to_yaml
       end
     end

data/lib/tugboat/middleware.rb

@@ -2,31 +2,32 @@ require "middleware"
 
 module Tugboat
   module Middleware
+    autoload :AddKey, "tugboat/middleware/add_key"
+    autoload :AskForCredentials, "tugboat/middleware/ask_for_credentials"
     autoload :Base, "tugboat/middleware/base"
-    autoload :InjectConfiguration, "tugboat/middleware/inject_configuration"
     autoload :CheckConfiguration, "tugboat/middleware/check_configuration"
-    autoload :AskForCredentials, "tugboat/middleware/ask_for_credentials"
-    autoload :InjectClient, "tugboat/middleware/inject_client"
     autoload :CheckCredentials, "tugboat/middleware/check_credentials"
-    autoload :ListDroplets, "tugboat/middleware/list_droplets"
+    autoload :CheckDropletActive, "tugboat/middleware/check_droplet_active"
+    autoload :CheckDropletInactive, "tugboat/middleware/check_droplet_inactive"
+    autoload :ConfirmAction, "tugboat/middleware/confirm_action"
+    autoload :CreateDroplet, "tugboat/middleware/create_droplet"
+    autoload :DestroyDroplet, "tugboat/middleware/destroy_droplet"
     autoload :FindDroplet, "tugboat/middleware/find_droplet"
-    autoload :RestartDroplet, "tugboat/middleware/restart_droplet"
-    autoload :StartDroplet, "tugboat/middleware/start_droplet"
     autoload :HaltDroplet, "tugboat/middleware/halt_droplet"
     autoload :InfoDroplet, "tugboat/middleware/info_droplet"
-    autoload :SSHDroplet, "tugboat/middleware/ssh_droplet"
-    autoload :CreateDroplet, "tugboat/middleware/create_droplet"
-    autoload :DestroyDroplet, "tugboat/middleware/destroy_droplet"
-    autoload :ConfirmAction, "tugboat/middleware/confirm_action"
-    autoload :SnapshotDroplet, "tugboat/middleware/snapshot_droplet"
-    autoload :ResizeDroplet, "tugboat/middleware/resize_droplet"
+    autoload :InjectClient, "tugboat/middleware/inject_client"
+    autoload :InjectConfiguration, "tugboat/middleware/inject_configuration"
+    autoload :ListDroplets, "tugboat/middleware/list_droplets"
     autoload :ListImages, "tugboat/middleware/list_images"
-    autoload :ListSSHKeys, "tugboat/middleware/list_ssh_keys"
     autoload :ListRegions, "tugboat/middleware/list_regions"
     autoload :ListSizes, "tugboat/middleware/list_sizes"
-    autoload :CheckDropletActive, "tugboat/middleware/check_droplet_active"
-    autoload :CheckDropletInactive, "tugboat/middleware/check_droplet_inactive"
+    autoload :ListSSHKeys, "tugboat/middleware/list_ssh_keys"
     autoload :PasswordReset, "tugboat/middleware/password_reset"
+    autoload :ResizeDroplet, "tugboat/middleware/resize_droplet"
+    autoload :RestartDroplet, "tugboat/middleware/restart_droplet"
+    autoload :SnapshotDroplet, "tugboat/middleware/snapshot_droplet"
+    autoload :SSHDroplet, "tugboat/middleware/ssh_droplet"
+    autoload :StartDroplet, "tugboat/middleware/start_droplet"
     autoload :WaitForState, "tugboat/middleware/wait_for_state"
 
     # Start the authorization flow.
@@ -174,6 +175,16 @@ module Tugboat
       end
     end
 
+    # Create a droplet
+    def self.sequence_add_key
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use AddKey
+      end
+    end
+
     # Display a list of regions
     def self.sequence_regions
       ::Middleware::Builder.new do

data/lib/tugboat/middleware/add_key.rb

@@ -0,0 +1,47 @@
+module Tugboat
+  module Middleware
+    class AddKey < Base
+      def call(env)
+        ocean = env["ocean"]
+
+        if env["add_key_pub_key"]
+          pub_key_string = env["add_key_pub_key"]
+        else
+          if env["add_key_file_path"]
+            pub_key_string = File.read(env["add_key_file_path"])
+          else
+            possible_keys = Dir.glob("#{ENV['HOME']}/.ssh/*.pub")
+
+            # Only show hinted keys if the user has any
+            if possible_keys.size > 0
+              say "Possible public key paths from #{ENV['HOME']}/.ssh:"
+              say
+              possible_keys.each do |key_file|
+                say "#{key_file}"
+              end
+              say
+            end
+
+            ssh_key_file = ask "Enter the path to your SSH key:"
+            pub_key_string = File.read("#{ssh_key_file}")
+          end
+        end
+
+        say "Queueing upload of SSH key '#{env["add_key_name"]}'...", nil, false
+
+        req = ocean.ssh_keys.add    :name => env["add_key_name"],
+                                    :ssh_pub_key  => pub_key_string
+
+        if req.status == "ERROR"
+          say req.error_message, :red
+          exit 1
+        end
+
+        say "done", :green
+
+        @app.call(env)
+      end
+    end
+  end
+end
+

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -15,12 +15,13 @@ module Tugboat
         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)):"
+        image    = ask "Enter your default image ID (optional, defaults to 350076 (Ubuntu 13.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):"
+        private_networking = ask "Enter your default for private networking (optional, defaults to false):"
 
         # Write the config file.
-        env['config'].create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key)
+        env['config'].create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking)
         env['config'].reload!
 
         @app.call(env)

data/lib/tugboat/middleware/create_droplet.rb

@@ -22,11 +22,16 @@ module Tugboat
             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
+        env["create_droplet_private_networking"] ?
+            droplet_private_networking = env["create_droplet_private_networking"] :
+            droplet_private_networking = env["config"].default_private_networking
+
+        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,
+                                    :private_networking => droplet_private_networking
 
         if req.status == "ERROR"
           say req.error_message, :red

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -28,6 +28,9 @@ module Tugboat
 
         options << host_string
 
+        if env["user_droplet_ssh_command"]
+          options.push(env["user_droplet_ssh_command"])
+        end
 
         Kernel.exec("ssh", *options)
 

data/lib/tugboat/version.rb

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

data/spec/cli/add_key_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+require 'fileutils'
+
+describe Tugboat::CLI do
+  include_context "spec"
+
+  let(:tmp_path) { project_path + "/tmp/tugboat" }
+  let(:fake_home) { "#{project_path}/tmp" }
+
+  before :each do
+    File.open("id_dsa.pub", 'w') {|f| f.write("ssh-dss A456= user@host") }
+  end
+
+  after :each do
+    File.delete("id_dsa.pub") if File.exist?("id_dsa.pub")
+    File.delete("#{fake_home}/.ssh/id_rsa.pub") if File.exist?("#{fake_home}/.ssh/id_rsa.pub")
+  end
+
+  describe "add-key" 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"))
+
+      @cli.options = @cli.options.merge(:key => "#{ssh_public_key}")
+      @cli.add_key(ssh_key_name)
+
+      expect($stdout.string).to eq <<-eos
+Queueing upload of SSH key '#{ssh_key_name}'...done
+      eos
+
+      expect(a_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 have_been_made
+    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)
+      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"))
+
+      $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")
+
+      @cli.add_key(ssh_key_name)
+
+      expect($stdout.string).to eq <<-eos
+Possible public key paths from #{fake_home}/.ssh:
+
+#{fake_home}/.ssh/id_rsa.pub
+
+done
+      eos
+
+      expect(a_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 have_been_made
+    end
+
+    after :each do
+      File.delete("id_dsa.pub") if File.exist?("id_dsa.pub")
+      FileUtils.rm_rf("#{fake_home}/.ssh/") if File.exist?("#{fake_home}/.ssh/")
+    end
+
+  end
+end
+

data/spec/cli/authorize_cli_spec.rb

@@ -26,18 +26,20 @@ describe Tugboat::CLI do
       $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)): ")
+      $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)
 
       @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}'"
+      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}'"
 
     end
 
@@ -56,18 +58,20 @@ describe Tugboat::CLI do
       $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)): ")
+      $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('')
 
       @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: ''"
+      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: ''"
 
     end
   end

data/spec/cli/create_cli_spec.rb

@@ -5,7 +5,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}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}").
+      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=#{image}&name=#{droplet_name}&private_networking=#{private_networking}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}").
          to_return(:status => 200, :body => '{"status":"OK"}')
 
       @cli.create(droplet_name)
@@ -13,11 +13,11 @@ 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=#{image}&name=#{droplet_name}&region_id=#{region}&size_id=#{size}&ssh_key_ids=#{ssh_key_id}")).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}&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&region_id=3&size_id=666&ssh_key_ids=4321").
+      stub_request(:get, "https://api.digitalocean.com/droplets/new?api_key=#{api_key}&client_id=#{client_key}&image_id=555&name=foo&private_networking=#{private_networking}&region_id=3&size_id=666&ssh_key_ids=4321").
          to_return(:status => 200, :body => '{"status":"OK"}')
 
       @cli.options = @cli.options.merge(:image => '555', :size => '666', :region => '3', :keys => '4321')
@@ -27,7 +27,7 @@ Queueing creation of droplet '#{droplet_name}'...done
 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=555&name=foo&region_id=3&size_id=666&ssh_key_ids=4321")).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&private_networking=#{private_networking}&region_id=3&size_id=666&ssh_key_ids=4321")).to have_been_made
     end
   end
 

data/spec/config_spec.rb

@@ -23,22 +23,22 @@ describe Tugboat::Configuration do
   end
 
   describe "the file" 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(:region)           { "2" }
-    let(:image)            { "345791" }
-    let(:size)             { "66" }
-    let(:ssh_key_id)       { '1234' }
+    let(:client_key)         { "foo" }
+    let(:api_key)            { "bar" }
+    let(:ssh_user)           { "baz" }
+    let(:ssh_key_path)       { "~/.ssh/id_rsa2" }
+    let(:ssh_port)           { "22" }
+    let(:region)             { "2" }
+    let(:image)              { "345791" }
+    let(:size)               { "66" }
+    let(:ssh_key_id)         { '1234' }
+    let(:private_networking) { 'true' }
 
     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, region, image, size, ssh_key_id)
+      config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking)
     end
 
     it "can be created" do
@@ -85,20 +85,25 @@ describe Tugboat::Configuration do
       ssh = data["ssh"]
       expect(ssh).to have_key("ssh_port")
     end
+
+    it "should have private_networking set" do
+      private_networking = data["defaults"]
+      expect(private_networking).to have_key("private_networking")
+    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(: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(:config_default_networking) { Tugboat::Configuration::DEFAULT_PRIVATE_NETWORKING }
     let(:backwards_config) {
       {
                 "authentication" => { "client_key" => client_key, "api_key" => api_key },
@@ -135,5 +140,10 @@ describe Tugboat::Configuration do
       expect(ssh_key).to eql config_default_ssh_key
     end
 
+    it "should use default private networking option if not in configuration" do
+      private_networking = config.default_private_networking
+      expect(private_networking).to eql config_default_networking
+    end
+
   end
 end

data/spec/fixtures/create_ssh_key.json

@@ -0,0 +1,8 @@
+{
+  "status": "OK",
+  "ssh_key": {
+    "id": 47,
+    "name": "my_key",
+    "ssh_pub_key": "ssh-dss AAAAB3NzaC1kc3MAAACBAK5uLwicCrFEpaVKBzkWxC7RQn+smg5ZQb5keh9RQKo8AszFTol5npgUAr0JWmqKIHv7nof0HndO86x9iIqNjq3vrz9CIVcFfZM7poKBJZ27Hv3v0fmSKfAc6eGdx8eM9UkZe1gzcLXK8UP2HaeY1Y4LlaHXS5tPi/dXooFVgiA7AAAAFQCQl6LZo/VYB9VgPEZzOmsmQevnswAAAIBCNKGsVP5eZ+IJklXheUyzyuL75i04OOtEGW6MO5TymKMwTZlU9r4ukuwxty+T9Ot2LqlNRnLSPQUjb0vplasZ8Ix45JOpRbuSvPovryn7rvS7//klu9hIkFAAQ/AZfGTw+696EjFBg4F5tN6MGMA6KrTQVLXeuYcZeRXwE5t5lwAAAIEAl2xYh098bozJUANQ82DiZznjHc5FW76Xm1apEqsZtVRFuh3V9nc7QNcBekhmHp5Z0sHthXCm1XqnFbkRCdFlX02NpgtNs7OcKpaJP47N8C+C/Yrf8qK/Wt3fExrL2ZLX5XD2tiotugSkwZJMW5Bv0mtjrNt0Q7P45rZjNNTag2c= user@host"
+  }
+}

data/spec/middleware/ssh_droplet_spec.rb

@@ -35,10 +35,12 @@ describe Tugboat::Middleware::SSHDroplet do
                         "-p", ssh_port,
                         "-q",
                         "-X",
-                        "#{ssh_user}@#{droplet_ip}")
+                        "#{ssh_user}@#{droplet_ip}",
+                        "echo hello")
 
       env["droplet_ip"] = droplet_ip
       env["config"] = config
+      env["user_droplet_ssh_command"] = "echo hello"
       env["user_droplet_ssh_opts"] = "-q -X"
 
       described_class.new(app).call(env)

data/spec/shared/environment.rb

@@ -2,22 +2,25 @@ require 'spec_helper'
 
 shared_context "spec" do
   # Default configuration and
-  let(:config)           { Tugboat::Configuration.instance }
-  let(:client_key)       { "foo" }
-  let(:api_key)          { "bar" }
-  let(:ssh_user)         { "baz" }
-  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)              { {} }
+  let(:config)             { Tugboat::Configuration.instance }
+  let(:client_key)         { "foo" }
+  let(:api_key)            { "bar" }
+  let(:ssh_user)           { "baz" }
+  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(:ssh_key_name)       { 'macbook_pro' }
+  let(:ssh_public_key)     { 'ssh-dss A123= user@host' }
+  let(:private_networking) { 'false'}
+  let(:ocean)              { DigitalOcean::API.new :client_id => client_key, :api_key =>api_key }
+  let(:app)                { lambda { |env| } }
+  let(:env)                { {} }
 
   before(:each) do
     $stdout.sync = true
@@ -26,7 +29,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, region, image, size, ssh_key_id)
+    config.create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key_id, private_networking)
     config.reload!
 
     # Keep track of the old stderr / out

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jack Pearkes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -157,6 +157,7 @@ files:
 - lib/tugboat/cli.rb
 - lib/tugboat/config.rb
 - lib/tugboat/middleware.rb
+- lib/tugboat/middleware/add_key.rb
 - lib/tugboat/middleware/ask_for_credentials.rb
 - lib/tugboat/middleware/authentication_middleware.rb
 - lib/tugboat/middleware/base.rb
@@ -186,6 +187,7 @@ files:
 - lib/tugboat/middleware/start_droplet.rb
 - lib/tugboat/middleware/wait_for_state.rb
 - lib/tugboat/version.rb
+- spec/cli/add_key_spec.rb
 - spec/cli/authorize_cli_spec.rb
 - spec/cli/create_cli_spec.rb
 - spec/cli/destroy_cli_spec.rb
@@ -208,6 +210,7 @@ files:
 - spec/cli/wait_cli_spec.rb
 - spec/config_spec.rb
 - spec/fixtures/create_droplet.json
+- spec/fixtures/create_ssh_key.json
 - spec/fixtures/show_droplet.json
 - spec/fixtures/show_droplet_inactive.json
 - spec/fixtures/show_droplets.json
@@ -250,11 +253,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A command line tool for interacting with your DigitalOcean droplets.
 test_files:
+- spec/cli/add_key_spec.rb
 - spec/cli/authorize_cli_spec.rb
 - spec/cli/create_cli_spec.rb
 - spec/cli/destroy_cli_spec.rb
@@ -277,6 +281,7 @@ test_files:
 - spec/cli/wait_cli_spec.rb
 - spec/config_spec.rb
 - spec/fixtures/create_droplet.json
+- spec/fixtures/create_ssh_key.json
 - spec/fixtures/show_droplet.json
 - spec/fixtures/show_droplet_inactive.json
 - spec/fixtures/show_droplets.json
@@ -298,4 +303,3 @@ test_files:
 - spec/middleware/ssh_droplet_spec.rb
 - spec/shared/environment.rb
 - spec/spec_helper.rb
-has_rdoc: