ruby_gpg2 0.11.0.pre.4 → 0.11.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c86c5357eeff869c26b47c01341a7cf432f5a383bc27dbf40af5a5c97eb7c20
-  data.tar.gz: c0b5636e3d2d19d65a9fdc1fb291eea7c89fd9f8700c964c0238157ec24f65fc
+  metadata.gz: c27de5d22cf3041ceb816286e96aacfa9bb9d645c8d17dad6f8320f316cc668b
+  data.tar.gz: 34240663967448aa6405be530bef5b64cddf649a1782bcaeab5a96666bf54032
 SHA512:
-  metadata.gz: b182a0ecfbd09de22bcb191be8f45d6ecc0e28e86203e330adc1579da92fb39a24f80ebb1148583de0b553f8679c119d5558730bb94cca5316eee24680d66452
-  data.tar.gz: 448f7acbb26554b6dd1360fa68fa872cd4b18351a51611f6ad2d013757fb41103a354dae096fac65e61c9be5c78f56b1e591938dea4833f67191c3587fc861e7
+  metadata.gz: 882dcf36deceef20058a336045cbab36d47780d968ef7a35cdf03233e97b5e7e300050aa87be6a4ec251185721688a6887e38cc03fecebebcebf1d1a88010a77
+  data.tar.gz: 26df8353e6c0df19f0cedd7e4793eaa4977fc9e54bdb0ae9b2037f3cb2798a12ec226f8c49d7d2934340dc34f0a49fc7b14f6c3579372d470883d6317dc4c11d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruby_gpg2 (0.11.0.pre.4)
-      lino (~> 3.0)
+    ruby_gpg2 (0.11.0.pre.5)
+      lino (= 3.2.0.pre.10)
 
 GEM
   remote: https://rubygems.org/
@@ -22,6 +22,7 @@ GEM
     ast (2.4.2)
     base64 (0.1.1)
     bigdecimal (3.1.4)
+    childprocess (5.0.0)
     colored2 (3.1.2)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
@@ -44,9 +45,10 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     immutable-struct (2.4.1)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
-    lino (3.1.0)
+    lino (3.2.0.pre.10)
+      childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
     minitest (5.20.0)
@@ -93,7 +95,7 @@ GEM
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -108,7 +110,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.57.2)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -116,7 +118,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)

data/lib/ruby_gpg2/colon_output.rb

@@ -97,7 +97,7 @@ module RubyGPG2
     # rubocop:disable Metrics/MethodLength
     def make_key(type, key_record, fingerprint, user_ids)
       Key.new(
-        type: type,
+        type:,
         validity: key_record.validity,
         length: key_record.key_length,
         algorithm: key_record.key_algorithm,
@@ -108,8 +108,8 @@ module RubyGPG2
         serial_number: key_record.serial_number,
         compliance_modes: key_record.compliance_modes,
         origin: key_record.origin,
-        fingerprint: fingerprint,
-        user_ids: user_ids
+        fingerprint:,
+        user_ids:
       )
     end
     # rubocop:enable Metrics/MethodLength

data/lib/ruby_gpg2/colon_record.rb

@@ -5,7 +5,7 @@ require 'date'
 module RubyGPG2
   # rubocop:disable Metrics/ClassLength
   class ColonRecord
