ruby_gpg2 0.1.0.pre.12 → 0.1.0.pre.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcbde10d4fc7b46bd1cb4ce62f80ef33ad2c0c24145267fde57974b9abf7aa8
-  data.tar.gz: 132a6fd205e3be5fe2bd99d925b9b69751f377c480d7ead9353e83a8f884ffc4
+  metadata.gz: bdc48fbd38f00f4db65a315ea2662da69bf719c9133bbea87db91a24b85dc470
+  data.tar.gz: 309cf5c12ba74e33c0d4a2d465f1d783972972df56d029134791844499c75b15
 SHA512:
-  metadata.gz: ce74fe316e2b38e999751dd28835672130924e83e3969d88969417afc0ea8ad681a25d002fc201d19385f5dae4eca0579121655bfc69ecafb7f254f474082ae9
-  data.tar.gz: cd91a872e6f9e80db4b463a80b925be9a4ed3b1d9ed5134931d7b0d780e9da1436e701f8fb9839356041a2ba469a6ee4a570c59aafed01137499ae5f94574b95
+  metadata.gz: 68574ff80148908ed23fc999b05072a41742b4cec083ddb79135898bd160d57bb9c31c4468a2ec7923934d90a40dc39c86f77c5750c2aea4aaf45137d853d5da
+  data.tar.gz: cbe2ca56a501372a5f768f944cd94b1aaffd82abbac8c5a30fdae029f043ca815c7d8af06ccc8521fbcfeee1f40d812bebeb14fa3edbfdf5d160bdc71fcea315

data/Gemfile.lock

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

data/lib/ruby_gpg2/commands/generate_key.rb

@@ -5,6 +5,7 @@ require_relative 'mixins/global_config'
 require_relative 'mixins/batch_config'
 require_relative 'mixins/passphrase_config'
 require_relative 'mixins/pinentry_config'
+require_relative 'mixins/without_passphrase'
 
 module RubyGPG2
   module Commands
@@ -13,6 +14,7 @@ module RubyGPG2
       include Mixins::BatchConfig
       include Mixins::PassphraseConfig
       include Mixins::PinentryConfig
+      include Mixins::WithoutPassphrase
 
       def configure_command(builder, opts)
         parameter_file_path = opts[:parameter_file_path]

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

@@ -3,19 +3,11 @@ module RubyGPG2
     module Mixins
       module PassphraseConfig
         def configure_command(builder, opts)
-          without_passphrase = opts[:without_passphrase].nil? ?
-              false :
-              opts[:without_passphrase]
           passphrase = opts[:passphrase]
 
           builder = super(builder, opts)
-          if passphrase
-            builder = builder.with_option(
-                '--passphrase', passphrase, quoting: "'")
-          elsif without_passphrase
-            builder = builder.with_option(
-                '--passphrase', '', quoting: "'")
-          end
+          builder = builder.with_option(
+                '--passphrase', passphrase, quoting: "'") if passphrase
           builder
         end
       end

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

@@ -0,0 +1,14 @@
+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)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_gpg2/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg2
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.12
+  version: 0.1.0.pre.13
 platform: ruby
 authors:
 - Toby Clemson
@@ -172,6 +172,7 @@ files:
 - lib/ruby_gpg2/commands/mixins/passphrase_config.rb
 - lib/ruby_gpg2/commands/mixins/pinentry_config.rb
 - lib/ruby_gpg2/commands/mixins/with_captured_output.rb
+- lib/ruby_gpg2/commands/mixins/without_passphrase.rb
 - lib/ruby_gpg2/key.rb
 - lib/ruby_gpg2/parameter_file_contents.rb
 - lib/ruby_gpg2/user_id.rb