gpg_status_parser 0.2.0 → 0.3.0

data/lib/gpg_status_parser/arguments.rb

@@ -78,7 +78,23 @@ module GPGStatusParser::Arguments
     :cur => NO_WHITESPACE,
     :total => NO_WHITESPACE,
     :fname => NO_WHITESPACE,
-    :pid => NO_WHITESPACE}
+    :pid => NO_WHITESPACE,
+    :count => NUMBER,
+    :no_user_id => NUMBER,
+    :imported => NUMBER,
+    :imported_rsa => NUMBER,
+    :unchanged => NUMBER,
+    :n_uids => NUMBER,
+    :n_sigs => NUMBER,
+    :n_subk => NUMBER,
+    :n_revoc => NUMBER,
+    :sec_read => NUMBER,
+    :sec_imported => NUMBER,
+    :sec_dups => NUMBER,
+    :skipped_new_keys => NUMBER,
+    :not_imported => NUMBER
+  }
+  
 
   def self.extract_expected_argument argument_string
     argument_string = argument_string.strip
@@ -141,9 +157,10 @@ module GPGStatusParser::Arguments
       
     end
     
-    # raise "Acutal args didnt match expected" if expected_args.length != results.length
-    raise "Acutal args didnt match expected" if argument_value_string && argument_value_string.length > 0
-
+    if argument_value_string && argument_value_string.length > 0
+      warn "Actual args didnt match expected.  Extra stuff #{argument_value_string.inspect}"
+    end
+    
     # Delete unspecified optional args
     args = Hash[expected_args.zip(results)]
     args.delete_if {|key,val| val.nil? || val.empty?}

data/lib/gpg_status_parser/status_codes.rb

@@ -35,6 +35,7 @@ module GPGStatusParser
     :NO_RECP => "<reserved>",
     :NO_SGNR => "<reserved>",
     :KEYEXPIRED => "<expire-timestamp>",
+    :SIGEXPIRED => "",
     :KEYREVOKED => "",
     :NO_PUBKEY => "<long keyid>",
     :NO_SECKEY => "<long keyid>",
@@ -51,7 +52,7 @@ module GPGStatusParser
     :GET_LINE => "",
     :GET_HIDDEN => "",
     :GOT_IT => "",
-    :USERID_HINT => "<long main keyid> <string>",
+    :USERID_HINT => "<long main keyid> <username>",
     :NEED_PASSPHRASE => "<long keyid> <long main keyid> <keytype> <keylength>",
     :NEED_PASSPHRASE_SYM => "<cipher_algo> <s2k_mode> <s2k_hash>",
     :NEED_PASSPHRASE_PIN => "<card_type> <chvno> [<serialno>]",
@@ -62,7 +63,7 @@ module GPGStatusParser
     :IMPORTED => "<long keyid>  <username>",
     :IMPORT_OK => "<reason> [<fingerprint>]",
     :IMPORT_PROBLEM => "<reason> [<fingerprint>]",
-    :IMPORT_RES => "<args>",
+    :IMPORT_RES => "<count> <no_user_id> <imported> <imported_rsa> <unchanged> <n_uids> <n_subk> <n_sigs> <n_revoc> <sec_read> <sec_imported> <sec_dups> <skipped_new_keys> <not_imported>",
     :CARDCTRL => "<what> [<serialno>]",
     :SC_OP_FAILURE => "[<code>]",
     :SC_OP_SUCCESS => "",

data/lib/gpg_status_parser/status_message.rb

@@ -19,7 +19,7 @@ module GPGStatusParser
       raise NotGPGStatus if match.nil?
 
       @status = match[1].intern
-      raise InvalidStatus if !STATUS_CODES.keys.include?(@status)
+      raise InvalidStatus, @status if !STATUS_CODES.keys.include?(@status)
 
       expected_arg_string = GPGStatusParser::STATUS_CODES[@status]
       expected_args = GPGStatusParser::Arguments.extract_expected_arguments(expected_arg_string)

