ruby_gpg2 0.1.0.pre.6 → 0.1.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae329dd0d835adcc4c63cf46ecd8096bbb6ac3f078e7e4086fb7b09a4286f3fc
-  data.tar.gz: 1b677593919f3ad60db2e2f2d9d131705737ba5c7da490cbdbd96eab742aade9
+  metadata.gz: fb0849638a19aa4b0403c24df4b3c7bc7f395a2d6d1b7f0eec28e0c87acdac4f
+  data.tar.gz: 6c5f98a82c15e4974c062f2aa606a1f908cc5454b1fc9a1869f79540ad557476
 SHA512:
-  metadata.gz: c55c420f5f178b499884846e2c858f0d467f4a5fa20e71aaf154239400e56295a06673047bf19ec94ab637756b436bf6d4ffe26770270aec022d34c2d1ac2ec3
-  data.tar.gz: acff64a40f09f97cf1f742aece11b89554f3f25a258a3070e885702511d582c552eb13ec46e3b440d2efc426e37c6cb8b830849e3b4d87b13c2640271eb57ee9
+  metadata.gz: bbfb0b48c99ae4390987ff2a7ae7907745facb6a0fa677055eb9f83dbff03ab210a7772f0a35444a82c23a2f0867e96cdfc6f16346e3e74bffac39aafddc023e
+  data.tar.gz: bc23189fc6f9984a33f0bd956301c05767ecb9e4adbd72ba7c8f3541dab758c6b68dc50c9fe831c8ca2db93cfc1a13797c00024dc3904973da21fffa7062cd4e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_gpg2 (0.1.0.pre.6)
+    ruby_gpg2 (0.1.0.pre.7)
       lino (= 1.3.0)
 
 GEM

data/lib/ruby_gpg2/colon_output.rb

@@ -1,4 +1,5 @@
 require_relative './colon_record'
+require_relative './key'
 
 module RubyGPG2
   class ColonOutput
@@ -9,14 +10,63 @@ module RubyGPG2
           .collect { |record| ColonRecord.parse(record) })
     end
 
-    include Enumerable
-
     def initialize(records)
       @records = records
     end
 
-    def each(&block)
-      @records.each(&block)
+    def public_keys
+      public_key_indices = @records
+          .each_with_index
+          .collect { |record, index|
+            record.type == :public_key ? index : nil
+          }
+          .compact << @records.count
+
+      public_key_record_groups = []
+      public_key_indices.each_cons(2) do |index_pair|
+        public_key_record_groups <<
+            @records[index_pair[0]...index_pair[1]]
+      end
+
+      public_key_record_groups.map do |record_group|
+        records_in_group = record_group.count
+        public_key_record = record_group[0]
+
+        fingerprint_record =
+            (records_in_group > 1 && record_group[1].fingerprint_record?) ?
+                record_group[1] :
+                nil
+        fingerprint = fingerprint_record&.fingerprint
+
+        user_id_records = record_group
+            .drop_while { |r| !r.user_id_record? }
+            .take_while { |r| r.user_id_record? }
+        user_ids = user_id_records.map do |record|
+          UserID.new(
+              name: record.user_name,
+              comment: record.user_comment,
+              email: record.user_email,
+              validity: record.validity,
+              creation_date: record.creation_date,
+              expiration_date: record.expiration_date,
+              hash: record.user_id_hash,
+              origin: record.origin)
+        end
+
+        Key.new(
+            type: :public,
+            validity: public_key_record.validity,
+            length: public_key_record.key_length,
+            algorithm: public_key_record.key_algorithm,
+            id: public_key_record.key_id,
+            creation_date: public_key_record.creation_date,
+            owner_trust: public_key_record.owner_trust,
+            capabilities: public_key_record.key_capabilities,
+            compliance_modes: public_key_record.compliance_modes,
+            origin: public_key_record.origin,
+            fingerprint: fingerprint,
+            user_ids: user_ids)
+      end
     end
 
     def ==(other)

data/lib/ruby_gpg2/colon_record.rb

@@ -2,6 +2,8 @@ require 'date'
 
 module RubyGPG2
   class ColonRecord
