iostreams 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dad581b0665992975c33f75b23f50964ae1311e025b7a1524fca4004f0ede2b
-  data.tar.gz: 4db01e4d6c2d36ce522df3b323a6e0d9f42de0d1644a282a0cea06479e979289
+  metadata.gz: 36a51f41f33a1c58f1d5d03ed857784e86de4588ca38aa5a596e479f8661faf3
+  data.tar.gz: 23dd967c21581520675799692296bb901e2dc539f008fa30623f4bd72a2c90f3
 SHA512:
-  metadata.gz: 4057a5c484129c60dbc9c84e462026da862900e17b0604b385164210f14814fbae6d065d015ee9171402eb9f793f33ac26c0ee7658f94b8cdeb0724c796cbe63
-  data.tar.gz: 5a84fe37c1eebc775bd84b9903181ff035c325b1233ab64990e586f5b0bd3fd51c21d4f1429f9b0e8ab64733e9b63be5c5e05df7bf026e9d1d8c0cd8a7716417
+  metadata.gz: 81d5f7ea50b7a5b06a5d26b758eb0639b0c820735cd0cf1545c6298f244b96b0070d3f8a11deed0ef8398b5b6c461561b3c43661612e3eeda19bdf61abb549ab
+  data.tar.gz: 19f6f2051351533029cd7fca3cd6e7be3a4e5d3ea4ff2ae512b0b98a12b84639ae63e6a4decc0ff3edf1d50d5c14ddc1b869767f2f6c8793fc392f6ad02d939f

data/README.md

@@ -1,7 +1,8 @@
-# iostreams
+# IOStreams
 [![Gem Version](https://img.shields.io/gem/v/iostreams.svg)](https://rubygems.org/gems/iostreams) [![Build Status](https://travis-ci.org/rocketjob/iostreams.svg?branch=master)](https://travis-ci.org/rocketjob/iostreams) [![Downloads](https://img.shields.io/gem/dt/iostreams.svg)](https://rubygems.org/gems/iostreams) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg) [![Gitter chat](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
 
-Input and Output streaming for Ruby.
+IOStreams is an incredibly powerful streaming library that makes changes to file formats, compression, encryption, 
+or storage mechanism transparent to the application.
 
 ## Project Status
 
@@ -9,7 +10,9 @@ Production Ready, heavily used in production environments, many as part of Rocke
 
 ## Documentation
 
-[Semantic Logger Guide](http://rocketjob.github.io/iostreams)
+Start with the [IOStreams tutorial](https://iostreams.rocketjob.io/tutorial) to get a great introduction to IOStreams.
+
+Next, checkout the remaining [IOStreams documentation](https://iostreams.rocketjob.io/)
 
 ## Versioning
 

data/lib/io_streams/builder.rb

@@ -20,7 +20,7 @@ module IOStreams
       raise(ArgumentError, "Cannot call #option unless the `file_name` was already set}") unless file_name
 
       @options ||= {}
-      if opts = @options[stream]
+      if (opts = @options[stream])
         opts.merge!(options)
       else
         @options[stream] = options.dup
@@ -40,7 +40,7 @@ module IOStreams
       raise(ArgumentError, "Invalid stream: #{stream.inspect}") unless IOStreams.extensions.include?(stream)
 
       @streams ||= {}
-      if opts = @streams[stream]
+      if (opts = @streams[stream])
         opts.merge!(options)
       else
         @streams[stream] = options.dup
@@ -91,7 +91,8 @@ module IOStreams
     private
 
     def class_for_stream(type, stream)
-      ext = IOStreams.extensions[stream.nil? ? nil : stream.to_sym] || raise(ArgumentError, "Unknown Stream type: #{stream.inspect}")
+      ext = IOStreams.extensions[stream.nil? ? nil : stream.to_sym] ||
+            raise(ArgumentError, "Unknown Stream type: #{stream.inspect}")
       ext.send("#{type}_class") || raise(ArgumentError, "No #{type} registered for Stream type: #{stream.inspect}")
     end
 
@@ -99,7 +100,7 @@ module IOStreams
     def parse_extensions
       parts      = ::File.basename(file_name).split(".")
       extensions = []
-      while extension = parts.pop
+      while (extension = parts.pop)
         sym = extension.downcase.to_sym
         break unless IOStreams.extensions[sym]
 
@@ -116,10 +117,12 @@ module IOStreams
         block.call(io_stream)
       elsif pipeline.size == 1
         stream, opts = pipeline.first
-        class_for_stream(type, stream).open(io_stream, opts, &block)
+        class_for_stream(type, stream).open(io_stream, **opts, &block)
       else
         # Daisy chain multiple streams together
-        last = pipeline.keys.inject(block) { |inner, stream_sym| ->(io) { class_for_stream(type, stream_sym).open(io, pipeline[stream_sym], &inner) } }
+        last = pipeline.keys.inject(block) do |inner, stream_sym|
+          ->(io) { class_for_stream(type, stream_sym).open(io, **pipeline[stream_sym], &inner) }
+        end
         last.call(io_stream)
       end
     end

data/lib/io_streams/bzip2/reader.rb

@@ -2,11 +2,13 @@ module IOStreams
   module Bzip2
     class Reader < IOStreams::Reader
       # Read from a Bzip2 stream, decompressing the contents as it is read
-      def self.stream(input_stream, **_args)
-        Utils.load_soft_dependency("rbzip2", "Bzip2") unless defined?(RBzip2)
+      def self.stream(input_stream, **args)
+        unless defined?(::Bzip2::FFI)
+          Utils.load_soft_dependency("bzip2-ffi", "Bzip2", "bzip2/ffi")
+        end
 
         begin
-          io = RBzip2.default_adapter::Decompressor.new(input_stream)
+          io = ::Bzip2::FFI::Reader.new(input_stream, args)
           yield io
         ensure
           io&.close

data/lib/io_streams/bzip2/writer.rb

@@ -2,11 +2,13 @@ module IOStreams
   module Bzip2
     class Writer < IOStreams::Writer
       # Write to a stream, compressing with Bzip2
-      def self.stream(input_stream, original_file_name: nil, **_args)
-        Utils.load_soft_dependency("rbzip2", "Bzip2") unless defined?(RBzip2)
+      def self.stream(input_stream, original_file_name: nil, **args)
+        unless defined?(::Bzip2::FFI)
+          Utils.load_soft_dependency("bzip2-ffi", "Bzip2", "bzip2/ffi")
+        end
 
         begin
-          io = RBzip2.default_adapter::Compressor.new(input_stream)
+          io = ::Bzip2::FFI::Writer.new(input_stream, args)
           yield io
         ensure
           io&.close

data/lib/io_streams/deprecated.rb

@@ -206,7 +206,7 @@ module IOStreams
         elsif streams.is_a?(Array)
           streams.each { |stream| apply_old_style_streams(path, stream) }
         elsif streams.is_a?(Hash)
-          streams.each_pair { |stream, options| path.stream(stream, options) }
+          streams.each_pair { |stream, options| path.stream(stream, **options) }
         else
           raise ArgumentError, "Invalid old style stream supplied: #{params.inspect}"
         end

data/lib/io_streams/encode/reader.rb

@@ -73,7 +73,7 @@ module IOStreams
         # EOF reached?
         return unless block
 
-        block = block.encode(@encoding, @encoding_options) unless block.encoding == @encoding
+        block = block.encode(@encoding, **@encoding_options) unless block.encoding == @encoding
         block = @cleaner.call(block, @replace) if @cleaner
         block
       end

data/lib/io_streams/encode/writer.rb

@@ -66,7 +66,7 @@ module IOStreams
         return 0 if data.nil?
 
         data  = data.to_s
-        block = data.encoding == @encoding ? data : data.encode(@encoding, @encoding_options)
+        block = data.encoding == @encoding ? data : data.encode(@encoding, **@encoding_options)
         block = @cleaner.call(block, @replace) if @cleaner
         @output_stream.write(block)
       end

data/lib/io_streams/errors.rb

@@ -18,5 +18,15 @@ module IOStreams
     # When the specified delimiter is not found in the supplied stream / file
     class DelimiterNotFound < Error
     end
+
+    # Fixed length line has the wrong length
+    class InvalidLineLength < Error
+    end
+
+    class ValueTooLong < Error
+    end
+
+    class InvalidLayout < Error
+    end
   end
 end

data/lib/io_streams/io_streams.rb

@@ -58,7 +58,7 @@ module IOStreams
   end
 
   # For an existing IO Stream
-  # IOStreams.stream(io).file_name('blah.zip').encoding('BINARY').reader(&:read)
+  # IOStreams.stream(io).file_name('blah.zip').encoding('BINARY').read
   # IOStreams.stream(io).file_name('blah.zip').encoding('BINARY').each(:line){ ... }
   # IOStreams.stream(io).file_name('blah.csv.zip').each(:line) { ... }
   # IOStreams.stream(io).stream(:zip).stream(:pgp, passphrase: 'receiver_passphrase').read

data/lib/io_streams/paths/file.rb

@@ -15,16 +15,16 @@ module IOStreams
       # Examples:
       #
       # # Case Insensitive file name lookup:
-      # IOStreams::Paths::File.new("ruby").glob("r*.md") { |name| puts name }
+      # IOStreams.path("ruby").glob("r*.md") { |name| puts name }
       #
       # # Case Sensitive file name lookup:
-      # IOStreams::Paths::File.new("ruby").each("R*.md", case_sensitive: true) { |name| puts name }
+      # IOStreams.path("ruby").each("R*.md", case_sensitive: true) { |name| puts name }
       #
       # # Also return the names of directories found during the search:
-      # IOStreams::Paths::File.new("ruby").each("R*.md", directories: true) { |name| puts name }
+      # IOStreams.path("ruby").each("R*.md", directories: true) { |name| puts name }
       #
       # # Case Insensitive recursive file name lookup:
-      # IOStreams::Paths::File.new("ruby").glob("**/*.md") { |name| puts name }
+      # IOStreams.path("ruby").glob("**/*.md") { |name| puts name }
       #
       # Parameters:
       #   pattern [String]

data/lib/io_streams/paths/http.rb

@@ -26,16 +26,19 @@ module IOStreams
       #
       #   http_redirect_count: [Integer]
       #     Maximum number of http redirects to follow.
-      def initialize(url, username: nil, password: nil, http_redirect_count: 10)
+      def initialize(url, username: nil, password: nil, http_redirect_count: 10, parameters: nil)
         uri = URI.parse(url)
         unless %w[http https].include?(uri.scheme)
-          raise(ArgumentError, "Invalid URL. Required Format: 'http://<host_name>/<file_name>', or 'https://<host_name>/<file_name>'")
+          raise(
+            ArgumentError,
+            "Invalid URL. Required Format: 'http://<host_name>/<file_name>', or 'https://<host_name>/<file_name>'"
+          )
         end
 
         @username            = username || uri.user
         @password            = password || uri.password
         @http_redirect_count = http_redirect_count
-        @url                 = url
+        @url                 = parameters ? "#{url}?#{URI.encode_www_form(parameters)}" : url
         super(uri.path)
       end
 

data/lib/io_streams/paths/s3.rb

@@ -3,7 +3,7 @@ require "uri"
 module IOStreams
   module Paths
     class S3 < IOStreams::Path
-      attr_reader :bucket_name, :client
+      attr_reader :bucket_name, :client, :options
 
       # Arguments:
       #
@@ -92,7 +92,7 @@ module IOStreams
       #   encrypting data. This value is used to store the object and then it is
       #   discarded; Amazon does not store the encryption key. The key must be
       #   appropriate for use with the algorithm specified in the
-      #   x-amz-server-side​-encryption​-customer-algorithm header.
+      #   x-amz-server-side-encryption-customer-algorithm header.
       #
       # @option params [String] :sse_customer_key_md5
       #   Specifies the 128-bit MD5 digest of the encryption key according to
@@ -179,17 +179,36 @@ module IOStreams
       #
       # Notes:
       # - Can copy across buckets.
+      # - No stream conversions are applied.
       def move_to(target_path)
+        target = copy_to(target_path, convert: false)
+        delete
+        target
+      end
+
+      # Make S3 perform direct copies within S3 itself.
+      def copy_to(target_path, convert: true)
+        return super(target_path) if convert
+
         target = IOStreams.new(target_path)
         return super(target) unless target.is_a?(self.class)
 
         source_name = ::File.join(bucket_name, path)
-        # TODO: Does/should it also copy metadata?
-        client.copy_object(bucket: target.bucket_name, key: target.path, copy_source: source_name)
-        delete
+        client.copy_object(options.merge(bucket: target.bucket_name, key: target.path, copy_source: source_name))
         target
       end
 
+      # Make S3 perform direct copies within S3 itself.
+      def copy_from(source_path, convert: true)
+        return super(source_path) if convert
+
+        source = IOStreams.new(source_path)
+        return super(source, **args) unless source.is_a?(self.class)
+
+        source_name = ::File.join(source.bucket_name, source.path)
+        client.copy_object(options.merge(bucket: bucket_name, key: path, copy_source: source_name))
+      end
+
       # S3 logically creates paths when a key is set.
       def mkpath
         self
@@ -220,7 +239,7 @@ module IOStreams
       # Shortcut method if caller has a filename already with no other streams applied:
       def read_file(file_name)
         ::File.open(file_name, "wb") do |file|
-          client.get_object(@options.merge(response_target: file, bucket: bucket_name, key: path))
+          client.get_object(options.merge(response_target: file, bucket: bucket_name, key: path))
         end
       end
 
@@ -248,10 +267,10 @@ module IOStreams
           # Use multipart file upload
           s3  = Aws::S3::Resource.new(client: client)
           obj = s3.bucket(bucket_name).object(path)
-          obj.upload_file(file_name)
+          obj.upload_file(file_name, options)
         else
           ::File.open(file_name, "rb") do |file|
-            client.put_object(@options.merge(bucket: bucket_name, key: path, body: file))
+            client.put_object(options.merge(bucket: bucket_name, key: path, body: file))
           end
         end
       end

data/lib/io_streams/paths/sftp.rb

@@ -173,7 +173,10 @@ module IOStreams
               writer.close
               out = reader.read.chomp
               unless waith_thr.value.success?
-                raise(Errors::CommunicationsFailure, "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
+                raise(
+                  Errors::CommunicationsFailure,
+                  "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}"
+                )
               end
 
               out
@@ -183,7 +186,10 @@ module IOStreams
                     rescue StandardError
                       nil
                     end
-              raise(Errors::CommunicationsFailure, "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
+              raise(
+                Errors::CommunicationsFailure,
+                "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}"
+              )
             end
           end
         end
@@ -201,7 +207,10 @@ module IOStreams
               writer.close
               out = reader.read.chomp
               unless waith_thr.value.success?
-                raise(Errors::CommunicationsFailure, "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
+                raise(
+                  Errors::CommunicationsFailure,
+                  "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}"
+                )
               end
 
               out
@@ -211,7 +220,10 @@ module IOStreams
                     rescue StandardError
                       nil
                     end
-              raise(Errors::CommunicationsFailure, "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
+              raise(
+                Errors::CommunicationsFailure,
+                "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}"
+              )
             end
           end
         end

data/lib/io_streams/pgp.rb

@@ -46,7 +46,15 @@ module IOStreams
     #     `SecureRandom.urlsafe_base64(128)`
     #
     # See `man gpg` for the remaining options
-    def self.generate_key(name:, email:, comment: nil, passphrase:, key_type: "RSA", key_length: 4096, subkey_type: "RSA", subkey_length: key_length, expire_date: nil)
+    def self.generate_key(name:,
+                          email:,
+                          comment: nil,
+                          passphrase:,
+                          key_type: "RSA",
+                          key_length: 4096,
+                          subkey_type: "RSA",
+                          subkey_length: key_length,
+                          expire_date: nil)
       version_check
       params = ""
       params << "Key-Type: #{key_type}\n" if key_type
@@ -63,12 +71,11 @@ module IOStreams
 
       out, err, status = Open3.capture3(command, binmode: true, stdin_data: params)
       logger&.debug { "IOStreams::Pgp.generate_key: #{command}\n#{params}\n#{err}#{out}" }
-      if status.success?
-        if match = err.match(/gpg: key ([0-9A-F]+)\s+/)
-          match[1]
-        end
-      else
-        raise(Pgp::Failure, "GPG Failed to generate key: #{err}#{out}")
+
+      raise(Pgp::Failure, "GPG Failed to generate key: #{err}#{out}") unless status.success?
+
+      if (match = err.match(/gpg: key ([0-9A-F]+)\s+/))
+        match[1]
       end
     end
 
@@ -77,7 +84,8 @@ module IOStreams
     # Returns false if no key was found.
     # Raises an exception if it fails to delete the key.
     #
-    # email: [String] Email address for the key.
+    # email: [String] Optional email address for the key.
+    # key_id: [String] Optional id for the key.
     #
     # public: [true|false]
     #   Whether to delete the public key
@@ -86,12 +94,12 @@ module IOStreams
     # private: [true|false]
     #   Whether to delete the private key
     #   Default: false
-    def self.delete_keys(email:, public: true, private: false)
+    def self.delete_keys(email: nil, key_id: nil, public: true, private: false)
       version_check
       method_name = pgp_version.to_f >= 2.2 ? :delete_public_or_private_keys : :delete_public_or_private_keys_v1
       status      = false
-      status      = send(method_name, email: email, private: true) if private
-      status      = send(method_name, email: email, private: false) if public
+      status      = send(method_name, email: email, key_id: key_id, private: true) if private
+      status      = send(method_name, email: email, key_id: key_id, private: false) if public
       status
     end
 
@@ -150,16 +158,15 @@ module IOStreams
 
       out, err, status = Open3.capture3(command, binmode: true, stdin_data: key)
       logger&.debug { "IOStreams::Pgp.key_info: #{command}\n#{err}#{out}" }
-      if status.success? && out.length.positive?
-        # Sample Output:
-        #
-        #   pub  4096R/3A5456F5 2017-06-07
-        #   uid                            Joe Bloggs <j@bloggs.net>
-        #   sub  4096R/2C9B240B 2017-06-07
-        parse_list_output(out)
-      else
-        raise(Pgp::Failure, "GPG Failed extracting key details: #{err} #{out}")
-      end
+
+      raise(Pgp::Failure, "GPG Failed extracting key details: #{err} #{out}") unless status.success? && out.length.positive?
+
+      # Sample Output:
+      #
+      #   pub  4096R/3A5456F5 2017-06-07
+      #   uid                            Joe Bloggs <j@bloggs.net>
+      #   sub  4096R/2C9B240B 2017-06-07
+      parse_list_output(out)
     end
 
     # Returns [String] containing all the public keys for the supplied email address.
@@ -181,11 +188,10 @@ module IOStreams
 
       out, err, status = Open3.capture3(command, binmode: true)
       logger&.debug { "IOStreams::Pgp.export: #{command}\n#{err}" }
-      if status.success? && out.length.positive?
-        out
-      else
-        raise(Pgp::Failure, "GPG Failed reading key: #{email}: #{err}")
-      end
+
+      raise(Pgp::Failure, "GPG Failed reading key: #{email}: #{err}") unless status.success? && out.length.positive?
+
+      out
     end
 
     # Imports the supplied public/private key
@@ -251,11 +257,14 @@ module IOStreams
     def self.import_and_trust(key:)
       raise(ArgumentError, "Key cannot be empty") if key.nil? || (key == "")
 
-      email = key_info(key: key).last.fetch(:email)
-      raise(ArgumentError, "Recipient email cannot be extracted from supplied key") unless email
+      key_info = key_info(key: key).last
+
+      email = key_info.fetch(:email, nil)
+      key_id = key_info.fetch(:key_id, nil)
+      raise(ArgumentError, "Recipient email or key id cannot be extracted from supplied key") unless email || key_id
 
       import(key: key)
-      set_trust(email: email)
+      set_trust(email: email, key_id: key_id)
       email
     end
 
@@ -266,20 +275,19 @@ module IOStreams
     #
     # After importing keys, they are not trusted and the relevant trust level must be set.
     #   Default: 5 : Ultimate
-    def self.set_trust(email:, level: 5)
+    def self.set_trust(email: nil, key_id: nil, level: 5)
       version_check
-      fingerprint = fingerprint(email: email)
+      fingerprint = key_id || fingerprint(email: email)
       return unless fingerprint
 
       command          = "#{executable} --import-ownertrust"
       trust            = "#{fingerprint}:#{level + 1}:\n"
       out, err, status = Open3.capture3(command, stdin_data: trust)
       logger&.debug { "IOStreams::Pgp.set_trust: #{command}\n#{err}#{out}" }
-      if status.success?
-        err
-      else
-        raise(Pgp::Failure, "GPG Failed trusting key: #{err} #{out}")
-      end
+
+      raise(Pgp::Failure, "GPG Failed trusting key: #{err} #{out}") unless status.success?
+
+      err
     end
 
     # DEPRECATED - Use key_ids instead of fingerprints
@@ -287,18 +295,18 @@ module IOStreams
       version_check
       Open3.popen2e("#{executable} --list-keys --fingerprint --with-colons #{email}") do |_stdin, out, waith_thr|
         output = out.read.chomp
-        if waith_thr.value.success?
-          output.each_line do |line|
-            if match = line.match(/\Afpr.*::([^\:]*):\Z/)
-              return match[1]
-            end
+        unless waith_thr.value.success?
+          unless output =~ /(public key not found|No public key)/i
+            raise(Pgp::Failure, "GPG Failed calling #{executable} to list keys for #{email}: #{output}")
           end
-          nil
-        else
-          return if output =~ /(public key not found|No public key)/i
+        end
 
-          raise(Pgp::Failure, "GPG Failed calling #{executable} to list keys for #{email}: #{output}")
+        output.each_line do |line|
+          if (match = line.match(/\Afpr.*::([^\:]*):\Z/))
+            return match[1]
+          end
         end
+        nil
       end
     end
 
@@ -328,7 +336,7 @@ module IOStreams
           #           CAMELLIA128, CAMELLIA192, CAMELLIA256
           #   Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
           #   Compression: Uncompressed, ZIP, ZLIB, BZIP2
-          if match = out.lines.first.match(/(\d+\.\d+.\d+)/)
+          if (match = out.lines.first.match(/(\d+\.\d+.\d+)/))
             match[1]
           end
         else
@@ -348,9 +356,12 @@ module IOStreams
     end
 
     def self.version_check
-      if pgp_version.to_f >= 2.3
-        raise(Pgp::UnsupportedVersion, "Version #{pgp_version} of #{executable} is not yet supported. You are welcome to submit a Pull Request.")
-      end
+      return unless pgp_version.to_f >= 2.3
+
+      raise(
+        Pgp::UnsupportedVersion,
+        "Version #{pgp_version} of #{executable} is not yet supported. Please submit a Pull Request to support it."
+      )
     end
 
     # v2.2.1 output:
@@ -370,7 +381,7 @@ module IOStreams
       results = []
       hash    = {}
       out.each_line do |line|
-        if match = line.match(/(pub|sec)\s+(\D+)(\d+)\s+(\d+-\d+-\d+)\s+(.*)/)
+        if (match = line.match(/(pub|sec)\s+(\D+)(\d+)\s+(\d+-\d+-\d+)\s+(.*)/))
           # v2.2:    pub   rsa1024 2017-10-24 [SCEA]
           hash = {
             private:    match[1] == "sec",
@@ -382,7 +393,7 @@ module IOStreams
                            match[4]
                          end)
           }
-        elsif match = line.match(%r{(pub|sec)\s+(\d+)(.*)/(\w+)\s+(\d+-\d+-\d+)(\s+(.+)<(.+)>)?})
+        elsif (match = line.match(%r{(pub|sec)\s+(\d+)(.*)/(\w+)\s+(\d+-\d+-\d+)(\s+(.+)<(.+)>)?}))
           # Matches: pub  2048R/C7F9D9CB 2016-10-26
           # Or:      pub  2048R/C7F9D9CB 2016-10-26 Receiver <receiver@example.org>
           hash = {
@@ -403,7 +414,7 @@ module IOStreams
             results << hash
             hash = {}
           end
-        elsif match = line.match(/uid\s+(\[(.+)\]\s+)?(.+)<(.+)>/)
+        elsif (match = line.match(/uid\s+(\[(.+)\]\s+)?(.+)<(.+)>/))
           # Matches:  uid       [ unknown] Joe Bloggs <j@bloggs.net>
           # Or:       uid                  Joe Bloggs <j@bloggs.net>
           # v2.2:     uid           [ultimate] Joe Bloggs <pgp_test@iostreams.net>
@@ -412,7 +423,15 @@ module IOStreams
           hash[:trust] = match[2].to_s.strip if match[1]
           results << hash
           hash = {}
-        elsif match = line.match(/([A-Z0-9]+)/)
+        elsif (match = line.match(/uid\s+(\[(.+)\]\s+)?(.+)/))
+          # Matches:  uid       [ unknown] Joe Bloggs
+          # Or:       uid                  Joe Bloggs
+          # v2.2:     uid           [ultimate] Joe Bloggs
+          hash[:name]  = match[3].to_s.strip
+          hash[:trust] = match[2].to_s.strip if match[1]
+          results << hash
+          hash = {}
+        elsif (match = line.match(/([A-Z0-9]+)/))
           # v2.2  18A0FC1C09C0D8AE34CE659257DC4AE323C7368C
           hash[:key_id] ||= match[1]
         end
@@ -420,10 +439,10 @@ module IOStreams
       results
     end
 
-    def self.delete_public_or_private_keys(email:, private: false)
+    def self.delete_public_or_private_keys(email: nil, key_id: nil, private: false)
       keys = private ? "secret-keys" : "keys"
 
-      list = list_keys(email: email, private: private)
+      list = email ? list_keys(email: email, private: private) : list_keys(key_id: key_id)
       return false if list.empty?
 
       list.each do |key_info|
@@ -435,17 +454,17 @@ module IOStreams
         logger&.debug { "IOStreams::Pgp.delete_keys: #{command}\n#{err}#{out}" }
 
         unless status.success?
-          raise(Pgp::Failure, "GPG Failed calling #{executable} to delete #{keys} for #{email}: #{err}: #{out}")
+          raise(Pgp::Failure, "GPG Failed calling #{executable} to delete #{keys} for #{email || key_id}: #{err}: #{out}")
         end
-        raise(Pgp::Failure, "GPG Failed to delete #{keys} for #{email} #{err.strip}:#{out}") if out.include?("error")
+        raise(Pgp::Failure, "GPG Failed to delete #{keys} for #{email || key_id} #{err.strip}:#{out}") if out.include?("error")
       end
       true
     end
 
-    def self.delete_public_or_private_keys_v1(email:, private: false)
+    def self.delete_public_or_private_keys_v1(email: nil, key_id: nil, private: false)
       keys = private ? "secret-keys" : "keys"
 
-      command = "for i in `#{executable} --list-#{keys} --with-colons --fingerprint #{email} | grep \"^fpr\" | cut -d: -f10`; do\n"
+      command = "for i in `#{executable} --list-#{keys} --with-colons --fingerprint #{email || key_id} | grep \"^fpr\" | cut -d: -f10`; do\n"
       command << "#{executable} --batch --no-tty --yes --delete-#{keys} \"$i\" ;\n"
       command << "done"
 
@@ -454,9 +473,9 @@ module IOStreams
 
       return false if err =~ /(not found|no public key)/i
       unless status.success?
-        raise(Pgp::Failure, "GPG Failed calling #{executable} to delete #{keys} for #{email}: #{err}: #{out}")
+        raise(Pgp::Failure, "GPG Failed calling #{executable} to delete #{keys} for #{email || key_id}: #{err}: #{out}")
       end
-      raise(Pgp::Failure, "GPG Failed to delete #{keys} for #{email} #{err.strip}: #{out}") if out.include?("error")
+      raise(Pgp::Failure, "GPG Failed to delete #{keys} for #{email || key_id} #{err.strip}: #{out}") if out.include?("error")
 
       true
     end