@@ -5,6 +5,7 @@ import os

 import sys

 import json

 import time

+import argparse

 from prettytable import PrettyTable

 from termcolor import colored

@@ -20,11 +21,17 @@ CURRENCIES = {

     'YEN': '¥'

 }

+def parse_args():

+    args_parser = argparse.ArgumentParser(description='Display the contents of cached "boobank list" JSON files.')

+    args_parser.add_argument('json_file', nargs='*', default=['-'], help='JSON files to display')

+    return args_parser.parse_args()

+

 def main():

+    args = parse_args()

     table = get_table()

     total = 0

     timestamps = {}

-    filepaths = set(sys.argv[1:])

+    filepaths = set(args.json_file)

     for filepath in filepaths:

         accounts = get_accounts(filepath)

         timestamp = accounts.get('timestamp', time.time())

@@ -8,15 +8,14 @@ import json

 import copy

 import time

 import errno

+import argparse

 import subprocess

-CONF_FILE = '~/.config/boobank-cacher/conf.json'

+DEFAULT_CONF_FILE = '~/.config/boobank-cacher/conf.json'

-def get_conf_path():

-    return os.path.expanduser(CONF_FILE)

-

-def get_conf():

-    with open(get_conf_path(), 'r') as filedesc:

+def get_conf(conf_path):

+    conf_path = os.path.expanduser(conf_path)

+    with open(conf_path, 'r') as filedesc:

         return json.load(filedesc)

 def mkdir(path, mode):

@@ -83,8 +82,14 @@ def write_cache(results):

         with open(cache_path, 'w') as filedesc:

             json.dump(command['result'], filedesc, indent=4)

+def parse_args():

+    args_parser = argparse.ArgumentParser(description='Cache the output of boobank commands to JSON files.')

+    args_parser.add_argument('-c', '--config', default=DEFAULT_CONF_FILE, help='configuration file to use')

+    return args_parser.parse_args()

+

 def main():

-    conf = get_conf()

+    args = parse_args()

+    conf = get_conf(args.config)

     results = run_boobank(conf)

     process_additions(results)

     write_cache(results)

@@ -5,38 +5,34 @@ import sys

 import json

 import time

 import socket

+import argparse

 def main():

-    accounts = get_accounts()

+    args = parse_args()

+    accounts = get_accounts(args.json_file)

     timestamp = time.time()

-    socket = graphite_connect()

+    socket = graphite_connect(args.host, args.port)

     for account in accounts.get('data', []):

         send_account(socket, account, timestamp)

     socket.close()

-def graphite_connect():

-    (host, port) = ('::1', 2003)

-    if len(sys.argv) == 4:

-        (host, port) = (sys.argv[2], int(sys.argv[3]))

-    elif len(sys.argv) == 3:

-        host = sys.argv[2]

+def parse_args():

+    args_parser = argparse.ArgumentParser(description='Send the contents of a boobank-cacher JSON file to Graphite.')

+    args_parser.add_argument('-gh', '--graphite-host', dest='host', default='::1', help='Graphite host; defaults to ::1.')

+    args_parser.add_argument('-gp', '--graphite-port', dest='port', default='2003', type=int, help='Graphite port; defaults to 2003.')

+    args_parser.add_argument('json_file', nargs='?', type=argparse.FileType('r'), default=sys.stdin, help='JSON file to send to Graphite; defaults to "-" (standard input).')

+    return args_parser.parse_args()

+

+def graphite_connect(host, port):

     addr_infos = socket.getaddrinfo(host, port, 0, 0, socket.IPPROTO_TCP)

     _, _, _, _, sockaddr = addr_infos[0]

     graphite_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)

     graphite_socket.connect(sockaddr)

     return graphite_socket

-def get_accounts():

-    try:

-        accounts_json_path = sys.argv[1]

-    except IndexError:

-        accounts_json_path = '-'

-    if accounts_json_path == '-':

-        return json.load(sys.stdin)

-    else:

-        with open(accounts_json_path, 'r') as filedesc:

-            return json.load(filedesc)

+def get_accounts(filedesc):

+    return json.load(filedesc)

 def get_path(account):

     (id, bank) = account['id'].split('@')

@@ -5,6 +5,7 @@ import os

 import sys

 import json

 import time

+import argparse

 from prettytable import PrettyTable

 from termcolor import colored

@@ -17,9 +18,16 @@ CURRENCIES = {

     'YEN': '¥'

 }

+def parse_args():

+    args_parser = argparse.ArgumentParser(description='Display the contents of a cached "boobank history" JSON file.')

+    args_parser.add_argument('json_file', nargs='?', default='-', help='JSON file to display')

+    args_parser.add_argument('-c', '--count', default=None, type=int, help='Maximum number of operations to display.')

+    return args_parser.parse_args()

+

 def main():

-    filepath = sys.argv[1]

-    max_operations = int(sys.argv[2]) if len(sys.argv) > 2 else None

+    args = parse_args()

+    filepath = args.json_file

+    max_operations = args.count

     history = get_history(filepath)

     timestamp = history.get('timestamp', time.time())

     table = get_table(timestamp)