mail-gpg 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dcf09f797ab779eb55e25010d36f0755f1e9faa
-  data.tar.gz: 9fc53e722aceea7fa514a08cd2978679106d44e3
+  metadata.gz: 0f2bdd9267f91e61670a13871264ff5147b4a94d
+  data.tar.gz: 21e4caa89623e7ae09a0e56dfe529d86d6733104
 SHA512:
-  metadata.gz: 836562359cfe50d35a2e7950cdb32fbdbdca566bab08539dbd579b1acaa917d38ce60e5ed2c83820519b92e160a1327aa631143a571231573d417630046bfac9
-  data.tar.gz: a80337dde9e52d9a0e00e352f7e664ab3450aa48d5da3a0d2a25945bc9b7770b2a5d282eef1bd491d83b330138f0431c378cf315e43dd90bcc2e9b8011cfd5bd
+  metadata.gz: c36bc5f37255e7eb1af591b72c056b6a47fc69df10a554344d2cc22c47cf794888fa7f2d7d00e9e86795953f279bbf0e2c220ff80b650f46a99807f4dd021d7e
+  data.tar.gz: 0d69b3db9aebe8ef48f542d061d044a1bc9300ad72319ddfd5b0f6610ee246cb3e3d26ea7a624faccb4ac41e1768878f5b3fd0f3bb2817854695fd9089254fa4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.3 2015-02-18
+
+* inline pgp detection now ignores signature.asc attachments
+
 == 0.2.2 2014-09-03
 
 * add option to import missing keys for signature verification

data/README.md

@@ -191,6 +191,7 @@ Mail::Message#gpg method.
 Test cases use a mock gpghome located in `test/gpghome` in order to not mess
 around with your personal gpg keychain.
 
+Password for the test PGP private keys is `abc`
 
 ## Todo
 

data/Rakefile

@@ -39,9 +39,17 @@ END
   end
 end
 
-task :default => [:test]
+task :default => ["mail_gpg:tests:setup", :test]
+
+namespace :mail_gpg do
+  namespace :tests do
+    task :setup do
+      setup_gpghome
+    end
+  end
+end
+
 Rake::TestTask.new(:test) do |test|
-  setup_gpghome
   test.libs << 'test'
   test.test_files = FileList['test/**/*_test.rb']
   test.verbose = true

data/lib/mail/gpg.rb

@@ -213,7 +213,10 @@ module Mail
           return true if part.body.include?('-----BEGIN PGP MESSAGE-----')
           return true if part.has_content_type? &&
             /application\/(?:octet-stream|pgp-encrypted)/ =~ part.mime_type &&
-            /.*\.(?:pgp|gpg|asc)$/ =~ part.content_type_parameters[:name]
+            /.*\.(?:pgp|gpg|asc)$/ =~ part.content_type_parameters[:name] &&
+            'signature.asc' != part.content_type_parameters[:name]
+          # that last condition above prevents false positives in case e.g.
+          # someone forwards a mime signed mail including signature.
         end
       end
       false

data/lib/mail/gpg/message_patch.rb

@@ -28,8 +28,9 @@ module Mail
       # mail.gpg encrypt: true, sign: true
       # mail.gpg encrypt: true, sign_as: "other_address@host.com"
       #
-      # future versions will also support sign-only mode:
-      # mail.gpg sign_as: 'jane@doe.com', encrypt: false
+      # sign-only mode is also supported:
+      # mail.gpg sign: true
+      # mail.gpg sign_as: 'jane@doe.com'
       #
       # To turn off gpg encryption use:
       # mail.gpg false
@@ -44,13 +45,11 @@ module Mail
             self.delivery_handler = nil
           end
           nil
-        end
-        if options
+        else
           self.raise_encryption_errors = true if raise_encryption_errors.nil?
           @gpg = options
           self.delivery_handler ||= Mail::Gpg::DeliveryHandler
-        else
-          @gpg
+          nil
         end
       end
 

data/lib/mail/gpg/version.rb

@@ -1,5 +1,5 @@
 module Mail
   module Gpg
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,137 +1,137 @@
 --- !ruby/object:Gem::Specification
 name: mail-gpg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jens Kraemer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -143,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE.txt
@@ -198,12 +198,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []