ruby_gpg2 0.1.0.pre.3 → 0.1.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d840f9c3019500c8efe2d72f3a92076657d3084739380d8218ccc1eeadf24fe
-  data.tar.gz: 5c791b3c7ecb325cd46ccc64b3c6cb0eee59597602ca00af0f7e3bdbb3ef929b
+  metadata.gz: 9983337ad6842d933f046ade16db182df89cc4fa92275aa287db62fdca3fa0de
+  data.tar.gz: a6853e170aa664350f00183a92b417083c7a5d94106f3aed81503d0055d571ae
 SHA512:
-  metadata.gz: cec3bc2eaaf7d77fbda1f15d0b2b9e17c3c6d96d7088349d4e3975219db3068ee41160d57e523ad65f4038ffd910c5f98258247bf5291783254f97d12367dc03
-  data.tar.gz: ee8b8a8b70d2899a94a53c6222fb808ce23a2f09137ee6ab8a6717f0495c823e254c2fdc473d9d783778b875cba00d2a7d05a3432e8f5b783aa154645f1117fc
+  metadata.gz: 23bca3f4f330f9e29c0ecff4df0bb3de24f3a06e9e1b139eec394395012cafa10118752229f9449cd13e827df48a8980d805e4350e6877ab46f1bb13714994e6
+  data.tar.gz: 00ebe337f7b596c5ae3111bc883f9ab5efb6c7cfac729cfad43bd757c01cdfccb0b241c9b5f5d54f91b93763edcf31857de2213681b34d02717a446370282941

data/Gemfile.lock

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

data/lib/ruby_gpg2/colon_output.rb

@@ -6,7 +6,7 @@ module RubyGPG2
       new(records
           .strip
           .split("\n")
-          .collect { |record| KeyListRecord.parse(record) })
+          .collect { |record| ColonRecord.parse(record) })
     end
 
     include Enumerable
@@ -18,5 +18,15 @@ module RubyGPG2
     def each(&block)
       @records.each(&block)
     end
+
+    def ==(other)
+      other.class == self.class && other.state == state
+    end
+
+    protected
+
+    def state
+      [@records]
+    end
   end
 end

data/lib/ruby_gpg2/colon_record.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module RubyGPG2
   class ColonRecord
     TYPES = {
@@ -65,14 +67,18 @@ module RubyGPG2
         'e' => :encrypt,
         's' => :sign,
         'c' => :certify,
+        'a' => :authenticate,
         'E' => :primary_encrypt,
         'S' => :primary_sign,
-        'C' => :primary_certify
+        'C' => :primary_certify,
+        'A' => :primary_authenticate,
+        '?' => :unknown
     }
 
     COMPLIANCE_MODES = {
         '8' => :rfc_4880bis,
-        '23' => :de_vs
+        '23' => :de_vs,
+        '6001' => :roca_screening_hit
     }
 
     def self.parse(record)

data/lib/ruby_gpg2/commands/base.rb

@@ -3,22 +3,11 @@ require 'lino'
 module RubyGPG2
   module Commands
     class Base
-      attr_reader :binary
-
-      def initialize(binary: nil)
+      def initialize(binary: nil, stdin: nil, stdout: nil, stderr: nil)
         @binary = binary || RubyGPG2.configuration.binary
-      end
-
-      def stdin
-        ''
-      end
-
-      def stdout
-        STDOUT
-      end
-
-      def stderr
-        STDERR
+        @stdin = stdin || RubyGPG2.configuration.stdin
+        @stdout = stdout || RubyGPG2.configuration.stdout
+        @stderr = stderr || RubyGPG2.configuration.stderr
       end
 
       def execute(opts = {})
@@ -35,6 +24,10 @@ module RubyGPG2
         do_after(opts)
       end
 
+      protected
+
+      attr_reader :binary, :stdin, :stdout, :stderr
+
       def instantiate_builder
         Lino::CommandLineBuilder
             .for_command(binary)

data/lib/ruby_gpg2/commands/generate_key.rb

@@ -2,11 +2,13 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/global_config'
+require_relative 'mixins/batch_config'
 
 module RubyGPG2
   module Commands
     class GenerateKey < Base
       include Mixins::GlobalConfig
+      include Mixins::BatchConfig
 
       def configure_command(builder, opts)
         parameter_file_path = opts[:parameter_file_path]

data/lib/ruby_gpg2/commands/list_public_keys.rb

@@ -0,0 +1,22 @@
+require 'lino'
+
+require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/colon_config'
+require_relative 'mixins/with_captured_output'
+
+module RubyGPG2
+  module Commands
+    class ListPublicKeys < Base
+      include Mixins::GlobalConfig
+      include Mixins::ColonConfig
+      include Mixins::WithCapturedOutput
+
+      def configure_command(builder, opts)
+        builder = builder.with_subcommand('--list-public-keys')
+        builder = super(builder, opts)
+        builder
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module RubyGPG2
+  module Commands
+    module Mixins
+      module BatchConfig
+        def configure_command(builder, opts)
+          batch = opts[:batch].nil? ? true : opts[:batch]
+
+          builder = super(builder, opts)
+          builder = builder.with_flag('--batch') if batch
+          builder
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module RubyGPG2
+  module Commands
+    module Mixins
+      module ColonConfig
+        def configure_command(builder, opts)
+          with_colons = opts[:with_colons].nil? ? true : opts[:with_colons]
+
+          builder = super(builder, opts)
+          builder = builder.with_flag('--with-colons') if with_colons
+          builder
+        end
+      end
+    end
+  end
+end

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

@@ -3,11 +3,9 @@ module RubyGPG2
     module Mixins
       module GlobalConfig
         def configure_command(builder, opts)
-          batch = opts[:batch].nil? ? true : opts[:batch]
           home_directory = opts[:home_directory]
 
           builder = super(builder, opts)
-          builder = builder.with_flag('--batch') if batch
           builder = builder.with_option(
               '--homedir', home_directory, quoting: '"') if home_directory
           builder

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

@@ -0,0 +1,22 @@
+require 'stringio'
+
+module RubyGPG2
+  module Commands
+    module Mixins
+      module WithCapturedOutput
+        def initialize(*args)
+          super(*args)
+          @stdout = StringIO.new unless
+              (defined?(@stdout) && @stdout.respond_to?(:string))
+        end
+
+        def do_after(opts)
+          parse_output = opts[:parse_output].nil? ? true : opts[:parse_output]
+          parse_output ?
+              ColonOutput.parse(stdout.string) :
+              stdout.string
+        end
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/commands.rb

@@ -1,4 +1,5 @@
 require_relative 'commands/generate_key'
+require_relative 'commands/list_public_keys'
 
 module RubyGPG2
   module Commands

data/lib/ruby_gpg2/version.rb

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

data/lib/ruby_gpg2.rb

@@ -21,10 +21,13 @@ module RubyGPG2
   end
 
   class Configuration
-    attr_accessor :binary
+    attr_accessor :binary, :logger, :stdin, :stdout, :stderr
 
     def initialize
       @binary = 'gpg'
+      @stdin = ''
+      @stdout = $stdout
+      @stderr = $stderr
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.3
+  version: 0.1.0.pre.4
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -164,7 +164,11 @@ files:
 - lib/ruby_gpg2/commands.rb
 - lib/ruby_gpg2/commands/base.rb
 - lib/ruby_gpg2/commands/generate_key.rb
+- lib/ruby_gpg2/commands/list_public_keys.rb
+- lib/ruby_gpg2/commands/mixins/batch_config.rb
+- 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/parameter_file.rb
 - lib/ruby_gpg2/version.rb
 - ruby_gpg2.gemspec