tugboat 0.0.5 → 0.0.6

data/.gitignore

@@ -6,6 +6,7 @@
 .bundle
 .rvmrc
 Gemfile.lock
+coverage
 doc/*
 log/*
 pkg/*

data/CHANGELOG.md

@@ -1,4 +1,29 @@
-## 0.0.5 (unreleased)
+## 0.0.6 (June 25, 2013)
+
+FEATURES:
+
+  - [Ørjan](https://github.com/blom) added a `start` command, which
+  let's you start a droplet. [GH-30]
+  - [Ørjan](https://github.com/blom) added a `resize` command, which
+  let's you resize a droplet. [GH-40]
+  - [Ørjan](https://github.com/blom) added a `password-reset` command
+  [GH-45]
+  - Added a the `wait` command, allowing you to "wait" for a droplet
+  to enter a state. [GH-46]
+
+IMPROVEMENTS:
+
+  - [Ørjan](https://github.com/blom) added an `--ssh-opts` flag, for the
+  `ssh` command. [GH-38]
+  - Droplet state is checked for some commands. For example, a droplet
+  can't be started if it's active. [GH-31]
+
+BUG FIXES:
+
+  - DigitalOcean changed their `image_id`'s, so the defaults for `create`
+  were updated. [GH-39]
+
+## 0.0.5 (May 4, 2013)
 
 FEATURES:
 
@@ -11,7 +36,7 @@ FEATURES:
   - [Ørjan](https://github.com/blom) added a `sizes` command, which
   returns a list of available sizes. You can specify which size to
   use while creating: `tugboat create foobar -s 66` [GH-19]
-  - [Ørjan](https://github.com/blom) added a `hard` flag to 
+  - [Ørjan](https://github.com/blom) added a `hard` flag to
   `halt` and `restart`. This cycles the Droplet's power. `tugboat restart --hard` [GH-27]
 
 IMPROVEMENTS:

data/README.md

@@ -1,5 +1,6 @@
 # Tugboat
 [![Build Status](https://travis-ci.org/pearkes/tugboat.png?branch=master)](https://travis-ci.org/pearkes/tugboat)
+[![Coverage Status](https://coveralls.io/repos/pearkes/tugboat/badge.png?branch=master)](https://coveralls.io/r/pearkes/tugboat)
 
 A command line tool for interacting with your [DigitalOcean](https://www.digitalocean.com/) droplets.
 
@@ -107,6 +108,66 @@ match.
     $ tugboat snapshot test-admin-snaphot admin
     Queuing snapshot 'test-admin-snapshot' for 13231512 (pearkes-admin-001)...done
 
+### Resize a droplet
+
+    $ tugboat resize admin -s 66
+    Queuing resize for 13231512 (pearkes-admin-001)...done
+
+### List Available Images
+
+You can list images that you have created.
+
+    $ tugboat images
+    My Images:
+    pearkes-admin-001 2013-05-19 (id: 13231512, distro: Ubuntu)
+    ....
+
+Optionally, list images provided by DigitalOcean as well.
+
+    $ tugboat images --global
+    My Images:
+    pearkes-admin-001 2013-05-19 (id: 13231512, distro: Ubuntu)
+    ....
+    Global Images:
+    CentOS 5.8 x64 (id: 1601, distro: CentOS)
+    ...
+
+### List Available Sizes
+
+    $ tugboat sizes
+    Sizes:
+    512MB (id: 66)
+    1GB (id: 63)
+    ...
+
+### List Available Regions
+
+    $ tugboat regions
+    Regions:
+    New York 1 (id: 1)
+    Amsterdam 1 (id: 2)
+    San Francisco 1 (id: 3)
+
+### List SSH Keys
+
+    $ tugboat keys
+    Keys:
+    pearkes (id: 10501)
+    ...
+
+### Wait for Droplet State
+
+Sometimes you want to wait for a droplet to enter some state, for
+example "off".
+
+    $ tugboat wait admin --state off
+    Droplet fuzzy name provided. Finding droplet ID...done, 13231512 (pearkes-admin-001)
+    Waiting for droplet to become off....
+    ...
+
+This will simply block until the droplet returns a state of "off".
+A period will be printed after each request.
+
 ## Help
 
 If you're curious about command flags for a specific command, you can

data/lib/tugboat/cli.rb

@@ -9,7 +9,9 @@ module Tugboat
 
     !check_unknown_options
 
-    map "--version" => :version, "-v" => :version
+    map "--version"      => :version,
+        "-v"             => :version,
+        "password-reset" => :password_reset
 
     desc "help [COMMAND]", "Describe commands or a specific command"
     def help(meth=nil)
@@ -68,13 +70,18 @@ module Tugboat
                   :type => :string,
                   :aliases => "-u",
                   :desc => "Specifies which user to log in as"
+    method_option "ssh_opts",
+                  :type => :string,
+                  :aliases => "-o",
+                  :desc => "Custom SSH options"
     def ssh(name=nil)
       Middleware.sequence_ssh_droplet.call({
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
         "user_droplet_ssh_port" => options[:ssh_port],
-        "user_droplet_ssh_user" => options[:ssh_user]
+        "user_droplet_ssh_user" => options[:ssh_user],
+        "user_droplet_ssh_opts" => options[:ssh_opts]
       })
     end
 
@@ -82,12 +89,12 @@ module Tugboat
     method_option  "size",
                    :type => :numeric,
                    :aliases => "-s",
-                   :default => 64,
+                   :default => 66,
                    :desc => "The size_id of the droplet"
     method_option  "image",
                    :type => :numeric,
                    :aliases => "-i",
-                   :default => 2676,
+                   :default => 284203,
                    :desc => "The image_id of the droplet"
     method_option  "region",
                    :type => :numeric,
@@ -228,6 +235,86 @@ module Tugboat
     def sizes
       Middleware.sequence_sizes.call({})
     end
+
+    desc "start FUZZY_NAME", "Start a droplet"
+    method_option "id",
+                  :type => :string,
+                  :aliases => "-i",
+                  :desc => "The ID of the droplet."
+    method_option "name",
+                  :type => :string,
+                  :aliases => "-n",
+                  :desc => "The exact name of the droplet"
+    def start(name=nil)
+      Middleware.sequence_start_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name
+      })
+    end
+
+    desc "resize FUZZY_NAME", "Resize a droplet"
+    method_option "id",
+                  :type => :numeric,
+                  :aliases => "-i",
+                  :desc => "The ID of the droplet."
+    method_option "name",
+                  :type => :string,
+                  :aliases => "-n",
+                  :desc => "The exact name of the droplet"
+    method_option "size",
+                  :type => :numeric,
+                  :aliases => "-s",
+                  :required => true,
+                  :desc => "The size_id to resize the droplet to"
+    def resize(name=nil)
+      Middleware.sequence_resize_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_size" => options[:size],
+        "user_droplet_fuzzy_name" => name
+      })
+    end
+
+    desc "password-reset FUZZY_NAME", "Reset root password"
+    method_option "id",
+                  :type => :numeric,
+                  :aliases => "-i",
+                  :desc => "The ID of the droplet."
+    method_option "name",
+                  :type => :string,
+                  :aliases => "-n",
+                  :desc => "The exact name of the droplet"
+    def password_reset(name=nil)
+      Middleware.sequence_password_reset.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name
+      })
+    end
+
+    desc "wait FUZZY_NAME", "Wait for a droplet to reach a state"
+    method_option "id",
+                  :type => :numeric,
+                  :aliases => "-i",
+                  :desc => "The ID of the droplet."
+    method_option "name",
+                  :type => :string,
+                  :aliases => "-n",
+                  :desc => "The exact name of the droplet"
+    method_option "state",
+                  :type => :string,
+                  :aliases => "-s",
+                  :default => "active",
+                  :desc => "The state of the droplet to wait for"
+    def wait(name=nil)
+      Middleware.sequence_wait.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_desired_state" => options[:state],
+        "user_droplet_fuzzy_name" => name
+      })
+    end
   end
 end
 

data/lib/tugboat/middleware.rb

@@ -11,6 +11,7 @@ module Tugboat
     autoload :ListDroplets, "tugboat/middleware/list_droplets"
     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"
@@ -18,10 +19,15 @@ module Tugboat
     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 :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 :PasswordReset, "tugboat/middleware/password_reset"
+    autoload :WaitForState, "tugboat/middleware/wait_for_state"
 
     # Start the authorization flow.
     # This writes a ~/.tugboat file, which can be edited manually.
@@ -67,6 +73,18 @@ module Tugboat
       end
     end
 
+    # Start a droplet
+    def self.sequence_start_droplet
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindDroplet
+        use CheckDropletInactive
+        use StartDroplet
+      end
+    end
+
     # Shutdown a droplet
     def self.sequence_halt_droplet
       ::Middleware::Builder.new do
@@ -74,6 +92,7 @@ module Tugboat
         use CheckConfiguration
         use InjectClient
         use FindDroplet
+        use CheckDropletActive
         use HaltDroplet
       end
     end
@@ -96,6 +115,7 @@ module Tugboat
         use CheckConfiguration
         use InjectClient
         use FindDroplet
+        use CheckDropletActive
         use SSHDroplet
       end
     end
@@ -129,6 +149,7 @@ module Tugboat
         use CheckConfiguration
         use InjectClient
         use FindDroplet
+        use CheckDropletInactive
         use SnapshotDroplet
       end
     end
@@ -162,5 +183,38 @@ module Tugboat
         use ListSizes
       end
     end
+
+    # Resize a droplet
+    def self.sequence_resize_droplet
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindDroplet
+        use ResizeDroplet
+      end
+    end
+
+    # Reset root password
+    def self.sequence_password_reset
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindDroplet
+        use PasswordReset
+      end
+    end
+
+    # Wait for a droplet to enter a desired state
+    def self.sequence_wait
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindDroplet
+        use WaitForState
+      end
+    end
   end
 end

data/lib/tugboat/middleware/check_droplet_active.rb

@@ -0,0 +1,17 @@
+module Tugboat
+  module Middleware
+    # Check if the droplet in the environment is active
+    class CheckDropletActive < Base
+      def call(env)
+
+        if env["droplet_status"] != "active"
+          say "Droplet must be on for this operation to be successful.", :red
+          exit 1
+        end
+
+        @app.call(env)
+      end
+    end
+  end
+end
+

data/lib/tugboat/middleware/check_droplet_inactive.rb

@@ -0,0 +1,17 @@
+module Tugboat
+  module Middleware
+    # Check if the droplet in the environment is inactive, or "off"
+    class CheckDropletInactive < Base
+      def call(env)
+
+        if env["droplet_status"] != "off"
+          say "Droplet must be off for this operation to be successful.", :red
+          exit 1
+        end
+
+        @app.call(env)
+      end
+    end
+  end
+end
+

data/lib/tugboat/middleware/find_droplet.rb

@@ -33,6 +33,7 @@ module Tugboat
           env["droplet_id"] = req.droplet.id
           env["droplet_name"] = "(#{req.droplet.name})"
           env["droplet_ip"] = req.droplet.ip_address
+          env["droplet_status"] = req.droplet.status
         end
 
         # If they provide a name, we need to get the ID for it.
@@ -46,6 +47,7 @@ module Tugboat
               env["droplet_id"] = d.id
               env["droplet_name"] = "(#{d.name})"
               env["droplet_ip"] = d.ip_address
+              env["droplet_status"] = d.status
             end
           end
 
@@ -81,6 +83,7 @@ module Tugboat
             env["droplet_id"] = found_droplets.first.id
             env["droplet_name"] = "(#{found_droplets.first.name})"
             env["droplet_ip"] = found_droplets.first.ip_address
+            env["droplet_status"] = found_droplets.first.status
           elsif found_droplets.length > 1
             # Did we run the multiple questionairre?
             did_run_multiple = true
@@ -96,6 +99,7 @@ module Tugboat
             env["droplet_id"] = found_droplets[choice.to_i].id
             env["droplet_name"] = found_droplets[choice.to_i].name
             env["droplet_ip"] = found_droplets[choice.to_i].ip_address
+            env["droplet_status"] = found_droplets[choice.to_i].status
           end
 
           # If we coulnd't find it, tell the user and drop out of the

data/lib/tugboat/middleware/password_reset.rb

@@ -0,0 +1,23 @@
+module Tugboat
+  module Middleware
+    class PasswordReset < Base
+      def call(env)
+        ocean = env["ocean"]
+
+        say "Queuing password reset for #{env["droplet_id"]} #{env["droplet_name"]}...", nil, false
+        res = ocean.droplets.password_reset env["droplet_id"]
+
+        if res.status == "ERROR"
+          say res.error_message, :red
+          exit 1
+        end
+
+        say "done", :green
+        say "Your new root password will be emailed to you"
+
+        @app.call(env)
+      end
+    end
+  end
+end
+