Refactor config parsing

libagent/gpg/__init__.py

@@ -214,11 +214,7 @@ def run_agent(device_type):
     args, _ = parser.parse_known_args()
 
     assert args.homedir
-    config_file = os.path.join(args.homedir, 'gpg-agent.conf')
-
-    lines = (line.strip() for line in open(config_file))
-    lines = (line for line in lines if line and not line.startswith('#'))
-    config = dict(line.split(' ', 1) for line in lines)
+    config = util.parse_config(args.homedir)
 
     util.setup_logging(verbosity=int(config['verbosity']),
                        filename=config['log-file'])

libagent/gpg/agent.py

@@ -79,6 +79,7 @@ class AgentStop(Exception):
 
 class Handler(object):
     """GPG agent requests' handler."""
+    # pylint: disable=too-many-instance-attributes
 
     def __init__(self, device, pubkey_bytes):
         """C-tor."""

libagent/ssh/__init__.py

@@ -215,6 +215,7 @@ def _dummy_context():
 def main(device_type):
     """Run ssh-agent using given hardware client factory."""
     args = create_agent_parser(device_type=device_type).parse_args()
+    config = util.parse_config()
     util.setup_logging(verbosity=args.verbose, filename=args.log_file)
 
     public_keys = None
@@ -255,7 +256,7 @@ def main(device_type):
         sys.stdin.close()
 
     conn = JustInTimeConnection(
-        conn_factory=lambda: client.Client(device_type()),
+        conn_factory=lambda: client.Client(device_type(config=config)),
         identities=identities, public_keys=public_keys)
 
     if command or args.daemonize:

libagent/util.py

@@ -5,6 +5,7 @@
 import io
 import logging
 import struct
+import os
 
 log = logging.getLogger(__name__)
 
@@ -229,3 +230,13 @@ def which(cmd):
         raise OSError('Cannot find {!r} in $PATH'.format(cmd))
     log.debug('which %r => %r', cmd, full_path)
     return full_path
+
+
+def parse_config(homedir=None):
+    if not homedir:
+        homedir = os.environ.get('GNUPGHOME')
+    config_file = os.path.join(homedir, 'gpg-agent.conf')
+    with open(config_file, 'r') as source:
+        lines = (line.strip() for line in source)
+    lines = (line for line in lines if line and not line.startswith('#'))
+    return dict(line.split(' ', 1) for line in lines)