data.tar.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 
-iQEcBAABCgAGBQJRICf6AAoJEP5F5V2hilTWNMkIALMlt98b/n67s6jlOA4P00ws
-pyEII0ZznGMN8zIfFn+QpcLJ4N475Nd+ZdNza0M+ObbUXEGDASbsoEkFtjU3ycmz
-1LyfujQcE41gJ2Od7x+LsqAMYP6IIiSEJlC7G4yUre2J7vYKw1manA2KarOR8J9U
-BqE24DwLvRjYi4i3KXj4uS3AAymDvDrlKP6V1J59T3ZvfGwVMvWh0kdOJ320ZqNU
-telIvyYn1zkGAZg3TC4Quoj619leFgdYAfLygGWmQePVAAxs+5dkl99+i3sF6nbl
-bvKN4z5PK7gtLS4alIOpaF5IHY/NQUv4Fg+FP8gpyR47CoSbQeP7xSYrPROfPd4=
-=jz+e
+iQEcBAABCgAGBQJRKM7jAAoJEP5F5V2hilTW1jQH/1aQBu/JPu6M7C1UZ98NbkR7
+xkmooFS6+/lFkNs7JUczX9dfU9I4e/ukXAxn7TUaY4l/rmxzIyn51uMp937s0kky
+6pyYGsiSmam+jQYZ5/g3BmNdX1TdErkLvhLeDum/ZaKWzmjlW8pJ4NZ4tyVguMoP
+vtT7vO0V0bbXdeKG4M9Kir4vY2n4H3wn1C+DAB7VBKRXqaTXuijC7Fv6Th8JIsa2
+TJ81aeM3l34XsO+Px+3VADmEHduwe81ge/hqi7WfTvWAc5QWHFc8DwH3fejgx5Yh
+62dri9HGtthF5qlUjNX9JczHzfVCC01ZeX/NSHNkrHK11lkri6VuZBMW4X2bdDQ=
+=fP7T
 -----END PGP SIGNATURE-----

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpg_status_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies: []
 description: Turns structured status messages provided by gpg into ruby objects for
   easy manipulation in your code.

metadata.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 
-iQEcBAABCgAGBQJRICf/AAoJEP5F5V2hilTWHhQH/140mBfZ0bmss+LHrovNIknU
-ptRbwphTP1gTjoxp9WImOhhu2+EpFmD0SkIElxTa8Q55Yr/H2hyZqXUffn56uiJy
-PuIsipdBFvqmZTWXbo7/gu8wmTVSCEU8tnPcd/HhqBVPdN8bO3wX+M/VOXT3o8ST
-4qS32FIapLjbWBRRweQrKW7BG+LFXa89cNG50ISYafk0ehE4YHpmWEbi4A02a+1j
-Gccw1dkVmEKYJz7hjYUVTLE2Xojg9WytidBvfzl4r+GI3uNfGN2UdjTpQ/sp/siD
-L35Sr5uVe7AO6JYUC1TcuU5ANA07bs9tr0XgxmAnmQvN5feC6lTceXA39H5a9kw=
-=X4IE
+iQEcBAABCgAGBQJRKM7oAAoJEP5F5V2hilTWYm8H/0UcWUEJ96ns/iyzKxNS5kzt
+EapjQ+/6hYx8M8/5mjPC8gHkOrCJB6syJvx4N4F/vz83xc661A5ozEznqPNcM4CP
++lsxN2B20LQ7rCOpDVFGi4e76BAUzwzKQqxLjzr1NGyrU4h+UE8K5/tkeSikXb9y
+NG2ivyZLvy/RM6UvN1lRnWR24zYQtXoMfqIImgjHTtPJ2h+sl5drUaYGkNy6UMYs
+C3JjrvAJ17eV4sHF5EJSMCD+jpsFc1lMdtL+Sr2581Al8vUtCWmJjp4H4o4kFxug
+bGEvTu/kcg8izG71j4/BTjknsZh4W/Ef12zkCiOy/6G0I6PbxVSGoucZqWhKeUM=
+=7DB2
 -----END PGP SIGNATURE-----