simple-gnupg-keyserver 2.0.0 → 2.0.1

data/README.rdoc

@@ -66,7 +66,8 @@ The current default options are:
 
   defaultOptions = {
     'debug'        => false,        # should debug output to logged?
-    'title'        => 'SimpleHKP'   # the title used by the default headerHTML
+    'title'        =>               # the title used by the default headerHTML
+      "SimpleHKP @ #{Socket.gethostname}",
     'simpleHKPdir' => 'simpleHKP',  # base disk path to simpleHKP disk space
     'keyDir'       => 'keys',       # subdir to key storage directory
     'idDir'        => 'identities', # subdir to identity storage directory

data/lib/simpleHKP.rb

@@ -46,6 +46,6 @@ require 'simpleHKP/server'
 
 module SimpleHKP
 
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 
 end

data/lib/simpleHKP/keys.rb

@@ -4,6 +4,7 @@ module SimpleHKP
   module Keys
 
     def saveLastKey(lastKey)
+      puts "saving last key" if @debug
       lastKey['colonData'].gsub!(/\\x3a/,':') if 
         lastKey.has_key?('colonData')
       pp lastKey if @debug
@@ -17,7 +18,12 @@ module SimpleHKP
       gpg2cmd = "gpg2 --homedir #{@keyDir} --with-fingerprint --with-colons --list-sigs"
       puts gpg2cmd if @debug
       lastKey = Hash.new
-      IO.popen(gpg2cmd, 'r').readlines.each do | aLine |
+      gpgData = ""
+      IO.popen(gpg2cmd, 'r') do | gpgPipe |
+        gpgData = gpgPipe.read
+      end
+      pp gpgData if @debug
+      gpgData.each_line do | aLine |
         next if aLine =~ /^tru/
         if aLine =~ /^pub/ then
           saveLastKey(lastKey)
@@ -38,8 +44,16 @@ module SimpleHKP
         lastKey['colonData'] << aLine
       end
       saveLastKey(lastKey)
+      puts "finished initial loading of keys" if @debug
+      pp @keyLookupData if @debug
       @keyLookupData.each_pair do | key, value |
-        value['humanData'] = `gpg2 --list-sig #{key}`
+        puts "looking up human data for #{key}"
+        pp value
+        gpg2Cmd = "gpg2 --homedir #{@keyDir} --list-sig #{key}"
+        puts gpg2Cmd if @debug
+        IO.popen(gpg2Cmd) do | gpgPipe |
+          value['humanData'] = gpgPipe.read
+        end
       end
       pp @keyLookupData if @debug
       puts "SimpleHKP: finished loading keys" if @debug
@@ -80,8 +94,9 @@ module SimpleHKP
       # send the key data through gpg2 (again ;-( to extract the keyID
       #
       gpgKeyData = ""
-      IO.popen('gpg2 --with-fingerprint --with-colons -', 'r+') do | pipe |
-        puts 'gpg2 --with-fingerprint --with-colons -' if @debug
+      gpg2Cmd = "gpg2 --homedir #{@keyDir} --with-fingerprint --with-colons -"
+      puts gpg2Cmd if @debug
+      IO.popen(gpg2Cmd, 'r+') do | pipe |
         pipe.write(keys[0][1])
         pipe.close_write
         gpgKeyData = pipe.read

data/lib/simpleHKP/server.rb

@@ -116,7 +116,7 @@ module SimpleHKP
       #
       defaultOptions = {
         'debug'        => false,
-        'title'        => 'SimpleHKP',
+        'title'        => "SimpleHKP @ #{Socket.gethostname}",
         'simpleHKPdir' => 'simpleHKP',
         'keyDir'       => 'keys',
         'idDir'        => 'identities',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-gnupg-keyserver
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc