gpgr 0.0.1 → 0.0.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-GPGR_VERSION = "0.0.1" 
+GPGR_VERSION = "0.0.2" 
 
 task :default => [:test]
        
@@ -22,7 +22,7 @@ Rake::RDocTask.new do |rdoc|
                            "COPYING",
                            "LICENSE", 
                            "HACKING", "lib/" )
-  rdoc.main     = "README.markdown"
+  rdoc.main     = "README"
   rdoc.rdoc_dir = "doc/html"
   rdoc.title    = "Gpgr Documentation"
 end     

data/lib/gpgr.rb

@@ -46,6 +46,8 @@ module Gpgr
       GpgFileForEncryption.new(path, default_options[:to])
     end
 
+    class InvalidEmailException < Exception; end
+
     class GpgFileForEncryption
       
       attr_accessor :email_addresses, :file, :file_output
@@ -87,10 +89,11 @@ module Gpgr
           end
         end
         if bad_key
-          raise "One or more of the e-mail addresses you supplied don't have valid keys assigned!"
+          raise InvalidEmailException.new("One or more of the e-mail addresses you supplied don't have valid keys assigned!")
+        else
+          command = Gpgr.command + " -q --no-verbose --yes -a -o #{@file_output} -r " + @email_addresses.join(' -r ') + " -e #{@file}"
+          system(command)
         end
-        command = Gpgr.command + " --yes -a -o #{@file_output} -r " + @email_addresses.join(' -r ') + " -e #{@file}"
-        system(command)
       end
       
     end
@@ -108,7 +111,7 @@ module Gpgr
     # and added to the keyring for the user executing this command.
     #
     def self.import(path_to_key)
-      system "#{Gpgr.command} --yes --import #{File.expand_path(path_to_key)}"
+      system "#{Gpgr.command} -q --no-verbose --yes --import #{File.expand_path(path_to_key)}"
     end
 
     # Iterates through all of the files at a specified path and attempts to import
@@ -127,9 +130,21 @@ module Gpgr
     #
     def self.installed_public_keys
       keys = []
-      `#{Gpgr.command} --list-public-keys --with-colons | grep uid`.split("\n").each do |key| 
-        keys << /\<(.*@.*)\>/.match(key)[1].upcase
+      email_regexp = /\<(.*@.*)\>/
+
+      # Select the output to grep for, which is different depending on the version
+      # of GPG installed. This is tested on 1.4 and 2.1.
+      #
+      if `#{Gpgr.command} --version | grep GnuPG`.include?('1.')
+        grep_for = 'pub'
+      else
+        grep_for = 'uid'
       end
+
+      `#{Gpgr.command} --list-public-keys --with-colons | grep #{grep_for}`.split("\n").each do |key| 
+        keys << email_regexp.match(key)[1].upcase
+      end
+
       keys.uniq
     end
     

data/test/test_file_encryption_functionality.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestFileEncryptionFunctionality < Test::Unit::TestCase
+
+  def test_file_method_returns_expected_object
+    o = Gpgr::Encrypt.file(__FILE__)
+    assert_equal Gpgr::Encrypt::GpgFileForEncryption, o.class
+  end  
+
+  def test_default_values_are_corrently_set
+    o = Gpgr::Encrypt.file(__FILE__)
+    assert_equal File.expand_path(__FILE__), o.file
+    assert_equal File.expand_path(__FILE__) + '.pgp', o.file_output
+    assert o.email_addresses.empty?
+  end
+
+  def test_can_set_output_file_path
+    o = Gpgr::Encrypt.file(__FILE__ , :to => '/tmp/boogaboog.gpg')
+    assert_equal File.expand_path(__FILE__), o.file
+    assert_equal '/tmp/boogaboog.gpg', o.file_output
+  end
+
+  def test_using_updates_email_addresses
+    o = Gpgr::Encrypt.file(__FILE__)
+    assert o.email_addresses.empty?
+    o.using [ 'test@test.com' ]
+    assert !o.email_addresses.empty?
+  end
+
+  def test_encrypt_will_not_work_with_a_bad_email
+    o = Gpgr::Encrypt.file(__FILE__)
+    o.using [ 'nobody@example.com' ]
+    assert_raise Gpgr::Encrypt::InvalidEmailException do
+      o.encrypt
+    end
+    assert !File.exists(o.file_output)
+  end
+ 
+end

data/test/test_helper.rb

@@ -29,7 +29,7 @@ Passphrase: abc
 %secring #{file_path}.sec
 %commit
   PGP
-  `echo '#{params}' | gpg --batch --gen-key -a`
+  `echo '#{params}' | gpg -q --no-verbose --batch --gen-key -a`
   if File.exists?(file_path + '.pub')
     return file_path + '.pub'
   else
@@ -38,11 +38,11 @@ Passphrase: abc
 end
 
 def remove_installed_key(email)
-  system "gpg --delete-key --yes --batch #{email}"
+  system "gpg -q --no-verbose --delete-key --yes --batch #{email}"
 end
 
 def cleanup_batch_keys
     remove_installed_key 'testymctest1@example.com'
     remove_installed_key 'testymctest2@example.com'
     remove_installed_key 'testymctest3@example.com'
-end
+end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gpgr
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Stenhouse
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +00:00
+date: 2010-03-18 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -31,16 +26,16 @@ extra_rdoc_files:
 - COPYING
 files: 
 - lib/gpgr.rb
-- test/generate_keys.rb
-- test/test_helper.rb
-- test/test_key_management_functionality.rb
+- test/test_keys/testing_1268859031.pub
 - test/test_keys/testing_1268859016.pub
 - test/test_keys/testing_1268859023.pub
-- test/test_keys/testing_1268859031.pub
+- test/test_key_management_functionality.rb
+- test/test_file_encryption_functionality.rb
 - test/test_keys_with_non_key_files/test.csv
+- test/test_keys_with_non_key_files/testing_1268859031.pub
 - test/test_keys_with_non_key_files/testing_1268859016.pub
 - test/test_keys_with_non_key_files/testing_1268859023.pub
-- test/test_keys_with_non_key_files/testing_1268859031.pub
+- test/test_helper.rb
 - Rakefile
 - HACKING
 - README.markdown
@@ -63,20 +58,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: gpgr
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A lightweight GPG CLI interface for encyrypting files

data/test/generate_keys.rb

@@ -1,31 +0,0 @@
-path = File.expand_path(File.dirname(__FILE__) + '/test_keys')
-
-
-def generate_key(name, email, start_path)
-  file_path = "#{start_path}/testing_#{Time.now.to_i}"
-  params = <<-PGP
-Key-Type: DSA
-Key-Length: 1024
-Subkey-Type: ELG-E
-Subkey-Length: 1024
-Name-Real: #{name}
-Name-Comment: with stupid passphrase
-Name-Email: #{email}
-Expire-Date: 0
-Passphrase: abc
-%pubring #{file_path}.pub
-%secring #{file_path}.sec
-%commit
-  PGP
-  `echo '#{params}' | gpg --batch --gen-key -a`
-  if File.exists?(file_path + '.pub')
-    return file_path + '.pub'
-  else
-    raise "ARRGH"
-  end
-end
-
- 
-generate_key('TestyMcTest1', 'testymctest1@example.com', path)
-generate_key('TestyMcTest2', 'testymctest2@example.com', path)
-generate_key('TestyMcTest3', 'testymctest3@example.com', path)