Merge 9046bb5 into 5b3069d

ueno · Sep 15, 2014 · 08b8340 · 08b8340
2 parents 5b3069d + 9046bb5
commit 08b8340
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/gpgme/key.rb b/lib/gpgme/key.rb
@@ -151,6 +151,12 @@ def delete!(allow_secret = false)
       end
     end
 
+    ##
+    # Returns true if the key has an expiry date else false
+    def expires?
+      primary_subkey.expires?
+    end
+
     ##
     # Returns the expiry date for this key
     def expires

diff --git a/lib/gpgme/sub_key.rb b/lib/gpgme/sub_key.rb
@@ -11,13 +11,16 @@ def timestamp
       Time.at(@timestamp)
     end
 
+    def expires?
+      @expires != 0
+    end
+
     def expires
-      Time.at(@expires)
+      expires? ? Time.at(@expires) : nil
     end
 
     def expired
-      return false if @expires == 0
-      @expires < Time.now.to_i
+      expires? && @expires < Time.now.to_i
     end
 
     def sha