rgpg 0.2.3 → 0.2.4

data/lib/rgpg.rb

@@ -1,3 +1,8 @@
-require_relative 'rgpg/gem_info'
-require_relative 'rgpg/gpg_helper'
+if RUBY_VERSION < '1.9.0'
+  require File.expand_path('../rgpg/gem_info', __FILE__)
+  require File.expand_path('../rgpg/gpg_helper', __FILE__)
+else
+  require_relative 'rgpg/gem_info'
+  require_relative 'rgpg/gpg_helper'
+end
 

data/lib/rgpg/gem_info.rb

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

data/lib/rgpg/gpg_helper.rb

@@ -11,8 +11,10 @@ module Rgpg
       begin
         script_file.write(script)
         script_file.close
-        result = system("gpg --batch --gen-key #{Shellwords.escape(script_file.path)}")
-        raise RuntimeError.new('gpg failed') unless result
+        run_gpg_no_capture(
+          '--batch',
+          '--gen-key', script_file.path
+        )
       ensure
         script_file.close
         script_file.unlink
@@ -25,7 +27,7 @@ module Rgpg
 
       recipient = get_recipient(public_key_file_name)
       with_temporary_encrypt_keyring(public_key_file_name) do |keyring_file_name|
-        run_gpg(
+        run_gpg_capture(
           '--keyring', keyring_file_name,
           '--output', output_file_name,
           '--encrypt',
@@ -44,7 +46,7 @@ module Rgpg
 
       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(
+        run_gpg_capture(
           '--keyring', keyring_file_name,
           '--secret-keyring', secret_keyring_file_name,
           '--output', output_file_name,
@@ -58,21 +60,49 @@ module Rgpg
 
     private
 
-    def self.run_gpg(*args)
+    def self.with_temp_home_dir
+      Dir.mktmpdir('.rgpg-tmp-', ENV['HOME']) do |home_dir|
+        yield home_dir
+      end
+    end
+
+    def self.build_safe_command_line(home_dir, *args)
       fragments = [
         'gpg',
+        '--homedir', home_dir,
         '--no-default-keyring'
       ] + args
-      command_line = fragments.collect { |fragment| Shellwords.escape(fragment) }.join(' ')
+      fragments.collect { |fragment| Shellwords.escape(fragment) }.join(' ')
+    end
 
-      output_file = Tempfile.new('gpg-output')
-      begin
-        output_file.close
-        result = system("#{command_line} > #{Shellwords.escape(output_file.path)} 2>&1")
-      ensure
-        output_file.unlink
+    def self.run_gpg_no_capture(*args)
+      with_temp_home_dir do |home_dir|
+        command_line = build_safe_command_line(home_dir, *args)
+        result = system(command_line)
+        raise RuntimeError.new('gpg failed') unless result
+      end
+    end
+
+    def self.run_gpg_capture(*args)
+      with_temp_home_dir do |home_dir|
+        command_line = build_safe_command_line(home_dir, *args)
+
+        output_file = Tempfile.new('gpg-output')
+        begin
+          output_file.close
+          result = system("#{command_line} > #{Shellwords.escape(output_file.path)} 2>&1")
+
+          output = nil
+          File.open(output_file.path) do |f|
+            output = f.read
+          end
+          raise RuntimeError.new("gpg failed: #{output}") unless result
+
+          output.lines.collect(&:chomp)
+        ensure
+          output_file.unlink
+        end
       end
-      raise RuntimeError.new('gpg failed') unless result
     end
 
     def self.generate_key_script(public_key_file_name, private_key_file_name, recipient, real_name)
@@ -95,17 +125,16 @@ module Rgpg
     end
 
     def self.get_recipient(key_file_name)
-      result = `gpg #{key_file_name}`.lines.first.chomp
-      raise RuntimeError.new('gpg failed') unless $?
-      result =~ /^(pub|sec)\s+\d+D\/([0-9a-fA-F]{8}).+<(.+)>/ or raise RuntimeError.new('Invalid output')
+      lines = run_gpg_capture(key_file_name)
+      result = lines.detect { |line| line =~ /^(pub|sec)\s+\d+D\/([0-9a-fA-F]{8}).+<(.+)>/ }
+      raise RuntimeError.new('Invalid output') unless result
       key_id = $2
       recipient = $3
-      recipient
     end
 
     def self.with_temporary_encrypt_keyring(public_key_file_name)
       with_temporary_keyring_file do |keyring_file_name|
-        run_gpg(
+        run_gpg_capture(
           '--keyring', keyring_file_name,
           '--import', public_key_file_name
         )
@@ -116,7 +145,7 @@ module Rgpg
     def self.with_temporary_decrypt_keyrings(public_key_file_name, private_key_file_name)
       with_temporary_keyring_file do |keyring_file_name|
         with_temporary_keyring_file do |secret_keyring_file_name|
-          run_gpg(
+          run_gpg_capture(
             '--keyring', keyring_file_name,
             '--secret-keyring', secret_keyring_file_name,
             '--import', private_key_file_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgpg
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies: []
 description: Simple Ruby wrapper around "gpg" command for file encryption
 email: rcook@rcook.org