-    USER_ID_REGEX = /^(.*?) (?:\((.*)\) )?<(.*)>$/.freeze
+    USER_ID_REGEX = /^(.*?) (?:\((.*)\) )?<(.*)>$/
 
     TYPES = {
       'pub' => :public_key,
@@ -225,7 +225,7 @@ module RubyGPG2
       def make_standard_record(record, type, fields)
         new(
           raw: record,
-          type: type,
+          type:,
           validity: validity(fields[1]),
           key_length: key_length(fields[2]),
           key_algorithm: key_algorithm(fields[3]),
@@ -252,7 +252,7 @@ module RubyGPG2
       def make_trust_base_record(record, type, fields)
         new(
           raw: record,
-          type: type,
+          type:,
           trust_model: trust_model(fields[2]),
           creation_date: creation_date(fields[3]),
           expiration_date: expiration_date(fields[4]),

data/lib/ruby_gpg2/commands/base.rb

@@ -1,51 +1,119 @@
 # frozen_string_literal: true
 
 require 'lino'
+require 'tempfile'
 
 require_relative 'result'
 
 module RubyGPG2
   module Commands
     class Base
-      def initialize(binary: nil, stdin: nil, stdout: nil, stderr: nil)
-        @binary = binary || RubyGPG2.configuration.binary
-        @stdin = stdin || RubyGPG2.configuration.stdin
-        @stdout = stdout || RubyGPG2.configuration.stdout
-        @stderr = stderr || RubyGPG2.configuration.stderr
-      end
-
-      def execute(opts = {})
-        do_before(opts)
-        do_around(opts) do |updated_opts|
-          builder = configure_command(instantiate_builder, updated_opts)
-          builder
-            .build
-            .execute(stdin: stdin, stdout: stdout, stderr: stderr)
+      def initialize(opts = {})
+        @binary = opts[:binary] || RubyGPG2.configuration.binary
+        @stdin = opts[:stdin] || RubyGPG2.configuration.stdin
+        @stdout = opts[:stdout] || RubyGPG2.configuration.stdout
+        @stderr = opts[:stderr] || RubyGPG2.configuration.stderr
+      end
+
+      def execute(parameters = {}, invocation_options = {})
+        parameters = resolve_parameters(parameters)
+        invocation_options = resolve_invocation_options(invocation_options)
+
+        do_before(parameters, invocation_options)
+        result = do_around(parameters, invocation_options) do |p, io|
+          build_and_execute_command(p, io)
         end
-        do_after(opts)
+        result = do_after(result, parameters, invocation_options)
+        prepare_result(result, parameters, invocation_options)
       end
 
-      protected
+      private
 
       attr_reader :binary, :stdin, :stdout, :stderr
 
+      def do_before(parameters, invocation_options); end
+
+      def do_around(parameters, invocation_options)
+        yield parameters, invocation_options
+      end
+
+      def do_after(result, _parameters, _invocation_options)
+        result
+      end
+
+      def build_and_execute_command(parameters, invocation_options)
+        command = configure_command(instantiate_builder, parameters).build
+        stdout = resolve_stdout(invocation_options)
+        stderr = resolve_stderr(invocation_options)
+
+        command.execute(stdin:, stdout:, stderr:)
+
+        process_streams(invocation_options, stdout, stderr)
+      end
+
       def instantiate_builder
         Lino::CommandLineBuilder
           .for_command(binary)
       end
 
-      def do_before(_); end
-
-      def configure_command(builder, _opts)
+      def configure_command(builder, _parameters)
         builder
       end
 
-      def do_around(opts)
-        yield opts
+      def process_result(result, _parameters, _invocation_options)
+        result
+      end
+
+      def parameter_defaults(_parameters)
+        {}
+      end
+
+      def parameter_overrides(_parameters)
+        {}
       end
 
-      def do_after(_)
-        Result.new
+      def invocation_option_defaults(_invocation_options)
+        { capture: [], result: :processed }
+      end
+
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
+      end
+
+      def resolve_invocation_options(invocation_options)
+        invocation_option_defaults(invocation_options)
+          .merge(invocation_options)
+      end
+
+      def resolve_stdout(invocation_options)
+        invocation_options[:capture].include?(:stdout) ? Tempfile.new : @stdout
+      end
+
+      def resolve_stderr(invocation_options)
+        invocation_options[:capture].include?(:stderr) ? Tempfile.new : @stderr
+      end
+
+      def process_streams(invocation_options, stdout, stderr)
+        cap = invocation_options[:capture]
+        result = Result.new
+        add_contents_to_result(cap, result, :stdout, stdout, :output)
+        add_contents_to_result(cap, result, :stderr, stderr, :error)
+        result
+      end
+
+      def add_contents_to_result(capture, result, stream_name, stream, type)
+        return unless capture.include?(stream_name)
+
+        stream.rewind
+        result.send("#{type}=", stream.read)
+      end
+
+      def prepare_result(result, parameters, invocation_options)
+        return result if invocation_options[:result] == :raw
+
+        process_result(result, parameters, invocation_options)
       end
     end
   end

data/lib/ruby_gpg2/commands/decrypt.rb

@@ -24,8 +24,8 @@ module RubyGPG2
       include Mixins::PinentryConfig
       include Mixins::WithoutPassphrase
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(builder, parameters)
+        builder = super(builder, parameters)
         builder.with_subcommand('--decrypt')
       end
     end

data/lib/ruby_gpg2/commands/encrypt.rb

@@ -22,8 +22,8 @@ module RubyGPG2
       include Mixins::RecipientConfig
       include Mixins::TrustModeConfig
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      def configure_command(builder, parameters)
+        builder = super(builder, parameters)
         builder.with_subcommand('--encrypt')
       end
     end

data/lib/ruby_gpg2/commands/export.rb

@@ -14,10 +14,10 @@ module RubyGPG2
       include Mixins::ArmorConfig
       include Mixins::OutputConfig
 
-      def configure_command(builder, opts)
-        names = opts[:names] || []
+      def configure_command(builder, parameters)
+        names = parameters[:names] || []
 
-        builder = super(builder, opts)
+        builder = super(builder, parameters)
         builder = builder.with_subcommand('--export')
         names.each do |name|
           builder = builder.with_argument(name)

data/lib/ruby_gpg2/commands/export_secret_keys.rb

@@ -22,10 +22,10 @@ module RubyGPG2
       include Mixins::OutputConfig
       include Mixins::WithoutPassphrase
 
-      def configure_command(builder, opts)
-        names = opts[:names] || []
+      def configure_command(builder, parameters)
+        names = parameters[:names] || []
 
-        builder = super(builder, opts)
+        builder = super(builder, parameters)
         builder = builder.with_subcommand('--export-secret-keys')
         names.each do |name|
           builder = builder.with_argument(name)

data/lib/ruby_gpg2/commands/generate_key.rb

@@ -8,7 +8,6 @@ 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'
 
@@ -20,15 +19,14 @@ 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)
-        parameter_file_path = opts[:parameter_file_path]
+      def configure_command(builder, parameters)
+        parameter_file_path = parameters[:parameter_file_path]
 
         builder = builder.with_subcommand('--generate-key')
-        builder = super(builder, opts)
+        builder = super(builder, parameters)
         if parameter_file_path
           builder = builder.with_argument(parameter_file_path)
         end

data/lib/ruby_gpg2/commands/import.rb

@@ -6,7 +6,6 @@ require_relative 'base'
 require_relative 'mixins/global_config'
 require_relative 'mixins/batch_config'
 require_relative 'mixins/status_config'
-require_relative 'mixins/with_result'
 require_relative 'mixins/with_captured_status'
 
 module RubyGPG2
@@ -15,13 +14,12 @@ module RubyGPG2
       include Mixins::GlobalConfig
       include Mixins::BatchConfig
       include Mixins::StatusConfig
-      include Mixins::WithResult
       include Mixins::WithCapturedStatus
 
-      def configure_command(builder, opts)
-        key_file_paths = opts[:key_file_paths] || []
+      def configure_command(builder, parameters)
+        key_file_paths = parameters[:key_file_paths] || []
 
-        builder = super(builder, opts)
+        builder = super(builder, parameters)
         builder = builder.with_subcommand('--import')
         key_file_paths.each do |key_file_path|
           builder = builder.with_argument(key_file_path)

data/lib/ruby_gpg2/commands/list_public_keys.rb

@@ -5,7 +5,6 @@ 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
@@ -13,12 +12,11 @@ module RubyGPG2
     class ListPublicKeys < Base
       include Mixins::GlobalConfig
       include Mixins::ColonConfig
-      include Mixins::WithResult
       include Mixins::WithCapturedOutput
 
-      def configure_command(builder, opts)
+      def configure_command(builder, parameters)
         builder = builder.with_subcommand('--list-public-keys')
-        super(builder, opts)
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_gpg2/commands/list_secret_keys.rb

@@ -5,7 +5,6 @@ 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
@@ -13,12 +12,11 @@ module RubyGPG2
     class ListSecretKeys < Base
       include Mixins::GlobalConfig
       include Mixins::ColonConfig
-      include Mixins::WithResult
       include Mixins::WithCapturedOutput
 
-      def configure_command(builder, opts)
+      def configure_command(builder, parameters)
         builder = builder.with_subcommand('--list-secret-keys')
-        super(builder, opts)
+        super(builder, parameters)
       end
     end
   end

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module ArmorConfig
-        def configure_command(builder, opts)
-          armor = opts[:armor]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          armor = parameters[:armor]
+
+          builder = super(builder, parameters)
           builder = builder.with_flag('--armor') if armor
           builder
         end

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

@@ -4,10 +4,17 @@ module RubyGPG2
   module Commands
     module Mixins
       module BatchConfig
-        def configure_command(builder, opts)
-          batch = opts[:batch].nil? ? true : opts[:batch]
+        private
 
-          builder = super(builder, opts)
+        def parameter_defaults(parameters)
+          batch = parameters[:batch]
+          super.merge(batch: batch.nil? ? true : batch)
+        end
+
+        def configure_command(builder, parameters)
+          batch = parameters[:batch]
+
+          builder = super(builder, parameters)
           builder = builder.with_flag('--batch') if batch
           builder
         end

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

@@ -4,10 +4,17 @@ module RubyGPG2
   module Commands
     module Mixins
       module ColonConfig
-        def configure_command(builder, opts)
-          with_colons = opts[:with_colons].nil? ? true : opts[:with_colons]
+        private
 
-          builder = super(builder, opts)
+        def parameter_defaults(parameters)
+          with_colons = parameters[:with_colons]
+          super.merge(with_colons: with_colons.nil? ? true : with_colons)
+        end
+
+        def configure_command(builder, parameters)
+          with_colons = parameters[:with_colons]
+
+          builder = super(builder, parameters)
           builder = builder.with_flag('--with-colons') if with_colons
           builder
         end

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

@@ -4,11 +4,18 @@ module RubyGPG2
   module Commands
     module Mixins
       module GlobalConfig
-        def configure_command(builder, opts)
-          home_directory = opts[:home_directory]
-          without_tty = opts[:without_tty].nil? ? true : opts[:without_tty]
+        private
 
-          builder = super(builder, opts)
+        def parameter_defaults(parameters)
+          without_tty = parameters[:without_tty]
+          super.merge(without_tty: without_tty.nil? ? true : without_tty)
+        end
+
+        def configure_command(builder, parameters)
+          home_directory = parameters[:home_directory]
+          without_tty = parameters[:without_tty]
+
+          builder = super(builder, parameters)
           if home_directory
             builder = builder.with_option(
               '--homedir', home_directory, quoting: '"'

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module InputConfig
-        def configure_command(builder, opts)
-          input_file_path = opts[:input_file_path]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          input_file_path = parameters[:input_file_path]
+
+          builder = super(builder, parameters)
           builder = builder.with_argument(input_file_path) if input_file_path
           builder
         end

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module OutputConfig
-        def configure_command(builder, opts)
-          output_file_path = opts[:output_file_path]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          output_file_path = parameters[:output_file_path]
+
+          builder = super(builder, parameters)
           if output_file_path
             builder = builder.with_option(
               '--output', output_file_path, quoting: '"'

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module PassphraseConfig
-        def configure_command(builder, opts)
-          passphrase = opts[:passphrase]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          passphrase = parameters[:passphrase]
+
+          builder = super(builder, parameters)
           if passphrase
             builder = builder.with_option(
               '--passphrase', passphrase, quoting: '"'

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module PinentryConfig
-        def configure_command(builder, opts)
-          pinentry_mode = opts[:pinentry_mode]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          pinentry_mode = parameters[:pinentry_mode]
+
+          builder = super(builder, parameters)
           if pinentry_mode
             builder = builder.with_option(
               '--pinentry-mode', pinentry_mode

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module RecipientConfig
-        def configure_command(builder, opts)
-          recipient = opts[:recipient]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          recipient = parameters[:recipient]
+
+          builder = super(builder, parameters)
           if recipient
             builder = builder.with_option(
               '--recipient', recipient

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module StatusConfig
-        def configure_command(builder, opts)
-          status_file = opts[:status_file]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          status_file = parameters[:status_file]
+
+          builder = super(builder, parameters)
           if status_file
             builder = builder.with_option(
               '--status-file', status_file, quoting: '"'

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

@@ -4,10 +4,12 @@ module RubyGPG2
   module Commands
     module Mixins
       module TrustModeConfig
-        def configure_command(builder, opts)
-          trust_mode = opts[:trust_mode]
+        private
 
-          builder = super(builder, opts)
+        def configure_command(builder, parameters)
+          trust_mode = parameters[:trust_mode]
+
+          builder = super(builder, parameters)
           if trust_mode
             builder = builder.with_option(
               '--trust-mode', trust_mode

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

@@ -6,21 +6,24 @@ module RubyGPG2
   module Commands
     module Mixins
       module WithCapturedOutput
-        def initialize(*args)
-          super(*args)
-          @stdout = StringIO.new unless
-              defined?(@stdout) && @stdout.respond_to?(:string)
-        end
+        private
 
-        def do_after(opts)
-          super(opts.merge(output: resolve_output(stdout.string, opts)))
+        def parameter_defaults(parameters)
+          parse_output = parameters[:parse_output]
+          super.merge(parse_output: parse_output.nil? ? true : parse_output)
         end
 
-        private
+        def invocation_option_defaults(_invocation_options)
+          super.merge(capture: [:stdout])
+        end
 
-        def resolve_output(output, opts)
-          parse_output = opts[:parse_output].nil? ? true : opts[:parse_output]
-          parse_output ? ColonOutput.parse(output) : output
+        def process_result(result, parameters, invocation_options)
+          result = super(result, parameters, invocation_options)
+          if parameters[:parse_output]
+            result.output =
+              ColonOutput.parse(result.output)
+          end
+          result
         end
       end
     end

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

@@ -8,30 +8,37 @@ module RubyGPG2
   module Commands
     module Mixins
       module WithCapturedStatus
-        def do_around(opts)
-          if opts[:with_status]
-            Tempfile.create('status-file', opts[:work_directory]) do |f|
-              yield opts.merge(status_file: f.path)
+        private
+
+        # rubocop:disable Metrics/MethodLength
+        def do_around(parameters, invocation_options)
+          if parameters[:with_status]
+            Tempfile.create('status-file', parameters[:work_directory]) do |f|
+              result = yield(
+                parameters.merge(status_file: f.path), invocation_options
+              )
               @status = File.read(f.path)
+              result
             end
           else
-            yield opts
+            yield parameters, invocation_options
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
-        def do_after(opts)
-          if opts[:with_status]
-            super(opts.merge(status: resolve_status(@status, opts)))
-          else
-            super(opts)
-          end
+        def status(parameters)
+          parameters[:parse_status] ? StatusOutput.parse(@status) : @status
         end
 
-        private
+        def parameter_defaults(parameters)
+          parse_status = parameters[:parse_status]
+          super.merge(parse_status: parse_status.nil? ? true : parse_status)
+        end
 
-        def resolve_status(status, opts)
-          parse_status = opts[:parse_status].nil? ? true : opts[:parse_status]
-          parse_status ? StatusOutput.parse(status) : status
+        def process_result(result, parameters, invocation_options)
+          result = super(result, parameters, invocation_options)
+          result.status = status(parameters) if parameters[:with_status]
+          result
         end
       end
     end

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

@@ -4,13 +4,13 @@ module RubyGPG2
   module Commands
     module Mixins
       module WithoutPassphrase
-        def configure_command(builder, opts)
-          without_passphrase = opts[:without_passphrase]
+        def configure_command(builder, parameters)
+          without_passphrase = parameters[:without_passphrase]
           if without_passphrase
-            opts = opts.merge(passphrase: '',
-                              pinentry_mode: :loopback)
+            parameters = parameters.merge(passphrase: '',
+                                          pinentry_mode: :loopback)
           end
-          super(builder, opts)
+          super(builder, parameters)
         end
       end
     end

data/lib/ruby_gpg2/commands/result.rb

@@ -2,6 +2,6 @@
 
 module RubyGPG2
   module Commands
-    Result = Struct.new(:output, :status)
+    Result = Struct.new(:output, :error, :status)
   end
 end

data/lib/ruby_gpg2/status_line.rb

@@ -4,7 +4,7 @@ require_relative 'status_lines'
 
 module RubyGPG2
   class StatusLine
-    TYPE_REGEX = /^\[GNUPG:\] (.*?)(\s|$)/.freeze
+    TYPE_REGEX = /^\[GNUPG:\] (.*?)(\s|$)/
 
     TYPES = {
       'IMPORT_OK' => StatusLines::ImportOK,

data/lib/ruby_gpg2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyGPG2
-  VERSION = '0.11.0.pre.4'
+  VERSION = '0.11.0.pre.5'
 end

data/lib/ruby_gpg2.rb

@@ -71,7 +71,7 @@ module RubyGPG2
 
     def initialize
       @binary = 'gpg'
-      @stdin = ''
+      @stdin = nil
       @stdout = $stdout
       @stderr = $stderr
     end

data/ruby_gpg2.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.1'
 
-  spec.add_dependency 'lino', '~> 3.0'
+  spec.add_dependency 'lino', '3.2.0.pre.10'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'gem-release'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.4
+  version: 0.11.0.pre.5
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0.pre.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0.pre.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,6 @@ files:
 - lib/ruby_gpg2/commands/mixins/trust_mode_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/commands/result.rb
 - lib/ruby_gpg2/key.rb
@@ -292,14 +291,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A simple Ruby wrapper for invoking gpg (>= 2.0) commands.

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'stringio'
-
-module RubyGPG2
-  module Commands
-    module Mixins
-      module WithResult
-        def do_after(opts)
-          result = super(opts)
-          result.output = opts[:output] if opts[:output]
-          result.status = opts[:status] if opts[:status]
-          result
-        end
-      end
-    end
-  end
-end