ruby_gpg2 0.1.0.pre.14 → 0.1.0.pre.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a08063c06520ca410cd2f9c97cd630b9b3aa6bf6f8c85d9bf119b12776d2c7
-  data.tar.gz: 6592f3a48800dad1f99e7ba1700abf3bb50ba143ef2901209a9fd06264cc240e
+  metadata.gz: 757eba52ef88c96af2b0c2be9199ca3365e7e90e1e49485f57fa5c417614df26
+  data.tar.gz: 6b8cea9b6c702051eea538d54adf389c1a50b62badbeb61a2c5f79da617f90e1
 SHA512:
-  metadata.gz: f8bb60f31f214609daac36c04ede22f5c4d72ad2872a82023ab01271cae77e7da0ab06ed253d0b933c9915070d22aa638103df7cbb04dfb494a956727b674c88
-  data.tar.gz: 6867a2278de034eedfd79f946593f7b04229f8f0c07d3cc3a6e63172367a78395a6cc3c173cb10d099956ebb224b8cf52fbb665fa716f3b5919e7c90e3fe1132
+  metadata.gz: 9e8cf2702299459f76054d7bba1e2cf6ae70771a02c33000d2e13e13e584bc35ab0e4f6129e902e8c925809bca072c36aee5393e56af68969dfc4e4bfd56ac06
+  data.tar.gz: c80831abc24ac65fbafd690393d07ebed189a9d10b32f4b1a2e3900f897007f8702fb8931bc2a80306d0e15e83de4ef212055e96dad505764df1eab59916c539

data/Gemfile.lock

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

data/lib/ruby_gpg2/commands/base.rb

@@ -14,13 +14,15 @@ module RubyGPG2
         builder = instantiate_builder
 
         do_before(opts)
-        builder = configure_command(builder, opts)
-        builder
-            .build
-            .execute(
-                stdin: stdin,
-                stdout: stdout,
-                stderr: stderr)
+        do_around(opts) do |updated_opts|
+          builder = configure_command(builder, updated_opts)
+          builder
+              .build
+              .execute(
+                  stdin: stdin,
+                  stdout: stdout,
+                  stderr: stderr)
+        end
         do_after(opts)
       end
 
@@ -41,6 +43,10 @@ module RubyGPG2
         builder
       end
 
+      def do_around(opts)
+        yield opts
+      end
+
       def do_after(opts)
       end
     end

data/lib/ruby_gpg2/commands/generate_key.rb

@@ -6,6 +6,8 @@ require_relative 'mixins/batch_config'
 require_relative 'mixins/passphrase_config'
 require_relative 'mixins/pinentry_config'
 require_relative 'mixins/status_config'
+require_relative 'mixins/with_result'
+require_relative 'mixins/with_captured_status'
 require_relative 'mixins/without_passphrase'
 
 module RubyGPG2
@@ -16,6 +18,8 @@ module RubyGPG2
       include Mixins::PassphraseConfig
       include Mixins::PinentryConfig
       include Mixins::StatusConfig
+      include Mixins::WithResult
+      include Mixins::WithCapturedStatus
       include Mixins::WithoutPassphrase
 
       def configure_command(builder, opts)

data/lib/ruby_gpg2/commands/list_public_keys.rb

@@ -3,6 +3,7 @@ require 'lino'
 require_relative 'base'
 require_relative 'mixins/global_config'
 require_relative 'mixins/colon_config'
+require_relative 'mixins/with_result'
 require_relative 'mixins/with_captured_output'
 
 module RubyGPG2
@@ -10,6 +11,7 @@ module RubyGPG2
     class ListPublicKeys < Base
       include Mixins::GlobalConfig
       include Mixins::ColonConfig
+      include Mixins::WithResult
       include Mixins::WithCapturedOutput
 
       def configure_command(builder, opts)
@@ -17,10 +19,6 @@ module RubyGPG2
         builder = super(builder, opts)
         builder
       end
-
-      def do_after(opts)
-        super(opts.merge(output_method: :public_keys))
-      end
     end
   end
 end

data/lib/ruby_gpg2/commands/list_secret_keys.rb

@@ -3,6 +3,7 @@ require 'lino'
 require_relative 'base'
 require_relative 'mixins/global_config'
 require_relative 'mixins/colon_config'
+require_relative 'mixins/with_result'
 require_relative 'mixins/with_captured_output'
 
 module RubyGPG2
@@ -10,6 +11,7 @@ module RubyGPG2
     class ListSecretKeys < Base
       include Mixins::GlobalConfig
       include Mixins::ColonConfig
+      include Mixins::WithResult
       include Mixins::WithCapturedOutput
 
       def configure_command(builder, opts)
@@ -17,10 +19,6 @@ module RubyGPG2
         builder = super(builder, opts)
         builder
       end
-
-      def do_after(opts)
-        super(opts.merge(output_method: :secret_keys))
-      end
     end
   end
 end

data/lib/ruby_gpg2/commands/mixins/with_captured_output.rb

@@ -12,11 +12,10 @@ module RubyGPG2
 
         def do_after(opts)
           parse_output = opts[:parse_output].nil? ? true : opts[:parse_output]
-          output_method = opts[:output_method]
-
-          parse_output ?
-              ColonOutput.parse(stdout.string).send(output_method) :
-              stdout.string
+          super(opts.merge(
+              output: parse_output ?
+                  ColonOutput.parse(stdout.string) :
+                  stdout.string))
         end
       end
     end

data/lib/ruby_gpg2/commands/mixins/with_captured_status.rb

