tugboat 0.0.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d849915ab2227a3a3ffa08de72535a611cfbd84
-  data.tar.gz: 62a801c0f5e32a631d290e05528f2805813d7f58
+  metadata.gz: a65287132cbbc39cf82f8b2f38c367cfe03cce4d
+  data.tar.gz: 7289289f9a09750c5a79500605f39086887f0804
 SHA512:
-  metadata.gz: 0248ef0e63f0b8d62ab68027740fc5ba22b31f5c9c20d7df711d51f6f4e3a35aa69369bf6dbaa677b3e3b0f421865133ea0bdca13e84a530f0c5520393d4a547
-  data.tar.gz: c1afc811c11f657f3821b2407164a63616368546c67f88f3eb67d14138c3eaf1ea00244132d0aa409f882467bf3f01a096ab6d7410ef12cb2efec8f51eb3d778
+  metadata.gz: a8c91047d99cf38350e01fc8d867a4c30b27fd437befcd5ca4542ebc02290608bc38ec7a6cbfc5b6ede7a20d1c597d800c874c7f889a76963f22e7b5152317d0
+  data.tar.gz: fc03cb535368841410681deeaa967349030bd7fb602d4f6efa24311b1dbaceabd15531584ecc0bb85345f4cda55d2c91d76408e27fc08248671196b943e72b72

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.2.1 (UNRELEASED)
+
+
+## 0.2.0 (Feburary 15, 2014)
+
+FEATURES:
+
+  - [Pierre](https://github.com/spearway) added an `info-image` and `destroy-image`
+  command, letting you deal with your images from Tugboat. It's great. [GH-91]
+  - [Pierre](https://github.com/spearway) also added a `rebuild` command,
+  letting you take an existing droplet and recreate it from scratch. [GH-90]
+
+IMPROVEMENTS:
+
+  - [Dale](https://github.com/Vel0x) made it so fuzzy name searching
+  is case insensitive. We wonder why we didn't do this earlier, really. [GH-88]
+  - There is now a `--quiet/-q` flag, which makes Tugboat be silent, as it
+  can get a little obnoxious. [GH-87]
+  - [Andrew](https://github.com/4n3w) hooked up a `backups_enabled` option
+  for creating droplets. [GH-82]
+
+
 ## 0.0.9 (December 24, 2013)
 
 FEATURES:

data/lib/tugboat/cli.rb

@@ -9,6 +9,8 @@ module Tugboat
 
     !check_unknown_options
 
+    class_option :quiet, type: :boolean, aliases: "-q"
+
     map "--version"      => :version,
         "-v"             => :version,
         "password-reset" => :password_reset
@@ -33,7 +35,9 @@ module Tugboat
     $USER environment variable.
     "
     def authorize
-      Middleware.sequence_authorize.call({})
+      Middleware.sequence_authorize.call({
+        "user_quiet" => options[:quiet]
+        })
     end
 
     desc "verify", "Check your DigitalOcean credentials"
@@ -42,12 +46,16 @@ module Tugboat
     to the API without errors.
     "
     def verify
-      Middleware.sequence_verify.call({})
+      Middleware.sequence_verify.call({
+        "user_quiet" => options[:quiet]
+        })
     end
 
     desc "droplets", "Retrieve a list of your droplets"
     def droplets
-      Middleware.sequence_list_droplets.call({})
+      Middleware.sequence_list_droplets.call({
+        "user_quiet" => options[:quiet]
+        })
     end
 
     desc "images", "Retrieve a list of your images"
@@ -59,6 +67,7 @@ module Tugboat
     def images
       Middleware.sequence_list_images.call({
         "user_show_global_images" => options[:global],
+        "user_quiet" => options[:quiet]
         })
     end
 
@@ -95,7 +104,8 @@ module Tugboat
         "user_droplet_ssh_port" => options[:ssh_port],
         "user_droplet_ssh_user" => options[:ssh_user],
         "user_droplet_ssh_opts" => options[:ssh_opts],
-        "user_droplet_ssh_command" => options[:ssh_command]
+        "user_droplet_ssh_command" => options[:ssh_command],
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -120,6 +130,10 @@ module Tugboat
                   :type => :boolean,
                   :aliases => "-p",
                   :desc => "Enable private networking on the droplet"
+    method_option  "backups_enabled",
+                   :type => :boolean,
+                   :aliases => "-b",
+                   :desc => "Enable backups on the droplet"
 
     def create(name)
       Middleware.sequence_create_droplet.call({
@@ -128,7 +142,43 @@ module Tugboat
         "create_droplet_region_id" => options[:region],
         "create_droplet_ssh_key_ids" => options[:keys],
         "create_droplet_private_networking" => options[:private_networking],
-        "create_droplet_name" => name
+        "create_droplet_backups_enabled" => options[:backups_enabled],
+        "create_droplet_name" => name,
+        "user_quiet" => options[:quiet]
+      })
+    end
+
+    desc "rebuild FUZZY_NAME IMAGE_NAME", "Rebuild 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"
+    method_option "confirm",
+                  :type => :boolean,
+                  :aliases => "-c",
+                  :desc => "Skip confirmation of the action"
+    method_option "image_id",
+                  :type => :numeric,
+                  :aliases => "-k",
+                  :desc => "The ID of the image"
+    method_option "image_name",
+                  :type => :string,
+                  :aliases => "-m",
+                  :desc => "The exact name of the image"
+    def rebuild(name=nil, image_name=nil)
+      Middleware.sequence_rebuild_droplet.call({
+        "user_droplet_id" => options[:id],
+        "user_droplet_name" => options[:name],
+        "user_droplet_fuzzy_name" => name,
+        "user_image_id" => options[:image_id],
+        "user_image_name" => options[:image_name],
+        "user_image_fuzzy_name" => image_name,
+        "user_confirm_action" => options[:confirm],
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -150,7 +200,31 @@ module Tugboat
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_confirm_action" => options[:confirm],
-        "user_droplet_fuzzy_name" => name
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
+      })
+    end
+
+    desc "destroy_image FUZZY_NAME", "Destroy an image"
+    method_option "id",
+                  :type => :string,
+                  :aliases => "-i",
+                  :desc => "The ID of the image."
+    method_option "name",
+                  :type => :string,
+                  :aliases => "-n",
+                  :desc => "The exact name of the image"
+    method_option "confirm",
+                  :type => :boolean,
+                  :aliases => "-c",
+                  :desc => "Skip confirmation of the action"
+    def destroy_image(name=nil)
+      Middleware.sequence_destroy_image.call({
+        "user_image_id" => options[:id],
+        "user_image_name" => options[:name],
+        "user_image_fuzzy_name" => name,
+        "user_confirm_action" => options[:confirm],
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -172,7 +246,8 @@ module Tugboat
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_hard" => options[:hard],
-        "user_droplet_fuzzy_name" => name
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -194,7 +269,8 @@ module Tugboat
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_hard" => options[:hard],
-        "user_droplet_fuzzy_name" => name
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -211,7 +287,26 @@ module Tugboat
       Middleware.sequence_info_droplet.call({
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
-        "user_droplet_fuzzy_name" => name
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
+      })
+    end
+
+    desc "info_image FUZZY_NAME [OPTIONS]", "Show an image's information"
+    method_option "id",
+                  :type => :string,
+                  :aliases => "-i",
+                  :desc => "The ID of the image."
+    method_option "name",
+                  :type => :string,
+                  :aliases => "-n",
+                  :desc => "The exact name of the image"
+    def info_image(name=nil)
+      Middleware.sequence_info_image.call({
+        "user_image_id" => options[:id],
+        "user_image_name" => options[:name],
+        "user_image_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -229,7 +324,8 @@ module Tugboat
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
-        "user_snapshot_name" => snapshot_name
+        "user_snapshot_name" => snapshot_name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -242,7 +338,7 @@ module Tugboat
     method_option  "key",
                    :type => :string,
                    :aliases => "-k",
-                   :desc => "The string of the key"                   
+                   :desc => "The string of the key"
     method_option "path",
                   :type => :string,
                   :aliases => "-p",
@@ -252,12 +348,15 @@ module Tugboat
         "add_key_name" => name,
         "add_key_pub_key" => options[:key],
         "add_key_file_path" => options[:path],
+        "user_quiet" => options[:quiet]
       })
     end
 
     desc "regions", "Show regions"
     def regions
-      Middleware.sequence_regions.call({})
+      Middleware.sequence_regions.call({
+        "user_quiet" => options[:quiet]
+        })
     end
 
     desc "version", "Show version"
@@ -267,7 +366,9 @@ module Tugboat
 
     desc "sizes", "Show available droplet sizes"
     def sizes
-      Middleware.sequence_sizes.call({})
+      Middleware.sequence_sizes.call({
+        "user_quiet" => options[:quiet]
+        })
     end
 
     desc "start FUZZY_NAME", "Start a droplet"
@@ -283,7 +384,8 @@ module Tugboat
       Middleware.sequence_start_droplet.call({
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
-        "user_droplet_fuzzy_name" => name
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -306,7 +408,8 @@ module Tugboat
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_size" => options[:size],
-        "user_droplet_fuzzy_name" => name
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -319,11 +422,13 @@ module Tugboat
                   :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
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
 
@@ -341,14 +446,17 @@ module Tugboat
                   :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
+        "user_droplet_fuzzy_name" => name,
+        "user_quiet" => options[:quiet]
       })
     end
   end
 end
 
+

data/lib/tugboat/config.rb

@@ -17,6 +17,7 @@ module Tugboat
     DEFAULT_SIZE = '66'
     DEFAULT_SSH_KEY = ''
     DEFAULT_PRIVATE_NETWORKING = 'false'
+    DEFAULT_BACKUPS_ENABLED = 'false'
 
     def initialize
       @path = ENV["TUGBOAT_CONFIG_PATH"] || File.join(File.expand_path("~"), FILE_NAME)
@@ -72,6 +73,10 @@ module Tugboat
       @data['defaults'].nil? ? DEFAULT_PRIVATE_NETWORKING : @data['defaults']['private_networking']
     end
 
+    def default_backups_enabled
+      @data['defaults'].nil? ? DEFAULT_BACKUPS_ENABLED : @data['defaults']['backups_enabled']
+    end
+
     # Re-runs initialize
     def reset!
       self.send(:initialize)
@@ -83,7 +88,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, private_networking)
+    def create_config_file(client, api, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking, backups_enabled)
       # Default SSH Key path
       if ssh_key_path.empty?
         ssh_key_path = File.join(File.expand_path("~"), DEFAULT_SSH_KEY_PATH)
@@ -117,6 +122,10 @@ module Tugboat
         private_networking = DEFAULT_PRIVATE_NETWORKING
       end
 
+      if backups_enabled.empty?
+        backups_enabled = DEFAULT_BACKUPS_ENABLED
+      end
+
       require 'yaml'
       File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |file|
         data = {
@@ -132,7 +141,8 @@ module Tugboat
                   "image" => image,
                   "size" => size,
                   "ssh_key" => ssh_key,
-                  "private_networking" => private_networking
+                  "private_networking" => private_networking,
+                  "backups_enabled" => backups_enabled
                 }
         }
         file.write data.to_yaml

data/lib/tugboat/middleware.rb

@@ -11,10 +11,14 @@ module Tugboat
     autoload :CheckDropletInactive, "tugboat/middleware/check_droplet_inactive"
     autoload :ConfirmAction, "tugboat/middleware/confirm_action"
     autoload :CreateDroplet, "tugboat/middleware/create_droplet"
+    autoload :RebuildDroplet, "tugboat/middleware/rebuild_droplet"
     autoload :DestroyDroplet, "tugboat/middleware/destroy_droplet"
+    autoload :DestroyImage, "tugboat/middleware/destroy_image"
     autoload :FindDroplet, "tugboat/middleware/find_droplet"
+    autoload :FindImage, "tugboat/middleware/find_image"
     autoload :HaltDroplet, "tugboat/middleware/halt_droplet"
     autoload :InfoDroplet, "tugboat/middleware/info_droplet"
+    autoload :InfoImage, "tugboat/middleware/info_image"
     autoload :InjectClient, "tugboat/middleware/inject_client"
     autoload :InjectConfiguration, "tugboat/middleware/inject_configuration"
     autoload :ListDroplets, "tugboat/middleware/list_droplets"
@@ -119,6 +123,17 @@ module Tugboat
       end
     end
 
+    # Show information about an image
+    def self.sequence_info_image
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindImage
+        use InfoImage
+      end
+    end
+
     # SSH into a droplet
     def self.sequence_ssh_droplet
       ::Middleware::Builder.new do
@@ -141,6 +156,19 @@ module Tugboat
       end
     end
 
+    # Rebuild a droplet
+    def self.sequence_rebuild_droplet
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindDroplet
+        use FindImage
+        use ConfirmAction
+        use RebuildDroplet
+      end
+    end
+
     # Destroy a droplet
     def self.sequence_destroy_droplet
       ::Middleware::Builder.new do
@@ -153,6 +181,18 @@ module Tugboat
       end
     end
 
+    # Destroy an image
+    def self.sequence_destroy_image
+      ::Middleware::Builder.new do
+        use InjectConfiguration
+        use CheckConfiguration
+        use InjectClient
+        use FindImage
+        use ConfirmAction
+        use DestroyImage
+      end
+    end
+
     # Snapshot a droplet
     def self.sequence_snapshot_droplet
       ::Middleware::Builder.new do

data/lib/tugboat/middleware/ask_for_credentials.rb

@@ -19,9 +19,10 @@ module Tugboat
         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):"
+        backups_enabled = ask "Enter your default for enabling backups (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, private_networking)
+        env['config'].create_config_file(client_key, api_key, ssh_key_path, ssh_user, ssh_port, region, image, size, ssh_key, private_networking, backups_enabled)
         env['config'].reload!
 
         @app.call(env)