hpcloud 2.0.0

data/lib/hpcloud/commands/images/metadata/add.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'images:metadata:update' => 'images:metadata:add'
+
+      desc "images:metadata:add <name> <metadata>", "Add metadata to an image."
+      long_desc <<-DESC
+  Add metadata to a image in your compute account.  You may specify the mage name or ID.  If metadata already exists, it is updated.  You must specify the M\metadata as a comma separated list of name value pairs.  Optionally, you may specify an availability zone.
+
+Examples:
+  hpcloud images:metadata:add my_image 'r2=d2,c3=po'  # Add the specified metadata to the image (if the metadata exists, it is updated)
+
+Aliases: images:metadata:update
+      DESC
+      CLI.add_common_options
+      define_method "images:metadata:add" do |name_or_id, metadata|
+        cli_command(options) {
+          image = Images.new.get(name_or_id.to_s)
+          if image.is_valid?
+            if image.meta.set_metadata(metadata)
+              @log.display "Image '#{name_or_id}' set metadata '#{metadata}'."
+            else
+              @log.fatal image.meta.cstatus
+            end
+          else
+            @log.fatal image.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/images/metadata/remove.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'images:metadata:rm' => 'images:metadata:remove'
+
+      desc "images:metadata:remove <image_name_or_id> [metadata_key ...]", "Remove metadata from an image."
+      long_desc <<-DESC
+  Remove metadata from an image in your compute account.  You may specify an image name or ID.  Optionally, you may specify an availability zone.
+
+Examples:
+  hpcloud images:metadata:remove my_image r2 c3  # Remove the specified metadata from the image
+
+Aliases: images:metadata:rm
+      DESC
+      CLI.add_common_options
+      define_method "images:metadata:remove" do |name_or_id, *metadata|
+        cli_command(options) {
+          image = Images.new.get(name_or_id.to_s)
+          if image.is_valid?
+            metadata.each { |key|
+              if image.meta.remove_metadata(key)
+                @log.display "Removed metadata '#{key}' from image '#{name_or_id}'."
+              else
+                @log.error image.meta.cstatus
+              end
+            }
+          else
+            @log.fatal image.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/images/metadata.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'images:metadata:list' => 'images:metadata'
+
+      desc "images:metadata <image_name_or_id>", "List the metadata for an image."
+      long_desc <<-DESC
+  List the metadata for an image in your compute account. You may specify either the name or ID of the image.  Optionally, you may specify an availability zone.
+
+Examples:
+  hpcloud images:metadata Skynet                        # List the metadata for image 'Skynet'
+  hpcloud images:metadata '7ba2a4b6'                        # List the metadata for image '7ba2a4b6'
+
+Aliases: images:metadata:list
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      define_method "images:metadata" do |name_or_id|
+        cli_command(options) {
+          image = Images.new.get(name_or_id.to_s)
+          if image.is_valid?
+            ray = image.meta.to_array()
+            Tableizer.new(options, Metadata.get_keys(), ray).print
+          else
+            @log.fatal image.cstatus
+          end
+        }
+      end
+
+    end
+  end
+end

data/lib/hpcloud/commands/images/remove.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(images:rm images:delete images:del) => 'images:remove'
+
+      desc "images:remove name_or_id [name_or_id ...]", "Remove images by name or identifier."
+      long_desc <<-DESC
+  Remove existing images by specifying thier names or IDs. Optionally, you may specify an availability zone.
+
+Examples:
+  hpcloud images:remove my-image          # Delete image 'my-image'
+  hpcloud images:remove 53e78869 8dbf51b8 # Delete images '53e78869' and '8dbf51b8'
+
+Aliases: images:rm, images:delete, images:del
+      DESC
+      CLI.add_common_options
+      define_method "images:remove" do |name_or_id, *name_or_ids|
+        cli_command(options) {
+          name_or_ids = [name_or_id] + name_or_ids
+          images = Images.new.get(name_or_ids, false)
+          images.each { |image|
+            sub_command("removing image") {
+              if image.is_valid?
+                image.fog.destroy
+                @log.display "Removed image '#{image.name}'."
+              else
+                @log.error image.cstatus
+              end
+            }
+          }
+        }
+      end
+
+    end
+  end
+end

data/lib/hpcloud/commands/images.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/images'
+require 'hpcloud/image_helper'
+require 'hpcloud/commands/images/add'
+require 'hpcloud/commands/images/metadata'
+require 'hpcloud/commands/images/remove'
+require 'hpcloud/commands/images/metadata/add'
+require 'hpcloud/commands/images/metadata/remove'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'images:list' => 'images'
+
+      desc "images [name_or_id ...]", "List the available images in your compute account."
+      long_desc <<-DESC
+  List the images in your compute account. You may filter the images displayed by specifying one ore more image names or IDs on the command line.  Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud images                         # List the images
+  hpcloud images 701be39b                # List image '701be39b'
+  hpcloud images -z az-2.region-a.geo-1  # List images for availability zone `az-2.region-a.geo-1`
+
+Aliases: images:list
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      def images(*arguments)
+        cli_command(options) {
+          images = Images.new()
+          if images.empty?
+            @log.display "You currently have no images, use `#{selfname} images:add` to create one."
+          else
+            ray = images.get_array(arguments)
+            if ray.empty?
+              @log.display "There are no images that match the provided arguments"
+            else
+              Tableizer.new(options, ImageHelper.get_keys(), ray).print
+            end
+          end
+        }
+      end
+
+    end
+  end
+end

data/lib/hpcloud/commands/info.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+    
+      map '--version' => 'info'
+    
+      desc "info", "Display info about the HP Cloud UNIX CLI."
+      def info
+        @log.display "******************************************************************"
+        @log.display " HP Cloud CLI"
+        @log.display " Command-line interface for managing HP Cloud services"
+        @log.display "\n Version: #{VERSION}"
+        @log.display "    SHA1: #{SHA1}"
+        @log.display "\n Copyright (c) 2011 Hewlett-Packard Development Company, L.P."
+        @log.display "******************************************************************"
+      end
+    
+    end
+  end
+end

data/lib/hpcloud/commands/keypairs/add.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "keypairs:add <key_name>", "add a key pair"
+      long_desc <<-DESC
+  Add a key pair by specifying the name. Optionally you can specify a fingerprint and private key data. You can use the `-o` option to save the key to a file. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud keypairs:add mykey                                           # Create the key 'mykey'
+  hpcloud keypairs:add mykey -f <fingerprint>                          # Create the key 'mykey' using the supplied fingerprint
+  hpcloud keypairs:add mykey -p 'private key data'                     # Create the key 'mykey' using the supplied private key data
+  hpcloud keypairs:add mykey -f <fingerprint> -p 'private key data'    # Create the key 'mykey' using the supplied fingerprint and private key data
+  hpcloud keypairs:add mykey -o                                        # Create the key `mykey` and save it to file `mykey.pem`  in the current folder
+  hpcloud keypairs:add mykey -z az-2.region-a.geo-1                    # Create the key `mykey` for availability zone `az-2.region-a.geo-1`
+      DESC
+      method_option :fingerprint,
+                    :type => :string, :aliases => '-f',
+                    :desc => 'Specify a fingerprint to be used.'
+      method_option :private_key,
+                    :type => :string, :aliases => '-p',
+                    :desc => 'Specify private key data to be used.'
+      method_option :output, :default => true,
+                    :type => :boolean, :aliases => '-o',
+                    :desc => 'Save key pair in the ~/.hpcloud/keypairs folder.'
+      CLI.add_common_options
+      define_method "keypairs:add" do |key_name|
+        cli_command(options) {
+          if Keypairs.new.get(key_name).is_valid? == true
+            @log.fatal "Key pair '#{key_name}' already exists.", :conflicted
+          end
+
+          keypair = KeypairHelper.new(Connection.instance)
+          keypair.name = key_name
+          keypair.fingerprint = options[:fingerprint]
+          keypair.private_key = options[:private_key]
+          if keypair.save == true
+            if options.output?
+              filename = keypair.private_add
+              @log.display "Created key pair '#{key_name}' and saved it to a file at '#{filename}'."
+            else
+              @log.display keypair.fog.private_key
+              @log.display "Created key pair '#{key_name}'."
+            end
+          else
+            @log.fatal keypair.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/keypairs/import.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "keypairs:import <key_name> <public_key_data>", "Import a key pair."
+      long_desc <<-DESC
+  Import a key pair by specifying the public key data. Alternately, you may specify the name of the import file on the command line.  Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud keypairs:import mykey ~/.ssh/id_rsa.pub    # Import a key from file `~/.ssh/id_rs.pub`
+  hpcloud keypairs:import mykey 'public_key_data'    # Import a key from public key data
+  hpcloud keypairs:import mykey 'public_key_data' -z az-2.region-a.geo-1   # Import a key from public key data for availability zone `az-2.region-a.geo-1`
+      DESC
+      CLI.add_common_options
+      define_method "keypairs:import" do |key_name, public_key_data|
+        cli_command(options) {
+          keypair = Keypairs.new.get(key_name)
+          if keypair.is_valid?
+            @log.fatal "Key pair '#{key_name}' already exists."
+          else
+            keypair = KeypairHelper.new(Connection.instance)
+            keypair.name = key_name
+            begin
+              path = File.expand_path(public_key_data)
+              if File.exists?(path)
+                public_key_data = File.read(path)
+              end
+            rescue
+            end
+            keypair.public_key = public_key_data
+            if keypair.save == true
+              @log.display "Imported key pair '#{key_name}'."
+            else
+              @log.fatal keypair.cstatus
+            end
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/keypairs/private/add.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "keypairs:private:add <key_name> <file_name>", "Make a private key available for the CLI"
+      long_desc <<-DESC
+  This command copies the private key file to ~/.hpcloud/keypairs directory so the CLI can use it for various commands to access servers.  This command does *not* upload the private key anywhere and it will *only* be available for the CLI on the current server.
+
+Examples:
+  hpcloud keypairs:private:add mykey ./mykey.pem  # Make the 'mykey' private key available for the CLI
+      DESC
+      define_method "keypairs:private:add" do |key_name, file_name|
+        cli_command(options) {
+          keypair = KeypairHelper.new(nil)
+          keypair.name = key_name
+          keypair.private_key = File.read(file_name)
+          filename = keypair.private_add
+          @log.display "Added private key '#{filename}'."
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/keypairs/private/location.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "keypairs:private:location <server_name_or_id>", "Find the private key for the given server"
+      long_desc <<-DESC
+  Find the location of the private key for a given server.
+
+Examples:
+  hpcloud keypairs:private:location myserver  # Print the location of the private key for 'myserver'
+      DESC
+      define_method "keypairs:private:location" do |server_name_or_id|
+        cli_command(options) {
+          server = Servers.new.get(server_name_or_id)
+          if server.is_valid?
+            location = KeypairHelper.private_filename("#{server.id}")
+            if File.exists?(location)
+              @log.display "#{location}"
+            else
+              @log.fatal "Cannot find private key file for '#{server_name_or_id}'.", :not_found
+            end
+          else
+            @log.fatal server.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/keypairs/private/remove.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(keypairs:private:rm keypairs:private:delete keypairs:private:destroy keypairs:private:del) => 'keypairs:private:remove'
+
+      desc "keypairs:private:remove <key_name> [key_name...]", "Remove a private key file"
+      long_desc <<-DESC
+  This command removes private key files from the ~/.hpcloud/keypairs directory which is the store used by the CLI. If you plan to continue to use this private key, make sure you have it stored somewhere else.  There is no way to recover a private key that has been deleted unless you have another copy of that key.  Keys are stored in the ~/.hpcloud/keypairs directory by key name and server id, so there may be multiple copies of a single key in the private key store.
+
+Examples:
+  hpcloud keypairs:private:remove mykey spare  # Remove 'mykey' and 'spare' from the private key storage
+
+Aliases: keypairs:private:rm, keypairs:private:del
+      DESC
+      define_method "keypairs:private:remove" do |name, *names|
+        cli_command(options) {
+          keypair = KeypairHelper.new(nil)
+          names = [name] + names
+          names.each { |name|
+            keypair.name = name
+            sub_command {
+              filename = keypair.private_remove
+              @log.display "Removed private key '#{filename}'."
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/keypairs/private.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/commands/keypairs/private/add'
+require 'hpcloud/commands/keypairs/private/location'
+require 'hpcloud/commands/keypairs/private/remove'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "keypairs:private", "List private keypairs in local directory"
+      long_desc <<-DESC
+  List the private keys stored on this machine.  These private keys are *not* available on other systems unless you copy them to that system.
+
+Examples:
+  hpcloud keypairs:private         # Create the key 'mykey'
+  hpcloud keypairs:private mykey   # Create the key 'mykey'
+      DESC
+      define_method "keypairs:private" do
+        cli_command(options) {
+          KeypairHelper.private_list.each{ |private_key|
+            @log.display private_key
+          }
+        }
+      end
+    end
+  end
+end