tugboat 2.0.0.RC1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a6516497a6285190e53a1e6209f4c3bc7ff38e
-  data.tar.gz: 1deee8b54ce280230929f27e920fef46b6d471ff
+  metadata.gz: 7d9cd87077814b0c15d54c53ba161fffdf4adcd5
+  data.tar.gz: cea9da9936b38ff7b773643406cbf2ed6ac8b844
 SHA512:
-  metadata.gz: 3f275a9150a93971d9a8e0067c09d51727162c2b97bd52c6acd42faead78c8fbcd713212343ace0c296fa347976ada8e9d5d99c2d7b0268d2f53108fe23ac424
-  data.tar.gz: 4a77d1bd1b256ba368d04c722e13b85802f5344d80f69979ce0887517577dcf95a66507730bb350cd7f54a205c43a66e8b04004393b17784407663c5b6d0bc3a
+  metadata.gz: 04e3dd2f82fc781620cdea6ec5966b4e6ac836333d276f541bccfd526cc051d06adcbcfe25975ae5677757d046f52bd8d04e8bd911d33e8fac85e22a9e395ffb
+  data.tar.gz: 59aebcb1e96713bd589e071088a4c35af544b8b2d065ba0ef3e54f696622bb14edfaca431b8b19f3258f3796132182f717a4af3207781da8b028a57d2be9da44

data/CHANGELOG.md

@@ -1,8 +1,26 @@
 # Change Log
 