+    USER_ID_REGEX = /^(.*?) (?:\((.*)\) )?<(.*)>$/
+
     TYPES = {
         'pub' => :public_key,
         'crt' => :x509_certificate,
@@ -173,6 +175,32 @@ module RubyGPG2
       @maximum_certificate_chain_depth = opts[:maximum_certificate_chain_depth]
     end
 
+    def fingerprint_record?
+      type == :fingerprint
+    end
+
+    def user_id_record?
+      type == :user_id
+    end
+
+    def user_name
+      if (match = user_id&.match(USER_ID_REGEX))
+        match[1]
+      end
+    end
+
+    def user_comment
+      if (match = user_id&.match(USER_ID_REGEX))
+        match[2]
+      end
+    end
+
+    def user_email
+      if (match = user_id&.match(USER_ID_REGEX))
+        match[3]
+      end
+    end
+
     def ==(other)
       other.class == self.class && other.state == state
     end

data/lib/ruby_gpg2/key.rb

@@ -0,0 +1,58 @@
+module RubyGPG2
+  class Key
+    attr_reader(
+        :type,
+        :validity,
+        :length,
+        :algorithm,
+        :id,
+        :creation_date,
+        :owner_trust,
+        :capabilities,
+        :compliance_modes,
+        :origin,
+        :fingerprint,
+        :user_ids)
+
+    def initialize(opts)
+      @type = opts[:type]
+      @validity = opts[:validity]
+      @length = opts[:length]
+      @algorithm = opts[:algorithm]
+      @id = opts[:id]
+      @creation_date = opts[:creation_date]
+      @owner_trust = opts[:owner_trust]
+      @capabilities = opts[:capabilities]
+      @compliance_modes = opts[:compliance_modes]
+      @origin = opts[:origin]
+      @fingerprint = opts[:fingerprint]
+      @user_ids = opts[:user_ids]
+    end
+
+    def primary_user_id
+      @user_ids&.first
+    end
+
+    def ==(other)
+      other.class == self.class && other.state == state
+    end
+
+    protected
+
+    def state
+      [
+          @type,
+          @validity,
+          @length,
+          @algorithm,
+          @id,
+          @creation_date,
+          @owner_trust,
+          @capabilities,
+          @compliance_modes,
+          @origin,
+          @fingerprint
+      ]
+    end
+  end
+end

data/lib/ruby_gpg2/user_id.rb

@@ -0,0 +1,43 @@
+module RubyGPG2
+  class UserID
+    attr_reader(
+        :name,
+        :comment,
+        :email,
+        :validity,
+        :creation_date,
+        :expiration_date,
+        :hash,
+        :origin)
+
+    def initialize(opts)
+      @name = opts[:name]
+      @comment = opts[:comment]
+      @email = opts[:email]
+      @validity = opts[:validity]
+      @creation_date = opts[:creation_date]
+      @expiration_date = opts[:expiration_date]
+      @hash = opts[:hash]
+      @origin = opts[:origin]
+    end
+
+    def ==(other)
+      other.class == self.class && other.state == state
+    end
+
+    protected
+
+    def state
+      [
+          @name,
+          @comment,
+          @email,
+          @validity,
+          @creation_date,
+          @expiration_date,
+          @hash,
+          @origin
+      ]
+    end
+  end
+end

data/lib/ruby_gpg2/version.rb

@@ -1,3 +1,3 @@
 module RubyGPG2
-  VERSION = '0.1.0.pre.6'
+  VERSION = '0.1.0.pre.7'
 end

data/lib/ruby_gpg2.rb

@@ -2,6 +2,8 @@ require 'ruby_gpg2/version'
 require 'ruby_gpg2/commands'
 require 'ruby_gpg2/parameter_file'
 require 'ruby_gpg2/colon_output'
+require 'ruby_gpg2/key'
+require 'ruby_gpg2/user_id'
 
 module RubyGPG2
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.6
+  version: 0.1.0.pre.7
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -170,7 +170,9 @@ files:
 - lib/ruby_gpg2/commands/mixins/colon_config.rb
 - lib/ruby_gpg2/commands/mixins/global_config.rb
 - lib/ruby_gpg2/commands/mixins/with_captured_output.rb
+- lib/ruby_gpg2/key.rb
 - lib/ruby_gpg2/parameter_file.rb
+- lib/ruby_gpg2/user_id.rb
 - lib/ruby_gpg2/version.rb
 - ruby_gpg2.gemspec
 - scripts/ci/common/configure-git.sh