ruby_gpg2 0.1.0.pre.18 → 0.1.0.pre.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61184dcaf6b7deed870ea7fda333741513ace486b6e3562f826fd2f12131418a
-  data.tar.gz: 71d66927a34b518b0ced1151a53dd7d7828e22992a9c7713b743dcb8b378866b
+  metadata.gz: df0b9ee2a84c8dd0c62d4144fd19f121bfd5fe224ab868ecdfc69c1defbc220f
+  data.tar.gz: 1cdb7985e466380912a53f7714c16a3561d91d28d2dbd2ca1a1738654b79c08f
 SHA512:
-  metadata.gz: 27fa7119e8dc8c7ff42ed2c44cd94c5e3d3779535f429407d35b75edc85f89edcd9d68e23d7924cf62e788828c616168c0516dcc6bcfce21914cb28050f3ceba
-  data.tar.gz: bd60c0893362ccc82f30961e452153d2549fbe705f290d16cee79076f2bd3cc0b6b4319010c56344d9626945aafa477c646fc054a1cc5c6175e40ca593ba910e
+  metadata.gz: 1bdb40b2d7e24886fc12d9327fc64cf54a1eb4960ebb2f6e4c80f5fc38aa03926bc9f52e3d64e11e4bc090c35a12cba369fefe85eb36f2b1b4118974202e035e
+  data.tar.gz: 30ff8200b4a908083eda056b9a803be9d1a8f6c179cb6f4b0693e96ce0faf7126f88a306900d4429de8867356719177d9e968056c8a9e138e5db72ccf333ef64

data/Gemfile.lock

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

data/lib/ruby_gpg2/colon_output.rb

@@ -15,62 +15,13 @@ module RubyGPG2
     end
 
     def secret_keys
-      []
+      group_by_type(:secret_key)
+          .map { |record_group| extract_key(:secret, record_group) }
     end
 
     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
+      group_by_type(:public_key)
+          .map { |record_group| extract_key(:public, record_group) }
     end
 
     def ==(other)
@@ -82,5 +33,66 @@ module RubyGPG2
     def state
       [@records]
     end
+
+    private
+
+    def indices_by_type(type)
+      @records
+          .each_with_index
+          .collect { |record, index| record.type == type ? index : nil }
+          .compact
+    end
+
+    def group_by_type(type)
+      indices = indices_by_type(type)
+      indices << @records.count
+
+      groups = []
+      indices.each_cons(2) do |index_pair|
+        groups << @records[index_pair[0]...index_pair[1]]
+      end
+      groups
+    end
+
+    def extract_key(type, record_group)
+      records_in_group = record_group.count
+      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: type,
+          validity: key_record.validity,
+          length: key_record.key_length,
+          algorithm: key_record.key_algorithm,
+          id: key_record.key_id,
+          creation_date: key_record.creation_date,
+          owner_trust: key_record.owner_trust,
+          capabilities: key_record.key_capabilities,
+          serial_number: key_record.serial_number,
+          compliance_modes: key_record.compliance_modes,
+          origin: key_record.origin,
+          fingerprint: fingerprint,
+          user_ids: user_ids)
+    end
   end
 end

data/lib/ruby_gpg2/key.rb

@@ -9,6 +9,7 @@ module RubyGPG2
         :creation_date,
         :owner_trust,
         :capabilities,
+        :serial_number,
         :compliance_modes,
         :origin,
         :fingerprint,
@@ -23,6 +24,7 @@ module RubyGPG2
       @creation_date = opts[:creation_date]
       @owner_trust = opts[:owner_trust]
       @capabilities = opts[:capabilities]
+      @serial_number = opts[:serial_number]
       @compliance_modes = opts[:compliance_modes]
       @origin = opts[:origin]
       @fingerprint = opts[:fingerprint]
@@ -49,6 +51,7 @@ module RubyGPG2
           @creation_date,
           @owner_trust,
           @capabilities,
+          @serial_number,
           @compliance_modes,
           @origin,
           @fingerprint

data/lib/ruby_gpg2/version.rb

@@ -1,3 +1,3 @@
 module RubyGPG2
-  VERSION = '0.1.0.pre.18'
+  VERSION = '0.1.0.pre.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.18
+  version: 0.1.0.pre.19
 platform: ruby
 authors:
 - Toby Clemson