sks_dump_parser 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b06b5a9dc6e7b1234b1357fded43c4b7a5a579
-  data.tar.gz: 5952fc949175dc48d6bf5935f9a33f2c2b29968f
+  metadata.gz: 523b6e3ed43a257cccc18c99597c2742799a500b
+  data.tar.gz: ef7c860a0b3c780752d5cb46edc83b8e48698585
 SHA512:
-  metadata.gz: 2eb2318c318c40cf86a1d0a5be66dd5201c5fdd76da91311c5a930da9dfb8ca7f1b1dfd7f1e29984d23727f3e948e6c6313b161cfdcbf2dd74ce61912e0eee49
-  data.tar.gz: d42321a0cd6b05da3a64ce80541b1ac5fb187abcfcf6060276201ba34793e68257a7e80dd36fd4d9a028d7b8859df879eae740ec2a23fbed720785021384786f
+  metadata.gz: b56af18ad9066d3e6f259aec7848da53d8357334dc9b712831bb3b9572c9e73be3e0a04983e4443249897acca7e06e66ab859e40f97e3d85d1de40772e26d172
+  data.tar.gz: 32db228481463025a5f90a23f52d3076dc81903449bc8bb02a03e05d62567d9dee925053924a195dafbc6e72e72234162d3d3eee986d06f41f3d27f76b5fb12e

data/lib/sks_parser.rb

@@ -11,9 +11,8 @@ class SksParser
 
     # enumerate states
     S_READING_UID = 0
-    S_READING_USER = 1
-    S_READING_SIGS = 2
-    S_READING_SUBS = 3
+    S_READING_USER_OR_SIGS = 1
+    S_READING_SUBS = 2
 
     def self.get_dump_hash_from(dump)
       sm = StateMachine.new
@@ -31,10 +30,8 @@ class SksParser
       case @state
         when S_READING_UID
           process_uid_line(line)
-        when S_READING_USER
-          process_user_line(line)
-        when S_READING_SIGS
-          process_sig_line(line)
+        when S_READING_USER_OR_SIGS
+          process_user_or_sig_line(line)
         when S_READING_SUBS
           process_sub_line(line)
         else
@@ -45,29 +42,20 @@ class SksParser
     def process_uid_line(line)
       if line.start_with?("\tkeyid")
         @keyid = line.split(' ')[1]
-        @dump_hash[@keyid] = {}
-        self.state = S_READING_USER
-      else
-        return
+        @dump_hash[@keyid] = {:sigs => []}
+        self.state = S_READING_USER_OR_SIGS
       end
     end
 
-    def process_user_line(line)
-      @dump_hash[@keyid][:user] = line.split(' ', 4)[3][1..-2]
-      @dump_hash[@keyid][:sigs] = []
-      self.state = S_READING_SIGS
-    end
-
-    def process_sig_line(line)
-      if line.start_with?(':signature')
+    def process_user_or_sig_line(line)
+      if line.start_with?(":user")
+        @dump_hash[@keyid][:user] = line.split(' ', 4)[3][1..-2]
+      elsif line.start_with?(":sig")
         @dump_hash[@keyid][:sigs] << line.split(' ')[5]
-      end
-      if line.start_with?(':public sub')
+      elsif line.start_with?(':public sub')
         self.state = S_READING_SUBS
       elsif line.start_with?(':public key')
         self.state = S_READING_UID
-      elsif line.start_with?(':user')
-        self.state = S_READING_UID
       end
     end
 
@@ -83,6 +71,7 @@ class SksParser
     output = []
     files = Dir.glob("#{directory}/*")
     files.each do |file|
+      puts file
       IO.popen("gpg --list-packets #{file}").each do |line|
         output << line
       end
@@ -90,6 +79,6 @@ class SksParser
     StateMachine.get_dump_hash_from(output)
   end
 
-  puts SksParser.parse_dump('asdf')
+  #puts SksParser.parse_dump('/Users/sue/IdeaProjects/sks/')
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sks_dump_parser
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Sue White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: sue@mailworks.org