ruby_gpg2 0.9.0.pre.6 → 0.9.0.pre.7

data/lib/ruby_gpg2/commands/import.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_gpg2/commands/list_public_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -16,8 +18,7 @@ module RubyGPG2
 
       def configure_command(builder, opts)
         builder = builder.with_subcommand('--list-public-keys')
-        builder = super(builder, opts)
-        builder
+        super(builder, opts)
       end
     end
   end

data/lib/ruby_gpg2/commands/list_secret_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -16,8 +18,7 @@ module RubyGPG2
 
       def configure_command(builder, opts)
         builder = builder.with_subcommand('--list-secret-keys')
-        builder = super(builder, opts)
-        builder
+        super(builder, opts)
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -7,8 +9,11 @@ module RubyGPG2
           without_tty = opts[:without_tty].nil? ? true : opts[:without_tty]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--homedir', home_directory, quoting: '"') if home_directory
+          if home_directory
+            builder = builder.with_option(
+              '--homedir', home_directory, quoting: '"'
+            )
+          end
           builder = builder.with_flag('--no-tty') if without_tty
           builder
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -6,8 +8,11 @@ module RubyGPG2
           output_file_path = opts[:output_file_path]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-                '--output', output_file_path, quoting: '"') if output_file_path
+          if output_file_path
+            builder = builder.with_option(
+              '--output', output_file_path, quoting: '"'
+            )
+          end
           builder
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -6,8 +8,11 @@ module RubyGPG2
           passphrase = opts[:passphrase]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-                '--passphrase', passphrase, quoting: '"') if passphrase
+          if passphrase
+            builder = builder.with_option(
+              '--passphrase', passphrase, quoting: '"'
+            )
+          end
           builder
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -6,8 +8,11 @@ module RubyGPG2
           pinentry_mode = opts[:pinentry_mode]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--pinentry-mode', pinentry_mode) if pinentry_mode
+          if pinentry_mode
+            builder = builder.with_option(
+              '--pinentry-mode', pinentry_mode
+            )
+          end
           builder
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -6,8 +8,11 @@ module RubyGPG2
           recipient = opts[:recipient]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-                '--recipient', recipient) if recipient
+          if recipient
+            builder = builder.with_option(
+              '--recipient', recipient
+            )
+          end
           builder
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -6,8 +8,11 @@ module RubyGPG2
           status_file = opts[:status_file]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--status-file', status_file, quoting: '"') if status_file
+          if status_file
+            builder = builder.with_option(
+              '--status-file', status_file, quoting: '"'
+            )
+          end
           builder
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
@@ -6,8 +8,11 @@ module RubyGPG2
           trust_mode = opts[:trust_mode]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-                '--trust-mode', trust_mode) if trust_mode
+          if trust_mode
+            builder = builder.with_option(
+              '--trust-mode', trust_mode
+            )
+          end
           builder
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 
 module RubyGPG2
@@ -7,15 +9,18 @@ module RubyGPG2
         def initialize(*args)
           super(*args)
           @stdout = StringIO.new unless
-              (defined?(@stdout) && @stdout.respond_to?(:string))
+              defined?(@stdout) && @stdout.respond_to?(:string)
         end
 
         def do_after(opts)
+          super(opts.merge(output: resolve_output(stdout.string, opts)))
+        end
+
+        private
+
+        def resolve_output(output, opts)
           parse_output = opts[:parse_output].nil? ? true : opts[:parse_output]
-          super(opts.merge(
-              output: parse_output ?
-                  ColonOutput.parse(stdout.string) :
-                  stdout.string))
+          parse_output ? ColonOutput.parse(output) : output
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 
 require_relative '../../status_output'
@@ -8,8 +10,7 @@ module RubyGPG2
       module WithCapturedStatus
         def do_around(opts)
           if opts[:with_status]
-            Tempfile.create(
-                'status-file', opts[:work_directory]) do |f|
+            Tempfile.create('status-file', opts[:work_directory]) do |f|
               yield opts.merge(status_file: f.path)
               @status = File.read(f.path)
             end
@@ -19,16 +20,19 @@ module RubyGPG2
         end
 
         def do_after(opts)
-          parse_status = opts[:parse_status].nil? ? true : opts[:parse_status]
           if opts[:with_status]
-            super(opts.merge(
-                status: parse_status ?
-                    StatusOutput.parse(@status) :
-                    @status))
+            super(opts.merge(status: resolve_status(@status, opts)))
           else
             super(opts)
           end
         end
+
+        private
+
+        def resolve_status(status, opts)
+          parse_status = opts[:parse_status].nil? ? true : opts[:parse_status]
+          parse_status ? StatusOutput.parse(status) : status
+        end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 
 module RubyGPG2

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

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
     module Mixins
       module WithoutPassphrase
         def configure_command(builder, opts)
           without_passphrase = opts[:without_passphrase]
