ruby-pgp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b432669b4f5ee44e8a38a98529188ac56c1805976c0165ffa3db9a2842eea353
-  data.tar.gz: d50a88d4fcb014eadc8c81e8cf05e98b3263224fd553d83bd0ff59e4aaacf4eb
+  metadata.gz: 6fa376eee6905851682992f1a483dbb669d6180b2b3eea5db2ce7dcf8476aad6
+  data.tar.gz: 78be3caee14c1a49d5d088d1c3e1ecc3f7e0802765e883b1c3a94fcb781f7cc7
 SHA512:
-  metadata.gz: 4c390a4d5fafe6dc931ef6386e3ff80d6ada3ba0ba5ec8aeab0399e293af6759d524e9959c7d2f7e7d9d79a70ba92e81b3a055785eca6add14dd59e9660fe387
-  data.tar.gz: 5804d452f534a60d66fa5d2fb9a1f89276798cde88799dd586ef2ad0b647118429e72b534c2680e96819a07b98416c3b52115e5bbc67ffd8291777e73bf1a2f7
+  metadata.gz: 11a3b1c30f823d33330aab439ee1724ab8b6bba8f848f59055950d326770d8725856c68e683de95d245feb5054c7714e3ee795307908c2fa6be0b6323650ae9b
+  data.tar.gz: b7efc4e3fcba5d9bb39a1b671a4e72603ae8b7ea72825df89fe513fd793069d98c64636cad999da11962ec2389c0d20c5ebfa806fb795782645c5ab1ff623234

data/lib/pgp/decryptor.rb

@@ -1,16 +1,26 @@
 module PGP
   class Decryptor
-    include PGP::KeysImporter
-
     attr_accessor :passphrase
 
+    def initialize(gpg_engine=nil)
+      @gpg_engine = gpg_engine || GPG::Engine.new
+    end
+
     def decrypt(encrypted_data)
-      result = GPG::Engine.new.decrypt(encrypted_data, self.passphrase)
+      result = @gpg_engine.decrypt(encrypted_data, self.passphrase)
       result[1]
     end
 
     def decrypt_file(file_path)
       decrypt File.read(file_path)
     end
+
+    def add_keys(key_string)
+      @gpg_engine.import_key(key_string)
+    end
+
+    def add_keys_from_file(filename)
+      add_keys(File.read(filename))
+    end
   end
 end

data/lib/pgp/encryptor.rb

@@ -2,13 +2,14 @@ module PGP
   class Encryptor
     attr_accessor :recipients
 
-    def initialize(key_string=nil)
+    def initialize(key_string=nil, gpg_engine=nil)
+      @gpg_engine = gpg_engine || GPG::Engine.new
       self.recipients = []
       add_keys(key_string) if key_string
     end
 
     def add_keys(key_string)
-      self.recipients += GPG::Engine.new.import_key(key_string)
+      self.recipients += @gpg_engine.import_key(key_string)
     end
 
     def add_keys_from_file(filename)
@@ -16,7 +17,7 @@ module PGP
     end
 
     def encrypt(cleartext, filename=nil, mtime=nil)
-      result = GPG::Engine.new.encrypt(cleartext, recipients)
+      result = @gpg_engine.encrypt(cleartext, recipients)
 
       unless filename.nil?
         File.write(filename, result[1])

data/lib/pgp/signer.rb

@@ -1,16 +1,26 @@
 module PGP
   class Signer
-    include PGP::KeysImporter
-
     attr_accessor :passphrase
 
+    def initialize(gpg_engine=nil)
+      @gpg_engine = gpg_engine || GPG::Engine.new
+    end
+
     def sign(data)
-      result = GPG::Engine.new.sign(data, self.passphrase)
+      result = @gpg_engine.sign(data, self.passphrase)
       result[1]
     end
 
     def sign_file(file_path)
       sign File.read(file_path)
     end
+
+    def add_keys(key_string)
+      @gpg_engine.import_key(key_string)
+    end
+
+    def add_keys_from_file(filename)
+      add_keys(File.read(filename))
+    end
   end
 end

data/lib/pgp/verifier.rb

@@ -1,14 +1,24 @@
 module PGP
   class Verifier
-    include PGP::KeysImporter
+    def initialize(gpg_engine=nil)
+      @gpg_engine = gpg_engine || GPG::Engine.new
+    end
 
     def verify(signed_data)
-      result = GPG::Engine.new.verify_signature(signed_data)
+      result = @gpg_engine.verify_signature(signed_data)
       signature_valid = result[0]
 
       raise 'Signature could not be verified' unless signature_valid
 
       result[1]
     end
+
+    def add_keys(key_string)
+      @gpg_engine.import_key(key_string)
+    end
+
+    def add_keys_from_file(filename)
+      add_keys(File.read(filename))
+    end
   end
 end

data/lib/pgp/version.rb

@@ -1,3 +1,3 @@
 module PGP
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/pgp.rb

@@ -1,5 +1,4 @@
 require 'pgp/log'
-require 'pgp/keys_importer'
 require 'pgp/decryptor'
 require 'pgp/encryptor'
 require 'pgp/verifier'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pgp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Camilo Sanchez
@@ -66,7 +66,6 @@ files:
 - lib/pgp/gpg/engine.rb
 - lib/pgp/gpg/runner.rb
 - lib/pgp/gpg/temp_path_helper.rb
-- lib/pgp/keys_importer.rb
 - lib/pgp/log.rb
 - lib/pgp/ruby_decryptor.rb
 - lib/pgp/signer.rb

data/lib/pgp/keys_importer.rb

@@ -1,11 +0,0 @@
-module PGP
-  module KeysImporter
-    def add_keys(key_string)
-      GPG::Engine.new.import_key(key_string)
-    end
-
-    def add_keys_from_file(filename)
-      add_keys(File.read(filename))
-    end
-  end
-end