ruby_gpg2 0.1.0.pre.24 → 0.3.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 262fa5828445a8b815c8559edabfc8a9b37650490834736804d214635295e29c
-  data.tar.gz: 9caa53e85f84f29d37644c2ef49453a6963a1dbfb3bd14b21951fac338ab8264
+  metadata.gz: fe873b22790b6394af48855ac313beac4bf2096b6d40aa5eb5cd8da8193b8bb3
+  data.tar.gz: 61efacada4cdc48579621494897e889355eb103f3ece6f06e08a5d8d3eb0fa94
 SHA512:
-  metadata.gz: 5e92062433cef4ca2a705ea2949bc5491e79f8caa7c04638034e7db0bed21b902f70aa8e1c91a4e6ab96ea12cebd18ee1c0b33b5124f32e6382a70a12ae1473d
-  data.tar.gz: c3750d44bc8d46a88ecf45748ff064f837605adaacb946606950f0b7a5e2c917d693b7ee13c723400fe997e90f5ea18dfe2bc2c899663677f1514810fb0089d0
+  metadata.gz: ebe36ef0c3a388f124c66dbf4c8c672d8326ad2b79428a4f9f42989b428982d9dd07da5d33da4157f54f995cc8656b66168ab701f800896fa5b607e2392c29ef
+  data.tar.gz: 747aabae36d659cb9e8109c11acb1ef3bd11f6b3f0ed6676dde13002bf2051cde60bfb3f2922fb6fdc0123e60e7be1b15c40b84e5e1561f854bcf2d4663481bb

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    ruby_gpg2 (0.1.0.pre.24)
+    ruby_gpg2 (0.3.0.pre.1)
       lino (= 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
@@ -29,13 +29,13 @@ GEM
     lino (1.3.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rake (13.0.1)
     rake_circle_ci (0.7.0)
       colored2 (~> 3.1)
@@ -58,15 +58,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)

data/lib/ruby_gpg2.rb

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

data/lib/ruby_gpg2/commands/decrypt.rb

@@ -5,6 +5,7 @@ require_relative 'mixins/global_config'
 require_relative 'mixins/batch_config'
 require_relative 'mixins/input_config'
 require_relative 'mixins/output_config'
+require_relative 'mixins/trust_mode_config'
 require_relative 'mixins/passphrase_config'
 require_relative 'mixins/pinentry_config'
 require_relative 'mixins/without_passphrase'
@@ -16,6 +17,7 @@ module RubyGPG2
       include Mixins::BatchConfig
       include Mixins::InputConfig
       include Mixins::OutputConfig
+      include Mixins::TrustModeConfig
       include Mixins::PassphraseConfig
       include Mixins::PinentryConfig
       include Mixins::WithoutPassphrase

data/lib/ruby_gpg2/commands/encrypt.rb

@@ -7,6 +7,7 @@ require_relative 'mixins/armor_config'
 require_relative 'mixins/input_config'
 require_relative 'mixins/output_config'
 require_relative 'mixins/recipient_config'
+require_relative 'mixins/trust_mode_config'
 
 module RubyGPG2
   module Commands
@@ -17,6 +18,7 @@ module RubyGPG2
       include Mixins::InputConfig
       include Mixins::OutputConfig
       include Mixins::RecipientConfig
+      include Mixins::TrustModeConfig
 
       def configure_command(builder, opts)
         builder = super(builder, opts)

data/lib/ruby_gpg2/commands/import.rb

@@ -3,12 +3,18 @@ require 'lino'
 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
   module Commands
     class Import < Base
       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] || []

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

@@ -0,0 +1,16 @@
+module RubyGPG2
+  module Commands
+    module Mixins
+      module TrustModeConfig
+        def configure_command(builder, opts)
+          trust_mode = opts[:trust_mode]
+
+          builder = super(builder, opts)
+          builder = builder.with_option(
+                '--trust-mode', trust_mode) if trust_mode
+          builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/status_line.rb

@@ -1,139 +1,22 @@
+require_relative 'status_lines'
+
 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
+        "IMPORT_OK" => StatusLines::ImportOK,
+        "IMPORT_PROBLEM" => StatusLines::ImportProblem,
+        "IMPORTED" => StatusLines::Imported,
+        "KEY_CREATED" => StatusLines::KeyCreated,
+        "KEY_CONSIDERED" => StatusLines::KeyConsidered
     }
 
     def self.parse(line)
       TYPES
           .fetch(
               line.match(TYPE_REGEX)[1],
-              Unimplemented)
+              StatusLines::Unimplemented)
           .parse(line)
     end
   end

data/lib/ruby_gpg2/status_lines.rb

@@ -0,0 +1,12 @@
+require_relative 'status_lines/import_ok'
+require_relative 'status_lines/import_problem'
+require_relative 'status_lines/imported'
+require_relative 'status_lines/key_considered'
+require_relative 'status_lines/key_created'
+require_relative 'status_lines/unimplemented'
+
+module RubyGPG2
+  module StatusLines
+
+  end
+end