-          super(builder, without_passphrase ?
-              opts.merge(passphrase: '', pinentry_mode: :loopback) :
-              opts)
+          opts = if without_passphrase
+                   opts.merge(passphrase: '', pinentry_mode: :loopback)
+                 else
+                   opts
+                 end
+          super(builder, opts)
         end
       end
     end

data/lib/ruby_gpg2/commands/result.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   module Commands
-    class Result < Struct.new(:output, :status)
-
-    end
+    Result = Struct.new(:output, :status)
   end
 end

data/lib/ruby_gpg2/commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'commands/decrypt'
 require_relative 'commands/encrypt'
 require_relative 'commands/export'
@@ -9,6 +11,5 @@ require_relative 'commands/list_secret_keys'
 
 module RubyGPG2
   module Commands
-
   end
-end
+end

data/lib/ruby_gpg2/key.rb

@@ -1,20 +1,25 @@
+# frozen_string_literal: true
+
 module RubyGPG2
   class Key
     attr_reader(
-        :type,
-        :validity,
-        :length,
-        :algorithm,
-        :id,
-        :creation_date,
-        :owner_trust,
-        :capabilities,
-        :serial_number,
-        :compliance_modes,
-        :origin,
-        :fingerprint,
-        :user_ids)
+      :type,
+      :validity,
+      :length,
+      :algorithm,
+      :id,
+      :creation_date,
+      :owner_trust,
+      :capabilities,
+      :serial_number,
+      :compliance_modes,
+      :origin,
+      :fingerprint,
+      :user_ids
+    )
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def initialize(opts)
       @type = opts[:type]
       @validity = opts[:validity]
@@ -30,6 +35,8 @@ module RubyGPG2
       @fingerprint = opts[:fingerprint]
       @user_ids = opts[:user_ids]
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     def primary_user_id
       @user_ids&.first
@@ -41,21 +48,23 @@ module RubyGPG2
 
     protected
 
+    # rubocop:disable Metrics/MethodLength
     def state
       [
-          @type,
-          @validity,
-          @length,
-          @algorithm,
-          @id,
-          @creation_date,
-          @owner_trust,
-          @capabilities,
-          @serial_number,
-          @compliance_modes,
-          @origin,
-          @fingerprint
+        @type,
+        @validity,
+        @length,
+        @algorithm,
+        @id,
+        @creation_date,
+        @owner_trust,
+        @capabilities,
+        @serial_number,
+        @compliance_modes,
+        @origin,
+        @fingerprint
       ]
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/ruby_gpg2/parameter_file_contents.rb

@@ -1,53 +1,41 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 
 module RubyGPG2
   class ParameterFileContents
     attr_reader(
-        :key_type,
-        :key_length,
-        :subkey_type,
-        :subkey_length,
-        :owner_name,
-        :owner_email,
-        :owner_comment,
-        :expiry,
-        :passphrase)
+      :key_type,
+      :key_length,
+      :subkey_type,
+      :subkey_length,
+      :owner_name,
+      :owner_email,
+      :owner_comment,
+      :expiry,
+      :passphrase
+    )
 
     def initialize(opts)
-      @key_type = opts.fetch(:key_type, 'RSA')
-      @key_length = opts.fetch(:key_length,
-          (@key_type.to_s == 'default' ? nil : 2048))
-      @subkey_type = opts.fetch(:subkey_type, 'RSA')
-      @subkey_length = opts.fetch(:subkey_length,
-          ((@subkey_type.nil? || @subkey_type.to_s == 'default') ? nil : 2048))
-      @owner_name = opts.fetch(:owner_name, nil)
-      @owner_email = opts.fetch(:owner_email, nil)
-      @owner_comment = opts.fetch(:owner_comment, nil)
-      @expiry = opts.fetch(:expiry, :never)
-      @passphrase = opts.fetch(:passphrase, nil)
+      @key_type = resolve_key_type(opts)
+      @key_length = resolve_key_length(opts, @key_type)
+      @subkey_type = resolve_subkey_type(opts)
+      @subkey_length = resolve_subkey_length(opts, @subkey_type)
+      @owner_name = resolve_owner_name(opts)
+      @owner_email = resolve_owner_email(opts)
+      @owner_comment = resolve_owner_comment(opts)
+      @expiry = resolve_expiry(opts)
+      @passphrase = resolve_passphrase(opts)
 
-      owner_name_present = !@owner_name.nil?
-      owner_email_present = !@owner_email.nil?
-      missing_count = [
-          owner_name_present,
-          owner_email_present
-      ].count(false)
-      missing_names = [
-          owner_name_present ? nil : :owner_name,
-          owner_email_present ? nil : :owner_email
-      ].compact
-
-      unless missing_count == 0
-        raise RuntimeError.new(
-            "Missing required parameter#{missing_count > 1 ? 's' : ''}: " +
-                "#{missing_names}.")
-      end
+      assert_required_parameters_present
+    end
+
+    def expiry_date
+      expiry == :never ? 0 : expiry
     end
 
     def write_to(path)