@@ -0,0 +1,31 @@
+require 'tempfile'
+
+require_relative '../../status_output'
+
+module RubyGPG2
+  module Commands
+    module Mixins
+      module WithCapturedStatus
+        def do_around(opts)
+          if opts[:with_status]
+            Tempfile.create do |f|
+              yield opts.merge(status_file: f.path)
+              @status = File.read(f.path)
+            end
+          else
+            yield opts
+          end
+        end
+
+        def do_after(opts)
+          if opts[:with_status]
+            super(opts.merge(
+                status: StatusOutput.parse(@status)))
+          else
+            super(opts)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/commands/mixins/with_result.rb

@@ -0,0 +1,19 @@
+require 'stringio'
+
+module RubyGPG2
+  module Commands
+    module Mixins
+      module WithResult
+        class Result < Struct.new(:output, :status)
+        end
+
+        def do_after(opts)
+          result = Result.new
+          result.output = opts[:output] if opts[:output]
+          result.status = opts[:status] if opts[:status]
+          result
+        end
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/status_line.rb

@@ -0,0 +1,140 @@
+module RubyGPG2
+  class StatusLine
+    class KeyCreated
+      KEY_TYPES = {
+          'B' => :primary_and_subkey,
+          'P' => :primary,
+          'S' => :subkey
+      }
+
+      def self.parse(line)
+        match = line.match(/^\[GNUPG:\] KEY_CREATED (.) (.*?)(?: (.*))?$/)
+        new(
+            raw: line,
+            key_type: KEY_TYPES[match[1]],
+            key_fingerprint: match[2],
+            handle: match[3])
+      end
+
+      attr_reader(
+          :raw,
+          :key_type,
+          :key_fingerprint,
+          :handle)
+
+      def initialize(opts)
+        @raw = opts[:raw]
+        @key_type = opts[:key_type]
+        @key_fingerprint = opts[:key_fingerprint]
+        @handle = opts[:handle]
+      end
+
+      def type
+        :key_created
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      protected
+
+      def state
+        [
+            @raw,
+            @key_type,
+            @key_fingerprint
+        ]
+      end
+    end
+
+    class KeyConsidered
+      FLAGS = {
+          '0' => [],
+          '1' => [:key_not_selected],
+          '2' => [:all_subkeys_expired_or_revoked]
+      }
+
+      def self.parse(line)
+        match = line.match(/^\[GNUPG:\] KEY_CONSIDERED (.*) (.*)$/)
+        new(
+            raw: line,
+            key_fingerprint: match[1],
+            flags: FLAGS[match[2]])
+      end
+
+      attr_reader(
+          :raw,
+          :key_fingerprint,
+          :flags)
+
+      def initialize(opts)
+        @raw = opts[:raw]
+        @key_fingerprint = opts[:key_fingerprint]
+        @flags = opts[:flags]
+      end
+
+      def type
+        :key_considered
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      protected
+
+      def state
+        [
+            @raw,
+            @key_fingerprint,
+            @flags
+        ]
+      end
+    end
+
+    class Unimplemented
+      def self.parse(line)
+        new(raw: line)
+      end
+
+      attr_reader(
+          :raw)
+
+      def initialize(opts)
+        @raw = opts[:raw]
+      end
+
+      def type
+        :unknown
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      protected
+
+      def state
+        [
+            @raw
+        ]
+      end
+    end
+
+    TYPE_REGEX = /^\[GNUPG:\] (.*?)(\s|$)/
+
+    TYPES = {
+        "KEY_CREATED" => KeyCreated,
+        "KEY_CONSIDERED" => KeyConsidered
+    }
+
+    def self.parse(line)
+      TYPES
+          .fetch(
+              line.match(TYPE_REGEX)[1],
+              Unimplemented)
+          .parse(line)
+    end
+  end
+end

data/lib/ruby_gpg2/status_output.rb

@@ -0,0 +1,26 @@
+require_relative 'status_line'
+
+module RubyGPG2
+  class StatusOutput
+    def self.parse(lines)
+      new(lines
+          .strip
+          .split("\n")
+          .collect { |line| StatusLine.parse(line) })
+    end
+
+    def initialize(lines)
+      @lines = lines
+    end
+
+    def ==(other)
+      other.class == self.class && other.state == state
+    end
+
+    protected
+
+    def state
+      [@lines]
+    end
+  end
+end

data/lib/ruby_gpg2/version.rb

@@ -1,3 +1,3 @@
 module RubyGPG2
-  VERSION = '0.1.0.pre.14'
+  VERSION = '0.1.0.pre.15'
 end

data/lib/ruby_gpg2.rb

@@ -2,6 +2,7 @@ require 'ruby_gpg2/version'
 require 'ruby_gpg2/commands'
 require 'ruby_gpg2/parameter_file_contents'
 require 'ruby_gpg2/colon_output'
+require 'ruby_gpg2/status_output'
 require 'ruby_gpg2/key'
 require 'ruby_gpg2/user_id'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.14
+  version: 0.1.0.pre.15
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -173,9 +173,13 @@ files:
 - lib/ruby_gpg2/commands/mixins/pinentry_config.rb
 - lib/ruby_gpg2/commands/mixins/status_config.rb
 - lib/ruby_gpg2/commands/mixins/with_captured_output.rb
+- lib/ruby_gpg2/commands/mixins/with_captured_status.rb
+- lib/ruby_gpg2/commands/mixins/with_result.rb
 - lib/ruby_gpg2/commands/mixins/without_passphrase.rb
 - lib/ruby_gpg2/key.rb
 - lib/ruby_gpg2/parameter_file_contents.rb
+- lib/ruby_gpg2/status_line.rb
+- lib/ruby_gpg2/status_output.rb
 - lib/ruby_gpg2/user_id.rb
 - lib/ruby_gpg2/version.rb
 - ruby_gpg2.gemspec