data/lib/ruby_gpg2/status_lines/import_ok.rb

@@ -0,0 +1,65 @@
+module RubyGPG2
+  module StatusLines
+    class ImportOK
+      REASONS = {
+          1 => :new_key,
+          2 => :new_user_ids,
+          4 => :new_signatures,
+          8 => :new_subkeys,
+          16 => :private_key
+      }
+
+      def self.parse(line)
+        match = line.match(/^\[GNUPG:\] IMPORT_OK (\d+) (.*)$/)
+        new(
+            raw: line,
+            reasons: reasons(match[1]),
+            key_fingerprint: match[2])
+      end
+
+      attr_reader(
+          :raw,
+          :reasons,
+          :key_fingerprint)
+
+      def initialize(opts)
+        @raw = opts[:raw]
+        @reasons = opts[:reasons]
+        @key_fingerprint = opts[:key_fingerprint]
+      end
+
+      def type
+        :import_ok
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      protected
+
+      def state
+        [
+            @raw,
+            @reasons,
+            @key_fingerprint
+        ]
+      end
+
+      private
+
+      def self.reasons(value)
+        value = value.to_i
+        if value == 0
+          [:no_change]
+        else
+          REASONS.inject([]) do |r, entry|
+            (value & entry[0]) > 0 ?
+                (r << entry[1]) :
+                r
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/status_lines/import_problem.rb

@@ -0,0 +1,50 @@
+module RubyGPG2
+  module StatusLines
+    class ImportProblem
+      REASONS = {
+          0 => :no_reason_given,
+          1 => :invalid_certificate,
+          2 => :issuer_certificate_missing,
+          3 => :certificate_chain_too_long,
+          4 => :error_storing_certificate
+      }
+
+      def self.parse(line)
+        match = line.match(/^\[GNUPG:\] IMPORT_PROBLEM (\d+) (.*)$/)
+        new(
+            raw: line,
+            reason: REASONS[match[1].to_i],
+            key_fingerprint: match[2])
+      end
+
+      attr_reader(
+          :raw,
+          :reason,
+          :key_fingerprint)
+
+      def initialize(opts)
+        @raw = opts[:raw]
+        @reason = opts[:reason]
+        @key_fingerprint = opts[:key_fingerprint]
+      end
+
+      def type
+        :import_problem
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      protected
+
+      def state
+        [
+            @raw,
+            @reason,
+            @key_fingerprint
+        ]
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/status_lines/imported.rb

@@ -0,0 +1,42 @@
+module RubyGPG2
+  module StatusLines
+    class Imported
+      def self.parse(line)
+        match = line.match(/^\[GNUPG:\] IMPORTED (.*?) (.*)$/)
+        new(
+            raw: line,
+            key_id: match[1],
+            user_id: match[2])
+      end
+
+      attr_reader(
+          :raw,
+          :key_id,
+          :user_id)
+
+      def initialize(opts)
+        @raw = opts[:raw]
+        @key_id = opts[:key_id]
+        @user_id = opts[:user_id]
+      end
+
+      def type
+        :imported
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      protected
+
+      def state
+        [
+            @raw,
+            @key_id,
+            @user_id
+        ]
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/status_lines/key_considered.rb

@@ -0,0 +1,48 @@
+module RubyGPG2
+  module StatusLines
+    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
+  end
+end

data/lib/ruby_gpg2/status_lines/key_created.rb

@@ -0,0 +1,51 @@
+module RubyGPG2
+  module StatusLines
+    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
+  end
+end

data/lib/ruby_gpg2/status_lines/unimplemented.rb

@@ -0,0 +1,32 @@
+module RubyGPG2
+  module StatusLines
+    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
+  end
+end

data/lib/ruby_gpg2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.24
+  version: 0.3.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -181,6 +181,7 @@ files:
 - lib/ruby_gpg2/commands/mixins/pinentry_config.rb
 - lib/ruby_gpg2/commands/mixins/recipient_config.rb
 - lib/ruby_gpg2/commands/mixins/status_config.rb
+- 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
@@ -189,6 +190,13 @@ files:
 - lib/ruby_gpg2/key.rb
 - lib/ruby_gpg2/parameter_file_contents.rb
 - lib/ruby_gpg2/status_line.rb
+- lib/ruby_gpg2/status_lines.rb
+- lib/ruby_gpg2/status_lines/import_ok.rb
+- lib/ruby_gpg2/status_lines/import_problem.rb
+- lib/ruby_gpg2/status_lines/imported.rb
+- lib/ruby_gpg2/status_lines/key_considered.rb
+- lib/ruby_gpg2/status_lines/key_created.rb
+- lib/ruby_gpg2/status_lines/unimplemented.rb
 - lib/ruby_gpg2/status_output.rb
 - lib/ruby_gpg2/user_id.rb
 - lib/ruby_gpg2/version.rb