-      File.open(path, 'w') do |f|
-        f.write(to_s)
-      end
+      File.open(path, 'w') { |f| f.write(to_s) }
     end
 
     def in_temp_file(tmpdir = nil)
@@ -59,22 +47,84 @@ module RubyGPG2
     end
 
     def to_s
-      [
-          parm("Key-Type", key_type),
-          parm("Key-Length", key_length),
-          parm("Subkey-Type", subkey_type),
-          parm('Subkey-Length', subkey_length),
-          parm('Name-Real', owner_name),
-          parm('Name-Comment', owner_comment),
-          parm('Name-Email', owner_email),
-          parm('Expire-Date',
-              expiry == :never ? 0 : expiry),
-          parm('Passphrase', passphrase),
-      ].compact.join("\n") + "\n"
+      "#{to_parms.compact.join("\n")}\n"
     end
 
     private
 
+    def assert_required_parameters_present
+      owner_name_present = !@owner_name.nil?
+      owner_email_present = !@owner_email.nil?
+      missing_count = [owner_name_present, owner_email_present].count(false)
+      missing_names =
+        [to_error_code(owner_name_present, :owner_name),
+         to_error_code(owner_email_present, :owner_email)].compact
+
+      return if missing_count.zero?
+
+      raise "Missing required parameter#{missing_count > 1 ? 's' : ''}: " \
+            "#{missing_names}."
+    end
+
+    def to_error_code(present, code)
+      present ? nil : code
+    end
+
+    def resolve_key_type(opts)
+      opts.fetch(:key_type, 'RSA')
+    end
+
+    def resolve_key_length(opts, key_type)
+      opts.fetch(
+        :key_length, (key_type.to_s == 'default' ? nil : 2048)
+      )
+    end
+
+    def resolve_subkey_type(opts)
+      opts.fetch(:subkey_type, 'RSA')
+    end
+
+    def resolve_subkey_length(opts, subkey_type)
+      opts.fetch(
+        :subkey_length,
+        (subkey_type.nil? || subkey_type.to_s == 'default' ? nil : 2048)
+      )
+    end
+
+    def resolve_owner_name(opts)
+      opts.fetch(:owner_name, nil)
+    end
+
+    def resolve_owner_email(opts)
+      opts.fetch(:owner_email, nil)
+    end
+
+    def resolve_owner_comment(opts)
+      opts.fetch(:owner_comment, nil)
+    end
+
+    def resolve_expiry(opts)
+      opts.fetch(:expiry, :never)
+    end
+
+    def resolve_passphrase(opts)
+      opts.fetch(:passphrase, nil)
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    def to_parms
+      [parm('Key-Type', key_type),
+       parm('Key-Length', key_length),
+       parm('Subkey-Type', subkey_type),
+       parm('Subkey-Length', subkey_length),
+       parm('Name-Real', owner_name),
+       parm('Name-Comment', owner_comment),
+       parm('Name-Email', owner_email),
+       parm('Expire-Date', expiry_date),
+       parm('Passphrase', passphrase)]
+    end
+    # rubocop:enable Metrics/AbcSize
+
     def parm(name, value)
       value ? "#{name}: #{value}" : nil
     end

data/lib/ruby_gpg2/status_line.rb

@@ -1,23 +1,26 @@
+# frozen_string_literal: true
+
 require_relative 'status_lines'
 
 module RubyGPG2
   class StatusLine
-    TYPE_REGEX = /^\[GNUPG:\] (.*?)(\s|$)/
+    TYPE_REGEX = /^\[GNUPG:\] (.*?)(\s|$)/.freeze
 
     TYPES = {
-        "IMPORT_OK" => StatusLines::ImportOK,
-        "IMPORT_PROBLEM" => StatusLines::ImportProblem,
-        "IMPORTED" => StatusLines::Imported,
-        "KEY_CREATED" => StatusLines::KeyCreated,
-        "KEY_CONSIDERED" => StatusLines::KeyConsidered
-    }
+      'IMPORT_OK' => StatusLines::ImportOK,
+      'IMPORT_PROBLEM' => StatusLines::ImportProblem,
+      'IMPORTED' => StatusLines::Imported,
+      'KEY_CREATED' => StatusLines::KeyCreated,
+      'KEY_CONSIDERED' => StatusLines::KeyConsidered
+    }.freeze
 
     def self.parse(line)
       TYPES
-          .fetch(
-              line.match(TYPE_REGEX)[1],
-              StatusLines::Unimplemented)
-          .parse(line)
+        .fetch(
+          line.match(TYPE_REGEX)[1],
+          StatusLines::Unimplemented
+        )
+        .parse(line)
     end
   end
-end
+end