+## [v2.0.0.RC1](https://github.com/pearkes/tugboat/tree/v2.0.0.RC1) (2015-10-20)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.1...v2.0.0.RC1)
+
+**Closed issues:**
+
+- Possible to delete an image/snapshot? [\#177](https://github.com/pearkes/tugboat/issues/177)
+
+**Merged pull requests:**
+
+- Update gemspec [\#181](https://github.com/pearkes/tugboat/pull/181) ([petems](https://github.com/petems))
+
+- API 2.0 Release Candidate PR [\#180](https://github.com/pearkes/tugboat/pull/180) ([petems](https://github.com/petems))
+
+- Add CLI config spec and slight formatting changes [\#179](https://github.com/pearkes/tugboat/pull/179) ([petems](https://github.com/petems))
+
+- Fix interactive prompt during authorize [\#175](https://github.com/pearkes/tugboat/pull/175) ([conorsch](https://github.com/conorsch))
+
 ## [v1.3.1](https://github.com/pearkes/tugboat/tree/v1.3.1) (2015-08-02)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.0...v1.3.1)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.1.0.ALPHA...v1.3.1)
 
 **Closed issues:**
 
@@ -12,6 +30,10 @@
 
 - Removes wrong help messages for `images`. [\#173](https://github.com/pearkes/tugboat/pull/173) ([haihappen](https://github.com/haihappen))
 
+## [v2.1.0.ALPHA](https://github.com/pearkes/tugboat/tree/v2.1.0.ALPHA) (2015-07-20)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.3.0...v2.1.0.ALPHA)
+
 ## [v1.3.0](https://github.com/pearkes/tugboat/tree/v1.3.0) (2015-07-19)
 
 [Full Changelog](https://github.com/pearkes/tugboat/compare/v1.2.0...v1.3.0)
@@ -38,12 +60,14 @@
 
 ## [v1.1.0](https://github.com/pearkes/tugboat/tree/v1.1.0) (2015-07-18)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v2.0.0.ALPHA...v1.1.0)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.0.0...v1.1.0)
 
 **Closed issues:**
 
 - Unable to bundle to run tugboat from git repo version for testing  [\#171](https://github.com/pearkes/tugboat/issues/171)
 
+- 1.0.0 Release [\#125](https://github.com/pearkes/tugboat/issues/125)
+
 **Merged pull requests:**
 
 - Update ssh to private ip [\#172](https://github.com/pearkes/tugboat/pull/172) ([petems](https://github.com/petems))

data/README.md

@@ -28,7 +28,7 @@ Run the configuration utility, `tugboat authorize`. You can grab your keys
     Enter your default region ID (optional, defaults to 1 (New York)):
     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):
+    Enter your default ssh key IDs (optional, defaults to '', comma separated string):
 
     Authentication with DigitalOcean was successful!
 
@@ -41,9 +41,9 @@ Tugboat will look for a .tugboat config file first in the current directory you'
 ### Retrieve a list of your droplets
 
     $ tugboat droplets
-    pearkes-web-001 (ip: 30.30.30.1, status: active, region: 1, id: 13231511)
-    pearkes-admin-001 (ip: 30.30.30.3, status: active, region: 1, id: 13231512)
-    pearkes-api-001 (ip: 30.30.30.5, status: active, region: 1, id: 13231513)
+    pearkes-web-001 (ip: 30.30.30.1, status: active, region: nyc2, id: 13231511)
+    pearkes-admin-001 (ip: 30.30.30.3, status: active, region: nyc2, id: 13231512)
+    pearkes-api-001 (ip: 30.30.30.5, status: active, region: nyc2, id: 13231513)
 
 ### Fuzzy name matching
 
@@ -82,7 +82,7 @@ match.
 
 ### Create a droplet
 
-    $ tugboat create pearkes-www-002 -s 64 -i 2676 -r 2 -k 11251
+    $ tugboat create pearkes-www-002 -s 512mb -i ubuntu-12-04-x64 -r nyc2 -k 11251
     Queueing creation of droplet 'pearkes-www-002'...done
 
 ### Info about a droplet
@@ -94,10 +94,11 @@ match.
     ID:               13231512
     Status:           active
     IP:               30.30.30.3
-    Region ID:        1
-    Image ID:         25489
-    Size ID:          66
     Backups Active:   false
+    IP6:              2A03:B0C0:0001:00D0:0000:0000:0308:D001
+    Region:           London 1 - lon1
+    Image:            6918990 - ubuntu-14-04-x64
+    Size:             1GB
 
 Print info in machine-readable format. The ``--porcelain`` flag silences extra output for easy parsing. Fuzzy name matching is not supported with the ``--porcelain`` flag.
 
@@ -105,10 +106,10 @@ Print info in machine-readable format. The ``--porcelain`` flag silences extra o
     name pearkes-admin-001
     id 13231512
     status active
-    ip 30.30.30.3
-    region_id 1
-    image_id 25489
-    size_id 66
+    ip4 30.30.30.3
+    region lon1
+    image 6918990
+    size 1gb
     backups_active false
 
 Print a single attribute.
@@ -148,44 +149,61 @@ Print a single attribute.
 
 ### List Available Images
 
-You can list images that you have created.
+You can list all images
 
     $ tugboat images
-    My Images:
-    pearkes-admin-001 2013-05-19 (id: 13231512, distro: Ubuntu)
+    Showing both private and public images
+    Private Images:
+    My application image (id: 6376601, distro: Ubuntu)
+
+    Public Images:
+    745.1.0 (alpha) (slug: coreos-alpha, id: 12789325, distro: CoreOS)
+    723.3.0 (beta) (slug: coreos-beta, id: 12789350, distro: CoreOS)
+    717.3.0 (stable) (slug: coreos-stable, id: 12789351, distro: CoreOS)
     ....
 
-Optionally, list images provided by DigitalOcean as well.
+Or just list images that you have created.
 
-    $ tugboat images --global
-    My Images:
-    pearkes-admin-001 2013-05-19 (id: 13231512, distro: Ubuntu)
+    $ tugboat images --show_just_private_images # or -p
+    Showing just private images
+    Private Images:
+    My application image (id: 6376601, distro: Ubuntu)
     ....
-    Global Images:
-    CentOS 5.8 x64 (id: 1601, distro: CentOS)
-    ...
 
 ### List Available Sizes
 
     $ tugboat sizes
     Sizes:
-    512MB (id: 66)
-    1GB (id: 63)
+    Disk: 20GB, Memory: 512MB (slug: 512mb)
+    Disk: 30GB, Memory: 1024MB (slug: 1gb)
+    Disk: 40GB, Memory: 2048MB (slug: 2gb)
+    Disk: 60GB, Memory: 4096MB (slug: 4gb)
+    Disk: 80GB, Memory: 8192MB (slug: 8gb)
+    Disk: 160GB, Memory: 16384MB (slug: 16gb)
+    Disk: 320GB, Memory: 32768MB (slug: 32gb)
+    Disk: 480GB, Memory: 49152MB (slug: 48gb)
+    Disk: 640GB, Memory: 65536MB (slug: 64gb)
     ...
 
 ### List Available Regions
 
     $ tugboat regions
     Regions:
-    New York 1 (id: 1) (slug: nyc1)
-    Amsterdam 1 (id: 2) (slug: ams1)
-    San Francisco 1 (id: 3) (slug: sfo1)
+    Amsterdam 1 (slug: ams1)
+    Amsterdam 2 (slug: ams2)
+    Amsterdam 3 (slug: ams3)
+    London 1 (slug: lon1)
+    New York 1 (slug: nyc1)
+    New York 2 (slug: nyc2)
+    New York 3 (slug: nyc3)
+    San Francisco 1 (slug: sfo1)
+    Singapore 1 (slug: sgp1)
 
 ### List SSH Keys
 
     $ tugboat keys
     Keys:
-    pearkes (id: 10501)
+    Name: pearkes, (id: 231192), fingerprint: 3b:16:bf:e4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa
     ...
 
 ### Wait for Droplet State
@@ -213,7 +231,6 @@ 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 communicate with DigitalOcean through SSL/TLS:
 
     $ brew install curl-ca-bundle
@@ -226,12 +243,8 @@ After installation, source the bundle path in your `.bash_profile`/`.bashrc`:
 
 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).
-
+See the [contributing guide](CONTRIBUTING.md).

data/lib/tugboat/cli.rb

@@ -36,6 +36,7 @@ module Tugboat
     "
     def authorize
       Middleware.sequence_authorize.call({
+        "tugboat_action" => __method__,
         "user_quiet" => options[:quiet]
         })
     end
@@ -51,6 +52,7 @@ module Tugboat
                   :desc => "Hide your API keys"
     def config
       Middleware.sequence_config.call({
+        "tugboat_action" => __method__,
         "user_hide_keys" => options[:hide],
         })
     end
@@ -62,14 +64,22 @@ module Tugboat
     "
     def verify
       Middleware.sequence_verify.call({
+        "tugboat_action" => __method__,
         "user_quiet" => options[:quiet]
         })
     end
 
-    desc "droplets", "Retrieve a list of your droplets"
+    method_option "include_urls",
+                  :type => :boolean,
+                  :default => false,
+                  :aliases => "-i",
+                  :desc => "Include URLs for the droplets (can be opened in a browser)"
+    desc "droplets [OPTIONS]", "Retrieve a list of your droplets"
     def droplets
       Middleware.sequence_list_droplets.call({
-        "user_quiet" => options[:quiet]
+        "tugboat_action" => __method__,
+        "user_quiet" => options[:quiet],
+        "include_urls" => options["include_urls"]
         })
     end
 
@@ -81,6 +91,7 @@ module Tugboat
                   :desc => "Show just private images"
     def images
       Middleware.sequence_list_images.call({
+        "tugboat_action" => __method__,
         "user_show_just_private_images" => options[:show_just_private_images],
         "user_quiet" => options[:quiet]
         })
@@ -114,10 +125,11 @@ module Tugboat
                   :desc => "Custom SSH options"
     method_option "ssh_command",
                   :type => :string,
-                  :aliases => "-c",
+                  :aliases => [ "-c", "-y" ,],
                   :desc => "Command to run on the droplet"
     def ssh(name=nil)
       Middleware.sequence_ssh_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
@@ -134,15 +146,15 @@ module Tugboat
     method_option  "size",
                    :type => :numeric,
                    :aliases => "-s",
-                   :desc => "The size_id of the droplet"
+                   :desc => "The size slug of the droplet"
     method_option  "image",
                    :type => :numeric,
                    :aliases => "-i",
-                   :desc => "The image_id of the droplet"
+                   :desc => "The image slug of the droplet"
     method_option  "region",
                    :type => :numeric,
                    :aliases => "-r",
-                   :desc => "The region_id of the droplet"
+                   :desc => "The region slug of the droplet"
     method_option  "keys",
                    :type => :string,
                    :aliases => "-k",
@@ -151,6 +163,14 @@ module Tugboat
                   :type => :boolean,
                   :aliases => "-p",
                   :desc => "Enable private networking on the droplet"
+    method_option  "ip6",
+                  :type => :boolean,
+                  :aliases => "-l",
+                  :desc => "Enable IP6 on the droplet"
+    method_option  "user_data",
+                  :type => :string,
+                  :aliases => "-u",
+                  :desc => "Location of a file to read and use as user data"
     method_option  "backups_enabled",
                    :type => :boolean,
                    :aliases => "-b",
@@ -163,11 +183,14 @@ module Tugboat
       end
 
       Middleware.sequence_create_droplet.call({
-        "create_droplet_size_id" => options[:size],
-        "create_droplet_image_id" => options[:image],
-        "create_droplet_region_id" => options[:region],
+        "tugboat_action" => __method__,
         "create_droplet_ssh_key_ids" => options[:keys],
+        "create_droplet_size_slug" => options[:size],
+        "create_droplet_image_slug" => options[:image],
+        "create_droplet_region_slug" => options[:region],
         "create_droplet_private_networking" => options[:private_networking],
+        "create_droplet_ip6" => options[:ip6],
+        "create_droplet_user_data" => options[:user_data],
         "create_droplet_backups_enabled" => options[:backups_enabled],
         "create_droplet_name" => name,
         "user_quiet" => options[:quiet]
@@ -185,7 +208,7 @@ module Tugboat
                   :desc => "The exact name of the droplet"
     method_option "confirm",
                   :type => :boolean,
-                  :aliases => "-c",
+                  :aliases => [ "-c", "-y" ,],
                   :desc => "Skip confirmation of the action"
     method_option "image_id",
                   :type => :numeric,
@@ -197,6 +220,7 @@ module Tugboat
                   :desc => "The exact name of the image"
     def rebuild(name=nil, image_name=nil)
       Middleware.sequence_rebuild_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
@@ -219,10 +243,11 @@ module Tugboat
                   :desc => "The exact name of the droplet"
     method_option "confirm",
                   :type => :boolean,
-                  :aliases => "-c",
+                  :aliases => [ "-c", "-y" ,],
                   :desc => "Skip confirmation of the action"
     def destroy(name=nil)
       Middleware.sequence_destroy_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_confirm_action" => options[:confirm],
@@ -242,10 +267,11 @@ module Tugboat
                   :desc => "The exact name of the image"
     method_option "confirm",
                   :type => :boolean,
-                  :aliases => "-c",
+                  :aliases => [ "-c", "-y" ,],
                   :desc => "Skip confirmation of the action"
     def destroy_image(name=nil)
       Middleware.sequence_destroy_image.call({
+        "tugboat_action" => __method__,
         "user_image_id" => options[:id],
         "user_image_name" => options[:name],
         "user_image_fuzzy_name" => name,
@@ -269,6 +295,7 @@ module Tugboat
                   :desc => "Perform a hard restart"
     def restart(name=nil)
       Middleware.sequence_restart_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_hard" => options[:hard],
@@ -292,6 +319,7 @@ module Tugboat
                   :desc => "Perform a hard shutdown"
     def halt(name=nil)
       Middleware.sequence_halt_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_hard" => options[:hard],
@@ -318,6 +346,7 @@ module Tugboat
                   :desc => "Give the output in an easy-to-parse format for scripts."
     def info(name=nil)
       Middleware.sequence_info_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
@@ -338,6 +367,7 @@ module Tugboat
                   :desc => "The exact name of the image"
     def info_image(name=nil)
       Middleware.sequence_info_image.call({
+        "tugboat_action" => __method__,
         "user_image_id" => options[:id],
         "user_image_name" => options[:name],
         "user_image_fuzzy_name" => name,
@@ -356,6 +386,7 @@ module Tugboat
                   :desc => "The exact name of the droplet"
     def snapshot(snapshot_name, name=nil)
       Middleware.sequence_snapshot_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
@@ -366,7 +397,9 @@ module Tugboat
 
     desc "keys", "Show available SSH keys"
     def keys
-      Middleware.sequence_ssh_keys.call({})
+      Middleware.sequence_ssh_keys.call({
+        "tugboat_action" => __method__,
+      })
     end
 
     desc "add-key KEY-NAME", "Upload an ssh public key to DigitalOcean, to be assigned to a droplet later"
@@ -383,6 +416,7 @@ module Tugboat
                   :desc => "The path to the ssh key"
     def add_key(name)
       Middleware.sequence_add_key.call({
+        "tugboat_action" => __method__,
         "add_key_name" => name,
         "add_key_pub_key" => options[:key],
         "add_key_file_path" => options[:path],
@@ -393,6 +427,7 @@ module Tugboat
     desc "regions", "Show regions"
     def regions
       Middleware.sequence_regions.call({
+        "tugboat_action" => __method__,
         "user_quiet" => options[:quiet]
         })
     end
@@ -405,6 +440,7 @@ module Tugboat
     desc "sizes", "Show available droplet sizes"
     def sizes
       Middleware.sequence_sizes.call({
+        "tugboat_action" => __method__,
         "user_quiet" => options[:quiet]
         })
     end
@@ -420,6 +456,7 @@ module Tugboat
                   :desc => "The exact name of the droplet"
     def start(name=nil)
       Middleware.sequence_start_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
@@ -443,6 +480,7 @@ module Tugboat
                   :desc => "The size_id to resize the droplet to"
     def resize(name=nil)
       Middleware.sequence_resize_droplet.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_size" => options[:size],
@@ -463,6 +501,7 @@ module Tugboat
 
     def password_reset(name=nil)
       Middleware.sequence_password_reset.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
@@ -487,6 +526,7 @@ module Tugboat
 
     def wait(name=nil)
       Middleware.sequence_wait.call({
+        "tugboat_action" => __method__,
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_desired_state" => options[:state],

data/lib/tugboat/config.rb

@@ -16,8 +16,10 @@ module Tugboat
     DEFAULT_IMAGE = 'ubuntu-14-04-x64'
     DEFAULT_SIZE = '512mb'
     DEFAULT_SSH_KEY = ''
+    DEFAULT_IP6 = 'false'
     DEFAULT_PRIVATE_NETWORKING = 'false'
     DEFAULT_BACKUPS_ENABLED = 'false'
+    DEFAULT_USER_DATA = nil
 
     # Load config file from current directory, if not exit load from user's home directory
     def initialize
@@ -38,7 +40,7 @@ module Tugboat
     end
 
     def access_token
-      @data['authentication']['access_token']
+      env_access_token || @data['authentication']['access_token']
     end
 
     def ssh_key_path
@@ -73,6 +75,14 @@ module Tugboat
       @data['defaults'].nil? ? DEFAULT_SSH_KEY : @data['defaults']['ssh_key']
     end
 
+    def default_ip6
+      @data['defaults'].nil? ? DEFAULT_IP6 : @data['defaults']['ip6']
+    end
+
+    def default_user_data
+      @data['defaults'].nil? ? DEFAULT_USER_DATA : @data['defaults']['user_data']
+    end
+
     def default_private_networking
       @data['defaults'].nil? ? DEFAULT_PRIVATE_NETWORKING : @data['defaults']['private_networking']
     end
@@ -81,6 +91,10 @@ module Tugboat
       @data['defaults'].nil? ? DEFAULT_BACKUPS_ENABLED : @data['defaults']['backups_enabled']
     end
 
+    def env_access_token
+      ENV['DO_API_TOKEN'] unless ENV['DO_API_TOKEN'].to_s.empty?
+    end
+
     # Re-runs initialize
     def reset!
       self.send(:initialize)

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -17,7 +17,7 @@ module Tugboat
         region   = ask "Enter your default region (optional, defaults to nyc1):"
         image    = ask "Enter your default image ID or image slug (optional, defaults to ubuntu-14-04-x64):"
         size     = ask "Enter your default size (optional, defaults to 512mb)):"
-        ssh_key  = ask "Enter your default ssh key ID (optional, defaults to none):"
+        ssh_key  = ask "Enter your default ssh key IDs (optional, defaults to none, comma separated string):"
         private_networking = ask "Enter your default for private networking (optional, defaults to false):"
         backups_enabled = ask "Enter your default for enabling backups (optional, defaults to false):"
 

data/lib/tugboat/middleware/create_droplet.rb

@@ -6,41 +6,62 @@ module Tugboat
 
         say "Queueing creation of droplet '#{env["create_droplet_name"]}'...", nil, false
 
-        env["create_droplet_region_id"] ?
-        droplet_region_id = env["create_droplet_region_id"] :
-        droplet_region_id = env["config"].default_region
+        env["create_droplet_region_slug"] ?
+        droplet_region_slug = env["create_droplet_region_slug"] :
+        droplet_region_slug = 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_image_slug"] ?
+        droplet_image_slug = env["create_droplet_image_slug"] :
+        droplet_image_slug = 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_size_slug"] ?
+        droplet_size_slug = env["create_droplet_size_slug"] :
+        droplet_size_slug = 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
+        droplet_ssh_key_ids = env["create_droplet_ssh_key_ids"] :
+        droplet_ssh_key_ids = env["config"].default_ssh_key
 
         env["create_droplet_private_networking"] ?
         droplet_private_networking = env["create_droplet_private_networking"] :
         droplet_private_networking = env["config"].default_private_networking
 
+        env["create_droplet_ip6"] ?
+        droplet_ip6 = env["create_droplet_ip6"] :
+        droplet_ip6 = env["config"].default_ip6
+
+        env["create_droplet_user_data"] ?
+        droplet_user_data = env["create_droplet_user_data"] :
+        droplet_user_data = env["config"].default_user_data
+
+        if droplet_user_data
+          unless File.file?(droplet_user_data)
+            say "Could not find file: #{droplet_user_data}, check your user_data setting"
+            exit 1
+          else
+            user_data_string = File.open(droplet_user_data, 'rb') { |f| f.read }
+          end
+        end
+
         env["create_droplet_backups_enabled"] ?
         droplet_backups_enabled = env["create_droplet_backups_enabled"] :
         droplet_backups_enabled = env["config"].default_backups_enabled
 
-        droplet_ssh_key_id = nil if droplet_ssh_key_id.empty?
+        droplet_key_array = droplet_ssh_key_ids.split(',')
+
+        droplet_key_array = nil if [droplet_key_array].empty?
+
 
         create_opts = {
           :name               => env["create_droplet_name"],
-          :size               => droplet_size_id,
-          :image              => "#{droplet_image_id}",
-          :region             => droplet_region_id,
-          :ssh_keys           => [droplet_ssh_key_id],
+          :size               => droplet_size_slug,
+          :image              => "#{droplet_image_slug}",
+          :region             => droplet_region_slug,
+          :ssh_keys           => droplet_key_array,
           :private_networking => droplet_private_networking,
           :backups_enabled    => droplet_backups_enabled,
-          :ipv6               => nil,
+          :ipv6               => droplet_ip6,
+          :user_data          => user_data_string,
         }
 
         response = ocean.droplet.create(create_opts)

data/lib/tugboat/middleware/find_droplet.rb

@@ -12,7 +12,10 @@ module Tugboat
         # First, if nothing is provided to us, we should quit and
         # let the user know.
         if !user_fuzzy_name && !user_droplet_name && !user_droplet_id
-          say "Tugboat attempted to find a droplet with no arguments. Try `tugboat help`", :red
+
+          say "Tugboat attempted to find a droplet with no arguments.", :red
+          say "Try running `tugboat #{env['tugboat_action']} dropletname`", :green
+          say "For more help run: `tugboat help #{env['tugboat_action']}`", :blue
           exit 1
         end
 
@@ -113,10 +116,17 @@ module Tugboat
             end
             say
             choice = ask "Please choose a droplet:", :limited_to => choices
+            for ip_list in found_droplets[choice.to_i].networks.v4 do
+              if ip_list.type == "private"
+                private_ip = ip_list.ip_address
+              elsif ip_list.type == "public"
+                public_ip = ip_list.ip_address
+              end
+            end
             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_ip"] = public_ip
+            env["droplet_ip_private"] = private_ip
             env["droplet_status"] = found_droplets[choice.to_i].status
           end
 

data/lib/tugboat/middleware/find_image.rb

@@ -11,7 +11,9 @@ module Tugboat
         # First, if nothing is provided to us, we should quit and
         # let the user know.
         if !user_fuzzy_name && !user_image_name && !user_image_id
-          say "Tugboat attempted to find an image with no arguments. Try `tugboat help`", :red
+          say "Tugboat attempted to find an image with no arguments.", :red
+          say "Try running `tugboat #{env['tugboat_action']} imagename`", :green
+          say "For more help run: `tugboat help #{env['tugboat_action']}`", :blue
           exit 1
         end
 

data/lib/tugboat/middleware/info_droplet.rb

@@ -39,7 +39,7 @@ module Tugboat
           ["ip6",  droplet_ip6_public],
           ["private_ip",  droplet_private_ip],
           ["region",  droplet.region.slug],
-          ["Image",  droplet.image.id],
+          ["image",  droplet.image.id],
           ["size",  droplet.size_slug],
           ["backups_active",  !droplet.backup_ids.empty?]
         ]
@@ -69,8 +69,14 @@ module Tugboat
               say "Private IP:       #{droplet_private_ip}"
             end
 
+            if droplet.image.slug.nil?
+              image_description  = droplet.image.name
+            else
+              image_description = droplet.image.slug
+            end
+
             say "Region:           #{droplet.region.name} - #{droplet.region.slug}"
-            say "Image:            #{droplet.image.id} - #{droplet.image.name}"
+            say "Image:            #{droplet.image.id} - #{image_description}"
             say "Size:             #{droplet.size_slug.upcase}"
             say "Backups Active:   #{!droplet.backup_ids.empty?}"
           end

data/lib/tugboat/middleware/info_image.rb

@@ -17,6 +17,7 @@ module Tugboat
         say "Name:             #{image.name}"
         say "ID:               #{image.id}"
         say "Distribution:     #{image.distribution}"
+        say "Min Disk Size:    #{image.min_disk_size}GB"
 
         @app.call(env)
       end

data/lib/tugboat/middleware/list_droplets.rb

@@ -25,12 +25,18 @@ module Tugboat
             end
 
             public_addr = droplet.networks.v4.detect { |address| address.type == 'public' }
-            say "#{droplet.name} (ip: #{public_addr.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region.slug}, id: #{droplet.id})"
+            say "#{droplet.name} (ip: #{public_addr.ip_address}#{private_ip}, status: #{status_color}#{droplet.status}#{CLEAR}, region: #{droplet.region.slug}, id: #{droplet.id}#{env["include_urls"] ? droplet_id_to_url(droplet.id) : '' })"
           end
         end
 
         @app.call(env)
       end
+
+      private
+
+      def droplet_id_to_url(id)
+        ", url: 'https://cloud.digitalocean.com/droplets/#{id}'"
+      end
     end
   end
 end

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -2,7 +2,7 @@ module Tugboat
   module Middleware
     class SSHDroplet < Base
       def call(env)
-        say "Executing SSH #{env["droplet_name"]}..."
+        say "Executing SSH on Droplet #{env["droplet_name"]}..."
 
         options = [
           "-o", "IdentitiesOnly=yes",
@@ -44,6 +44,8 @@ module Tugboat
 
         host_string = "#{ssh_user}@#{host_ip}"
 
+        say "Attempting SSH: #{host_string}"
+
         options << host_string
 
         if env["user_droplet_ssh_command"]

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "2.0.0.RC1"
+  VERSION = "2.0.0"
 end

data/spec/cli/add_key_spec.rb

@@ -39,7 +39,9 @@ ID: 3
     before :each do
       allow(ENV).to receive(:[]).with('HOME').and_return(fake_home)
       allow(ENV).to receive(:[]).with('DEBUG').and_return(nil)
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').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

data/spec/cli/authorize_cli_spec.rb

@@ -30,7 +30,7 @@ describe Tugboat::CLI do
       expect($stdin).to receive(:gets).and_return(image)
       expect($stdout).to receive(:print).with("Enter your default size (optional, defaults to 512mb)): ")
       expect($stdin).to receive(:gets).and_return(size)
-      expect($stdout).to receive(:print).with("Enter your default ssh key ID (optional, defaults to none): ")
+      expect($stdout).to receive(:print).with("Enter your default ssh key IDs (optional, defaults to none, comma separated string): ")
       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)
@@ -76,7 +76,7 @@ describe Tugboat::CLI do
       expect($stdin).to receive(:gets).and_return('')
       expect($stdout).to receive(:print).with("Enter your default size (optional, defaults to 512mb)): ")
       expect($stdin).to receive(:gets).and_return('')
-      expect($stdout).to receive(:print).with("Enter your default ssh key ID (optional, defaults to none): ")
+      expect($stdout).to receive(:print).with("Enter your default ssh key IDs (optional, defaults to none, comma separated string): ")
       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('')

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(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"foo\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null}",
+         with(:body => "{\"name\":\"foo\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":null}",
               :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
          to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
 
@@ -19,7 +19,7 @@ Queueing creation of droplet '#{droplet_name}'...Droplet created!
 
     it "with args does not use defaults from configuration" do
       stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"example.com\",\"size\":\"1gb\",\"image\":\"ubuntu-12-04-x64\",\"region\":\"nyc3\",\"ssh_keys\":[\"foo_bar_key\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null}",
+         with(:body => "{\"name\":\"example.com\",\"size\":\"1gb\",\"image\":\"ubuntu-12-04-x64\",\"region\":\"nyc3\",\"ssh_keys\":[\"foo_bar_key\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":null}",
               :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
          to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
 
@@ -32,8 +32,48 @@ Queueing creation of droplet 'example.com'...Droplet created!
 
     end
 
+    it "with ip6 enable args" do
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
+         with(:body => "{\"name\":\"example.com\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":\"true\",\"user_data\":null}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
+
+      @cli.options = @cli.options.merge(:ip6 => 'true')
+      @cli.create('example.com')
+
+      expect($stdout.string).to eq <<-eos
+Queueing creation of droplet 'example.com'...Droplet created!
+      eos
+
+    end
+
+    it "with user data args" do
+      stub_request(:post, "https://api.digitalocean.com/v2/droplets").
+         with(:body => "{\"name\":\"example.com\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":\"#!/bin/bash\\n\\necho \\\"Hello world\\\"\"}",
+              :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
+
+      @cli.options = @cli.options.merge(:user_data => project_path + "/spec/fixtures/user_data.sh")
+      @cli.create('example.com')
+
+      expect($stdout.string).to eq <<-eos
+Queueing creation of droplet 'example.com'...Droplet created!
+      eos
+
+    end
+
+    it "fails when user data file does not exist" do
+      @cli.options = @cli.options.merge(:user_data => "/foo/bar/baz.sh")
+      expect {@cli.create("example.com")}.to raise_error(SystemExit)
+
+      expect($stdout.string).to eq <<-eos
+Queueing creation of droplet 'example.com'...Could not find file: /foo/bar/baz.sh, check your user_data setting
+      eos
+
+    end
+
     it "doesn't create a droplet when mistyping help command" do
-      help_text = "Usage:\n  rspec create NAME\n\nOptions:\n  -s, [--size=N]              # The size_id of the droplet\n  -i, [--image=N]             # The image_id of the droplet\n  -r, [--region=N]            # The region_id of the droplet\n  -k, [--keys=KEYS]           # A comma separated list of SSH key ids to add to the droplet\n  -p, [--private-networking]  # Enable private networking on the droplet\n  -b, [--backups-enabled]     # Enable backups on the droplet\n  -q, [--quiet]               \n\nCreate a droplet.\n"
+      help_text = "Usage:\n  rspec create NAME\n\nOptions:\n  -s, [--size=N]               # The size slug of the droplet\n  -i, [--image=N]              # The image slug of the droplet\n  -r, [--region=N]             # The region slug of the droplet\n  -k, [--keys=KEYS]            # A comma separated list of SSH key ids to add to the droplet\n  -p, [--private-networking]   # Enable private networking on the droplet\n  -l, [--ip6]                  # Enable IP6 on the droplet\n  -u, [--user-data=USER_DATA]  # Location of a file to read and use as user data\n  -b, [--backups-enabled]      # Enable backups on the droplet\n  -q, [--quiet]                \n\nCreate a droplet.\n"
 
       @cli.create('help')
       expect($stdout.string).to eq help_text
@@ -47,7 +87,7 @@ Queueing creation of droplet 'example.com'...Droplet created!
 
     it "does not clobber named droplets that contain the word help" do
       stub_request(:post, "https://api.digitalocean.com/v2/droplets").
-         with(:body => "{\"name\":\"somethingblahblah--help\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null}",
+         with(:body => "{\"name\":\"somethingblahblah--help\",\"size\":\"512mb\",\"image\":\"ubuntu-14-04-x64\",\"region\":\"nyc2\",\"ssh_keys\":[\"1234\"],\"private_networking\":\"false\",\"backups_enabled\":\"false\",\"ipv6\":null,\"user_data\":null}",
               :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
          to_return(:status => 200, :body => fixture('create_droplet'), :headers => {})
 

data/spec/cli/droplets_cli_spec.rb

@@ -34,6 +34,7 @@ Try creating one with \e[32m`tugboat create`\e[0m
 
       expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
     end
+
     it "shows no output when --quiet is set" do
       stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
          with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
@@ -47,6 +48,23 @@ Try creating one with \e[32m`tugboat create`\e[0m
 
       expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
     end
+
+    it "includes urls when --include-urls is set" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture("show_droplets"), :headers => {'Content-Type' => 'application/json'},)
+
+      @cli.options = @cli.options.merge("include_urls" => true)
+      @cli.droplets
+
+      expect($stdout.string).to eq <<-eos
+example.com (ip: 104.236.32.182, status: \e[32mactive\e[0m, region: nyc3, id: 6918990, url: 'https://cloud.digitalocean.com/droplets/6918990')
+example2.com (ip: 104.236.32.172, status: \e[32mactive\e[0m, region: nyc3, id: 3164956, url: 'https://cloud.digitalocean.com/droplets/3164956')
+example3.com (ip: 104.236.32.173, status: \e[31moff\e[0m, region: nyc3, id: 3164444, url: 'https://cloud.digitalocean.com/droplets/3164444')
+      eos
+
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
+    end
   end
 
 end

data/spec/cli/env_variable_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Tugboat::CLI do
+  include_context "spec"
+
+  describe "DO_API_TOKEN=foobar" do
+    it "verifies with the ENV variable DO_API_TOKEN" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer env_variable', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+
+      allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('env_variable')
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+
+      @cli.verify
+      expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
+    end
+
+    it "does not use ENV variable DO_API_TOKEN if empty" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplets'), :headers => {})
+
+      allow(ENV).to receive(:[]).with('HOME').and_return('/tmp/fake_home')
+      allow(ENV).to receive(:[]).with('DO_API_TOKEN').and_return('')
+      allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
+
+      @cli.verify
+      expect($stdout.string).to eq "Authentication with DigitalOcean was successful.\n"
+      expect(a_request(:get, "https://api.digitalocean.com/v2/droplets?per_page=200")).to have_been_made
+    end
+  end
+end
+

data/spec/cli/info_cli_spec.rb

@@ -24,13 +24,36 @@ Status:           \e[32mactive\e[0m
 IP4:              104.131.186.241
 IP6:              2604:A880:0800:0010:0000:0000:031D:2001
 Region:           New York 3 - nyc3
-Image:            6918990 - 14.04 x64
+Image:            6918990 - ubuntu-14-04-x64
 Size:             512MB
 Backups Active:   false
       eos
 
     end
 
+    it "shows a droplet made from a user image" do
+      stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
+         with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
+         to_return(:status => 200, :body => fixture('show_droplet_user_image'), :headers => {})
+
+      @cli.options = @cli.options.merge(:id => 6918990)
+      @cli.info
+
+      expect($stdout.string).to eq <<-eos
+Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
+
+Name:             example.com
+ID:               6918990
+Status:           \e[32mactive\e[0m
+IP4:              104.131.186.241
+IP6:              2604:A880:0800:0010:0000:0000:031D:2001
+Region:           New York 3 - nyc3
+Image:            36646276 - Super Cool Custom Image
+Size:             512MB
+Backups Active:   false
+      eos
+    end
+
     it "shows a droplet with an id" do
       stub_request(:get, "https://api.digitalocean.com/v2/droplets/6918990?per_page=200").
          with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer foo', 'Content-Type'=>'application/json', 'User-Agent'=>'Faraday v0.9.2'}).
@@ -48,7 +71,7 @@ Status:           \e[32mactive\e[0m
 IP4:              104.131.186.241
 IP6:              2604:A880:0800:0010:0000:0000:031D:2001
 Region:           New York 3 - nyc3
-Image:            6918990 - 14.04 x64
+Image:            6918990 - ubuntu-14-04-x64
 Size:             512MB
 Backups Active:   false
       eos
@@ -75,7 +98,7 @@ Status:           \e[32mactive\e[0m
 IP4:              104.131.186.241
 IP6:              2604:A880:0800:0010:0000:0000:031D:2001
 Region:           New York 3 - nyc3
-Image:            6918990 - 14.04 x64
+Image:            6918990 - ubuntu-14-04-x64
 Size:             512MB
 Backups Active:   false
       eos
@@ -108,7 +131,7 @@ Status:           \e[32mactive\e[0m
 IP4:              104.131.186.241
 IP6:              2604:A880:0800:0010:0000:0000:031D:2001
 Region:           New York 3 - nyc3
-Image:            6918990 - 14.04 x64
+Image:            6918990 - ubuntu-14-04-x64
 Size:             512MB
 Backups Active:   false
       eos
@@ -131,7 +154,7 @@ status active
 ip4 104.131.186.241
 ip6 2604:A880:0800:0010:0000:0000:031D:2001
 region nyc3
-Image 6918990
+image 6918990
 size 512mb
 backups_active false
       eos
@@ -156,7 +179,7 @@ status active
 ip4 104.131.186.241
 ip6 2604:A880:0800:0010:0000:0000:031D:2001
 region nyc3
-Image 6918990
+image 6918990
 size 512mb
 backups_active false
       eos
@@ -212,7 +235,7 @@ Provide one of the following:
     ip6
     private_ip
     region
-    Image
+    image
     size
     backups_active
       eos

data/spec/cli/info_image_cli_spec.rb

@@ -21,6 +21,7 @@ Image fuzzy name provided. Finding image ID...done\e[0m, 12789325 (745.1.0 (alph
 Name:             745.1.0 (alpha)
 ID:               12789325
 Distribution:     CoreOS
+Min Disk Size:    20GB
       eos
     end
 
@@ -42,6 +43,7 @@ Image id provided. Finding Image...done\e[0m, 12438838 (Redmine on 14.04)
 Name:             Redmine on 14.04
 ID:               12438838
 Distribution:     Ubuntu
+Min Disk Size:    20GB
       eos
     end
 
@@ -63,6 +65,7 @@ Image name provided. Finding Image...done\e[0m, 12438838 (Redmine on 14.04)
 Name:             Redmine on 14.04
 ID:               12438838
 Distribution:     Ubuntu
+Min Disk Size:    20GB
       eos
     end
 
@@ -139,6 +142,7 @@ Please choose a image: ["0", "1", "2", "3", "4", "5", "6", "7"]\x20
 Name:             14.10 x32
 ID:               9801951
 Distribution:     Ubuntu
+Min Disk Size:    20GB
       eos
     end
 

data/spec/fixtures/show_droplet_user_image.json

@@ -0,0 +1,82 @@
+{
+  "droplet": {
+    "id": 6918990,
+    "name": "example.com",
+    "memory": 512,
+    "vcpus": 1,
+    "disk": 20,
+    "locked": false,
+    "status": "active",
+    "kernel": {
+      "id": 2233,
+      "name": "Ubuntu 14.04 x64 vmlinuz-3.13.0-37-generic",
+      "version": "3.13.0-37-generic"
+    },
+    "created_at": "2014-11-14T16:36:31Z",
+    "features": [
+      "ipv6",
+      "virtio"
+    ],
+    "backup_ids": [
+
+    ],
+    "snapshot_ids": [
+
+    ],
+    "image": {
+      "id": 36646276,
+      "name": "Super Cool Custom Image",
+      "distribution": "CentOS",
+      "slug": null,
+      "public": false,
+      "regions": [
+          "lon1"
+      ],
+      "created_at": "2015-02-27T14:44:25Z",
+      "min_disk_size": 20,
+      "type": "snapshot"
+    },
+    "size_slug": "512mb",
+    "networks": {
+      "v4": [
+        {
+          "ip_address": "104.131.186.241",
+          "netmask": "255.255.240.0",
+          "gateway": "104.131.176.1",
+          "type": "public"
+        }
+      ],
+      "v6": [
+        {
+          "ip_address": "2604:A880:0800:0010:0000:0000:031D:2001",
+          "netmask": 64,
+          "gateway": "2604:A880:0800:0010:0000:0000:0000:0001",
+          "type": "public"
+        }
+      ]
+    },
+    "region": {
+      "name": "New York 3",
+      "slug": "nyc3",
+      "sizes": [
+        "32gb",
+        "16gb",
+        "2gb",
+        "1gb",
+        "4gb",
+        "8gb",
+        "512mb",
+        "64gb",
+        "48gb"
+      ],
+      "features": [
+        "virtio",
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    }
+  }
+}

data/spec/fixtures/user_data.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "Hello world"

data/spec/middleware/find_droplet_spec.rb

@@ -6,6 +6,10 @@ describe Tugboat::Middleware::FindDroplet do
   describe ".call" do
     it "raises SystemExit with no droplet data" do
       expect {described_class.new(app).call(env) }.to raise_error(SystemExit)
+
+      expect($stdout.string).to include 'Tugboat attempted to find a droplet with no arguments'
+      expect($stdout.string).to include 'For more help run: '
+      expect($stdout.string).to include 'Try running `tugboat '
     end
   end
 

data/spec/middleware/find_image_spec.rb

@@ -6,6 +6,10 @@ describe Tugboat::Middleware::FindImage do
   describe ".call" do
     it "raises SystemExit with no image data" do
       expect {described_class.new(app).call(env) }.to raise_error(SystemExit)
+
+      expect($stdout.string).to include 'Tugboat attempted to find an image with no arguments'
+      expect($stdout.string).to include 'For more help run: '
+      expect($stdout.string).to include 'Try running `tugboat '
     end
   end
 

data/spec/middleware/ssh_droplet_spec.rb

@@ -83,7 +83,7 @@ describe Tugboat::Middleware::SSHDroplet do
       expect {described_class.new(app).call(env)}.to raise_error(SystemExit)
 
       expect($stdout.string).to eq <<-eos
-Executing SSH ...
+Executing SSH on Droplet ...
 You asked to ssh to the private IP, but no Private IP found!
       eos
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 2.0.0.RC1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jack Pearkes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -234,6 +234,7 @@ files:
 - spec/cli/destroy_cli_spec.rb
 - spec/cli/destroy_image_cli_spec.rb
 - spec/cli/droplets_cli_spec.rb
+- spec/cli/env_variable_spec.rb
 - spec/cli/halt_cli_spec.rb
 - spec/cli/help_cli_spec.rb
 - spec/cli/images_cli_spec.rb
@@ -266,6 +267,7 @@ files:
 - spec/fixtures/show_coreos_image.json
 - spec/fixtures/show_droplet.json
 - spec/fixtures/show_droplet_inactive.json
+- spec/fixtures/show_droplet_user_image.json
 - spec/fixtures/show_droplets.json
 - spec/fixtures/show_droplets_empty.json
 - spec/fixtures/show_image.json
@@ -279,6 +281,7 @@ files:
 - spec/fixtures/shutdown_response.json
 - spec/fixtures/snapshot_response.json
 - spec/fixtures/ubuntu_image_9801951.json
+- spec/fixtures/user_data.sh
 - spec/middleware/base_spec.rb
 - spec/middleware/check_configuration_spec.rb
 - spec/middleware/check_credentials_spec.rb
@@ -307,9 +310,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -328,6 +331,7 @@ test_files:
 - spec/cli/destroy_cli_spec.rb
 - spec/cli/destroy_image_cli_spec.rb
 - spec/cli/droplets_cli_spec.rb
+- spec/cli/env_variable_spec.rb
 - spec/cli/halt_cli_spec.rb
 - spec/cli/help_cli_spec.rb
 - spec/cli/images_cli_spec.rb
@@ -360,6 +364,7 @@ test_files:
 - spec/fixtures/show_coreos_image.json
 - spec/fixtures/show_droplet.json
 - spec/fixtures/show_droplet_inactive.json
+- spec/fixtures/show_droplet_user_image.json
 - spec/fixtures/show_droplets.json
 - spec/fixtures/show_droplets_empty.json
 - spec/fixtures/show_image.json
@@ -373,6 +378,7 @@ test_files:
 - spec/fixtures/shutdown_response.json
 - spec/fixtures/snapshot_response.json
 - spec/fixtures/ubuntu_image_9801951.json
+- spec/fixtures/user_data.sh
 - spec/middleware/base_spec.rb
 - spec/middleware/check_configuration_spec.rb
 - spec/middleware/check_credentials_spec.rb