rgpg 0.2.4 → 0.3.0

data/bin/rgpg

@@ -24,12 +24,13 @@ elsif ARGV[0] == '--encrypt'
   Rgpg::GpgHelper.encrypt_file(public_key_file_name, input_file_name, output_file_name)
   exit 0
 elsif ARGV[0] == '--decrypt'
-  raise RuntimeError.new(DECRYPT_USAGE) unless ARGV.size == 5
+  raise RuntimeError.new(DECRYPT_USAGE) unless ARGV.size == 5 || ARGV.size == 6
   public_key_file_name = ARGV[1]
   private_key_file_name = ARGV[2]
   input_file_name = ARGV[3]
   output_file_name = ARGV[4]
-  Rgpg::GpgHelper.decrypt_file(public_key_file_name, private_key_file_name, input_file_name, output_file_name)
+  ARGV.size == 6 ? passphrase = ARGV[5] : passphrase = nil
+  Rgpg::GpgHelper.decrypt_file(public_key_file_name, private_key_file_name, input_file_name, output_file_name, passphrase)
   exit 0
 else
   $stderr.puts "Unsupported command \"#{ARGV[0]}\"" unless ARGV[0].nil? || ARGV[0].size == 0

data/lib/rgpg/gem_info.rb

@@ -1,8 +1,8 @@
 module Rgpg
   module GemInfo
     MAJOR_VERSION = 0
-    MINOR_VERSION = 2
-    PATCH_VERSION = 4
+    MINOR_VERSION = 3
+    PATCH_VERSION = 0
 
     def self.version_string
       [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join('.')

data/lib/rgpg/gpg_helper.rb

@@ -39,22 +39,22 @@ module Rgpg
       end
     end
 
-    def self.decrypt_file(public_key_file_name, private_key_file_name, input_file_name, output_file_name)
+    def self.decrypt_file(public_key_file_name, private_key_file_name, input_file_name, output_file_name, passphrase=nil)
       raise ArgumentError.new("Public key file \"#{public_key_file_name}\" does not exist") unless File.exist?(public_key_file_name)
       raise ArgumentError.new("Private key file \"#{public_key_file_name}\" does not exist") unless File.exist?(private_key_file_name)
       raise ArgumentError.new("Input file \"#{input_file_name}\" does not exist") unless File.exist?(input_file_name)
 
       recipient = get_recipient(private_key_file_name)
       with_temporary_decrypt_keyrings(public_key_file_name, private_key_file_name) do |keyring_file_name, secret_keyring_file_name|
-        run_gpg_capture(
-          '--keyring', keyring_file_name,
-          '--secret-keyring', secret_keyring_file_name,
-          '--output', output_file_name,
-          '--decrypt',
-          '--yes',
-          '--trust-model', 'always',
-          input_file_name
-        )
+        args = '--keyring', keyring_file_name,
+               '--secret-keyring', secret_keyring_file_name,
+               '--output', output_file_name,
+               '--decrypt',
+               '--yes',
+               '--trust-model', 'always',
+               input_file_name
+        args.unshift '--passphrase', passphrase unless passphrase.nil?
+        run_gpg_capture(*args)
       end
     end
 
@@ -126,7 +126,7 @@ module Rgpg
 
     def self.get_recipient(key_file_name)
       lines = run_gpg_capture(key_file_name)
-      result = lines.detect { |line| line =~ /^(pub|sec)\s+\d+D\/([0-9a-fA-F]{8}).+<(.+)>/ }
+      result = lines.detect { |line| line =~ /^(pub|sec)\s+\d+(D|R)\/([0-9a-fA-F]{8}).+<(.+)>/ }
       raise RuntimeError.new('Invalid output') unless result
       key_id = $2
       recipient = $3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgpg
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies: []
 description: Simple Ruby wrapper around "gpg" command for file encryption
 email: rcook@rcook.org
@@ -36,15 +36,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4505311354280034693
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4505311354280034693
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: rgpg