published to pypi

CHANGES.txt

@@ -1,3 +1,8 @@
+0.1.1
+------
+
+Added to PyPI
+
 0.1
 ------
 

README.md

@@ -1,64 +0,0 @@
-howdoi - a code search tool
-===========================
-
-Are you a hack programmer? Do you find yourself constantly Googling for how to do basic programing tasks?
-
-Suppose you want to know how to format a date in bash. Why open your browser and read through blogs when you can just...
-
-    $ howdoi format string bash
-    > [foo@bar ~]$date --date "2012-02-13" +%s
-    > 1329055200
-    > [foo@bar ~]$date --date @1329055200
-    > Mon Feb 13 00:00:00 EST 2012
-    > [foo@bar ~]$date --date @1329055200 +"%Y-%m-%d"
-    > 2012-02-13
-
-howdoi will answer all sorts of queries
-
-    $ howdoi print stack trace python
-    > import traceback
-    >
-    > try:
-    >     1/0
-    > except:
-    >     print '>>> traceback <<<'
-    >     traceback.print_exc()
-    >     print '>>> end of traceback <<<'
-    > traceback.print_exc()
-
-    $ howdoi convert mp4 to animated gif
-    > video=/path/to/video.avi
-    > outdir=/path/to/output.gif
-    > mplayer "$video" \
-    >         -ao null \
-    >         -ss "00:01:00" \  # starting point
-    >         -endpos 10 \ # duration in second
-    >         -vo gif89a:fps=13:output=$outdir \
-    >         -vf scale=240:180
-
-    $ howdoi create tar archive
-    > tar -cf backup.tar --exclude "www/subf3" www
-
-Usage:
-
-    usage: howdoi [-h] [-p POS] [-f] [-l] QUERY [QUERY ...]
-
-    code search tool
-
-    positional arguments:
-      QUERY              the question to answer
-
-    optional arguments:
-      -h, --help         show this help message and exit
-      -p POS, --pos POS  select answer in specified position (default: 1)
-      -f, --full         display the full text of the answer
-      -l, --link         display only the answer link
-
-Extra notes:
-
-*   Requires [PyQuery](http://pypi.python.org/pypi/pyquery)
-*   Special thanks to Rich Jones ([@miserlou](https://github.com/miserlou)) for the idea
-
-TODOs:
-
-*   Be able to pick StackOverflow result based on different criteria (active, oldest, etc.)

README.rst

@@ -45,11 +45,19 @@ howdoi will answer all sorts of queries
     $ howdoi create tar archive
     > tar -cf backup.tar --exclude "www/subf3" www
 
-Usage:
+Installation
+------------
 
 ::
 
-    usage: howdoi [-h] [-p POS] [-f] [-l] QUERY [QUERY ...]
+    pip install howdoi
+
+Usage
+-----
+
+::
+
+    howdoi [-h] [-p POS] [-f] [-l] QUERY [QUERY ...]
 
     code search tool
 
@@ -72,4 +80,3 @@ TODOs:
 
 -  Be able to pick StackOverflow result based on different criteria
    (active, oldest, etc.)
-

howdoi/__init__.py

@@ -1 +1 @@
-__version__ = '0.1'
+__version__ = '0.1.1'

howdoi/howdoi.py

@@ -43,7 +43,7 @@ def get_duck_links(query):
     links = [l.find('a').attrib['href'] for l in html('.links_main')]
 
 def get_link_at_pos(links, pos):
-    pos = int(args['pos']) - 1
+    pos = int(pos) - 1
     for link in links:
         if is_question(link):
             if pos == 0:

setup.py

@@ -6,12 +6,14 @@ import os
 
 def read(*names):
     values = dict()
+    extensions = ['.txt', '.rst']
     for name in names:
-        filename = name + '.txt'
-        if os.path.isfile(filename):
-            value = open(name + '.txt').read()
-        else:
-            value = ''
+        value = ''
+        for extension in extensions:
+            filename = name + extension
+            if os.path.isfile(filename):
+                value = open(name + extension).read()
+                break
         values[name] = value
     return values