Merge eed51ae5de into 098384d341

cheat

@@ -1,32 +1,46 @@
 #!/usr/bin/env python
 import os
 import sys
+from itertools import izip_longest, islice
 
-# assemble a keyphrase out of all params passed to the script
-keyphrase = ' '.join(sys.argv[1:])
-cheat_dir = os.path.expanduser('~') + '/.cheat/'
+def columnize(sequence, columns=2):
+    size, remainder = divmod(len(sequence), columns)
+    if remainder: 
+        size += 1
+    slices = [islice(sequence, pos, pos + size) 
+              for pos in xrange(0, len(sequence), size)]
+    return izip_longest(fillvalue='', *slices)
 
-# verify that the ~/.cheat directory exists
-if not os.path.isdir(cheat_dir):
-  print >> sys.stderr, 'The ~/.cheat directory does not exist.'
-  exit()
+def main():
+  # assemble a keyphrase out of all params passed to the script
+  keyphrase = ' '.join(sys.argv[1:])
+  cheat_dir = os.path.expanduser('~') + '/.cheat/'
 
-# list the files in the ~/.cheat directory
-cheatsheets = os.listdir(cheat_dir)
-cheatsheets.sort()
+  # verify that the ~/.cheat directory exists
+  if not os.path.isdir(cheat_dir):
+    sys.stderr.write('The ~/.cheat directory does not exist.')
+    exit()
 
-# print help if requested
-if keyphrase in ['', 'help', '--help', '-h']:
-  print "Usage: cheat [keyphrase]\n"
-  print "Available keyphrases:"
-  print "\n".join(cheatsheets)
-  exit()
+  # list the files in the ~/.cheat directory
+  cheatsheets = os.listdir(cheat_dir)
+  cheatsheets.sort()
 
-# print the cheatsheet if it exists
-if keyphrase in cheatsheets:
-  with open (cheat_dir + keyphrase, 'r') as cheatsheet:
-    print cheatsheet.read()
+  # print help if requested
+  if keyphrase in ['', 'help', '--help', '-h']:
+    print("Usage: cheat [keyphrase]\n")
+    print("Available keyphrases:")
+    for values in columnize(cheatsheets, 4):
+      print(" %s" % ' '.join(value.ljust(20) for value in values))
+    exit()
 
-# if it does not, say so
-else:
-  print 'No cheatsheet found.'
+  # print the cheatsheet if it exists
+  if keyphrase in cheatsheets:
+    with open (cheat_dir + keyphrase, 'r') as cheatsheet:
+      print(cheatsheet.read())
+
+  # if it does not, say so
+  else:
+    print('No cheatsheet found.')
+
+if __name__ == '__main__':
+    main()

install

@@ -1,12 +1,20 @@
 #!/usr/bin/env python
-from os.path import expanduser
+
+import os
+import os.path
 import shutil
 import sys
 
+home = os.path.expanduser('~')
+thisdir = os.path.dirname(os.path.abspath(__file__))
+bindir = os.path.join(home, 'bin')
 try:
-  shutil.copy('./cheat', '/usr/local/bin/')
-  shutil.copytree('./.cheat', expanduser('~') + '/.cheat')
-  print "cheat has been installed successfully."
+    if not os.path.isdir(bindir):
+        os.path.mkdir(bindir)
+    os.symlink(os.path.join(thisdir, './cheat'), os.path.join(bindir, 'cheat'))
+    os.symlink(os.path.join(thisdir, './.cheat'), os.path.join(home, '.cheat'))
+    print("cheat has been installed successfully.")
 except IOError as e:
-   print >> sys.stderr, "This installer must be run as root."
-   sys.exit(1)
+    sys.stderr.write("Something went wrong: %s\n" % e)
+    sys.stderr.write("Your installation may be incomplete!\n")
+    sys.exit(1)